From 9ae7aa4399514195c38d47266b19ab3d72e492e8 Mon Sep 17 00:00:00 2001
From: krunchington <krunchington@gmail.com>
Date: Fri, 21 Mar 2025 12:32:12 -0700
Subject: [PATCH] Update testbed_ui to use Improved Spawning API (#18329)

# Objective

Contributes to #18238
Updates the `text2d`, example to use the `children!` macro.

~~The SpawnIter usage in this example is maybe not the best. Very open
to opinions. I even left one `with_children` that I thought was just
much better than any alternative.~~

## Solution

Updates examples to use the Improved Spawning API merged in
https://github.com/bevyengine/bevy/pull/17521

## Testing

- Did you test these changes? If so, how?
- Opened the examples before and after and verified the same behavior
was observed. I did this on Ubuntu 24.04.2 LTS using `--features
wayland`.
- Are there any parts that need more testing?
- Other OS's and features can't hurt, but this is such a small change it
shouldn't be a problem.
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
  - Run the examples yourself with and without these changes.
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test?
  - see above

---

## Showcase

n/a

## Migration Guide

n/a
---
 examples/testbed/ui.rs | 86 ++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 45 deletions(-)

diff --git a/examples/testbed/ui.rs b/examples/testbed/ui.rs
index 0693a4d098..0f2a9d86ec 100644
--- a/examples/testbed/ui.rs
+++ b/examples/testbed/ui.rs
@@ -105,26 +105,24 @@ mod grid {
     pub fn setup(mut commands: Commands) {
         commands.spawn((Camera2d, StateScoped(super::Scene::Grid)));
         // Top-level grid (app frame)
-        commands
-            .spawn((
-                Node {
-                    display: Display::Grid,
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    grid_template_columns: vec![GridTrack::min_content(), GridTrack::flex(1.0)],
-                    grid_template_rows: vec![
-                        GridTrack::auto(),
-                        GridTrack::flex(1.0),
-                        GridTrack::px(40.),
-                    ],
-                    ..default()
-                },
-                BackgroundColor(Color::WHITE),
-                StateScoped(super::Scene::Grid),
-            ))
-            .with_children(|builder| {
+        commands.spawn((
+            Node {
+                display: Display::Grid,
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                grid_template_columns: vec![GridTrack::min_content(), GridTrack::flex(1.0)],
+                grid_template_rows: vec![
+                    GridTrack::auto(),
+                    GridTrack::flex(1.0),
+                    GridTrack::px(40.),
+                ],
+                ..default()
+            },
+            BackgroundColor(Color::WHITE),
+            StateScoped(super::Scene::Grid),
+            children![
                 // Header
-                builder.spawn((
+                (
                     Node {
                         display: Display::Grid,
                         grid_column: GridPlacement::span(2),
@@ -132,34 +130,32 @@ mod grid {
                         ..default()
                     },
                     BackgroundColor(RED.into()),
-                ));
-
+                ),
                 // Main content grid (auto placed in row 2, column 1)
-                builder
-                    .spawn((
-                        Node {
-                            height: Val::Percent(100.0),
-                            aspect_ratio: Some(1.0),
-                            display: Display::Grid,
-                            grid_template_columns: RepeatedGridTrack::flex(3, 1.0),
-                            grid_template_rows: RepeatedGridTrack::flex(2, 1.0),
-                            row_gap: Val::Px(12.0),
-                            column_gap: Val::Px(12.0),
-                            ..default()
-                        },
-                        BackgroundColor(Color::srgb(0.25, 0.25, 0.25)),
-                    ))
-                    .with_children(|builder| {
-                        builder.spawn((Node::default(), BackgroundColor(ORANGE.into())));
-                        builder.spawn((Node::default(), BackgroundColor(BISQUE.into())));
-                        builder.spawn((Node::default(), BackgroundColor(BLUE.into())));
-                        builder.spawn((Node::default(), BackgroundColor(CRIMSON.into())));
-                        builder.spawn((Node::default(), BackgroundColor(AQUA.into())));
-                    });
-
+                (
+                    Node {
+                        height: Val::Percent(100.0),
+                        aspect_ratio: Some(1.0),
+                        display: Display::Grid,
+                        grid_template_columns: RepeatedGridTrack::flex(3, 1.0),
+                        grid_template_rows: RepeatedGridTrack::flex(2, 1.0),
+                        row_gap: Val::Px(12.0),
+                        column_gap: Val::Px(12.0),
+                        ..default()
+                    },
+                    BackgroundColor(Color::srgb(0.25, 0.25, 0.25)),
+                    children![
+                        (Node::default(), BackgroundColor(ORANGE.into())),
+                        (Node::default(), BackgroundColor(BISQUE.into())),
+                        (Node::default(), BackgroundColor(BLUE.into())),
+                        (Node::default(), BackgroundColor(CRIMSON.into())),
+                        (Node::default(), BackgroundColor(AQUA.into())),
+                    ]
+                ),
                 // Right side bar (auto placed in row 2, column 2)
-                builder.spawn((Node::DEFAULT, BackgroundColor(BLACK.into())));
-            });
+                (Node::DEFAULT, BackgroundColor(BLACK.into())),
+            ],
+        ));
     }
 }