Skip to content

Commit 844b35c

Browse files
vasilich6107vasilich6107
authored
recursive fix (#194)
Co-authored-by: Vasiliy Ditsyak <[email protected]>
1 parent 52cbb72 commit 844b35c

File tree

90 files changed

+7788
-7326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+7788
-7326
lines changed

‎packages/generator_tests/test/doc/animated_url_list_output_test.dart

Lines changed: 50 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,45 +1005,28 @@ class ReactiveAnimatedUrlLisOFormArrayBuilder<
10051005
throw FormControlParentNotFoundException(this);
10061006
}
10071007
1008-
return ReactiveFormArray<ReactiveAnimatedUrlLisOFormArrayBuilderT>(
1009-
formArray: formControl ?? control?.call(formModel),
1010-
builder: (context, formArray, child) {
1011-
final values = formArray.controls.indexed
1012-
.where((e) =>
1013-
controlFilter?.call(
1014-
e.$2 as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1015-
) ??
1016-
true)
1017-
.toList();
1018-
1019-
final itemList = values
1020-
.map((item) {
1021-
return MapEntry(
1022-
item.$1,
1023-
itemBuilder(
1024-
context,
1025-
item.$1,
1026-
formArray.controls[item.$1]
1027-
as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1028-
item.$2.value,
1029-
formModel,
1030-
),
1031-
);
1032-
})
1033-
.map((e) => e.value)
1034-
.toList();
1035-
1036-
if (emptyBuilder != null && itemList.isEmpty) {
1037-
return emptyBuilder!(context);
1038-
}
1039-
1040-
return builder?.call(
1041-
context,
1042-
itemList,
1043-
formModel,
1044-
) ??
1045-
Column(children: itemList);
1046-
},
1008+
final builder = this.builder;
1009+
final itemBuilder = this.itemBuilder;
1010+
1011+
return ReactiveFormArrayItemBuilder<
1012+
ReactiveAnimatedUrlLisOFormArrayBuilderT>(
1013+
formControl: formControl ?? control?.call(formModel),
1014+
builder: builder != null
1015+
? (context, itemList) => builder(
1016+
context,
1017+
itemList,
1018+
formModel,
1019+
)
1020+
: null,
1021+
itemBuilder: (
1022+
context,
1023+
i,
1024+
control,
1025+
item,
1026+
) =>
1027+
itemBuilder(context, i, control, item, formModel),
1028+
emptyBuilder: emptyBuilder,
1029+
controlFilter: controlFilter,
10471030
);
10481031
}
10491032
}
@@ -1097,45 +1080,34 @@ class ReactiveAnimatedUrlLisOFormArrayBuilder2<
10971080
throw FormControlParentNotFoundException(this);
10981081
}
10991082
1100-
return ReactiveFormArray<ReactiveAnimatedUrlLisOFormArrayBuilderT>(
1101-
formArray: formControl ?? control?.call(formModel),
1102-
builder: (context, formArray, child) {
1103-
final values = formArray.controls.indexed
1104-
.where((e) =>
1105-
controlFilter?.call(
1106-
e.$2 as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1107-
) ??
1108-
true)
1109-
.toList();
1110-
1111-
final itemList = values
1112-
.map((item) {
1113-
return MapEntry(
1114-
item.$1,
1115-
itemBuilder((
1116-
context: context,
1117-
i: item.$1,
1118-
control: formArray.controls[item.$1]
1119-
as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1120-
item: item.$2.value,
1121-
formModel: formModel
1122-
)),
1123-
);
1124-
})
1125-
.map((e) => e.value)
1126-
.toList();
1127-
1128-
if (emptyBuilder != null && itemList.isEmpty) {
1129-
return emptyBuilder!(context);
1130-
}
1131-
1132-
return builder?.call((
1133-
context: context,
1134-
itemList: itemList,
1135-
formModel: formModel,
1136-
)) ??
1137-
Column(children: itemList);
1138-
},
1083+
final builder = this.builder;
1084+
final itemBuilder = this.itemBuilder;
1085+
1086+
return ReactiveFormArrayItemBuilder<
1087+
ReactiveAnimatedUrlLisOFormArrayBuilderT>(
1088+
formControl: formControl ?? control?.call(formModel),
1089+
builder: builder != null
1090+
? (context, itemList) => builder((
1091+
context: context,
1092+
itemList: itemList,
1093+
formModel: formModel,
1094+
))
1095+
: null,
1096+
itemBuilder: (
1097+
context,
1098+
i,
1099+
control,
1100+
item,
1101+
) =>
1102+
itemBuilder((
1103+
context: context,
1104+
i: i,
1105+
control: control,
1106+
item: item,
1107+
formModel: formModel
1108+
)),
1109+
emptyBuilder: emptyBuilder,
1110+
controlFilter: controlFilter,
11391111
);
11401112
}
11411113
}

