From 9c6c080448960727172cc456d3f166e19a35942c Mon Sep 17 00:00:00 2001 From: Vasiliy Ditsyak Date: Sat, 24 May 2025 12:22:08 +0200 Subject: [PATCH] test fixes flutter-version: 3.27.4 bugfix rf18 --- .github/workflows/pr-check-annotation.yml | 2 +- .github/workflows/pr-check-example.yml | 2 +- .github/workflows/pr-check-generator-test.yml | 2 +- .github/workflows/pr-check-generator.yml | 2 +- .../doc/animated_url_list_output_test.dart | 16 +++---- .../test/doc/animated_url_list_test.dart | 16 +++---- .../test/doc/annotateless_output_test.dart | 16 +++---- .../test/doc/annotateless_test.dart | 16 +++---- .../test/doc/array_nullable_output_test.dart | 14 ++++--- .../test/doc/array_nullable_test.dart | 14 ++++--- .../test/doc/create_output_test.dart | 14 ++++--- .../test/doc/delivery_list_output_test.dart | 28 +++++++------ .../test/doc/delivery_list_test.dart | 28 +++++++------ .../test/doc/freezed_class_output_test.dart | 14 ++++--- .../test/doc/freezed_class_test.dart | 14 ++++--- .../test/doc/generic_output_test.dart | 14 ++++--- .../doc/generic_status_list_output_test.dart | 14 ++++--- .../test/doc/generic_status_list_test.dart | 14 ++++--- .../test/doc/generic_test.dart | 14 ++++--- .../test/doc/group_output_test.dart | 14 ++++--- .../generator_tests/test/doc/group_test.dart | 14 ++++--- .../login_extended_nullable_output_test.dart | 14 ++++--- .../doc/login_extended_nullable_test.dart | 14 ++++--- .../test/doc/login_extended_output_test.dart | 14 ++++--- .../test/doc/login_extended_test.dart | 14 ++++--- .../test/doc/login_output_test.dart | 14 ++++--- .../generator_tests/test/doc/login_test.dart | 14 ++++--- .../test/doc/mailing_list_output_test.dart | 14 ++++--- .../test/doc/mailing_list_test.dart | 14 ++++--- .../test/doc/nested_generics_output_test.dart | 28 +++++++------ .../test/doc/nested_generics_test.dart | 28 +++++++------ .../test/doc/profile_output_test.dart | 14 ++++--- .../test/doc/profile_test.dart | 14 ++++--- .../test/doc/renamed_basic_output_test.dart | 14 ++++--- .../test/doc/renamed_basic_test.dart | 14 ++++--- .../test/doc/user_profile_output_test.dart | 14 ++++--- .../test/doc/user_profile_test.dart | 14 ++++--- .../reactive_forms_annotations/CHANGELOG.md | 4 ++ .../reactive_forms_annotations/pubspec.yaml | 4 +- .../reactive_forms_generator/CHANGELOG.md | 34 ++++++++++++++- .../animated_url_list.gform.dart | 14 ++++--- .../animated_url_list_output.gform.dart | 14 ++++--- .../docs/annotateless/annotateless.gform.dart | 14 ++++--- .../annotateless_output.gform.dart | 14 ++++--- .../array_nullable/array_nullable.gform.dart | 14 ++++--- .../array_nullable_output.gform.dart | 14 ++++--- .../lib/docs/create/create_output.gform.dart | 14 ++++--- .../delivery_list/delivery_list.gform.dart | 28 +++++++------ .../delivery_list_output.gform.dart | 28 +++++++------ .../lib/docs/freezed/freezed_class.gform.dart | 14 ++++--- .../freezed/freezed_class_output.gform.dart | 14 ++++--- .../example/lib/docs/freezed2/test.gform.dart | 14 ++++--- .../lib/docs/generic/generic.gform.dart | 14 ++++--- .../docs/generic/generic_output.gform.dart | 14 ++++--- .../generic_status_list.gform.dart | 14 ++++--- .../generic_status_list_output.gform.dart | 14 ++++--- .../example/lib/docs/group/group.gform.dart | 14 ++++--- .../lib/docs/group/group_output.gform.dart | 14 ++++--- .../example/lib/docs/login/login.gform.dart | 14 ++++--- .../example/lib/docs/login/login_form.dart | 2 +- .../lib/docs/login/login_output.gform.dart | 14 ++++--- .../login_extended/login_extended.gform.dart | 14 ++++--- .../login_extended_output.gform.dart | 14 ++++--- .../login_extended_nullable.gform.dart | 14 ++++--- .../login_extended_nullable_output.gform.dart | 14 ++++--- .../docs/mailing_list/mailing_list.gform.dart | 14 ++++--- .../mailing_list_output.gform.dart | 14 ++++--- .../model_extends/model_extends.gform.dart | 14 ++++--- .../model_implements.gform.dart | 14 ++++--- .../example/lib/docs/nested/nested.gform.dart | 42 +++++++++++-------- .../lib/docs/nested/nested_output.gform.dart | 42 +++++++++++-------- .../nested_generics.gform.dart | 28 +++++++------ .../nested_generics_output.gform.dart | 28 +++++++------ .../lib/docs/profile/profile.gform.dart | 14 ++++--- .../docs/profile/profile_output.gform.dart | 14 ++++--- .../lib/docs/recursive/recursive.gform.dart | 14 ++++--- .../renamed_basic/renamed_basic.gform.dart | 14 ++++--- .../renamed_basic_output.gform.dart | 14 ++++--- .../docs/user_profile/user_profile.gform.dart | 14 ++++--- .../user_profile_output.gform.dart | 14 ++++--- .../example/pubspec.yaml | 7 +++- .../lib/src/reactive_forms/reactive_form.dart | 8 ++-- .../reactive_forms/reactive_form_builder.dart | 10 ++--- .../reactive_forms_generator/pubspec.yaml | 2 +- pubspec.lock | 10 ++--- 85 files changed, 740 insertions(+), 533 deletions(-) diff --git a/.github/workflows/pr-check-annotation.yml b/.github/workflows/pr-check-annotation.yml index f0344f1e..6af10a95 100644 --- a/.github/workflows/pr-check-annotation.yml +++ b/.github/workflows/pr-check-annotation.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.27.4 + flutter-version: 3.32.2 channel: stable cache: true - name: Check out repository code diff --git a/.github/workflows/pr-check-example.yml b/.github/workflows/pr-check-example.yml index 6af2cb9f..a75378d7 100644 --- a/.github/workflows/pr-check-example.yml +++ b/.github/workflows/pr-check-example.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.27.4 + flutter-version: 3.32.2 channel: stable cache: true - name: Check out repository code diff --git a/.github/workflows/pr-check-generator-test.yml b/.github/workflows/pr-check-generator-test.yml index 9324bf02..918437a3 100644 --- a/.github/workflows/pr-check-generator-test.yml +++ b/.github/workflows/pr-check-generator-test.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.27.4 + flutter-version: 3.32.2 channel: stable cache: true - name: Check out repository code diff --git a/.github/workflows/pr-check-generator.yml b/.github/workflows/pr-check-generator.yml index e797fd8c..d0b0c505 100644 --- a/.github/workflows/pr-check-generator.yml +++ b/.github/workflows/pr-check-generator.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 3.27.4 + flutter-version: 3.32.2 channel: stable cache: true - name: Check out repository code diff --git a/packages/generator_tests/test/doc/animated_url_list_output_test.dart b/packages/generator_tests/test/doc/animated_url_list_output_test.dart index 2f8958ad..a49e1423 100644 --- a/packages/generator_tests/test/doc/animated_url_list_output_test.dart +++ b/packages/generator_tests/test/doc/animated_url_list_output_test.dart @@ -9,7 +9,7 @@ void main() { group('reactive_forms_generator', () { test( 'Animated URL list Output', - () async { + () async { return testGenerator( fileName: fileName, model: ''' @@ -106,7 +106,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -115,7 +115,8 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnimatedUrlLisOForm? of( BuildContext context, { @@ -142,7 +143,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -163,7 +164,7 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -174,7 +175,8 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnimatedUrlLisOForm formModel, Widget? child) @@ -262,7 +264,7 @@ class _AnimatedUrlLisOFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/animated_url_list_test.dart b/packages/generator_tests/test/doc/animated_url_list_test.dart index 5c8b736f..42658f24 100644 --- a/packages/generator_tests/test/doc/animated_url_list_test.dart +++ b/packages/generator_tests/test/doc/animated_url_list_test.dart @@ -9,7 +9,7 @@ void main() { group('reactive_forms_generator', () { test( 'Animated URL list', - () async { + () async { return testGenerator( fileName: fileName, model: ''' @@ -106,7 +106,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -115,7 +115,8 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnimatedUrlListForm? of( BuildContext context, { @@ -142,7 +143,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -163,7 +164,7 @@ class AnimatedUrlListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -174,7 +175,8 @@ class AnimatedUrlListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnimatedUrlListForm formModel, Widget? child) @@ -262,7 +264,7 @@ class _AnimatedUrlListFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/annotateless_output_test.dart b/packages/generator_tests/test/doc/annotateless_output_test.dart index c71a0536..e47bcedc 100644 --- a/packages/generator_tests/test/doc/annotateless_output_test.dart +++ b/packages/generator_tests/test/doc/annotateless_output_test.dart @@ -9,7 +9,7 @@ void main() { group('reactive_forms_generator', () { test( 'Form with annotateless fields', - () async { + () async { return testGenerator( fileName: fileName, model: ''' @@ -96,7 +96,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -105,7 +105,8 @@ class ReactiveAnnotatelessOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnnotatelessOForm? of( BuildContext context, { @@ -132,7 +133,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -153,7 +154,7 @@ class AnnotatelessOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -164,7 +165,8 @@ class AnnotatelessOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnnotatelessOForm formModel, Widget? child) builder; @@ -250,7 +252,7 @@ class _AnnotatelessOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/annotateless_test.dart b/packages/generator_tests/test/doc/annotateless_test.dart index 908b62ce..10876f65 100644 --- a/packages/generator_tests/test/doc/annotateless_test.dart +++ b/packages/generator_tests/test/doc/annotateless_test.dart @@ -9,7 +9,7 @@ void main() { group('reactive_forms_generator', () { test( 'Form with annotateless fields', - () async { + () async { return testGenerator( fileName: fileName, model: ''' @@ -93,7 +93,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -102,7 +102,8 @@ class ReactiveAnnotatelessForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnnotatelessForm? of( BuildContext context, { @@ -129,7 +130,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -150,7 +151,7 @@ class AnnotatelessFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -161,7 +162,8 @@ class AnnotatelessFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnnotatelessForm formModel, Widget? child) builder; @@ -247,7 +249,7 @@ class _AnnotatelessFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/array_nullable_output_test.dart b/packages/generator_tests/test/doc/array_nullable_output_test.dart index 9dac5e8e..efe6a81c 100644 --- a/packages/generator_tests/test/doc/array_nullable_output_test.dart +++ b/packages/generator_tests/test/doc/array_nullable_output_test.dart @@ -109,7 +109,7 @@ class ReactiveArrayNullableOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -118,7 +118,8 @@ class ReactiveArrayNullableOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ArrayNullableOForm? of( BuildContext context, { @@ -145,7 +146,7 @@ class ReactiveArrayNullableOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -166,7 +167,7 @@ class ArrayNullableOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -177,7 +178,8 @@ class ArrayNullableOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ArrayNullableOForm formModel, Widget? child) @@ -264,7 +266,7 @@ class _ArrayNullableOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/array_nullable_test.dart b/packages/generator_tests/test/doc/array_nullable_test.dart index 905125a6..a007cbca 100644 --- a/packages/generator_tests/test/doc/array_nullable_test.dart +++ b/packages/generator_tests/test/doc/array_nullable_test.dart @@ -111,7 +111,7 @@ class ReactiveArrayNullableForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -120,7 +120,8 @@ class ReactiveArrayNullableForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ArrayNullableForm? of( BuildContext context, { @@ -147,7 +148,7 @@ class ReactiveArrayNullableForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -168,7 +169,7 @@ class ArrayNullableFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -179,7 +180,8 @@ class ArrayNullableFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ArrayNullableForm formModel, Widget? child) builder; @@ -265,7 +267,7 @@ class _ArrayNullableFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/create_output_test.dart b/packages/generator_tests/test/doc/create_output_test.dart index 0f31becc..b551932a 100644 --- a/packages/generator_tests/test/doc/create_output_test.dart +++ b/packages/generator_tests/test/doc/create_output_test.dart @@ -157,7 +157,7 @@ class ReactiveMSICreateForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -166,7 +166,8 @@ class ReactiveMSICreateForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static MSICreateForm? of( BuildContext context, { @@ -192,7 +193,7 @@ class ReactiveMSICreateForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -212,7 +213,7 @@ class MSICreateFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -223,7 +224,8 @@ class MSICreateFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, MSICreateForm formModel, Widget? child) builder; @@ -306,7 +308,7 @@ class _MSICreateFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/delivery_list_output_test.dart b/packages/generator_tests/test/doc/delivery_list_output_test.dart index 1fa1cfb3..0a54112d 100644 --- a/packages/generator_tests/test/doc/delivery_list_output_test.dart +++ b/packages/generator_tests/test/doc/delivery_list_output_test.dart @@ -149,7 +149,7 @@ class ReactiveDeliveryListOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -158,7 +158,8 @@ class ReactiveDeliveryListOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static DeliveryListOForm? of( BuildContext context, { @@ -185,7 +186,7 @@ class ReactiveDeliveryListOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -206,7 +207,7 @@ class DeliveryListOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -217,7 +218,8 @@ class DeliveryListOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, DeliveryListOForm formModel, Widget? child) builder; @@ -303,7 +305,7 @@ class _DeliveryListOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -2281,7 +2283,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -2290,7 +2292,8 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StandaloneDeliveryPointForm? of( BuildContext context, { @@ -2317,7 +2320,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -2338,7 +2341,7 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -2349,7 +2352,8 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, StandaloneDeliveryPointForm formModel, Widget? child) builder; @@ -2437,7 +2441,7 @@ class _StandaloneDeliveryPointFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/delivery_list_test.dart b/packages/generator_tests/test/doc/delivery_list_test.dart index d3e9938f..b36a3d06 100644 --- a/packages/generator_tests/test/doc/delivery_list_test.dart +++ b/packages/generator_tests/test/doc/delivery_list_test.dart @@ -141,7 +141,7 @@ class ReactiveDeliveryListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -150,7 +150,8 @@ class ReactiveDeliveryListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static DeliveryListForm? of( BuildContext context, { @@ -177,7 +178,7 @@ class ReactiveDeliveryListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -198,7 +199,7 @@ class DeliveryListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -209,7 +210,8 @@ class DeliveryListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, DeliveryListForm formModel, Widget? child) builder; @@ -295,7 +297,7 @@ class _DeliveryListFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -2219,7 +2221,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -2228,7 +2230,8 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StandaloneDeliveryPointForm? of( BuildContext context, { @@ -2255,7 +2258,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -2276,7 +2279,7 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -2287,7 +2290,8 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, StandaloneDeliveryPointForm formModel, Widget? child) builder; @@ -2375,7 +2379,7 @@ class _StandaloneDeliveryPointFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/freezed_class_output_test.dart b/packages/generator_tests/test/doc/freezed_class_output_test.dart index bffca501..3d261877 100644 --- a/packages/generator_tests/test/doc/freezed_class_output_test.dart +++ b/packages/generator_tests/test/doc/freezed_class_output_test.dart @@ -109,7 +109,7 @@ class ReactiveFreezedClassOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -118,7 +118,8 @@ class ReactiveFreezedClassOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static FreezedClassOForm? of( BuildContext context, { @@ -145,7 +146,7 @@ class ReactiveFreezedClassOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -166,7 +167,7 @@ class FreezedClassOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -177,7 +178,8 @@ class FreezedClassOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, FreezedClassOForm formModel, Widget? child) builder; @@ -263,7 +265,7 @@ class _FreezedClassOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/freezed_class_test.dart b/packages/generator_tests/test/doc/freezed_class_test.dart index ed2f16a1..91c17de5 100644 --- a/packages/generator_tests/test/doc/freezed_class_test.dart +++ b/packages/generator_tests/test/doc/freezed_class_test.dart @@ -108,7 +108,7 @@ class ReactiveFreezedClassForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -117,7 +117,8 @@ class ReactiveFreezedClassForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static FreezedClassForm? of( BuildContext context, { @@ -144,7 +145,7 @@ class ReactiveFreezedClassForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -165,7 +166,7 @@ class FreezedClassFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -176,7 +177,8 @@ class FreezedClassFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, FreezedClassForm formModel, Widget? child) builder; @@ -262,7 +264,7 @@ class _FreezedClassFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/generic_output_test.dart b/packages/generator_tests/test/doc/generic_output_test.dart index 35e50e51..26f02d15 100644 --- a/packages/generator_tests/test/doc/generic_output_test.dart +++ b/packages/generator_tests/test/doc/generic_output_test.dart @@ -91,7 +91,7 @@ class ReactiveTagsOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -100,7 +100,8 @@ class ReactiveTagsOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static TagsOForm? of( BuildContext context, { @@ -126,7 +127,7 @@ class ReactiveTagsOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -146,7 +147,7 @@ class TagsOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -157,7 +158,8 @@ class TagsOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, TagsOForm formModel, Widget? child) builder; @@ -240,7 +242,7 @@ class _TagsOFormBuilderState extends State> { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/generic_status_list_output_test.dart b/packages/generator_tests/test/doc/generic_status_list_output_test.dart index bdc5fba3..9ca481b7 100644 --- a/packages/generator_tests/test/doc/generic_status_list_output_test.dart +++ b/packages/generator_tests/test/doc/generic_status_list_output_test.dart @@ -90,7 +90,7 @@ class ReactiveStatusListOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -99,7 +99,8 @@ class ReactiveStatusListOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StatusListOForm? of( BuildContext context, { @@ -126,7 +127,7 @@ class ReactiveStatusListOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -147,7 +148,7 @@ class StatusListOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -158,7 +159,8 @@ class StatusListOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, StatusListOForm formModel, Widget? child) @@ -246,7 +248,7 @@ class _StatusListOFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/generic_status_list_test.dart b/packages/generator_tests/test/doc/generic_status_list_test.dart index ad795d7f..5fed1f8b 100644 --- a/packages/generator_tests/test/doc/generic_status_list_test.dart +++ b/packages/generator_tests/test/doc/generic_status_list_test.dart @@ -89,7 +89,7 @@ class ReactiveStatusListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -98,7 +98,8 @@ class ReactiveStatusListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StatusListForm? of( BuildContext context, { @@ -125,7 +126,7 @@ class ReactiveStatusListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -146,7 +147,7 @@ class StatusListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -157,7 +158,8 @@ class StatusListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, StatusListForm formModel, Widget? child) builder; @@ -244,7 +246,7 @@ class _StatusListFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/generic_test.dart b/packages/generator_tests/test/doc/generic_test.dart index 8ca911b2..bdf5b741 100644 --- a/packages/generator_tests/test/doc/generic_test.dart +++ b/packages/generator_tests/test/doc/generic_test.dart @@ -91,7 +91,7 @@ class ReactiveTagsForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -100,7 +100,8 @@ class ReactiveTagsForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static TagsForm? of( BuildContext context, { @@ -126,7 +127,7 @@ class ReactiveTagsForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -145,7 +146,7 @@ class TagsFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -156,7 +157,8 @@ class TagsFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, TagsForm formModel, Widget? child) builder; @@ -239,7 +241,7 @@ class _TagsFormBuilderState extends State> { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/group_output_test.dart b/packages/generator_tests/test/doc/group_output_test.dart index 5d72a0ec..a5ae2d4a 100644 --- a/packages/generator_tests/test/doc/group_output_test.dart +++ b/packages/generator_tests/test/doc/group_output_test.dart @@ -138,7 +138,7 @@ class ReactiveGroupOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -147,7 +147,8 @@ class ReactiveGroupOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static GroupOForm? of( BuildContext context, { @@ -173,7 +174,7 @@ class ReactiveGroupOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -192,7 +193,7 @@ class GroupOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -203,7 +204,8 @@ class GroupOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, GroupOForm formModel, Widget? child) builder; @@ -286,7 +288,7 @@ class _GroupOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/group_test.dart b/packages/generator_tests/test/doc/group_test.dart index 9f856311..fa5da156 100644 --- a/packages/generator_tests/test/doc/group_test.dart +++ b/packages/generator_tests/test/doc/group_test.dart @@ -138,7 +138,7 @@ class ReactiveGroupForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -147,7 +147,8 @@ class ReactiveGroupForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static GroupForm? of( BuildContext context, { @@ -173,7 +174,7 @@ class ReactiveGroupForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -192,7 +193,7 @@ class GroupFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -203,7 +204,8 @@ class GroupFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, GroupForm formModel, Widget? child) builder; @@ -286,7 +288,7 @@ class _GroupFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/login_extended_nullable_output_test.dart b/packages/generator_tests/test/doc/login_extended_nullable_output_test.dart index f28157f1..55034ed4 100644 --- a/packages/generator_tests/test/doc/login_extended_nullable_output_test.dart +++ b/packages/generator_tests/test/doc/login_extended_nullable_output_test.dart @@ -111,7 +111,7 @@ class ReactiveLoginExtendedNullableOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -120,7 +120,8 @@ class ReactiveLoginExtendedNullableOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedNullableOForm? of( BuildContext context, { @@ -147,7 +148,7 @@ class ReactiveLoginExtendedNullableOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -168,7 +169,7 @@ class LoginExtendedNullableOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -179,7 +180,8 @@ class LoginExtendedNullableOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, LoginExtendedNullableOForm formModel, Widget? child) builder; @@ -267,7 +269,7 @@ class _LoginExtendedNullableOFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/login_extended_nullable_test.dart b/packages/generator_tests/test/doc/login_extended_nullable_test.dart index 45737487..58fa9a25 100644 --- a/packages/generator_tests/test/doc/login_extended_nullable_test.dart +++ b/packages/generator_tests/test/doc/login_extended_nullable_test.dart @@ -111,7 +111,7 @@ class ReactiveLoginExtendedNullableForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -120,7 +120,8 @@ class ReactiveLoginExtendedNullableForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedNullableForm? of( BuildContext context, { @@ -147,7 +148,7 @@ class ReactiveLoginExtendedNullableForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -168,7 +169,7 @@ class LoginExtendedNullableFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -179,7 +180,8 @@ class LoginExtendedNullableFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, LoginExtendedNullableForm formModel, Widget? child) builder; @@ -267,7 +269,7 @@ class _LoginExtendedNullableFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/login_extended_output_test.dart b/packages/generator_tests/test/doc/login_extended_output_test.dart index f93d84a9..e2464fb3 100644 --- a/packages/generator_tests/test/doc/login_extended_output_test.dart +++ b/packages/generator_tests/test/doc/login_extended_output_test.dart @@ -166,7 +166,7 @@ class ReactiveLoginExtendedOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -175,7 +175,8 @@ class ReactiveLoginExtendedOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedOForm? of( BuildContext context, { @@ -202,7 +203,7 @@ class ReactiveLoginExtendedOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -223,7 +224,7 @@ class LoginExtendedOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -234,7 +235,8 @@ class LoginExtendedOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginExtendedOForm formModel, Widget? child) @@ -321,7 +323,7 @@ class _LoginExtendedOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/login_extended_test.dart b/packages/generator_tests/test/doc/login_extended_test.dart index 3c9a18d9..c150d029 100644 --- a/packages/generator_tests/test/doc/login_extended_test.dart +++ b/packages/generator_tests/test/doc/login_extended_test.dart @@ -160,7 +160,7 @@ class ReactiveLoginExtendedForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -169,7 +169,8 @@ class ReactiveLoginExtendedForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedForm? of( BuildContext context, { @@ -196,7 +197,7 @@ class ReactiveLoginExtendedForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -217,7 +218,7 @@ class LoginExtendedFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -228,7 +229,8 @@ class LoginExtendedFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginExtendedForm formModel, Widget? child) builder; @@ -314,7 +316,7 @@ class _LoginExtendedFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/login_output_test.dart b/packages/generator_tests/test/doc/login_output_test.dart index 9aeac0e2..13032c55 100644 --- a/packages/generator_tests/test/doc/login_output_test.dart +++ b/packages/generator_tests/test/doc/login_output_test.dart @@ -126,7 +126,7 @@ class ReactiveLoginOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -135,7 +135,8 @@ class ReactiveLoginOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginOForm? of( BuildContext context, { @@ -161,7 +162,7 @@ class ReactiveLoginOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -180,7 +181,7 @@ class LoginOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -191,7 +192,8 @@ class LoginOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginOForm formModel, Widget? child) builder; @@ -274,7 +276,7 @@ class _LoginOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/login_test.dart b/packages/generator_tests/test/doc/login_test.dart index 8a68abe6..ba1ea3ef 100644 --- a/packages/generator_tests/test/doc/login_test.dart +++ b/packages/generator_tests/test/doc/login_test.dart @@ -113,7 +113,7 @@ class ReactiveLoginForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -122,7 +122,8 @@ class ReactiveLoginForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginForm? of( BuildContext context, { @@ -148,7 +149,7 @@ class ReactiveLoginForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -167,7 +168,7 @@ class LoginFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -178,7 +179,8 @@ class LoginFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginForm formModel, Widget? child) builder; @@ -261,7 +263,7 @@ class _LoginFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/mailing_list_output_test.dart b/packages/generator_tests/test/doc/mailing_list_output_test.dart index 7b06b35c..d8ad87d2 100644 --- a/packages/generator_tests/test/doc/mailing_list_output_test.dart +++ b/packages/generator_tests/test/doc/mailing_list_output_test.dart @@ -104,7 +104,7 @@ class ReactiveMailingListOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -113,7 +113,8 @@ class ReactiveMailingListOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static MailingListOForm? of( BuildContext context, { @@ -140,7 +141,7 @@ class ReactiveMailingListOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -161,7 +162,7 @@ class MailingListOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -172,7 +173,8 @@ class MailingListOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, MailingListOForm formModel, Widget? child) builder; @@ -258,7 +260,7 @@ class _MailingListOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/mailing_list_test.dart b/packages/generator_tests/test/doc/mailing_list_test.dart index 064608ba..3889867d 100644 --- a/packages/generator_tests/test/doc/mailing_list_test.dart +++ b/packages/generator_tests/test/doc/mailing_list_test.dart @@ -104,7 +104,7 @@ class ReactiveMailingListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -113,7 +113,8 @@ class ReactiveMailingListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static MailingListForm? of( BuildContext context, { @@ -140,7 +141,7 @@ class ReactiveMailingListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -160,7 +161,7 @@ class MailingListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -171,7 +172,8 @@ class MailingListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, MailingListForm formModel, Widget? child) builder; @@ -256,7 +258,7 @@ class _MailingListFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/nested_generics_output_test.dart b/packages/generator_tests/test/doc/nested_generics_output_test.dart index da7e213f..ce3a669a 100644 --- a/packages/generator_tests/test/doc/nested_generics_output_test.dart +++ b/packages/generator_tests/test/doc/nested_generics_output_test.dart @@ -128,7 +128,7 @@ class ReactiveProductDetailsOForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -137,7 +137,8 @@ class ReactiveProductDetailsOForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProductDetailsOForm? of

( BuildContext context, { @@ -164,7 +165,7 @@ class ReactiveProductDetailsOForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -188,7 +189,7 @@ class ProductDetailsOFormBuilder

this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -199,7 +200,8 @@ class ProductDetailsOFormBuilder

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, ProductDetailsOForm formModel, Widget? child) builder; @@ -286,7 +288,7 @@ class _ProductDetailsOFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -1292,7 +1294,7 @@ class ReactiveIdOForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -1301,7 +1303,8 @@ class ReactiveIdOForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static IdOForm? of

( BuildContext context, { @@ -1327,7 +1330,7 @@ class ReactiveIdOForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -1348,7 +1351,7 @@ class IdOFormBuilder

extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -1359,7 +1362,8 @@ class IdOFormBuilder

extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, IdOForm formModel, Widget? child) builder; @@ -1443,7 +1447,7 @@ class _IdOFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/nested_generics_test.dart b/packages/generator_tests/test/doc/nested_generics_test.dart index f1fefa85..54092214 100644 --- a/packages/generator_tests/test/doc/nested_generics_test.dart +++ b/packages/generator_tests/test/doc/nested_generics_test.dart @@ -128,7 +128,7 @@ class ReactiveProductDetailsForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -137,7 +137,8 @@ class ReactiveProductDetailsForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProductDetailsForm? of

( BuildContext context, { @@ -164,7 +165,7 @@ class ReactiveProductDetailsForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -188,7 +189,7 @@ class ProductDetailsFormBuilder

this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -199,7 +200,8 @@ class ProductDetailsFormBuilder

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, ProductDetailsForm formModel, Widget? child) builder; @@ -286,7 +288,7 @@ class _ProductDetailsFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -1268,7 +1270,7 @@ class ReactiveIdForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -1277,7 +1279,8 @@ class ReactiveIdForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static IdForm? of

( BuildContext context, { @@ -1303,7 +1306,7 @@ class ReactiveIdForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -1324,7 +1327,7 @@ class IdFormBuilder

extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -1335,7 +1338,8 @@ class IdFormBuilder

extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, IdForm formModel, Widget? child) builder; @@ -1419,7 +1423,7 @@ class _IdFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/profile_output_test.dart b/packages/generator_tests/test/doc/profile_output_test.dart index 4ce9ad03..055194c9 100644 --- a/packages/generator_tests/test/doc/profile_output_test.dart +++ b/packages/generator_tests/test/doc/profile_output_test.dart @@ -341,7 +341,7 @@ class ReactiveProfileOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -350,7 +350,8 @@ class ReactiveProfileOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProfileOForm? of( BuildContext context, { @@ -376,7 +377,7 @@ class ReactiveProfileOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -396,7 +397,7 @@ class ProfileOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -407,7 +408,8 @@ class ProfileOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ProfileOForm formModel, Widget? child) builder; @@ -490,7 +492,7 @@ class _ProfileOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/profile_test.dart b/packages/generator_tests/test/doc/profile_test.dart index c7376782..a2c624a0 100644 --- a/packages/generator_tests/test/doc/profile_test.dart +++ b/packages/generator_tests/test/doc/profile_test.dart @@ -336,7 +336,7 @@ class ReactiveProfileForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -345,7 +345,8 @@ class ReactiveProfileForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProfileForm? of( BuildContext context, { @@ -371,7 +372,7 @@ class ReactiveProfileForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -390,7 +391,7 @@ class ProfileFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -401,7 +402,8 @@ class ProfileFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ProfileForm formModel, Widget? child) builder; @@ -484,7 +486,7 @@ class _ProfileFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/renamed_basic_output_test.dart b/packages/generator_tests/test/doc/renamed_basic_output_test.dart index ad37073c..ff4bd8c1 100644 --- a/packages/generator_tests/test/doc/renamed_basic_output_test.dart +++ b/packages/generator_tests/test/doc/renamed_basic_output_test.dart @@ -101,7 +101,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -110,7 +110,8 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static SomeWiredNameForm? of( BuildContext context, { @@ -137,7 +138,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -158,7 +159,7 @@ class SomeWiredNameFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -169,7 +170,8 @@ class SomeWiredNameFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, SomeWiredNameForm formModel, Widget? child) builder; @@ -255,7 +257,7 @@ class _SomeWiredNameFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/renamed_basic_test.dart b/packages/generator_tests/test/doc/renamed_basic_test.dart index 2bd2bb5f..596394a0 100644 --- a/packages/generator_tests/test/doc/renamed_basic_test.dart +++ b/packages/generator_tests/test/doc/renamed_basic_test.dart @@ -101,7 +101,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -110,7 +110,8 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static SomeWiredNameForm? of( BuildContext context, { @@ -137,7 +138,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -158,7 +159,7 @@ class SomeWiredNameFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -169,7 +170,8 @@ class SomeWiredNameFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, SomeWiredNameForm formModel, Widget? child) builder; @@ -255,7 +257,7 @@ class _SomeWiredNameFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/user_profile_output_test.dart b/packages/generator_tests/test/doc/user_profile_output_test.dart index 2ffe9148..eece536b 100644 --- a/packages/generator_tests/test/doc/user_profile_output_test.dart +++ b/packages/generator_tests/test/doc/user_profile_output_test.dart @@ -127,7 +127,7 @@ class ReactiveUserProfileOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -136,7 +136,8 @@ class ReactiveUserProfileOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static UserProfileOForm? of( BuildContext context, { @@ -163,7 +164,7 @@ class ReactiveUserProfileOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -184,7 +185,7 @@ class UserProfileOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -195,7 +196,8 @@ class UserProfileOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, UserProfileOForm formModel, Widget? child) builder; @@ -281,7 +283,7 @@ class _UserProfileOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/generator_tests/test/doc/user_profile_test.dart b/packages/generator_tests/test/doc/user_profile_test.dart index 4ebaed7e..0886c87f 100644 --- a/packages/generator_tests/test/doc/user_profile_test.dart +++ b/packages/generator_tests/test/doc/user_profile_test.dart @@ -127,7 +127,7 @@ class ReactiveUserProfileForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -136,7 +136,8 @@ class ReactiveUserProfileForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static UserProfileForm? of( BuildContext context, { @@ -163,7 +164,7 @@ class ReactiveUserProfileForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -183,7 +184,7 @@ class UserProfileFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -194,7 +195,8 @@ class UserProfileFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, UserProfileForm formModel, Widget? child) builder; @@ -279,7 +281,7 @@ class _UserProfileFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_annotations/CHANGELOG.md b/packages/reactive_forms_annotations/CHANGELOG.md index 1361188f..f38c574c 100644 --- a/packages/reactive_forms_annotations/CHANGELOG.md +++ b/packages/reactive_forms_annotations/CHANGELOG.md @@ -1,3 +1,7 @@ +## [8.0.1] + +* bugfix + ## [8.0.0] * Rf18 diff --git a/packages/reactive_forms_annotations/pubspec.yaml b/packages/reactive_forms_annotations/pubspec.yaml index 4c912715..4d8eeb86 100644 --- a/packages/reactive_forms_annotations/pubspec.yaml +++ b/packages/reactive_forms_annotations/pubspec.yaml @@ -2,14 +2,14 @@ name: reactive_forms_annotations description: Annotations for reactive_forms_generator repository: https://github.com/artflutter/reactive_forms_generator -version: 7.0.1 +version: 8.0.1 environment: sdk: ">=3.6.0 <4.0.0" resolution: workspace dependencies: - reactive_forms: ^17.0.0 + reactive_forms: ^18.0.0 collection: ^1.18.0 logging: ^1.3.0 flutter: diff --git a/packages/reactive_forms_generator/CHANGELOG.md b/packages/reactive_forms_generator/CHANGELOG.md index cbe1f282..52c46e9e 100644 --- a/packages/reactive_forms_generator/CHANGELOG.md +++ b/packages/reactive_forms_generator/CHANGELOG.md @@ -1,3 +1,19 @@ +## [8.0.3] + +* Recursive forms bugfix fix + +## [8.0.1] + +* bugfix + +## [8.0.0] + +* Rf18 + +## [8.0.0-beta0] + +* Rf18 + ## [7.0.6] * Recursive forms bugfix fix @@ -8,7 +24,23 @@ ## [7.0.4] -* fixes +* ReactiveFormArrayItemBuilder + +## [7.0.3] + +* fix + +## [7.0.2] + +* fix + +## [7.0.1] + +* array builder improvements + +## [7.0.0] + +* v7 release ## [7.0.0-beta4] diff --git a/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list.gform.dart b/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list.gform.dart index 58708d7e..e72b733a 100644 --- a/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list.gform.dart @@ -54,7 +54,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnimatedUrlListForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class AnimatedUrlListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class AnimatedUrlListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnimatedUrlListForm formModel, Widget? child) @@ -210,7 +212,7 @@ class _AnimatedUrlListFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list_output.gform.dart index d27b87f0..34d08469 100644 --- a/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/animated_url_list/animated_url_list_output.gform.dart @@ -54,7 +54,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnimatedUrlLisOForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnimatedUrlLisOForm formModel, Widget? child) @@ -210,7 +212,7 @@ class _AnimatedUrlLisOFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless.gform.dart b/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless.gform.dart index a43aa312..ae746939 100644 --- a/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless.gform.dart @@ -53,7 +53,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveAnnotatelessForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnnotatelessForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class AnnotatelessFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class AnnotatelessFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnnotatelessForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _AnnotatelessFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless_output.gform.dart index 41443885..ecf3acc8 100644 --- a/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/annotateless/annotateless_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveAnnotatelessOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static AnnotatelessOForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class AnnotatelessOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class AnnotatelessOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, AnnotatelessOForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _AnnotatelessOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable.gform.dart b/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable.gform.dart index 69f1b8e9..7527bfe1 100644 --- a/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable.gform.dart @@ -53,7 +53,7 @@ class ReactiveArrayNullableForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveArrayNullableForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ArrayNullableForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveArrayNullableForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class ArrayNullableFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class ArrayNullableFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ArrayNullableForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _ArrayNullableFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable_output.gform.dart index 0787c079..ca3968d2 100644 --- a/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/array_nullable/array_nullable_output.gform.dart @@ -54,7 +54,7 @@ class ReactiveArrayNullableOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveArrayNullableOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ArrayNullableOForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveArrayNullableOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class ArrayNullableOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class ArrayNullableOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ArrayNullableOForm formModel, Widget? child) @@ -209,7 +211,7 @@ class _ArrayNullableOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/create/create_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/create/create_output.gform.dart index e1b89e22..e7676b5b 100644 --- a/packages/reactive_forms_generator/example/lib/docs/create/create_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/create/create_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveMSICreateForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveMSICreateForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static MSICreateForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveMSICreateForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -108,7 +109,7 @@ class MSICreateFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -119,7 +120,8 @@ class MSICreateFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, MSICreateForm formModel, Widget? child) builder; @@ -202,7 +204,7 @@ class _MSICreateFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list.gform.dart b/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list.gform.dart index 25c73a23..2a21c593 100644 --- a/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list.gform.dart @@ -53,7 +53,7 @@ class ReactiveDeliveryListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveDeliveryListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static DeliveryListForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveDeliveryListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class DeliveryListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class DeliveryListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, DeliveryListForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _DeliveryListFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -2131,7 +2133,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -2140,7 +2142,8 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StandaloneDeliveryPointForm? of( BuildContext context, { @@ -2167,7 +2170,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -2188,7 +2191,7 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -2199,7 +2202,8 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, StandaloneDeliveryPointForm formModel, Widget? child) builder; @@ -2287,7 +2291,7 @@ class _StandaloneDeliveryPointFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list_output.gform.dart index f6e170a4..d34b9579 100644 --- a/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/delivery_list/delivery_list_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveDeliveryListOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveDeliveryListOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static DeliveryListOForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveDeliveryListOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class DeliveryListOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class DeliveryListOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, DeliveryListOForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _DeliveryListOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -2185,7 +2187,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -2194,7 +2196,8 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StandaloneDeliveryPointForm? of( BuildContext context, { @@ -2221,7 +2224,7 @@ class ReactiveStandaloneDeliveryPointForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -2242,7 +2245,7 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -2253,7 +2256,8 @@ class StandaloneDeliveryPointFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, StandaloneDeliveryPointForm formModel, Widget? child) builder; @@ -2341,7 +2345,7 @@ class _StandaloneDeliveryPointFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class.gform.dart b/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class.gform.dart index 87b20115..93d1d0dc 100644 --- a/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class.gform.dart @@ -53,7 +53,7 @@ class ReactiveFreezedClassForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveFreezedClassForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static FreezedClassForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveFreezedClassForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class FreezedClassFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class FreezedClassFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, FreezedClassForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _FreezedClassFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class_output.gform.dart index 8059c6e7..e50e0424 100644 --- a/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/freezed/freezed_class_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveFreezedClassOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveFreezedClassOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static FreezedClassOForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveFreezedClassOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class FreezedClassOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class FreezedClassOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, FreezedClassOForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _FreezedClassOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/freezed2/test.gform.dart b/packages/reactive_forms_generator/example/lib/docs/freezed2/test.gform.dart index 0cc3eb17..894059d7 100644 --- a/packages/reactive_forms_generator/example/lib/docs/freezed2/test.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/freezed2/test.gform.dart @@ -53,7 +53,7 @@ class ReactiveTestForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveTestForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static TestForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveTestForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -107,7 +108,7 @@ class TestFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -118,7 +119,8 @@ class TestFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, TestForm formModel, Widget? child) builder; @@ -201,7 +203,7 @@ class _TestFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/generic/generic.gform.dart b/packages/reactive_forms_generator/example/lib/docs/generic/generic.gform.dart index 57a1c1e4..073b2958 100644 --- a/packages/reactive_forms_generator/example/lib/docs/generic/generic.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/generic/generic.gform.dart @@ -53,7 +53,7 @@ class ReactiveTagsForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveTagsForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static TagsForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveTagsForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -107,7 +108,7 @@ class TagsFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -118,7 +119,8 @@ class TagsFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, TagsForm formModel, Widget? child) builder; @@ -201,7 +203,7 @@ class _TagsFormBuilderState extends State> { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/generic/generic_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/generic/generic_output.gform.dart index abb7b47f..f409ff97 100644 --- a/packages/reactive_forms_generator/example/lib/docs/generic/generic_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/generic/generic_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveTagsOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveTagsOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static TagsOForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveTagsOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -108,7 +109,7 @@ class TagsOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -119,7 +120,8 @@ class TagsOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, TagsOForm formModel, Widget? child) builder; @@ -202,7 +204,7 @@ class _TagsOFormBuilderState extends State> { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list.gform.dart b/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list.gform.dart index 1ea97037..24598d50 100644 --- a/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list.gform.dart @@ -54,7 +54,7 @@ class ReactiveStatusListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveStatusListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StatusListForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveStatusListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class StatusListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class StatusListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, StatusListForm formModel, Widget? child) builder; @@ -209,7 +211,7 @@ class _StatusListFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list_output.gform.dart index cb55571d..68a260f0 100644 --- a/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/generic_status_list/generic_status_list_output.gform.dart @@ -55,7 +55,7 @@ class ReactiveStatusListOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -64,7 +64,8 @@ class ReactiveStatusListOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static StatusListOForm? of( BuildContext context, { @@ -91,7 +92,7 @@ class ReactiveStatusListOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -112,7 +113,7 @@ class StatusListOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -123,7 +124,8 @@ class StatusListOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, StatusListOForm formModel, Widget? child) @@ -211,7 +213,7 @@ class _StatusListOFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/group/group.gform.dart b/packages/reactive_forms_generator/example/lib/docs/group/group.gform.dart index e2e58fa7..7b0ded29 100644 --- a/packages/reactive_forms_generator/example/lib/docs/group/group.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/group/group.gform.dart @@ -53,7 +53,7 @@ class ReactiveGroupForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveGroupForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static GroupForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveGroupForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -107,7 +108,7 @@ class GroupFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -118,7 +119,8 @@ class GroupFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, GroupForm formModel, Widget? child) builder; @@ -201,7 +203,7 @@ class _GroupFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/group/group_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/group/group_output.gform.dart index ab43f92e..acd29dde 100644 --- a/packages/reactive_forms_generator/example/lib/docs/group/group_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/group/group_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveGroupOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveGroupOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static GroupOForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveGroupOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -107,7 +108,7 @@ class GroupOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -118,7 +119,8 @@ class GroupOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, GroupOForm formModel, Widget? child) builder; @@ -201,7 +203,7 @@ class _GroupOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/login/login.gform.dart b/packages/reactive_forms_generator/example/lib/docs/login/login.gform.dart index 01de3a7e..c802a89d 100644 --- a/packages/reactive_forms_generator/example/lib/docs/login/login.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/login/login.gform.dart @@ -53,7 +53,7 @@ class ReactiveLoginForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveLoginForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveLoginForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -107,7 +108,7 @@ class LoginFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -118,7 +119,8 @@ class LoginFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginForm formModel, Widget? child) builder; @@ -201,7 +203,7 @@ class _LoginFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/login/login_form.dart b/packages/reactive_forms_generator/example/lib/docs/login/login_form.dart index cf462ece..7c1f9d9f 100644 --- a/packages/reactive_forms_generator/example/lib/docs/login/login_form.dart +++ b/packages/reactive_forms_generator/example/lib/docs/login/login_form.dart @@ -23,7 +23,7 @@ class _LoginFormWidgetState extends State { title: const Text('Login'), body: LoginFormBuilder( canPop: (formGroup) => true, - onPopInvoked: (formGroup, didPop) => {}, + onPopInvokedWithResult: (formGroup, didPop, result) => {}, model: _emptyModel, builder: (context, formModel, child) { return Column( diff --git a/packages/reactive_forms_generator/example/lib/docs/login/login_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/login/login_output.gform.dart index f37685e4..4222d473 100644 --- a/packages/reactive_forms_generator/example/lib/docs/login/login_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/login/login_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveLoginOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveLoginOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginOForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveLoginOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -107,7 +108,7 @@ class LoginOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -118,7 +119,8 @@ class LoginOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginOForm formModel, Widget? child) builder; @@ -201,7 +203,7 @@ class _LoginOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended.gform.dart b/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended.gform.dart index 01305aa5..e587c017 100644 --- a/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended.gform.dart @@ -53,7 +53,7 @@ class ReactiveLoginExtendedForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveLoginExtendedForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveLoginExtendedForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class LoginExtendedFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class LoginExtendedFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginExtendedForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _LoginExtendedFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended_output.gform.dart index 5df25475..5d4ede40 100644 --- a/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/login_extended/login_extended_output.gform.dart @@ -54,7 +54,7 @@ class ReactiveLoginExtendedOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveLoginExtendedOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedOForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveLoginExtendedOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class LoginExtendedOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class LoginExtendedOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, LoginExtendedOForm formModel, Widget? child) @@ -209,7 +211,7 @@ class _LoginExtendedOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable.gform.dart b/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable.gform.dart index 73fe580e..7b0246d2 100644 --- a/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable.gform.dart @@ -54,7 +54,7 @@ class ReactiveLoginExtendedNullableForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveLoginExtendedNullableForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedNullableForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveLoginExtendedNullableForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class LoginExtendedNullableFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class LoginExtendedNullableFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, LoginExtendedNullableForm formModel, Widget? child) builder; @@ -210,7 +212,7 @@ class _LoginExtendedNullableFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable_output.gform.dart index 70aba136..1993f9cd 100644 --- a/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/login_extended_nullable/login_extended_nullable_output.gform.dart @@ -54,7 +54,7 @@ class ReactiveLoginExtendedNullableOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveLoginExtendedNullableOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static LoginExtendedNullableOForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveLoginExtendedNullableOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class LoginExtendedNullableOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class LoginExtendedNullableOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, LoginExtendedNullableOForm formModel, Widget? child) builder; @@ -210,7 +212,7 @@ class _LoginExtendedNullableOFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list.gform.dart b/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list.gform.dart index 8fc3e8c3..d50bdfbf 100644 --- a/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list.gform.dart @@ -53,7 +53,7 @@ class ReactiveMailingListForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveMailingListForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static MailingListForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveMailingListForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -109,7 +110,7 @@ class MailingListFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -120,7 +121,8 @@ class MailingListFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, MailingListForm formModel, Widget? child) builder; @@ -205,7 +207,7 @@ class _MailingListFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list_output.gform.dart index 1f3cb554..b04e6259 100644 --- a/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/mailing_list/mailing_list_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveMailingListOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveMailingListOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static MailingListOForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveMailingListOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class MailingListOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class MailingListOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, MailingListOForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _MailingListOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/model_extends/model_extends.gform.dart b/packages/reactive_forms_generator/example/lib/docs/model_extends/model_extends.gform.dart index 97f34c60..ce6afa8e 100644 --- a/packages/reactive_forms_generator/example/lib/docs/model_extends/model_extends.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/model_extends/model_extends.gform.dart @@ -53,7 +53,7 @@ class ReactiveModelExtendsForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveModelExtendsForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ModelExtendsForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveModelExtendsForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class ModelExtendsFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class ModelExtendsFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ModelExtendsForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _ModelExtendsFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/model_implements/model_implements.gform.dart b/packages/reactive_forms_generator/example/lib/docs/model_implements/model_implements.gform.dart index 3ee84f68..f513f544 100644 --- a/packages/reactive_forms_generator/example/lib/docs/model_implements/model_implements.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/model_implements/model_implements.gform.dart @@ -54,7 +54,7 @@ class ReactiveModelImplementsForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -63,7 +63,8 @@ class ReactiveModelImplementsForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ModelImplementsForm? of( BuildContext context, { @@ -90,7 +91,7 @@ class ReactiveModelImplementsForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -111,7 +112,7 @@ class ModelImplementsFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -122,7 +123,8 @@ class ModelImplementsFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ModelImplementsForm formModel, Widget? child) @@ -210,7 +212,7 @@ class _ModelImplementsFormBuilderState child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/nested/nested.gform.dart b/packages/reactive_forms_generator/example/lib/docs/nested/nested.gform.dart index ca1dea31..7c90f223 100644 --- a/packages/reactive_forms_generator/example/lib/docs/nested/nested.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/nested/nested.gform.dart @@ -53,7 +53,7 @@ class ReactiveSubGroupForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveSubGroupForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static SubGroupForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveSubGroupForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -108,7 +109,7 @@ class SubGroupFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -119,7 +120,8 @@ class SubGroupFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, SubGroupForm formModel, Widget? child) builder; @@ -202,7 +204,7 @@ class _SubGroupFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -681,7 +683,7 @@ class ReactiveGroupForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -690,7 +692,8 @@ class ReactiveGroupForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static GroupForm? of( BuildContext context, { @@ -716,7 +719,7 @@ class ReactiveGroupForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -735,7 +738,7 @@ class GroupFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -746,7 +749,8 @@ class GroupFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, GroupForm formModel, Widget? child) builder; @@ -829,7 +833,7 @@ class _GroupFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -1503,7 +1507,7 @@ class ReactiveNestedForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -1512,7 +1516,8 @@ class ReactiveNestedForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static NestedForm? of( BuildContext context, { @@ -1538,7 +1543,7 @@ class ReactiveNestedForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -1557,7 +1562,7 @@ class NestedFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -1568,7 +1573,8 @@ class NestedFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, NestedForm formModel, Widget? child) builder; @@ -1651,7 +1657,7 @@ class _NestedFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/nested/nested_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/nested/nested_output.gform.dart index 62b0078e..8d3176f9 100644 --- a/packages/reactive_forms_generator/example/lib/docs/nested/nested_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/nested/nested_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveSubGroupOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveSubGroupOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static SubGroupOForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveSubGroupOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -108,7 +109,7 @@ class SubGroupOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -119,7 +120,8 @@ class SubGroupOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, SubGroupOForm formModel, Widget? child) builder; @@ -202,7 +204,7 @@ class _SubGroupOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -715,7 +717,7 @@ class ReactiveGroupOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -724,7 +726,8 @@ class ReactiveGroupOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static GroupOForm? of( BuildContext context, { @@ -750,7 +753,7 @@ class ReactiveGroupOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -769,7 +772,7 @@ class GroupOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -780,7 +783,8 @@ class GroupOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, GroupOForm formModel, Widget? child) builder; @@ -863,7 +867,7 @@ class _GroupOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -1538,7 +1542,7 @@ class ReactiveNestedOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -1547,7 +1551,8 @@ class ReactiveNestedOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static NestedOForm? of( BuildContext context, { @@ -1573,7 +1578,7 @@ class ReactiveNestedOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -1592,7 +1597,7 @@ class NestedOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -1603,7 +1608,8 @@ class NestedOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, NestedOForm formModel, Widget? child) builder; @@ -1686,7 +1692,7 @@ class _NestedOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics.gform.dart b/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics.gform.dart index d434c564..f0ef17a5 100644 --- a/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics.gform.dart @@ -56,7 +56,7 @@ class ReactiveProductDetailsForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -65,7 +65,8 @@ class ReactiveProductDetailsForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProductDetailsForm? of

( BuildContext context, { @@ -92,7 +93,7 @@ class ReactiveProductDetailsForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -116,7 +117,7 @@ class ProductDetailsFormBuilder

this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -127,7 +128,8 @@ class ProductDetailsFormBuilder

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, ProductDetailsForm formModel, Widget? child) builder; @@ -214,7 +216,7 @@ class _ProductDetailsFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -1196,7 +1198,7 @@ class ReactiveIdForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -1205,7 +1207,8 @@ class ReactiveIdForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static IdForm? of

( BuildContext context, { @@ -1231,7 +1234,7 @@ class ReactiveIdForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -1252,7 +1255,7 @@ class IdFormBuilder

extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -1263,7 +1266,8 @@ class IdFormBuilder

extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, IdForm formModel, Widget? child) builder; @@ -1347,7 +1351,7 @@ class _IdFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics_output.gform.dart index 7f39b5b1..f27447b2 100644 --- a/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/nested_generics/nested_generics_output.gform.dart @@ -56,7 +56,7 @@ class ReactiveProductDetailsOForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -65,7 +65,8 @@ class ReactiveProductDetailsOForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProductDetailsOForm? of

( BuildContext context, { @@ -92,7 +93,7 @@ class ReactiveProductDetailsOForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -116,7 +117,7 @@ class ProductDetailsOFormBuilder

this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -127,7 +128,8 @@ class ProductDetailsOFormBuilder

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function(BuildContext context, ProductDetailsOForm formModel, Widget? child) builder; @@ -214,7 +216,7 @@ class _ProductDetailsOFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, @@ -1220,7 +1222,7 @@ class ReactiveIdOForm

required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -1229,7 +1231,8 @@ class ReactiveIdOForm

final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static IdOForm? of

( BuildContext context, { @@ -1255,7 +1258,7 @@ class ReactiveIdOForm

stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -1276,7 +1279,7 @@ class IdOFormBuilder

extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -1287,7 +1290,8 @@ class IdOFormBuilder

extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, IdOForm formModel, Widget? child) builder; @@ -1371,7 +1375,7 @@ class _IdOFormBuilderState

child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/profile/profile.gform.dart b/packages/reactive_forms_generator/example/lib/docs/profile/profile.gform.dart index 380e7215..4703764b 100644 --- a/packages/reactive_forms_generator/example/lib/docs/profile/profile.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/profile/profile.gform.dart @@ -53,7 +53,7 @@ class ReactiveProfileForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveProfileForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProfileForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveProfileForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -107,7 +108,7 @@ class ProfileFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -118,7 +119,8 @@ class ProfileFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ProfileForm formModel, Widget? child) builder; @@ -201,7 +203,7 @@ class _ProfileFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/profile/profile_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/profile/profile_output.gform.dart index a6241e2f..f543ce45 100644 --- a/packages/reactive_forms_generator/example/lib/docs/profile/profile_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/profile/profile_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveProfileOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveProfileOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static ProfileOForm? of( BuildContext context, { @@ -88,7 +89,7 @@ class ReactiveProfileOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -108,7 +109,7 @@ class ProfileOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -119,7 +120,8 @@ class ProfileOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, ProfileOForm formModel, Widget? child) builder; @@ -202,7 +204,7 @@ class _ProfileOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/recursive/recursive.gform.dart b/packages/reactive_forms_generator/example/lib/docs/recursive/recursive.gform.dart index cda089fa..ff637566 100644 --- a/packages/reactive_forms_generator/example/lib/docs/recursive/recursive.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/recursive/recursive.gform.dart @@ -53,7 +53,7 @@ class ReactiveSecuredAreaForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveSecuredAreaForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static SecuredAreaForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveSecuredAreaForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -109,7 +110,7 @@ class SecuredAreaFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -120,7 +121,8 @@ class SecuredAreaFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, SecuredAreaForm formModel, Widget? child) builder; @@ -205,7 +207,7 @@ class _SecuredAreaFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic.gform.dart b/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic.gform.dart index d227926f..28218e37 100644 --- a/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic.gform.dart @@ -53,7 +53,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static SomeWiredNameForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class SomeWiredNameFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class SomeWiredNameFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, SomeWiredNameForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _SomeWiredNameFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic_output.gform.dart index ddf75cfd..cc566b86 100644 --- a/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/renamed_basic/renamed_basic_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static SomeWiredNameForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveSomeWiredNameForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class SomeWiredNameFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class SomeWiredNameFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, SomeWiredNameForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _SomeWiredNameFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile.gform.dart b/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile.gform.dart index 38306f52..a87fccc0 100644 --- a/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile.gform.dart @@ -53,7 +53,7 @@ class ReactiveUserProfileForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveUserProfileForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static UserProfileForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveUserProfileForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -109,7 +110,7 @@ class UserProfileFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -120,7 +121,8 @@ class UserProfileFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, UserProfileForm formModel, Widget? child) builder; @@ -205,7 +207,7 @@ class _UserProfileFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile_output.gform.dart b/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile_output.gform.dart index 99959545..119ad222 100644 --- a/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile_output.gform.dart +++ b/packages/reactive_forms_generator/example/lib/docs/user_profile/user_profile_output.gform.dart @@ -53,7 +53,7 @@ class ReactiveUserProfileOForm extends StatelessWidget { required this.form, required this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, }) : super(key: key); final Widget child; @@ -62,7 +62,8 @@ class ReactiveUserProfileOForm extends StatelessWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; static UserProfileOForm? of( BuildContext context, { @@ -89,7 +90,7 @@ class ReactiveUserProfileOForm extends StatelessWidget { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); @@ -110,7 +111,7 @@ class UserProfileOFormBuilder extends StatefulWidget { this.model, this.child, this.canPop, - this.onPopInvoked, + this.onPopInvokedWithResult, required this.builder, this.initState, }) : super(key: key); @@ -121,7 +122,8 @@ class UserProfileOFormBuilder extends StatefulWidget { final bool Function(FormGroup formGroup)? canPop; - final void Function(FormGroup formGroup, bool didPop)? onPopInvoked; + final ReactiveFormPopInvokedWithResultCallback? + onPopInvokedWithResult; final Widget Function( BuildContext context, UserProfileOForm formModel, Widget? child) builder; @@ -207,7 +209,7 @@ class _UserProfileOFormBuilderState extends State { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, diff --git a/packages/reactive_forms_generator/example/pubspec.yaml b/packages/reactive_forms_generator/example/pubspec.yaml index d83454f9..e33b477d 100644 --- a/packages/reactive_forms_generator/example/pubspec.yaml +++ b/packages/reactive_forms_generator/example/pubspec.yaml @@ -13,14 +13,17 @@ dependencies: sdk: flutter reactive_forms_annotations: path: ../../reactive_forms_annotations - reactive_forms: ^17.0.1 + reactive_forms: ^18.0.0 intl: ">=0.19.0 <1.0.0" freezed_annotation: ^3.0.0 dartz: ^0.10.1 json_annotation: ^4.9.0 # reactive_text_field: ^1.0.0 equatable: ^2.0.7 - reactive_forms_lbc: ^4.0.0 + reactive_forms_lbc: ^4.0.4 + +dependency_overrides: + reactive_forms: ^18.0.0 dev_dependencies: reactive_forms_generator: diff --git a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart index 757f82d9..a0f61c49 100644 --- a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart +++ b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart @@ -45,7 +45,7 @@ class ReactiveForm { ), Parameter( (b) => b - ..name = 'onPopInvoked' + ..name = 'onPopInvokedWithResult' ..toThis = true ..named = true, ), @@ -88,10 +88,10 @@ class ReactiveForm { ), Field( (b) => b - ..name = 'onPopInvoked' + ..name = 'onPopInvokedWithResult' ..modifier = FieldModifier.final$ ..type = const Reference( - 'void Function(FormGroup formGroup, bool didPop)?'), + 'ReactiveFormPopInvokedWithResultCallback?'), ), ]) ..methods.addAll( @@ -154,7 +154,7 @@ class ReactiveForm { stream: form.form.statusChanged, child: ReactiveFormPopScope( canPop: canPop, - onPopInvoked: onPopInvoked, + onPopInvokedWithResult: onPopInvokedWithResult, child: child, ), ); diff --git a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart index 76850533..981b6534 100644 --- a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart +++ b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart @@ -69,7 +69,7 @@ class ReactiveFormBuilder { ), Parameter( (b) => b - ..name = 'onPopInvoked' + ..name = 'onPopInvokedWithResult' ..named = true ..toThis = true, ), @@ -115,10 +115,10 @@ class ReactiveFormBuilder { ), Field( (b) => b - ..name = 'onPopInvoked' + ..name = 'onPopInvokedWithResult' + ..modifier = FieldModifier.final$ ..type = const Reference( - 'void Function(FormGroup formGroup, bool didPop)?') - ..modifier = FieldModifier.final$, + 'ReactiveFormPopInvokedWithResultCallback?'), ), Field( (b) => b @@ -248,7 +248,7 @@ class ReactiveFormBuilder { child: ReactiveFormBuilder( form: () => _formModel.form, canPop: widget.canPop, - onPopInvoked: widget.onPopInvoked, + onPopInvokedWithResult: widget.onPopInvokedWithResult, builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child), child: widget.child, ), diff --git a/packages/reactive_forms_generator/pubspec.yaml b/packages/reactive_forms_generator/pubspec.yaml index 4b2b1e1d..4a3eace8 100644 --- a/packages/reactive_forms_generator/pubspec.yaml +++ b/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.6 +version: 8.0.3 environment: sdk: ">=3.6.0 <4.0.0" diff --git a/pubspec.lock b/pubspec.lock index e44e16cb..8a0fb8b0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -585,21 +585,21 @@ packages: source: hosted version: "1.5.0" reactive_forms: - dependency: transitive + dependency: "direct overridden" description: name: reactive_forms - sha256: "9b1fb18e0aae9c50cfa0aaabaaa38bc4d78eefc9b7b95fa9c947b051f6524b8e" + sha256: "8394f3bbea59a49820174893739152bbce292e130fc1f3f1fb2a5f83f7e7c43e" url: "https://pub.dev" source: hosted - version: "17.0.1" + version: "18.0.0" reactive_forms_lbc: dependency: transitive description: name: reactive_forms_lbc - sha256: "62e714eef3e257b1f51111f7b1f92d5a2ecb96ecc531efd95e4c24e4b9a6b6c5" + sha256: "51576520d6034d0676a68f60527290450ab240c3be3c4534581aabfafbae7f90" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.4" recase: dependency: transitive description: