@@ -94,7 +94,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
9494 required this.form,
9595 required this.child,
9696 this.canPop,
97- this.onPopInvoked ,
97+ this.onPopInvokedWithResult ,
9898 }) : super(key: key);
9999
100100 final Widget child;
@@ -103,7 +103,8 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
103103
104104 final bool Function(FormGroup formGroup)? canPop;
105105
106- final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
106+ final ReactiveFormPopInvokedWithResultCallback<dynamic>?
107+ onPopInvokedWithResult;
107108
108109 static AnnotatelessOForm? of(BuildContext context, {bool listen = true}) {
109110 if (listen) {
@@ -130,7 +131,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
130131 stream: form.form.statusChanged,
131132 child: ReactiveFormPopScope(
132133 canPop: canPop,
133- onPopInvoked: onPopInvoked ,
134+ onPopInvokedWithResult: onPopInvokedWithResult ,
134135 child: child,
135136 ),
136137 );
@@ -151,7 +152,7 @@ class AnnotatelessOFormBuilder extends StatefulWidget {
151152 this.model,
152153 this.child,
153154 this.canPop,
154- this.onPopInvoked ,
155+ this.onPopInvokedWithResult ,
155156 required this.builder,
156157 this.initState,
157158 }) : super(key: key);
@@ -162,7 +163,8 @@ class AnnotatelessOFormBuilder extends StatefulWidget {
162163
163164 final bool Function(FormGroup formGroup)? canPop;
164165
165- final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
166+ final ReactiveFormPopInvokedWithResultCallback<dynamic>?
167+ onPopInvokedWithResult;
166168
167169 final Widget Function(
168170 BuildContext context,
@@ -255,7 +257,7 @@ class _AnnotatelessOFormBuilderState extends State<AnnotatelessOFormBuilder> {
255257 child: ReactiveFormBuilder(
256258 form: () => _formModel.form,
257259 canPop: widget.canPop,
258- onPopInvoked : widget.onPopInvoked ,
260+ onPopInvokedWithResult : widget.onPopInvokedWithResult ,
259261 builder: (context, formGroup, child) =>
260262 widget.builder(context, _formModel, widget.child),
261263 child: widget.child,
0 commit comments