From 871386bbb42bfecc265a78574ec165d053b896ff Mon Sep 17 00:00:00 2001 From: Hans Muller Date: Wed, 11 Aug 2021 17:29:29 -0700 Subject: [PATCH] Revert "Changing ElevatedButton.child to be non-nullable (#87901)" (#88071) This reverts commit 724c0eb65cef6a66241f9f1500dc9ed53991d5be. --- packages/flutter/lib/src/material/elevated_button.dart | 2 +- packages/flutter/lib/src/widgets/basic.dart | 4 ++-- packages/flutter/test/material/material_test.dart | 2 +- packages/flutter/test/widgets/widget_inspector_test.dart | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/flutter/lib/src/material/elevated_button.dart b/packages/flutter/lib/src/material/elevated_button.dart index e1dbcf276c2..402fa84fb07 100644 --- a/packages/flutter/lib/src/material/elevated_button.dart +++ b/packages/flutter/lib/src/material/elevated_button.dart @@ -96,7 +96,7 @@ class ElevatedButton extends ButtonStyleButton { FocusNode? focusNode, bool autofocus = false, Clip clipBehavior = Clip.none, - required Widget child, + required Widget? child, }) : super( key: key, onPressed: onPressed, diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index ae404195559..7fb7481d1c7 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -7157,7 +7157,7 @@ class IgnorePointer extends SingleChildRenderObjectWidget { /// height: 100.0, /// child: ElevatedButton( /// onPressed: () {}, -/// child: const Text('Lower'), +/// child: null, /// ), /// ), /// SizedBox( @@ -7170,7 +7170,7 @@ class IgnorePointer extends SingleChildRenderObjectWidget { /// primary: Colors.blue.shade200, /// ), /// onPressed: () {}, -/// child: const Text('Upper'), +/// child: null, /// ), /// ), /// ), diff --git a/packages/flutter/test/material/material_test.dart b/packages/flutter/test/material/material_test.dart index 5fa3d8078e4..df7ae5d788d 100644 --- a/packages/flutter/test/material/material_test.dart +++ b/packages/flutter/test/material/material_test.dart @@ -244,7 +244,7 @@ void main() { onPressed: () { pressed = true; }, - child: const Text('Button'), + child: null, ), const Material( type: MaterialType.transparency, diff --git a/packages/flutter/test/widgets/widget_inspector_test.dart b/packages/flutter/test/widgets/widget_inspector_test.dart index 9ae3ad0b833..53c5d040682 100644 --- a/packages/flutter/test/widgets/widget_inspector_test.dart +++ b/packages/flutter/test/widgets/widget_inspector_test.dart @@ -287,7 +287,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService { final GlobalKey topButtonKey = GlobalKey(); Widget selectButtonBuilder(BuildContext context, VoidCallback onPressed) { - return Material(child: ElevatedButton(onPressed: onPressed, key: selectButtonKey, child: const Text('Button'))); + return Material(child: ElevatedButton(onPressed: onPressed, key: selectButtonKey, child: null)); } // State type is private, hence using dynamic. dynamic getInspectorState() => inspectorKey.currentState; @@ -390,7 +390,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService { final GlobalKey inspectorKey = GlobalKey(); Widget selectButtonBuilder(BuildContext context, VoidCallback onPressed) { - return Material(child: ElevatedButton(onPressed: onPressed, key: selectButtonKey, child: const Text('Button'))); + return Material(child: ElevatedButton(onPressed: onPressed, key: selectButtonKey, child: null)); } // State type is private, hence using dynamic. dynamic getInspectorState() => inspectorKey.currentState; @@ -590,7 +590,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService { InspectorSelectButtonBuilder selectButtonBuilder(Key key) { return (BuildContext context, VoidCallback onPressed) { - return Material(child: ElevatedButton(onPressed: onPressed, key: key, child: const Text('Button'))); + return Material(child: ElevatedButton(onPressed: onPressed, key: key, child: null)); }; }