Using the button function to spawn a bundle with aditional structs

[Galedon]

I am trying to make a simple main menu. I would like to ommit the copy-pasting of button node-children code so I wanted to put it into a function as in the Buttonn example.
The problem is when I try to add a new component into the bundle - it does to seem work properly with the query.
Here is the code:

the button function:

fn button(
    text: &str,
    right: f32,
    bottom: f32,
    width: f32,
    height: f32,
    ) -> impl Bundle + use<> {
    (
        Node {
            right: Val::Percent(right),
            bottom: Val::Percent(bottom),
            width: Val::Percent(width),
            height: Val::Percent(height),
            ..default()
        },
        children![(
            Button,
            Node {
                width: Val::Percent(100.0),
                height: Val::Percent(100.0),
                // horizontally center child text
                justify_content: JustifyContent::Center,
                // vertically center child text
                align_items: AlignItems::Center,
                ..default()
            },
            BorderRadius::MAX,
            BackgroundColor(NORMAL_BUTTON),
            children![(
                Text::new(text),
                TextFont {
                    font_size: 20.0,
                    ..default()
                },
                TextColor(Color::srgb(0.9, 0.9, 0.9)),
            )]
        )],
    )
}

Main menu setup:

#[derive(Component)]
struct MenuButton;

#[derive(Component)]
enum ButtonFunc{
    NewGame,
    Exit
}
fn menu_setup(
    mut commands: Commands,
){
    commands.spawn((
        MenuButton,
        ButtonFunc::NewGame,
        button(
            "NEW GAME",
            -25.,
            -20.,
            50.,
            10.
        )
    ));
    commands.spawn(
        button(
            "EXIT",
            -25.,
            -80.,
            50.,
            10.
        )
    );
}

and the button system:

fn button_system(
    mut interaction_query: Query<
        (
            &Interaction,
            &mut BackgroundColor,
            // &ButtonFunc,
        ),
        (Changed<Interaction>, With<Button>),
    >,
    mut exit: EventWriter<AppExit>
) {
    for (interaction, mut color,
        // func
    ) in &mut interaction_query {
        match *interaction {
            Interaction::Pressed => {
                *color = PRESSED_BUTTON.into();
                // match *func{
                //     ButtonFunc::NewGame => {}
                //     ButtonFunc::Exit => {exit.write(AppExit::Success);}
                // }
            }
            Interaction::Hovered => {
                *color = HOVERED_BUTTON.into();
            }
            Interaction::None => {
                *color = NORMAL_BUTTON.into();
            }
        }

    }
}

When the &ButtonFunc, and match *func are not commented out, the buttons stop to react.

Is there a proper way to spawn buttons through function, or am I doomed to copy-pasting?

[gwafotapa]

Your exit button is missing the component ButtonFunc which is why the button_system won't pick it up.

[Galedon]

Oh, my mistake - but that is only a copy-pasting error after so many tries. The non-working version does not even highlight any of the buttons.

[Galedon]

Ok so just for anybody with a similral problem, after some hours of suffering (I am a beginner) I managed to reduce the one button to 3 lines :)
Here is the code:

fn menu_setup(
    mut commands: Commands,
){
    commands.spawn((
        MenuButtons,
        Camera2d::default()
    ));

    let button_node = Node {
        width: Val::Px(300.0),
        height: Val::Px(65.0),
        margin: UiRect::all(Val::Px(20.0)),
        justify_content: JustifyContent::Center,
        align_items: AlignItems::Center,
        ..default()
    };
    let button_full = (Button,
    button_node.clone(),
    BorderRadius::MAX,
    BackgroundColor(NORMAL_BUTTON),
    );
    fn button_text(text: &str) -> impl Bundle + use<>  {
        (
            Text::new(text),
            TextFont {
                font_size: 20.0,
                ..default()
            },
            TextColor(Color::srgb(0.9, 0.9, 0.9)),
        )
    }

    commands.spawn((
                       Node {
                           width: Val::Percent(100.0),
                           height: Val::Percent(100.0),
                           flex_direction: FlexDirection::Column,
                           align_items: AlignItems::Center,
                           justify_content: JustifyContent::Center,
                           ..default()
                       },
                       MenuButtons,
                       children![
                       (
                           button_full.clone(),
                           ButtonFunc::NewGame,
                           children![button_text("NEW GAME")]
                       ),
                        (
                           button_full.clone(),
                           ButtonFunc::Exit,
                           children![button_text("EXIT")]
                        ),
                       ]
                   ));