Skip to content

Commit 62cb339

Browse files
vasilich6107vasilich6107
committed
rf18
1 parent efa0180 commit 62cb339

File tree

49 files changed

+506
-449
lines changed

Some content is hidden

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

49 files changed

+506
-449
lines changed

‎packages/reactive_forms_annotations/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## [8.0.0-beta0]
2+
3+
* Rf18
4+
5+
## [7.0.0]
6+
7+
* v7 release
8+
19
## [7.0.0-beta0]
210

311
* freezed 3

‎packages/reactive_forms_annotations/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: reactive_forms_annotations
22
description: Annotations for reactive_forms_generator
33
repository: https://github.com/artflutter/reactive_forms_generator
44

5-
version: 7.0.0-beta0
5+
version: 8.0.0-beta0
66

77
environment:
88
sdk: ">=3.6.0 <4.0.0"
99
resolution: workspace
1010

1111
dependencies:
12-
reactive_forms: ^17.0.0
12+
reactive_forms: ^18.0.0
1313
collection: ^1.18.0
1414
logging: ^1.3.0
1515
flutter:

‎packages/reactive_forms_generator/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## [8.0.0-beta0]
2+
3+
* Rf18
4+
5+
## [7.0.0]
6+
7+
* v7 release
8+
19
## [7.0.0-beta4]
210

311
* bugfix

‎packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list.gform.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget {
5454
required this.form,
5555
required this.child,
5656
this.canPop,
57-
this.onPopInvoked,
57+
this.onPopInvokedWithResult,
5858
}) : super(key: key);
5959

