flutter · gspencergoog · Oct 31, 2025 · Oct 30, 2025 · Oct 30, 2025 · Oct 30, 2025
diff --git a/examples/travel_app/lib/src/catalog/checkbox_filter_chips_input.dart b/examples/travel_app/lib/src/catalog/checkbox_filter_chips_input.dart
@@ -109,6 +109,7 @@ final checkboxFilterChipsInput = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final checkboxFilterChipsData = _CheckboxFilterChipsInputData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/date_input_chip.dart b/examples/travel_app/lib/src/catalog/date_input_chip.dart
@@ -136,6 +136,7 @@ final dateInputChip = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final datePickerData = _DatePickerData.fromMap(data as JsonMap);
         final notifier = dataContext.subscribeToString(datePickerData.value);

diff --git a/examples/travel_app/lib/src/catalog/information_card.dart b/examples/travel_app/lib/src/catalog/information_card.dart
@@ -90,6 +90,7 @@ final informationCard = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final cardData = _InformationCardData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/input_group.dart b/examples/travel_app/lib/src/catalog/input_group.dart
@@ -126,6 +126,7 @@ final inputGroup = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final inputGroupData = _InputGroupData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/itinerary.dart b/examples/travel_app/lib/src/catalog/itinerary.dart
@@ -227,6 +227,7 @@ final itinerary = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final itineraryData = _ItineraryData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/listings_booker.dart b/examples/travel_app/lib/src/catalog/listings_booker.dart
@@ -60,6 +60,7 @@ final listingsBooker = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final listingsBookerData = _ListingsBookerData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/options_filter_chip_input.dart b/examples/travel_app/lib/src/catalog/options_filter_chip_input.dart
@@ -101,6 +101,7 @@ final optionsFilterChipInput = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final optionsFilterChipData = _OptionsFilterChipInputData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/tabbed_sections.dart b/examples/travel_app/lib/src/catalog/tabbed_sections.dart
@@ -110,6 +110,7 @@ final tabbedSections = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final tabbedSectionsData = _TabbedSectionsData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/text_input_chip.dart b/examples/travel_app/lib/src/catalog/text_input_chip.dart
@@ -79,6 +79,7 @@ final textInputChip = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final textInputChipData = _TextInputChipData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/trailhead.dart b/examples/travel_app/lib/src/catalog/trailhead.dart
@@ -78,6 +78,7 @@ final trailhead = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final trailheadData = _TrailheadData.fromMap(
           data as Map<String, Object?>,

diff --git a/examples/travel_app/lib/src/catalog/travel_carousel.dart b/examples/travel_app/lib/src/catalog/travel_carousel.dart
@@ -73,6 +73,7 @@ final travelCarousel = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final carouselData = _TravelCarouselData.fromMap(
           (data as Map).cast<String, Object?>(),

diff --git a/examples/travel_app/test/checkbox_filter_chips_input_test.dart b/examples/travel_app/test/checkbox_filter_chips_input_test.dart
@@ -31,6 +31,7 @@ void main() {
                   dispatchEvent: (_) {},
                   context: context,
                   dataContext: DataContext(DataModel(), '/'),
+                  getComponent: (String componentId) => null,
                 ),
               );
             },

diff --git a/examples/travel_app/test/date_input_chip_test.dart b/examples/travel_app/test/date_input_chip_test.dart
@@ -28,6 +28,7 @@ void main() {
                 dispatchEvent: (event) {},
                 context: context,
                 dataContext: DataContext(dataModel, '/'),
+                getComponent: (String componentId) => null,
               );
             },
           ),
@@ -59,6 +60,7 @@ void main() {
                 dispatchEvent: (event) {},
                 context: context,
                 dataContext: DataContext(dataModel, '/'),
+                getComponent: (String componentId) => null,
               );
             },
           ),
@@ -95,6 +97,7 @@ void main() {
                 dispatchEvent: (event) {},
                 context: context,
                 dataContext: DataContext(dataModel, '/'),
+                getComponent: (String componentId) => null,
               );
             },
           ),
