Skip to content

Commit 146a770

Browse files
vasilich6107vasilich6107
authored
fix for controlFilter (#190)
Co-authored-by: Vasiliy Ditsyak <vasilich6107@users.noreply.github.com>
1 parent 3012135 commit 146a770

File tree

80 files changed

+1695
-1840
lines changed

Some content is hidden

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

80 files changed

+1695
-1840
lines changed

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

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,30 +1008,29 @@ class ReactiveAnimatedUrlLisOFormArrayBuilder<
10081008
return ReactiveFormArray<ReactiveAnimatedUrlLisOFormArrayBuilderT>(
10091009
formArray: formControl ?? control?.call(formModel),
10101010
builder: (context, formArray, child) {
1011-
final values = formArray.controls
1011+
final values = formArray.controls.indexed
10121012
.where((e) =>
1013-
controlFilter?.call(e
1014-
as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>) ??
1013+
controlFilter?.call(
1014+
e as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1015+
) ??
10151016
true)
1016-
.map((e) => e.value)
10171017
.toList();
10181018
10191019
final itemList = values
1020-
.asMap()
1021-
.map((i, item) {
1020+
.map((item) {
10221021
return MapEntry(
1023-
i,
1022+
item.$1,
10241023
itemBuilder(
10251024
context,
1026-
i,
1027-
formArray.controls[i]
1025+
item.$1,
1026+
formArray.controls[item.$1]
10281027
as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1029-
item,
1028+
item.$2.value,
10301029
formModel,
10311030
),
10321031
);
10331032
})
1034-
.values
1033+
.map((e) => e.value)
10351034
.toList();
10361035
10371036
if (emptyBuilder != null && itemList.isEmpty) {
@@ -1101,30 +1100,29 @@ class ReactiveAnimatedUrlLisOFormArrayBuilder2<
11011100
return ReactiveFormArray<ReactiveAnimatedUrlLisOFormArrayBuilderT>(
11021101
formArray: formControl ?? control?.call(formModel),
11031102
builder: (context, formArray, child) {
1104-
final values = formArray.controls
1103+
final values = formArray.controls.indexed
11051104
.where((e) =>
1106-
controlFilter?.call(e
1107-
as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>) ??
1105+
controlFilter?.call(
1106+
e as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1107+
) ??
11081108
true)
1109-
.map((e) => e.value)
11101109
.toList();
11111110
11121111
final itemList = values
1113-
.asMap()
1114-
.map((i, item) {
1112+
.map((item) {
11151113
return MapEntry(
1116-
i,
1114+
item.$1,
11171115
itemBuilder((
11181116
context: context,
1119-
i: i,
1120-
control: formArray.controls[i]
1117+
i: item.$1,
1118+
control: formArray.controls[item.$1]
11211119
as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1122-
item: item,
1120+
item: item.$2.value,
11231121
formModel: formModel
11241122
)),
11251123
);
11261124
})
1127-
.values
1125+
.map((e) => e.value)
11281126
.toList();
11291127
11301128
if (emptyBuilder != null && itemList.isEmpty) {

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

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -934,30 +934,29 @@ class ReactiveAnimatedUrlListFormArrayBuilder<
934934
return ReactiveFormArray<ReactiveAnimatedUrlListFormArrayBuilderT>(
935935
formArray: formControl ?? control?.call(formModel),
936936
builder: (context, formArray, child) {
937-
final values = formArray.controls
937+
final values = formArray.controls.indexed
938938
.where((e) =>
939-
controlFilter?.call(e
940-
as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>) ??
939+
controlFilter?.call(
940+
e as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
941+
) ??
941942
true)
942-
.map((e) => e.value)
943943
.toList();
944944
945945
final itemList = values
946-
.asMap()
947-
.map((i, item) {
946+
.map((item) {
948947
return MapEntry(
949-
i,
948+
item.$1,
950949
itemBuilder(
951950
context,
952-
i,
953-
formArray.controls[i]
951+
item.$1,
952+
formArray.controls[item.$1]
954953
as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
955-
item,
954+
item.$2.value,
956955
formModel,
957956
),
958957
);
959958
})
960-
.values
959+
.map((e) => e.value)
961960
.toList();
962961
963962
if (emptyBuilder != null && itemList.isEmpty) {
@@ -1027,30 +1026,29 @@ class ReactiveAnimatedUrlListFormArrayBuilder2<
10271026
return ReactiveFormArray<ReactiveAnimatedUrlListFormArrayBuilderT>(
10281027
formArray: formControl ?? control?.call(formModel),
10291028
builder: (context, formArray, child) {
1030-
final values = formArray.controls
1029+
final values = formArray.controls.indexed
10311030
.where((e) =>
1032-
controlFilter?.call(e
1033-
as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>) ??
1031+
controlFilter?.call(
1032+
e as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
1033+
) ??
10341034
true)
1035-
.map((e) => e.value)
10361035
.toList();
10371036
10381037
final itemList = values
1039-
.asMap()
1040-
.map((i, item) {
1038+
.map((item) {
10411039
return MapEntry(
1042-
i,
1040+
item.$1,
10431041
itemBuilder((
10441042
context: context,
1045-
i: i,
1046-
control: formArray.controls[i]
1043+
i: item.$1,
1044+
control: formArray.controls[item.$1]
10471045
as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
1048-
item: item,
1046+
item: item.$2.value,
10491047
formModel: formModel
10501048
)),
10511049
);
10521050
})
1053-
.values
1051+
.map((e) => e.value)
10541052
.toList();
10551053
10561054
if (emptyBuilder != null && itemList.isEmpty) {

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -611,30 +611,29 @@ class ReactiveAnnotatelessOFormArrayBuilder<
611611
return ReactiveFormArray<ReactiveAnnotatelessOFormArrayBuilderT>(
612612
formArray: formControl ?? control?.call(formModel),
613613
builder: (context, formArray, child) {
614-
final values = formArray.controls
614+
final values = formArray.controls.indexed
615615
.where((e) =>
616616
controlFilter?.call(
617-
e as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>) ??
617+
e as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
618+
) ??
618619
true)
619-
.map((e) => e.value)
620620
.toList();
621621
622622
final itemList = values
623-
.asMap()
624-
.map((i, item) {
623+
.map((item) {
625624
return MapEntry(
626-
i,
625+
item.$1,
627626
itemBuilder(
628627
context,
629-
i,
630-
formArray.controls[i]
628+
item.$1,
629+
formArray.controls[item.$1]
631630
as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
632-
item,
631+
item.$2.value,
633632
formModel,
634633
),
635634
);
636635
})
637-
.values
636+
.map((e) => e.value)
638637
.toList();
639638
640639
if (emptyBuilder != null && itemList.isEmpty) {
@@ -704,30 +703,29 @@ class ReactiveAnnotatelessOFormArrayBuilder2<
704703
return ReactiveFormArray<ReactiveAnnotatelessOFormArrayBuilderT>(
705704
formArray: formControl ?? control?.call(formModel),
706705
builder: (context, formArray, child) {
707-
final values = formArray.controls
706+
final values = formArray.controls.indexed
708707
.where((e) =>
709708
controlFilter?.call(
710-
e as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>) ??
709+
e as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
710+
) ??
711711
true)
712-
.map((e) => e.value)
713712
.toList();
714713
715714
final itemList = values
716-
.asMap()
717-
.map((i, item) {
715+
.map((item) {
718716
return MapEntry(
719-
i,
717+
item.$1,
720718
itemBuilder((
721719
context: context,
722-
i: i,
723-
control: formArray.controls[i]
720+
i: item.$1,
721+
control: formArray.controls[item.$1]
724722
as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
725-
item: item,
723+
item: item.$2.value,
726724
formModel: formModel
727725
)),
728726
);
729727
})
730-
.values
728+
.map((e) => e.value)
731729
.toList();
732730
733731
if (emptyBuilder != null && itemList.isEmpty) {

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -597,30 +597,29 @@ class ReactiveAnnotatelessFormArrayBuilder<
597597
return ReactiveFormArray<ReactiveAnnotatelessFormArrayBuilderT>(
598598
formArray: formControl ?? control?.call(formModel),
599599
builder: (context, formArray, child) {
600-
final values = formArray.controls
600+
final values = formArray.controls.indexed
601601
.where((e) =>
602602
controlFilter?.call(
603-
e as FormControl<ReactiveAnnotatelessFormArrayBuilderT>) ??
603+
e as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
604+
) ??
604605
true)
605-
.map((e) => e.value)
606606
.toList();
607607
608608
final itemList = values
609-
.asMap()
610-
.map((i, item) {
609+
.map((item) {
611610
return MapEntry(
612-
i,
611+
item.$1,
613612
itemBuilder(
614613
context,
615-
i,
616-
formArray.controls[i]
614+
item.$1,
615+
formArray.controls[item.$1]
617616
as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
618-
item,
617+
item.$2.value,
619618
formModel,
620619
),
621620
);
622621
})
623-
.values
622+
.map((e) => e.value)
624623
.toList();
625624
626625
if (emptyBuilder != null && itemList.isEmpty) {
@@ -690,30 +689,29 @@ class ReactiveAnnotatelessFormArrayBuilder2<
690689
return ReactiveFormArray<ReactiveAnnotatelessFormArrayBuilderT>(
691690
formArray: formControl ?? control?.call(formModel),
692691
builder: (context, formArray, child) {
693-
final values = formArray.controls
692+
final values = formArray.controls.indexed
694693
.where((e) =>
695694
controlFilter?.call(
696-
e as FormControl<ReactiveAnnotatelessFormArrayBuilderT>) ??
695+
e as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
696+
) ??
697697
true)
698-
.map((e) => e.value)
699698
.toList();
700699
701700
final itemList = values
702-
.asMap()
703-
.map((i, item) {
701+
.map((item) {
704702
return MapEntry(
705-
i,
703+
item.$1,
706704
itemBuilder((
707705
context: context,
708-
i: i,
709-
control: formArray.controls[i]
706+
i: item.$1,
707+
control: formArray.controls[item.$1]
710708
as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
711-
item: item,
709+
item: item.$2.value,
712710
formModel: formModel
713711
)),
714712
);
715713
})
716-
.values
714+
.map((e) => e.value)
717715
.toList();
718716
719717
if (emptyBuilder != null && itemList.isEmpty) {

0 commit comments

Comments
 (0)