@@ -120,6 +120,7 @@ abstract class _DialogBaseData {
120120 final bool ? useRootNavigator;
121121 final String ? barrierLabel;
122122 final Offset ? anchorPoint;
123+ final bool ? requestFocus;
123124
124125 _DialogBaseData ({
125126 this .builder,
@@ -128,13 +129,15 @@ abstract class _DialogBaseData {
128129 this .useRootNavigator,
129130 this .barrierLabel,
130131 this .anchorPoint,
132+ this .requestFocus,
131133 });
132134}
133135
134136class MaterialDialogData extends _DialogBaseData {
135137 final bool ? useSafeArea;
136138 final Color ? barrierColor;
137139 final TraversalEdgeBehavior ? traversalEdgeBehavior;
140+ final AnimationStyle ? animationStyle;
138141
139142 MaterialDialogData ({
140143 super .builder,
@@ -143,9 +146,11 @@ class MaterialDialogData extends _DialogBaseData {
143146 super .useRootNavigator,
144147 super .barrierLabel,
145148 super .anchorPoint,
149+ super .requestFocus,
146150 this .useSafeArea,
147151 this .barrierColor,
148152 this .traversalEdgeBehavior,
153+ this .animationStyle,
149154 });
150155}
151156
@@ -157,6 +162,7 @@ class CupertinoDialogData extends _DialogBaseData {
157162 super .useRootNavigator,
158163 super .barrierLabel,
159164 super .anchorPoint,
165+ super .requestFocus,
160166 });
161167}
162168
@@ -170,6 +176,7 @@ Future<T?> showPlatformDialog<T>({
170176 bool useRootNavigator = true ,
171177 String ? barrierLabel,
172178 Offset ? anchorPoint,
179+ bool ? requestFocus,
173180}) {
174181 if (isMaterial (context)) {
175182 assert (material? .builder != null || builder != null );
@@ -186,6 +193,8 @@ Future<T?> showPlatformDialog<T>({
186193 barrierLabel: material? .barrierLabel ?? barrierLabel,
187194 anchorPoint: material? .anchorPoint ?? anchorPoint,
188195 traversalEdgeBehavior: material? .traversalEdgeBehavior,
196+ animationStyle: material? .animationStyle,
197+ requestFocus: material? .requestFocus ?? requestFocus,
189198 );
190199 } else {
191200 assert (cupertino? .builder != null || builder != null );
@@ -199,16 +208,16 @@ Future<T?> showPlatformDialog<T>({
199208 cupertino? .barrierDismissible ?? barrierDismissible ?? false ,
200209 barrierLabel: cupertino? .barrierLabel ?? barrierLabel,
201210 anchorPoint: cupertino? .anchorPoint ?? anchorPoint,
211+ requestFocus: material? .requestFocus ?? requestFocus,
202212 );
203213 }
204214}
205215
206216abstract class _ModalSheetBaseData {
207- _ModalSheetBaseData ({
208- this .anchorPoint,
209- });
217+ _ModalSheetBaseData ({this .anchorPoint, this .requestFocus});
210218
211219 final Offset ? anchorPoint;
220+ final bool ? requestFocus;
212221}
213222
214223class MaterialModalSheetData extends _ModalSheetBaseData {
@@ -232,6 +241,7 @@ class MaterialModalSheetData extends _ModalSheetBaseData {
232241
233242 MaterialModalSheetData ({
234243 super .anchorPoint,
244+ super .requestFocus,
235245 this .backgroundColor,
236246 this .elevation,
237247 this .shape,
@@ -262,6 +272,7 @@ class CupertinoModalSheetData extends _ModalSheetBaseData {
262272
263273 CupertinoModalSheetData ({
264274 super .anchorPoint,
275+ super .requestFocus,
265276 this .imageFilter,
266277 this .semanticsDismissible,
267278 this .useRootNavigator,
@@ -278,6 +289,8 @@ Future<T?> showPlatformModalSheet<T>({
278289 required WidgetBuilder builder,
279290 MaterialModalSheetData ? material,
280291 CupertinoModalSheetData ? cupertino,
292+ Offset ? anchorPoint,
293+ bool ? requestFocus,
281294}) {
282295 if (isMaterial (context)) {
283296 return showModalBottomSheet <T >(
@@ -295,14 +308,15 @@ Future<T?> showPlatformModalSheet<T>({
295308 routeSettings: material? .routeSettings,
296309 transitionAnimationController: material? .transitionAnimationController,
297310 constraints: material? .constraints,
298- anchorPoint: material? .anchorPoint,
311+ anchorPoint: material? .anchorPoint ?? anchorPoint ,
299312 useSafeArea: material? .useSafeArea ?? false ,
300313 barrierLabel: material? .barrierLabel,
301314 scrollControlDisabledMaxHeightRatio:
302315 material? .scrollControlDisabledMaxHeightRatio ??
303- _defaultScrollControlDisabledMaxHeightRatio,
316+ _defaultScrollControlDisabledMaxHeightRatio,
304317 showDragHandle: material? .showDragHandle,
305318 sheetAnimationStyle: material? .sheetAnimationStyle,
319+ requestFocus: material? .requestFocus ?? requestFocus,
306320 );
307321 } else {
308322 return showCupertinoModalPopup <T >(
@@ -314,7 +328,8 @@ Future<T?> showPlatformModalSheet<T>({
314328 barrierColor: cupertino? .barrierColor ?? _kModalBarrierColor,
315329 barrierDismissible: cupertino? .barrierDismissible ?? true ,
316330 routeSettings: cupertino? .routeSettings,
317- anchorPoint: cupertino? .anchorPoint,
331+ anchorPoint: cupertino? .anchorPoint ?? anchorPoint,
332+ requestFocus: cupertino? .requestFocus ?? requestFocus,
318333 );
319334 }
320335}
0 commit comments