@@ -132,6 +135,7 @@ void main() {
                 dispatchEvent: (event) {},
                 context: context,
                 dataContext: DataContext(dataModel, '/'),
+                getComponent: (String componentId) => null,
               );
             },
           ),

diff --git a/examples/travel_app/test/input_group_test.dart b/examples/travel_app/test/input_group_test.dart
@@ -35,6 +35,7 @@ void main() {
                     },
                     context: context,
                     dataContext: DataContext(DataModel(), '/'),
+                    getComponent: (String componentId) => null,
                   );
                 },
               ),
@@ -78,6 +79,7 @@ void main() {
                   dispatchEvent: (UiEvent _) {},
                   context: context,
                   dataContext: DataContext(DataModel(), '/'),
+                  getComponent: (String componentId) => null,
                 );
               },
             ),

diff --git a/examples/travel_app/test/itinerary_test.dart b/examples/travel_app/test/itinerary_test.dart
@@ -53,6 +53,7 @@ void main() {
       dispatchEvent: mockDispatchEvent,
       context: tester.element(find.byType(Container)),
       dataContext: DataContext(DataModel(), '/'),
+      getComponent: (String componentId) => null,
     );
 
     // 2. Pump the widget

diff --git a/examples/travel_app/test/options_filter_chip_input_test.dart b/examples/travel_app/test/options_filter_chip_input_test.dart
@@ -32,6 +32,7 @@ void main() {
                   dispatchEvent: (event) {},
                   context: context,
                   dataContext: DataContext(dataModel, '/'),
+                  getComponent: (String componentId) => null,
                 );
               },
             ),
@@ -90,6 +91,7 @@ void main() {
                   dispatchEvent: (event) {},
                   context: context,
                   dataContext: DataContext(dataModel, '/'),
+                  getComponent: (String componentId) => null,
                 );
               },
             ),

diff --git a/examples/travel_app/test/tabbed_sections_test.dart b/examples/travel_app/test/tabbed_sections_test.dart
@@ -53,6 +53,7 @@ void main() {
                         dispatchEvent: (event) {},
                         context: context,
                         dataContext: DataContext(DataModel(), '/'),
+                        getComponent: (String componentId) => null,
                       );
                     },
                   ),

diff --git a/examples/travel_app/test/trailhead_test.dart b/examples/travel_app/test/trailhead_test.dart
@@ -35,6 +35,7 @@ void main() {
                   },
                   context: context,
                   dataContext: DataContext(DataModel(), '/'),
+                  getComponent: (String componentId) => null,
                 );
               },
             ),
@@ -75,6 +76,7 @@ void main() {
                   dispatchEvent: (event) {},
                   context: context,
                   dataContext: DataContext(DataModel(), '/'),
+                  getComponent: (String componentId) => null,
                 );
               },
             ),

diff --git a/examples/travel_app/test/travel_carousel_test.dart b/examples/travel_app/test/travel_carousel_test.dart
@@ -48,6 +48,7 @@ void main() {
                     },
                     context: context,
                     dataContext: DataContext(DataModel(), '/'),
+                    getComponent: (String componentId) => null,
                   );
                 },
               ),
@@ -109,6 +110,7 @@ void main() {
                     },
                     context: context,
                     dataContext: DataContext(DataModel(), '/'),
+                    getComponent: (String componentId) => null,
                   );
                 },
               ),