6060
final Widget child;
@@ -63,7 +63,8 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget {
6363

6464
final bool Function(FormGroup formGroup)? canPop;
6565

66-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
66+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
67+
onPopInvokedWithResult;
6768

6869
static AnimatedUrlListForm? of(
6970
BuildContext context, {
@@ -90,7 +91,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget {
9091
stream: form.form.statusChanged,
9192
child: ReactiveFormPopScope(
9293
canPop: canPop,
93-
onPopInvoked: onPopInvoked,
94+
onPopInvokedWithResult: onPopInvokedWithResult,
9495
child: child,
9596
),
9697
);
@@ -111,7 +112,7 @@ class AnimatedUrlListFormBuilder extends StatefulWidget {
111112
this.model,
112113
this.child,
113114
this.canPop,
114-
this.onPopInvoked,
115+
this.onPopInvokedWithResult,
115116
required this.builder,
116117
this.initState,
117118
}) : super(key: key);
@@ -122,7 +123,8 @@ class AnimatedUrlListFormBuilder extends StatefulWidget {
122123

123124
final bool Function(FormGroup formGroup)? canPop;
124125

125-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
126+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
127+
onPopInvokedWithResult;
126128

127129
final Widget Function(
128130
BuildContext context, AnimatedUrlListForm formModel, Widget? child)
@@ -210,7 +212,7 @@ class _AnimatedUrlListFormBuilderState
210212
child: ReactiveFormBuilder(
211213
form: () => _formModel.form,
212214
canPop: widget.canPop,
213-
onPopInvoked: widget.onPopInvoked,
215+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
214216
builder: (context, formGroup, child) =>
215217
widget.builder(context, _formModel, widget.child),
216218
child: widget.child,
@@ -885,7 +887,7 @@ class ReactiveAnimatedUrlListFormArrayBuilder<
885887
final values = formArray.controls.indexed
886888
.where((e) =>
887889
controlFilter?.call(
888-
e as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
890+
e.$2 as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
889891
) ??
890892
true)
891893
.toList();
@@ -977,7 +979,7 @@ class ReactiveAnimatedUrlListFormArrayBuilder2<
977979
final values = formArray.controls.indexed
978980
.where((e) =>
979981
controlFilter?.call(
980-
e as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
982+
e.$2 as FormControl<ReactiveAnimatedUrlListFormArrayBuilderT>,
981983
) ??
982984
true)
983985
.toList();

‎packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list_output.gform.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget {
5454
required this.form,
5555
required this.child,
5656
this.canPop,
57-
this.onPopInvoked,
57+
this.onPopInvokedWithResult,
5858
}) : super(key: key);
5959

6060
final Widget child;
@@ -63,7 +63,8 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget {
6363

6464
final bool Function(FormGroup formGroup)? canPop;
6565

66-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
66+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
67+
onPopInvokedWithResult;
6768

6869
static AnimatedUrlLisOForm? of(
6970
BuildContext context, {
@@ -90,7 +91,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget {
9091
stream: form.form.statusChanged,
9192
child: ReactiveFormPopScope(
9293
canPop: canPop,
93-
onPopInvoked: onPopInvoked,
94+
onPopInvokedWithResult: onPopInvokedWithResult,
9495
child: child,
9596
),
9697
);
@@ -111,7 +112,7 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget {
111112
this.model,
112113
this.child,
113114
this.canPop,
114-
this.onPopInvoked,
115+
this.onPopInvokedWithResult,
115116
required this.builder,
116117
this.initState,
117118
}) : super(key: key);
@@ -122,7 +123,8 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget {
122123

123124
final bool Function(FormGroup formGroup)? canPop;
124125

125-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
126+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
127+
onPopInvokedWithResult;
126128

127129
final Widget Function(
128130
BuildContext context, AnimatedUrlLisOForm formModel, Widget? child)
@@ -210,7 +212,7 @@ class _AnimatedUrlLisOFormBuilderState
210212
child: ReactiveFormBuilder(
211213
form: () => _formModel.form,
212214
canPop: widget.canPop,
213-
onPopInvoked: widget.onPopInvoked,
215+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
214216
builder: (context, formGroup, child) =>
215217
widget.builder(context, _formModel, widget.child),
216218
child: widget.child,
@@ -959,7 +961,7 @@ class ReactiveAnimatedUrlLisOFormArrayBuilder<
959961
final values = formArray.controls.indexed
960962
.where((e) =>
961963
controlFilter?.call(
962-
e as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
964+
e.$2 as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
963965
) ??
964966
true)
965967
.toList();
@@ -1051,7 +1053,7 @@ class ReactiveAnimatedUrlLisOFormArrayBuilder2<
10511053
final values = formArray.controls.indexed
10521054
.where((e) =>
10531055
controlFilter?.call(
1054-
e as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
1056+
e.$2 as FormControl<ReactiveAnimatedUrlLisOFormArrayBuilderT>,
10551057
) ??
10561058
true)
10571059
.toList();

‎packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless.gform.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget {
5353
required this.form,
5454
required this.child,
5555
this.canPop,
56-
this.onPopInvoked,
56+
this.onPopInvokedWithResult,
5757
}) : super(key: key);
5858

5959
final Widget child;
@@ -62,7 +62,8 @@ class ReactiveAnnotatelessForm extends StatelessWidget {
6262

6363
final bool Function(FormGroup formGroup)? canPop;
6464

65-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
65+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
66+
onPopInvokedWithResult;
6667

6768
static AnnotatelessForm? of(
6869
BuildContext context, {
@@ -89,7 +90,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget {
8990
stream: form.form.statusChanged,
9091
child: ReactiveFormPopScope(
9192
canPop: canPop,
92-
onPopInvoked: onPopInvoked,
93+
onPopInvokedWithResult: onPopInvokedWithResult,
9394
child: child,
9495
),
9596
);
@@ -110,7 +111,7 @@ class AnnotatelessFormBuilder extends StatefulWidget {
110111
this.model,
111112
this.child,
112113
this.canPop,
113-
this.onPopInvoked,
114+
this.onPopInvokedWithResult,
114115
required this.builder,
115116
this.initState,
116117
}) : super(key: key);
@@ -121,7 +122,8 @@ class AnnotatelessFormBuilder extends StatefulWidget {
121122

122123
final bool Function(FormGroup formGroup)? canPop;
123124

124-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
125+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
126+
onPopInvokedWithResult;
125127

126128
final Widget Function(
127129
BuildContext context, AnnotatelessForm formModel, Widget? child) builder;
@@ -207,7 +209,7 @@ class _AnnotatelessFormBuilderState extends State<AnnotatelessFormBuilder> {
207209
child: ReactiveFormBuilder(
208210
form: () => _formModel.form,
209211
canPop: widget.canPop,
210-
onPopInvoked: widget.onPopInvoked,
212+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
211213
builder: (context, formGroup, child) =>
212214
widget.builder(context, _formModel, widget.child),
213215
child: widget.child,
@@ -560,7 +562,7 @@ class ReactiveAnnotatelessFormArrayBuilder<
560562
final values = formArray.controls.indexed
561563
.where((e) =>
562564
controlFilter?.call(
563-
e as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
565+
e.$2 as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
564566
) ??
565567
true)
566568
.toList();
@@ -652,7 +654,7 @@ class ReactiveAnnotatelessFormArrayBuilder2<
652654
final values = formArray.controls.indexed
653655
.where((e) =>
654656
controlFilter?.call(
655-
e as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
657+
e.$2 as FormControl<ReactiveAnnotatelessFormArrayBuilderT>,
656658
) ??
657659
true)
658660
.toList();

‎packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless_output.gform.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
5353
required this.form,
5454
required this.child,
5555
this.canPop,
56-
this.onPopInvoked,
56+
this.onPopInvokedWithResult,
5757
}) : super(key: key);
5858

5959
final Widget child;
@@ -62,7 +62,8 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
6262

6363
final bool Function(FormGroup formGroup)? canPop;
6464

65-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
65+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
66+
onPopInvokedWithResult;
6667

6768
static AnnotatelessOForm? of(
6869
BuildContext context, {
@@ -89,7 +90,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
8990
stream: form.form.statusChanged,
9091
child: ReactiveFormPopScope(
9192
canPop: canPop,
92-
onPopInvoked: onPopInvoked,
93+
onPopInvokedWithResult: onPopInvokedWithResult,
9394
child: child,
9495
),
9596
);
@@ -110,7 +111,7 @@ class AnnotatelessOFormBuilder extends StatefulWidget {
110111
this.model,
111112
this.child,
112113
this.canPop,
113-
this.onPopInvoked,
114+
this.onPopInvokedWithResult,
114115
required this.builder,
115116
this.initState,
116117
}) : super(key: key);
@@ -121,7 +122,8 @@ class AnnotatelessOFormBuilder extends StatefulWidget {
121122

122123
final bool Function(FormGroup formGroup)? canPop;
123124

124-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
125+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
126+
onPopInvokedWithResult;
125127

126128
final Widget Function(
127129
BuildContext context, AnnotatelessOForm formModel, Widget? child) builder;
@@ -207,7 +209,7 @@ class _AnnotatelessOFormBuilderState extends State<AnnotatelessOFormBuilder> {
207209
child: ReactiveFormBuilder(
208210
form: () => _formModel.form,
209211
canPop: widget.canPop,
210-
onPopInvoked: widget.onPopInvoked,
212+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
211213
builder: (context, formGroup, child) =>
212214
widget.builder(context, _formModel, widget.child),
213215
child: widget.child,
@@ -571,7 +573,7 @@ class ReactiveAnnotatelessOFormArrayBuilder<
571573
final values = formArray.controls.indexed
572574
.where((e) =>
573575
controlFilter?.call(
574-
e as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
576+
e.$2 as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
575577
) ??
576578
true)
577579
.toList();
@@ -663,7 +665,7 @@ class ReactiveAnnotatelessOFormArrayBuilder2<
663665
final values = formArray.controls.indexed
664666
.where((e) =>
665667
controlFilter?.call(
666-
e as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
668+
e.$2 as FormControl<ReactiveAnnotatelessOFormArrayBuilderT>,
667669
) ??
668670
true)
669671
.toList();

0 commit comments

Comments
 (0)