version: 7.0.4

Author: vasilich6107

packages/reactive_forms_generator/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [7.0.4]
+
+* fixes
+
 ## [7.0.0-beta4]
 
 * bugfix

packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_array_builder.dart

@@ -91,46 +91,34 @@ class ReactiveFormArrayBuilder {
             if (formModel == null) {
               throw FormControlParentNotFoundException(this);
             }
+            
+            final builder = this.builder;
+            final itemBuilder = this.itemBuilder;
         
-            return ReactiveFormArray<$T>(
-              formArray: formControl ?? control?.call(formModel),
-              builder: (context, formArray, child) {
-                final values = formArray.controls.indexed
-                  .where((e) =>
-                      controlFilter?.call(
-                        e.\$2 as FormControl<$T>,
-                      ) ??
-                      true)
-                  .toList();
-                
-                final itemList = values
-                  .map((item) {
-                    return MapEntry(
-                      item.\$1,
-                      itemBuilder(
+            return ReactiveFormArrayItemBuilder<$T>(
+              formControl: formControl ?? control?.call(formModel),
+              builder: builder != null
+                  ? (context, itemList) => builder(
                         context,
-                        item.\$1,
-                        formArray.controls[item.\$1]
-                            as FormControl<$T>,
-                        item.\$2.value,
+                        itemList,
                         formModel,
-                      ),
-                    );
-                  })
-                  .map((e) => e.value)
-                  .toList();
-                    
-               if(emptyBuilder != null && itemList.isEmpty) {
-                  return emptyBuilder!(context);
-               }
-        
-               return builder?.call(
-                     context,
-                     itemList,
-                     formModel,
-                   ) ??
-                   Column(children: itemList);
-              },
+                      )
+                  : null,
+              itemBuilder: (
+                context,
+                i,
+                control,
+                item,
+              ) =>
+                  itemBuilder(
+                context,
+                i,
+                control,
+                item,
+                formModel
+              ),
+              emptyBuilder: emptyBuilder,
+              controlFilter: controlFilter,
             );
           '''),
       );

packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_array_builder2.dart

@@ -91,45 +91,34 @@ class ReactiveFormArrayBuilder2 {
             if (formModel == null) {
               throw FormControlParentNotFoundException(this);
             }
+            
+            final builder = this.builder;
+            final itemBuilder = this.itemBuilder;
         
-            return ReactiveFormArray<$T>(
-              formArray: formControl ?? control?.call(formModel),
-              builder: (context, formArray, child) {
-                final values = formArray.controls.indexed
-                  .where((e) =>
-                      controlFilter?.call(
-                        e.\$2 as FormControl<$T>,
-                      ) ??
-                      true)
-                  .toList();
-                  
-                final itemList = values
-                  .map((item) {
-                    return MapEntry(
-                      item.\$1,
-                      itemBuilder((
+            return ReactiveFormArrayItemBuilder<$T>(
+              formControl: formControl ?? control?.call(formModel),
+              builder: builder != null
+                  ? (context, itemList) => builder((
                         context: context,
-                        i: item.\$1,
-                        control: formArray.controls[item.\$1] as FormControl<$T>,
-                        item: item.\$2.value,
-                        formModel: formModel)
-                      ),
-                    );
-                  })
-                  .map((e) => e.value)
-                  .toList();
-                
-                if(emptyBuilder != null && itemList.isEmpty) {
-                  return emptyBuilder!(context);
-                }
-        
-                return builder?.call((
-                      context: context,
-                      itemList: itemList,
-                      formModel: formModel,
-                    )) ??
-                    Column(children: itemList);
-              },
+                        itemList: itemList,
+                        formModel: formModel,
+                      ))
+                  : null,
+              itemBuilder: (
+                context,
+                i,
+                control,
+                item,
+              ) =>
+                  itemBuilder((
+                context: context,
+                i: i,
+                control: control,
+                item: item,
+                formModel: formModel
+              )),
+              emptyBuilder: emptyBuilder,
+              controlFilter: controlFilter,
             );
           '''),
       );

packages/reactive_forms_generator/pubspec.yaml

@@ -2,7 +2,7 @@ name: reactive_forms_generator
 description: Generator for reactive_forms. Generates form classes based on model.
 repository: https://github.com/artflutter/reactive_forms_generator
 
-version: 7.0.0-beta4
+version: 7.0.4
 
 environment:
   sdk: ">=3.6.0 <4.0.0"