@@ -143,6 +145,7 @@ void main() {
                     dispatchEvent: (event) {},
                     context: context,
                     dataContext: DataContext(DataModel(), '/'),
+                    getComponent: (String componentId) => null,
                   );
                 },
               ),

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/audio_player.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/audio_player.dart
@@ -36,6 +36,7 @@ final audioPlayer = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         return ConstrainedBox(
           constraints: const BoxConstraints(maxWidth: 200, maxHeight: 100),

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/button.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/button.dart
@@ -68,6 +68,7 @@ final button = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final buttonData = _ButtonData.fromMap(data as JsonMap);
         final child = buildChild(buttonData.child);

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/card.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/card.dart
@@ -41,6 +41,7 @@ final card = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final cardData = _CardData.fromMap(data as JsonMap);
         return Card(child: buildChild(cardData.child));

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/check_box.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/check_box.dart
@@ -48,6 +48,7 @@ final checkBox = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final checkBoxData = _CheckBoxData.fromMap(data as JsonMap);
         final labelNotifier = dataContext.subscribeToString(checkBoxData.label);

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/column.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/column.dart
@@ -113,23 +113,36 @@ final column = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final columnData = _ColumnData.fromMap(data as JsonMap);
         return ComponentChildrenBuilder(
           childrenData: columnData.children,
           dataContext: dataContext,
           buildChild: buildChild,
-          explicitListBuilder: (children) {
-            return Column(
-              mainAxisAlignment: _parseMainAxisAlignment(
-                columnData.distribution,
-              ),
-              crossAxisAlignment: _parseCrossAxisAlignment(
-                columnData.alignment,
-              ),
-              children: children,
-            );
-          },
+          getComponent: getComponent,
+          explicitListBuilder:
+              (childIds, buildChild, getComponent, dataContext) {
+                return Column(
+                  mainAxisAlignment: _parseMainAxisAlignment(
+                    columnData.distribution,
+                  ),
+                  crossAxisAlignment: _parseCrossAxisAlignment(
+                    columnData.alignment,
+                  ),
+                  mainAxisSize: MainAxisSize.min,
+                  children: childIds
+                      .map(
+                        (componentId) => buildWeightedChild(
+                          componentId: componentId,
+                          dataContext: dataContext,
+                          buildChild: buildChild,
+                          component: getComponent(componentId),
+                        ),
+                      )
+                      .toList(),
+                );
+              },
           templateListWidgetBuilder: (context, list, componentId, dataBinding) {
             return Column(
               mainAxisAlignment: _parseMainAxisAlignment(
@@ -138,12 +151,18 @@ final column = CatalogItem(
               crossAxisAlignment: _parseCrossAxisAlignment(
                 columnData.alignment,
               ),
+              mainAxisSize: MainAxisSize.min,
               children: [
-                for (var i = 0; i < list.length; i++)
-                  buildChild(
-                    componentId,
-                    dataContext.nested(DataPath('$dataBinding[$i]')),
+                for (var i = 0; i < list.length; i++) ...[
+                  buildWeightedChild(
+                    componentId: componentId,
+                    dataContext: dataContext.nested(
+                      DataPath('$dataBinding/$i'),
+                    ),
+                    buildChild: buildChild,
+                    component: getComponent(componentId),
                   ),
+                ],
               ],
             );
           },

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/date_time_input.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/date_time_input.dart
@@ -67,6 +67,7 @@ final dateTimeInput = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final dateTimeInputData = _DateTimeInputData.fromMap(data as JsonMap);
         final valueNotifier = dataContext.subscribeToString(

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/divider.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/divider.dart
@@ -40,6 +40,7 @@ final divider = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final dividerData = _DividerData.fromMap(data as JsonMap);
         if (dividerData.axis == 'vertical') {

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/heading.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/heading.dart
@@ -47,6 +47,7 @@ final heading = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final headingData = _HeadingData.fromMap(data as JsonMap);
         final notifier = dataContext.subscribeToString(headingData.text);

diff --git a/packages/flutter_genui/lib/src/catalog/core_widgets/image.dart b/packages/flutter_genui/lib/src/catalog/core_widgets/image.dart
@@ -72,6 +72,7 @@ final image = CatalogItem(
         required dispatchEvent,
         required context,
         required dataContext,
+        required getComponent,
       }) {
         final imageData = _ImageData.fromMap(data as JsonMap);
         final notifier = dataContext.subscribeToString(imageData.url);
@@ -88,11 +89,14 @@ final image = CatalogItem(
             }
             final fit = imageData.fit;
 
+            late Widget child;
+
             if (location.startsWith('assets/')) {
-              return Image.asset(location, fit: fit);
+              child = Image.asset(location, fit: fit);
             } else {
-              return Image.network(location, fit: fit);
+              child = Image.network(location, fit: fit);
             }
+            return SizedBox(width: 150, height: 150, child: child);
           },
         );
       },