‎packages/generator_tests/test/doc/animated_url_list_test.dart

Lines changed: 50 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -931,45 +931,28 @@ class ReactiveAnimatedUrlListFormArrayBuilder<
931931
throw FormControlParentNotFoundException(this);
932932
}
933933
934-
return ReactiveFormArray<ReactiveAnimatedUrlListFormArrayBuilderT>(
935-
formArray: formControl ?? control?.call(formModel),
936-
builder: (context, formArray, child) {
937-
final values = formArray.controls.indexed
938-
.where((e) =>
939-
controlFilter?.call(
940-
e.$2 as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
941-
) ??
942-
true)
943-
.toList();
944-
945-
final itemList = values
946-
.map((item) {
947-
return MapEntry(
948-
item.$1,
949-
itemBuilder(
950-
context,
951-
item.$1,
952-
formArray.controls[item.$1]
953-
as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
954-
item.$2.value,
955-
formModel,
956-
),
957-
);
958-
})
959-
.map((e) => e.value)
960-
.toList();
961-
962-
if (emptyBuilder != null && itemList.isEmpty) {
963-
return emptyBuilder!(context);
964-
}
965-
966-
return builder?.call(
967-
context,
968-
itemList,
969-
formModel,
970-
) ??
971-
Column(children: itemList);
972-
},
934+
final builder = this.builder;
935+
final itemBuilder = this.itemBuilder;
936+
937+
return ReactiveFormArrayItemBuilder<
938+
ReactiveAnimatedUrlListFormArrayBuilderT>(
939+
formControl: formControl ?? control?.call(formModel),
940+
builder: builder != null
941+
? (context, itemList) => builder(
942+
context,
943+
itemList,
944+
formModel,
945+
)
946+
: null,
947+
itemBuilder: (
948+
context,
949+
i,
950+
control,
951+
item,
952+
) =>
953+
itemBuilder(context, i, control, item, formModel),
954+
emptyBuilder: emptyBuilder,
955+
controlFilter: controlFilter,
973956
);
974957
}
975958
}
@@ -1023,45 +1006,34 @@ class ReactiveAnimatedUrlListFormArrayBuilder2<
10231006
throw FormControlParentNotFoundException(this);
10241007
}
10251008
1026-
return ReactiveFormArray<ReactiveAnimatedUrlListFormArrayBuilderT>(
1027-
formArray: formControl ?? control?.call(formModel),
1028-
builder: (context, formArray, child) {
1029-
final values = formArray.controls.indexed
1030-
.where((e) =>
1031-
controlFilter?.call(
1032-
e.$2 as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
1033-
) ??
1034-
true)
1035-
.toList();
1036-
1037-
final itemList = values
1038-
.map((item) {
1039-
return MapEntry(
1040-
item.$1,
1041-
itemBuilder((
1042-
context: context,
1043-
i: item.$1,
1044-
control: formArray.controls[item.$1]
1045-
as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
1046-
item: item.$2.value,
1047-
formModel: formModel
1048-
)),
1049-
);
1050-
})
1051-
.map((e) => e.value)
1052-
.toList();
1053-
1054-
if (emptyBuilder != null && itemList.isEmpty) {
1055-
return emptyBuilder!(context);
1056-
}
1057-
1058-
return builder?.call((
1059-
context: context,
1060-
itemList: itemList,
1061-
formModel: formModel,
1062-
)) ??
1063-
Column(children: itemList);
1064-
},
1009+
final builder = this.builder;
1010+
final itemBuilder = this.itemBuilder;
1011+
1012+
return ReactiveFormArrayItemBuilder<
1013+
ReactiveAnimatedUrlListFormArrayBuilderT>(
1014+
formControl: formControl ?? control?.call(formModel),
1015+
builder: builder != null
1016+
? (context, itemList) => builder((
1017+
context: context,
1018+
itemList: itemList,
1019+
formModel: formModel,
1020+
))
1021+
: null,
1022+
itemBuilder: (
1023+
context,
1024+
i,
1025+
control,
1026+
item,
1027+
) =>
1028+
itemBuilder((
1029+
context: context,
1030+
i: i,
1031+
control: control,
1032+
item: item,
1033+
formModel: formModel
1034+
)),
1035+
emptyBuilder: emptyBuilder,
1036+
controlFilter: controlFilter,
10651037
);
10661038
}
10671039
}

0 commit comments

Comments
 (0)