Widget state properties (#142151)

Fixes #138270.

Moves the majority of the logic of MaterialStateProperties down to the widgets layer, then has the existing Material classes pull from the widgets versions.

examples/api/lib/material/text_button/text_button.0.dart

@@ -358,13 +358,13 @@ class _TextButtonExampleState extends State<TextButtonExample> {
         },
         style: TextButton.styleFrom(
           overlayColor: Colors.transparent,
-          foregroundBuilder: (BuildContext context, Set<MaterialState> states, Widget? child) {
+          foregroundBuilder: (BuildContext context, Set<WidgetState> states, Widget? child) {
             late final ImageProvider image;
             if (currentAction != null) {
               image = runningImage;
-            } else if (states.contains(MaterialState.pressed)) {
+            } else if (states.contains(WidgetState.pressed)) {
               image = pressedImage;
-            } else if (states.contains(MaterialState.hovered)) {
+            } else if (states.contains(WidgetState.hovered)) {
               image = hoveredImage;
             } else {
               image = defaultImage;

packages/flutter/lib/fix_data/fix_material/fix_app_bar.yaml

@@ -23,6 +23,7 @@
 #     * SliverAppBar: fix_sliver_app_bar.yaml
 #     * TextTheme: fix_text_theme.yaml
 #     * ThemeData: fix_theme_data.yaml
+#     * WidgetState: fix_widget_state.yaml
 version: 1
 transforms:
   # Changes made in https://github.com/flutter/flutter/pull/86198

packages/flutter/lib/fix_data/fix_material/fix_app_bar_theme.yaml

@@ -23,6 +23,7 @@
 #     * SliverAppBar: fix_sliver_app_bar.yaml
 #     * TextTheme: fix_text_theme.yaml
 #     * ThemeData: fix_theme_data.yaml
+#     * WidgetState: fix_widget_state.yaml
 version: 1
 transforms:
   # Changes made in https://github.com/flutter/flutter/pull/86198

packages/flutter/lib/fix_data/fix_material/fix_color_scheme.yaml

@@ -23,6 +23,7 @@
 #     * SliverAppBar: fix_sliver_app_bar.yaml
 #     * TextTheme: fix_text_theme.yaml
 #     * ThemeData: fix_theme_data.yaml
+#     * WidgetState: fix_widget_state.yaml
 version: 1
 transforms:
 

packages/flutter/lib/fix_data/fix_material/fix_material.yaml

@@ -23,6 +23,7 @@
 #     * SliverAppBar: fix_sliver_app_bar.yaml
 #     * TextTheme: fix_text_theme.yaml
 #     * ThemeData: fix_theme_data.yaml
+#     * WidgetState: fix_widget_state.yaml
 version: 1
 transforms:
   # Changes made in https://github.com/flutter/flutter/pull/15303

packages/flutter/lib/fix_data/fix_material/fix_sliver_app_bar.yaml

@@ -23,6 +23,7 @@
 #     * Material (general): fix_material.yaml
 #     * TextTheme: fix_text_theme.yaml
 #     * ThemeData: fix_theme_data.yaml
+#     * WidgetState: fix_widget_state.yaml
 version: 1
 transforms:
   # Changes made in https://github.com/flutter/flutter/pull/86198

packages/flutter/lib/fix_data/fix_material/fix_text_theme.yaml

@@ -23,6 +23,7 @@
 #     * Material (general): fix_material.yaml
 #     * SliverAppBar: fix_sliver_app_bar.yaml
 #     * ThemeData: fix_theme_data.yaml
+#     * WidgetState: fix_widget_state.yaml
 version: 1
 transforms:
   # Changes made in https://github.com/flutter/flutter/pull/48547

packages/flutter/lib/fix_data/fix_material/fix_theme_data.yaml

@@ -23,6 +23,7 @@
 #     * Material (general): fix_material.yaml
 #     * SliverAppBar: fix_sliver_app_bar.yaml
 #     * TextTheme: fix_text_theme.yaml
+#     * WidgetState: fix_widget_state.yaml
 version: 1
 transforms:
   # Changes made in https://github.com/flutter/flutter/pull/87281

packages/flutter/lib/fix_data/fix_material/fix_widget_state.yaml

+# Copyright 2014 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# For details regarding the *Flutter Fix* feature, see
+# https://flutter.dev/docs/development/tools/flutter-fix
+
+# Please add new fixes to the top of the file, separated by one blank line
+# from other fixes. In a comment, include a link to the PR where the change
+# requiring the fix was made.
+
+# Every fix must be tested. See the flutter/packages/flutter/test_fixes/README.md
+# file for instructions on testing these data driven fixes.
+
+# For documentation about this file format, see
+# https://dart.dev/go/data-driven-fixes.
+
+# * Fixes in this file are for the MaterialState enum and classes from the Material library. *
+#   For fixes to
+#     * AppBar: fix_app_bar.yaml
+#     * AppBarTheme: fix_app_bar_theme.yaml
+#     * ColorScheme: fix_color_scheme.yaml
+#     * Material (general): fix_material.yaml
+#     * SliverAppBar: fix_sliver_app_bar.yaml
+#     * TextTheme: fix_text_theme.yaml
+#     * ThemeDate: fix_theme_data.yaml
+version: 1
+transforms:
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetState'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      enum: 'MaterialState'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetState'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetPropertyResolver'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      typedef: 'MaterialPropertyResolver'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetPropertyResolver'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStateColor'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStateColor'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStateColor'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStateMouseCursor'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStateMouseCursor'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStateMouseCursor'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStateBorderSide'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStateBorderSide'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStateBorderSide'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStateOutlinedBorder'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStateOutlinedBorder'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStateOutlinedBorder'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStateTextStyle'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStateTextStyle'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStateTextStyle'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStateProperty'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStateProperty'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStateProperty'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStatePropertyAll'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStatePropertyAll'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStatePropertyAll'
+
+  # Changes made in https://github.com/flutter/flutter/pull/142151
+  - title: "Replace with 'WidgetStatesController'"
+    date: 2024-02-01
+    element:
+      uris: [ 'material.dart', 'widgets.dart' ]
+      class: 'MaterialStatesController'
+    changes:
+      - kind: 'rename'
+        newName: 'WidgetStatesController'
+
+# Before adding a new fix: read instructions at the top of this file.

packages/flutter/lib/widgets.dart

@@ -164,4 +164,5 @@ export 'src/widgets/viewport.dart';
 export 'src/widgets/visibility.dart';
 export 'src/widgets/widget_inspector.dart';
 export 'src/widgets/widget_span.dart';
+export 'src/widgets/widget_state.dart';
 export 'src/widgets/will_pop_scope.dart';

packages/flutter/test/material/bottom_navigation_bar_theme_test.dart

@@ -102,7 +102,7 @@ void main() {
     expect(description[8], 'showSelectedLabels: true');
     expect(description[9], 'showUnselectedLabels: true');
     expect(description[10], 'type: BottomNavigationBarType.fixed');
-    expect(description[11], 'mouseCursor: MaterialStateMouseCursor(clickable)');
+    expect(description[11], 'mouseCursor: WidgetStateMouseCursor(clickable)');
   });
 
   testWidgets('BottomNavigationBar is themeable', (WidgetTester tester) async {

packages/flutter/test/material/button_style_test.dart

@@ -85,21 +85,21 @@ void main() {
       .toList();
 
     expect(description, <String>[
-      'textStyle: MaterialStatePropertyAll(TextStyle(inherit: true, size: 10.0))',
-      'backgroundColor: MaterialStatePropertyAll(Color(0xfffffff1))',
-      'foregroundColor: MaterialStatePropertyAll(Color(0xfffffff2))',
-      'overlayColor: MaterialStatePropertyAll(Color(0xfffffff3))',
-      'shadowColor: MaterialStatePropertyAll(Color(0xfffffff4))',
-      'surfaceTintColor: MaterialStatePropertyAll(Color(0xfffffff5))',
-      'elevation: MaterialStatePropertyAll(1.5)',
-      'padding: MaterialStatePropertyAll(EdgeInsets.all(1.0))',
-      'minimumSize: MaterialStatePropertyAll(Size(1.0, 2.0))',
-      'maximumSize: MaterialStatePropertyAll(Size(100.0, 200.0))',
-      'iconColor: MaterialStatePropertyAll(Color(0xfffffff6))',
-      'iconSize: MaterialStatePropertyAll(48.1)',
-      'side: MaterialStatePropertyAll(BorderSide(color: Color(0xfffffff6), width: 4.0))',
-      'shape: MaterialStatePropertyAll(StadiumBorder(BorderSide(width: 0.0, style: none)))',
-      'mouseCursor: MaterialStatePropertyAll(SystemMouseCursor(forbidden))',
+      'textStyle: WidgetStatePropertyAll(TextStyle(inherit: true, size: 10.0))',
+      'backgroundColor: WidgetStatePropertyAll(Color(0xfffffff1))',
+      'foregroundColor: WidgetStatePropertyAll(Color(0xfffffff2))',
+      'overlayColor: WidgetStatePropertyAll(Color(0xfffffff3))',
+      'shadowColor: WidgetStatePropertyAll(Color(0xfffffff4))',
+      'surfaceTintColor: WidgetStatePropertyAll(Color(0xfffffff5))',
+      'elevation: WidgetStatePropertyAll(1.5)',
+      'padding: WidgetStatePropertyAll(EdgeInsets.all(1.0))',
+      'minimumSize: WidgetStatePropertyAll(Size(1.0, 2.0))',
+      'maximumSize: WidgetStatePropertyAll(Size(100.0, 200.0))',
+      'iconColor: WidgetStatePropertyAll(Color(0xfffffff6))',
+      'iconSize: WidgetStatePropertyAll(48.1)',
+      'side: WidgetStatePropertyAll(BorderSide(color: Color(0xfffffff6), width: 4.0))',
+      'shape: WidgetStatePropertyAll(StadiumBorder(BorderSide(width: 0.0, style: none)))',
+      'mouseCursor: WidgetStatePropertyAll(SystemMouseCursor(forbidden))',
       'tapTargetSize: shrinkWrap',
       'animationDuration: 0:00:01.000000',
       'enableFeedback: true',

packages/flutter/test/material/checkbox_theme_test.dart

@@ -71,10 +71,10 @@ void main() {
     expect(
       description,
       equalsIgnoringHashCodes(<String>[
-        'mouseCursor: MaterialStatePropertyAll(SystemMouseCursor(click))',
-        'fillColor: MaterialStatePropertyAll(Color(0xfffffff0))',
-        'checkColor: MaterialStatePropertyAll(Color(0xfffffff1))',
-        'overlayColor: MaterialStatePropertyAll(Color(0xfffffff2))',
+        'mouseCursor: WidgetStatePropertyAll(SystemMouseCursor(click))',
+        'fillColor: WidgetStatePropertyAll(Color(0xfffffff0))',
+        'checkColor: WidgetStatePropertyAll(Color(0xfffffff1))',
+        'overlayColor: WidgetStatePropertyAll(Color(0xfffffff2))',
         'splashRadius: 1.0',
         'materialTapTargetSize: MaterialTapTargetSize.shrinkWrap',
         'visualDensity: VisualDensity#00000(h: 0.0, v: 0.0)',

packages/flutter/test/material/chip_theme_test.dart

@@ -129,7 +129,7 @@ void main() {
         .toList();
 
     expect(description, equalsIgnoringHashCodes(<String>[
-      'color: MaterialStatePropertyAll(Color(0xfffffff0))',
+      'color: WidgetStatePropertyAll(Color(0xfffffff0))',
       'backgroundColor: Color(0xfffffff1)',
       'deleteIconColor: Color(0xfffffff2)',
       'disabledColor: Color(0xfffffff3)',

packages/flutter/test/material/data_table_theme_test.dart

@@ -105,19 +105,19 @@ void main() {
       .toList();
 
     expect(description[0], 'decoration: BoxDecoration(color: Color(0xfffffff0))');
-    expect(description[1], "dataRowColor: Instance of '_MaterialStatePropertyWith<Color>'");
+    expect(description[1], "dataRowColor: Instance of '_WidgetStatePropertyWith<Color>'");
     expect(description[2], 'dataRowMinHeight: 41.0');
     expect(description[3], 'dataRowMaxHeight: 42.0');
     expect(description[4], 'dataTextStyle: TextStyle(inherit: true, size: 12.0)');
-    expect(description[5], "headingRowColor: Instance of '_MaterialStatePropertyWith<Color>'");
+    expect(description[5], "headingRowColor: Instance of '_WidgetStatePropertyWith<Color>'");
     expect(description[6], 'headingRowHeight: 52.0');
     expect(description[7], 'headingTextStyle: TextStyle(inherit: true, size: 14.0)');
     expect(description[8], 'horizontalMargin: 3.0');
     expect(description[9], 'columnSpacing: 4.0');
     expect(description[10], 'dividerThickness: 5.0');
     expect(description[11], 'checkboxHorizontalMargin: 6.0');
-    expect(description[12], 'headingCellCursor: MaterialStatePropertyAll(SystemMouseCursor(grab))');
-    expect(description[13], 'dataRowCursor: MaterialStatePropertyAll(SystemMouseCursor(forbidden))');
+    expect(description[12], 'headingCellCursor: WidgetStatePropertyAll(SystemMouseCursor(grab))');
+    expect(description[13], 'dataRowCursor: WidgetStatePropertyAll(SystemMouseCursor(forbidden))');
   });
 
   testWidgets('DataTable is themeable', (WidgetTester tester) async {

packages/flutter/test/material/date_picker_theme_test.dart

@@ -329,17 +329,17 @@ void main() {
       'headerHelpStyle: TextStyle(inherit: true, size: 11.0)',
       'weekDayStyle: TextStyle(inherit: true, size: 12.0)',
       'dayStyle: TextStyle(inherit: true, size: 13.0)',
-      'dayForegroundColor: MaterialStatePropertyAll(Color(0xfffffff5))',
-      'dayBackgroundColor: MaterialStatePropertyAll(Color(0xfffffff6))',
-      'dayOverlayColor: MaterialStatePropertyAll(Color(0xfffffff7))',
-      'dayShape: MaterialStatePropertyAll(RoundedRectangleBorder(BorderSide(width: 0.0, style: none), BorderRadius.zero))',
-      'todayForegroundColor: MaterialStatePropertyAll(Color(0xfffffff8))',
-      'todayBackgroundColor: MaterialStatePropertyAll(Color(0xfffffff9))',
+      'dayForegroundColor: WidgetStatePropertyAll(Color(0xfffffff5))',
+      'dayBackgroundColor: WidgetStatePropertyAll(Color(0xfffffff6))',
+      'dayOverlayColor: WidgetStatePropertyAll(Color(0xfffffff7))',
+      'dayShape: WidgetStatePropertyAll(RoundedRectangleBorder(BorderSide(width: 0.0, style: none), BorderRadius.zero))',
+      'todayForegroundColor: WidgetStatePropertyAll(Color(0xfffffff8))',
+      'todayBackgroundColor: WidgetStatePropertyAll(Color(0xfffffff9))',
       'todayBorder: BorderSide(width: 3.0)',
       'yearStyle: TextStyle(inherit: true, size: 13.0)',
-      'yearForegroundColor: MaterialStatePropertyAll(Color(0xfffffffa))',
-      'yearBackgroundColor: MaterialStatePropertyAll(Color(0xfffffffb))',
-      'yearOverlayColor: MaterialStatePropertyAll(Color(0xfffffffc))',
+      'yearForegroundColor: WidgetStatePropertyAll(Color(0xfffffffa))',
+      'yearBackgroundColor: WidgetStatePropertyAll(Color(0xfffffffb))',
+      'yearOverlayColor: WidgetStatePropertyAll(Color(0xfffffffc))',
       'rangePickerBackgroundColor: Color(0xfffffffd)',
       'rangePickerElevation: 7.0',
       'rangePickerShadowColor: Color(0xfffffffe)',
@@ -350,11 +350,11 @@ void main() {
       'rangePickerHeaderHeadlineStyle: TextStyle(inherit: true, size: 14.0)',
       'rangePickerHeaderHelpStyle: TextStyle(inherit: true, size: 15.0)',
       'rangeSelectionBackgroundColor: Color(0xffffff2f)',
-      'rangeSelectionOverlayColor: MaterialStatePropertyAll(Color(0xffffff3f))',
+      'rangeSelectionOverlayColor: WidgetStatePropertyAll(Color(0xffffff3f))',
       'dividerColor: Color(0xffffff4f)',
       'inputDecorationTheme: InputDecorationTheme#00000(fillColor: Color(0xffffff5f), border: UnderlineInputBorder())',
-      'cancelButtonStyle: ButtonStyle#00000(foregroundColor: MaterialStatePropertyAll(Color(0xffffff6f)))',
-      'confirmButtonStyle: ButtonStyle#00000(foregroundColor: MaterialStatePropertyAll(Color(0xffffff7f)))'
+      'cancelButtonStyle: ButtonStyle#00000(foregroundColor: WidgetStatePropertyAll(Color(0xffffff6f)))',
+      'confirmButtonStyle: ButtonStyle#00000(foregroundColor: WidgetStatePropertyAll(Color(0xffffff7f)))'
     ]));
   });
 

packages/flutter/test/material/floating_action_button_theme_test.dart

@@ -422,7 +422,7 @@ void main() {
       'extendedIconLabelSpacing: 12.0',
       'extendedPadding: EdgeInsetsDirectional(7.0, 0.0, 8.0, 0.0)',
       'extendedTextStyle: TextStyle(inherit: true, letterSpacing: 2.0)',
-      'mouseCursor: MaterialStateMouseCursor(clickable)',
+      'mouseCursor: WidgetStateMouseCursor(clickable)',
     ]);
   });
 

packages/flutter/test/material/list_tile_theme_test.dart

@@ -138,7 +138,7 @@ void main() {
         'minVerticalPadding: 300.0',
         'minLeadingWidth: 400.0',
         'enableFeedback: true',
-        'mouseCursor: MaterialStateMouseCursor(clickable)',
+        'mouseCursor: WidgetStateMouseCursor(clickable)',
         'visualDensity: VisualDensity#00000(h: -1.0, v: -1.0)(horizontal: -1.0, vertical: -1.0)',
         'titleAlignment: ListTileTitleAlignment.top',
       ]),

packages/flutter/test/material/material_state_property_test.dart

@@ -45,10 +45,10 @@ void main() {
 
   test('toString formats correctly', () {
     const MaterialStateProperty<Color?> colorProperty = MaterialStatePropertyAll<Color?>(Color(0xFFFFFFFF));
-    expect(colorProperty.toString(), equals('MaterialStatePropertyAll(Color(0xffffffff))'));
+    expect(colorProperty.toString(), equals('WidgetStatePropertyAll(Color(0xffffffff))'));
 
     const MaterialStateProperty<double?> doubleProperty = MaterialStatePropertyAll<double?>(33 + 1/3);
-    expect(doubleProperty.toString(), equals('MaterialStatePropertyAll(33.3)'));
+    expect(doubleProperty.toString(), equals('WidgetStatePropertyAll(33.3)'));
   });
 
   test("Can interpolate between two MaterialStateProperty's", () {

packages/flutter/test/material/menu_anchor_test.dart

@@ -1293,7 +1293,7 @@ void main() {
       expect(
         description.join('\n'),
         equalsIgnoringHashCodes(
-            'style: MenuStyle#00000(backgroundColor: MaterialStatePropertyAll(MaterialColor(primary value: Color(0xfff44336))), elevation: MaterialStatePropertyAll(10.0))\n'
+            'style: MenuStyle#00000(backgroundColor: WidgetStatePropertyAll(MaterialColor(primary value: Color(0xfff44336))), elevation: WidgetStatePropertyAll(10.0))\n'
             'clipBehavior: Clip.none'),
       );
     });
@@ -2357,7 +2357,7 @@ void main() {
         equalsIgnoringHashCodes(
           <String>[
             'focusNode: null',
-            'menuStyle: MenuStyle#00000(backgroundColor: MaterialStatePropertyAll(MaterialColor(primary value: Color(0xff4caf50))), elevation: MaterialStatePropertyAll(20.0), shape: MaterialStatePropertyAll(RoundedRectangleBorder(BorderSide(width: 0.0, style: none), BorderRadius.zero)))',
+            'menuStyle: MenuStyle#00000(backgroundColor: WidgetStatePropertyAll(MaterialColor(primary value: Color(0xff4caf50))), elevation: WidgetStatePropertyAll(20.0), shape: WidgetStatePropertyAll(RoundedRectangleBorder(BorderSide(width: 0.0, style: none), BorderRadius.zero)))',
             'alignmentOffset: null',
             'clipBehavior: hardEdge',
           ],

packages/flutter/test/material/navigation_bar_theme_test.dart

@@ -62,12 +62,12 @@ void main() {
     expect(description[2], 'elevation: 20.0');
     expect(description[3], 'indicatorColor: Color(0x00000098)');
     expect(description[4], 'indicatorShape: CircleBorder(BorderSide(width: 0.0, style: none))');
-    expect(description[5], 'labelTextStyle: MaterialStatePropertyAll(TextStyle(inherit: true, size: 7.0))');
+    expect(description[5], 'labelTextStyle: WidgetStatePropertyAll(TextStyle(inherit: true, size: 7.0))');
     // Ignore instance address for IconThemeData.
-    expect(description[6].contains('iconTheme: MaterialStatePropertyAll(IconThemeData'), isTrue);
+    expect(description[6].contains('iconTheme: WidgetStatePropertyAll(IconThemeData'), isTrue);
     expect(description[6].contains('(color: Color(0x00000097))'), isTrue);
     expect(description[7], 'labelBehavior: NavigationDestinationLabelBehavior.alwaysHide');
-    expect(description[8], 'overlayColor: MaterialStatePropertyAll(Color(0x00000096))');
+    expect(description[8], 'overlayColor: WidgetStatePropertyAll(Color(0x00000096))');
   });
 
   testWidgets('NavigationBarThemeData values are used when no NavigationBar properties are specified', (WidgetTester tester) async {

packages/flutter/test/material/navigation_drawer_theme_test.dart

@@ -60,8 +60,8 @@ void main() {
         'indicatorColor: Color(0x00000096)',
         'indicatorShape: RoundedRectangleBorder(BorderSide(width: 0.0, style: none), BorderRadius.circular(2.0))',
         'indicatorSize: Size(10.0, 10.0)',
-        'labelTextStyle: MaterialStatePropertyAll(TextStyle(inherit: true, size: 7.0))',
-        'iconTheme: MaterialStatePropertyAll(IconThemeData#00000(color: Color(0x00000095)))'
+        'labelTextStyle: WidgetStatePropertyAll(TextStyle(inherit: true, size: 7.0))',
+        'iconTheme: WidgetStatePropertyAll(IconThemeData#00000(color: Color(0x00000095)))'
       ],
     ));
   });

packages/flutter/test/material/popup_menu_theme_test.dart

@@ -117,9 +117,9 @@ void main() {
       'shadowColor: Color(0xfffffff2)',
       'surfaceTintColor: Color(0xfffffff3)',
       'text style: TextStyle(inherit: true, color: Color(0xfffffff4))',
-      "labelTextStyle: Instance of '_MaterialStatePropertyWith<TextStyle?>'",
+      "labelTextStyle: Instance of '_WidgetStatePropertyWith<TextStyle?>'",
       'enableFeedback: false',
-      'mouseCursor: MaterialStateMouseCursor(clickable)',
+      'mouseCursor: WidgetStateMouseCursor(clickable)',
       'position: over',
       'iconColor: Color(0xfffffff8)',
       'iconSize: 31.0'

packages/flutter/test/material/radio_theme_test.dart

@@ -68,9 +68,9 @@ void main() {
     expect(
       description,
       equalsIgnoringHashCodes(<String>[
-        'mouseCursor: MaterialStatePropertyAll(SystemMouseCursor(click))',
-        'fillColor: MaterialStatePropertyAll(Color(0xfffffff0))',
-        'overlayColor: MaterialStatePropertyAll(Color(0xfffffff1))',
+        'mouseCursor: WidgetStatePropertyAll(SystemMouseCursor(click))',
+        'fillColor: WidgetStatePropertyAll(Color(0xfffffff0))',
+        'overlayColor: WidgetStatePropertyAll(Color(0xfffffff1))',
         'splashRadius: 1.0',
         'materialTapTargetSize: MaterialTapTargetSize.shrinkWrap',
         'visualDensity: VisualDensity#00000(h: 0.0, v: 0.0)',

packages/flutter/test/material/scrollbar_theme_test.dart

@@ -741,12 +741,12 @@ void main() {
       .toList();
 
     expect(description, <String>[
-      "thumbVisibility: Instance of '_MaterialStatePropertyWith<bool?>'",
-      "thickness: Instance of '_MaterialStatePropertyWith<double?>'",
+      "thumbVisibility: Instance of '_WidgetStatePropertyWith<bool?>'",
+      "thickness: Instance of '_WidgetStatePropertyWith<double?>'",
       'radius: Radius.circular(3.0)',
-      "thumbColor: Instance of '_MaterialStatePropertyWith<Color?>'",
-      "trackColor: Instance of '_MaterialStatePropertyWith<Color?>'",
-      "trackBorderColor: Instance of '_MaterialStatePropertyWith<Color?>'",
+      "thumbColor: Instance of '_WidgetStatePropertyWith<Color?>'",
+      "trackColor: Instance of '_WidgetStatePropertyWith<Color?>'",
+      "trackBorderColor: Instance of '_WidgetStatePropertyWith<Color?>'",
       'crossAxisMargin: 3.0',
       'mainAxisMargin: 6.0',
       'minThumbLength: 120.0',

packages/flutter/test/material/search_bar_theme_test.dart

@@ -85,16 +85,16 @@ void main() {
       .map((DiagnosticsNode node) => node.toString())
       .toList();
 
-    expect(description[0], 'elevation: MaterialStatePropertyAll(3.0)');
-    expect(description[1], 'backgroundColor: MaterialStatePropertyAll(Color(0xfffffff1))');
-    expect(description[2], 'shadowColor: MaterialStatePropertyAll(Color(0xfffffff2))');
-    expect(description[3], 'surfaceTintColor: MaterialStatePropertyAll(Color(0xfffffff3))');
-    expect(description[4], 'overlayColor: MaterialStatePropertyAll(Color(0xfffffff4))');
-    expect(description[5], 'side: MaterialStatePropertyAll(BorderSide(color: Color(0xfffffff5), width: 2.0))');
-    expect(description[6], 'shape: MaterialStatePropertyAll(StadiumBorder(BorderSide(width: 0.0, style: none)))');
-    expect(description[7], 'padding: MaterialStatePropertyAll(EdgeInsets.all(16.0))');
-    expect(description[8], 'textStyle: MaterialStatePropertyAll(TextStyle(inherit: true, size: 24.0))');
-    expect(description[9], 'hintStyle: MaterialStatePropertyAll(TextStyle(inherit: true, size: 16.0))');
+    expect(description[0], 'elevation: WidgetStatePropertyAll(3.0)');
+    expect(description[1], 'backgroundColor: WidgetStatePropertyAll(Color(0xfffffff1))');
+    expect(description[2], 'shadowColor: WidgetStatePropertyAll(Color(0xfffffff2))');
+    expect(description[3], 'surfaceTintColor: WidgetStatePropertyAll(Color(0xfffffff3))');
+    expect(description[4], 'overlayColor: WidgetStatePropertyAll(Color(0xfffffff4))');
+    expect(description[5], 'side: WidgetStatePropertyAll(BorderSide(color: Color(0xfffffff5), width: 2.0))');
+    expect(description[6], 'shape: WidgetStatePropertyAll(StadiumBorder(BorderSide(width: 0.0, style: none)))');
+    expect(description[7], 'padding: WidgetStatePropertyAll(EdgeInsets.all(16.0))');
+    expect(description[8], 'textStyle: WidgetStatePropertyAll(TextStyle(inherit: true, size: 24.0))');
+    expect(description[9], 'hintStyle: WidgetStatePropertyAll(TextStyle(inherit: true, size: 16.0))');
     expect(description[10], 'constraints: BoxConstraints(350.0<=w<=850.0, 0.0<=h<=Infinity)');
     expect(description[11], 'textCapitalization: TextCapitalization.characters');
   });

packages/flutter/test/material/slider_theme_test.dart

@@ -99,7 +99,7 @@ void main() {
       "rangeValueIndicatorShape: Instance of 'PaddleRangeSliderValueIndicatorShape'",
       'showValueIndicator: always',
       'valueIndicatorTextStyle: TextStyle(inherit: true, color: Color(0xff000000))',
-      'mouseCursor: MaterialStateMouseCursor(clickable)',
+      'mouseCursor: WidgetStateMouseCursor(clickable)',
       'allowedInteraction: tapOnly'
     ]);
   });

packages/flutter/test/material/switch_theme_test.dart

@@ -73,15 +73,15 @@ void main() {
       .map((DiagnosticsNode node) => node.toString())
       .toList();
 
-    expect(description[0], 'thumbColor: MaterialStatePropertyAll(Color(0xfffffff0))');
-    expect(description[1], 'trackColor: MaterialStatePropertyAll(Color(0xfffffff1))');
-    expect(description[2], 'trackOutlineColor: MaterialStatePropertyAll(Color(0xfffffff3))');
-    expect(description[3], 'trackOutlineWidth: MaterialStatePropertyAll(6.0)');
+    expect(description[0], 'thumbColor: WidgetStatePropertyAll(Color(0xfffffff0))');
+    expect(description[1], 'trackColor: WidgetStatePropertyAll(Color(0xfffffff1))');
+    expect(description[2], 'trackOutlineColor: WidgetStatePropertyAll(Color(0xfffffff3))');
+    expect(description[3], 'trackOutlineWidth: WidgetStatePropertyAll(6.0)');
     expect(description[4], 'materialTapTargetSize: MaterialTapTargetSize.shrinkWrap');
-    expect(description[5], 'mouseCursor: MaterialStatePropertyAll(SystemMouseCursor(click))');
-    expect(description[6], 'overlayColor: MaterialStatePropertyAll(Color(0xfffffff2))');
+    expect(description[5], 'mouseCursor: WidgetStatePropertyAll(SystemMouseCursor(click))');
+    expect(description[6], 'overlayColor: WidgetStatePropertyAll(Color(0xfffffff2))');
     expect(description[7], 'splashRadius: 1.0');
-    expect(description[8], 'thumbIcon: MaterialStatePropertyAll(Icon(IconData(U+0007B)))');
+    expect(description[8], 'thumbIcon: WidgetStatePropertyAll(Icon(IconData(U+0007B)))');
   });
 
   testWidgets('Material2 - Switch is themeable', (WidgetTester tester) async {

packages/flutter/test/material/time_picker_theme_test.dart

@@ -91,8 +91,8 @@ void main() {
       shape: RoundedRectangleBorder(
         side: BorderSide(color: Color(0xfffffff3)),
       ),
-      timeSelectorSeparatorColor: MaterialStatePropertyAll<Color>(Color(0xfffffff4)),
-      timeSelectorSeparatorTextStyle: MaterialStatePropertyAll<TextStyle>(TextStyle(color: Color(0xfffffff5))),
+      timeSelectorSeparatorColor: WidgetStatePropertyAll<Color>(Color(0xfffffff4)),
+      timeSelectorSeparatorTextStyle: WidgetStatePropertyAll<TextStyle>(TextStyle(color: Color(0xfffffff5))),
     ).debugFillProperties(builder);
 
     final List<String> description = builder.properties
@@ -102,8 +102,8 @@ void main() {
 
     expect(description, equalsIgnoringHashCodes(<String>[
       'backgroundColor: Color(0xfffffff0)',
-      'cancelButtonStyle: ButtonStyle#00000(foregroundColor: MaterialStatePropertyAll(Color(0xfffffff1)))',
-      'confirmButtonStyle: ButtonStyle#00000(foregroundColor: MaterialStatePropertyAll(Color(0xfffffff2)))',
+      'cancelButtonStyle: ButtonStyle#00000(foregroundColor: WidgetStatePropertyAll(Color(0xfffffff1)))',
+      'confirmButtonStyle: ButtonStyle#00000(foregroundColor: WidgetStatePropertyAll(Color(0xfffffff2)))',
       'dayPeriodBorderSide: BorderSide(color: Color(0xfffffff3))',
       'dayPeriodColor: Color(0x00000000)',
       'dayPeriodShape: RoundedRectangleBorder(BorderSide(color: Color(0xfffffff5)), BorderRadius.zero)',
@@ -123,8 +123,8 @@ void main() {
       'inputDecorationTheme: InputDecorationTheme#ff861(labelStyle: TextStyle(inherit: true, color: Color(0xfffffff2)))',
       'padding: EdgeInsets.all(1.0)',
       'shape: RoundedRectangleBorder(BorderSide(color: Color(0xfffffff3)), BorderRadius.zero)',
-      'timeSelectorSeparatorColor: MaterialStatePropertyAll(Color(0xfffffff4))',
-      'timeSelectorSeparatorTextStyle: MaterialStatePropertyAll(TextStyle(inherit: true, color: Color(0xfffffff5)))'
+      'timeSelectorSeparatorColor: WidgetStatePropertyAll(Color(0xfffffff4))',
+      'timeSelectorSeparatorTextStyle: WidgetStatePropertyAll(TextStyle(inherit: true, color: Color(0xfffffff5)))'
     ]));
   });
 

packages/flutter/test/widgets/widget_state_property_test.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+
+void main() {
+  test('WidgetStateProperty.resolveWith()', () {
+    final WidgetStateProperty<WidgetState> value = WidgetStateProperty.resolveWith<WidgetState>(
+      (Set<WidgetState> states) => states.first,
+    );
+    expect(value.resolve(<WidgetState>{WidgetState.hovered}), WidgetState.hovered);
+    expect(value.resolve(<WidgetState>{WidgetState.focused}), WidgetState.focused);
+    expect(value.resolve(<WidgetState>{WidgetState.pressed}), WidgetState.pressed);
+    expect(value.resolve(<WidgetState>{WidgetState.dragged}), WidgetState.dragged);
+    expect(value.resolve(<WidgetState>{WidgetState.selected}), WidgetState.selected);
+    expect(value.resolve(<WidgetState>{WidgetState.disabled}), WidgetState.disabled);
+    expect(value.resolve(<WidgetState>{WidgetState.error}), WidgetState.error);
+  });
+
+  test('WidgetStateProperty.all()', () {
+    final WidgetStateProperty<int> value = WidgetStateProperty.all<int>(123);
+    expect(value.resolve(<WidgetState>{WidgetState.hovered}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.focused}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.pressed}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.dragged}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.selected}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.disabled}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.error}), 123);
+  });
+
+  test('WidgetStatePropertyAll', () {
+    const WidgetStatePropertyAll<int> value = WidgetStatePropertyAll<int>(123);
+    expect(value.resolve(<WidgetState>{}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.hovered}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.focused}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.pressed}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.dragged}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.selected}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.disabled}), 123);
+    expect(value.resolve(<WidgetState>{WidgetState.error}), 123);
+  });
+
+  test('toString formats correctly', () {
+    const WidgetStateProperty<Color?> colorProperty = WidgetStatePropertyAll<Color?>(Color(0xFFFFFFFF));
+    expect(colorProperty.toString(), equals('WidgetStatePropertyAll(Color(0xffffffff))'));
+
+    const WidgetStateProperty<double?> doubleProperty = WidgetStatePropertyAll<double?>(33 + 1/3);
+    expect(doubleProperty.toString(), equals('WidgetStatePropertyAll(33.3)'));
+  });
+
+  test("Can interpolate between two WidgetStateProperty's", () {
+    const WidgetStateProperty<TextStyle?> textStyle1 =  WidgetStatePropertyAll<TextStyle?>(
+      TextStyle(fontSize: 14.0),
+    );
+    const WidgetStateProperty<TextStyle?> textStyle2 = WidgetStatePropertyAll<TextStyle?>(
+      TextStyle(fontSize: 20.0),
+    );
+
+    // Using `0.0` interpolation value.
+    TextStyle textStyle = WidgetStateProperty.lerp<TextStyle?>(
+      textStyle1,
+      textStyle2,
+      0.0,
+      TextStyle.lerp,
+    )!.resolve(enabled)!;
+    expect(textStyle.fontSize, 14.0);
+
+    // Using `0.5` interpolation value.
+    textStyle = WidgetStateProperty.lerp<TextStyle?>(
+      textStyle1,
+      textStyle2,
+      0.5,
+      TextStyle.lerp,
+    )!.resolve(enabled)!;
+    expect(textStyle.fontSize, 17.0);
+
+    // Using `1.0` interpolation value.
+    textStyle = WidgetStateProperty.lerp<TextStyle?>(
+      textStyle1,
+      textStyle2,
+      1.0,
+      TextStyle.lerp,
+    )!.resolve(enabled)!;
+    expect(textStyle.fontSize, 20.0);
+  });
+}
+
+Set<WidgetState> enabled = <WidgetState>{};

packages/flutter/test/widgets/widget_states_controller_test.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
+
+void main() {
+  test('WidgetStatesController constructor', () {
+    expect(WidgetStatesController().value, <WidgetState>{});
+    expect(WidgetStatesController(<WidgetState>{}).value, <WidgetState>{});
+    expect(WidgetStatesController(<WidgetState>{WidgetState.selected}).value, <WidgetState>{WidgetState.selected});
+  });
+
+  test('WidgetStatesController dispatches memory events', () async {
+    await expectLater(
+      await memoryEvents(() => WidgetStatesController().dispose(), WidgetStatesController),
+      areCreateAndDispose,
+    );
+  });
+
+  test('WidgetStatesController update, listener', () {
+    int count = 0;
+    void valueChanged() {
+      count += 1;
+    }
+    final WidgetStatesController controller = WidgetStatesController();
+    controller.addListener(valueChanged);
+
+    controller.update(WidgetState.selected, true);
+    expect(controller.value, <WidgetState>{WidgetState.selected});
+    expect(count, 1);
+    controller.update(WidgetState.selected, true);
+    expect(controller.value, <WidgetState>{WidgetState.selected});
+    expect(count, 1);
+
+    controller.update(WidgetState.hovered, false);
+    expect(count, 1);
+    expect(controller.value, <WidgetState>{WidgetState.selected});
+    controller.update(WidgetState.selected, false);
+    expect(count, 2);
+    expect(controller.value, <WidgetState>{});
+
+    controller.update(WidgetState.hovered, true);
+    expect(controller.value, <WidgetState>{WidgetState.hovered});
+    expect(count, 3);
+    controller.update(WidgetState.hovered, true);
+    expect(controller.value, <WidgetState>{WidgetState.hovered});
+    expect(count, 3);
+    controller.update(WidgetState.pressed, true);
+    expect(controller.value, <WidgetState>{WidgetState.hovered, WidgetState.pressed});
+    expect(count, 4);
+    controller.update(WidgetState.selected, true);
+    expect(controller.value, <WidgetState>{WidgetState.hovered, WidgetState.pressed, WidgetState.selected});
+    expect(count, 5);
+    controller.update(WidgetState.selected, false);
+    expect(controller.value, <WidgetState>{WidgetState.hovered, WidgetState.pressed});
+    expect(count, 6);
+    controller.update(WidgetState.selected, false);
+    expect(controller.value, <WidgetState>{WidgetState.hovered, WidgetState.pressed});
+    expect(count, 6);
+    controller.update(WidgetState.pressed, false);
+    expect(controller.value, <WidgetState>{WidgetState.hovered});
+    expect(count, 7);
+    controller.update(WidgetState.hovered, false);
+    expect(controller.value, <WidgetState>{});
+    expect(count, 8);
+
+    controller.removeListener(valueChanged);
+    controller.update(WidgetState.selected, true);
+    expect(controller.value, <WidgetState>{WidgetState.selected});
+    expect(count, 8);
+  });
+
+
+  test('WidgetStatesController const initial value', () {
+    int count = 0;
+    void valueChanged() {
+      count += 1;
+    }
+    final WidgetStatesController controller = WidgetStatesController(const <WidgetState>{WidgetState.selected});
+    controller.addListener(valueChanged);
+
+    controller.update(WidgetState.selected, true);
+    expect(controller.value, <WidgetState>{WidgetState.selected});
+    expect(count, 0);
+
+    controller.update(WidgetState.selected, false);
+    expect(controller.value, <WidgetState>{});
+    expect(count, 1);
+  });
+}

packages/flutter/test_fixes/material/widget_state.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+void main() {
+  // Changes made in https://github.com/flutter/flutter/pull/142151
+  MaterialState selected = MaterialState.selected;
+  MaterialState hovered = MaterialState.hovered;
+  MaterialState focused = MaterialState.focused;
+  MaterialState pressed = MaterialState.pressed;
+  MaterialState dragged = MaterialState.dragged;
+  MaterialState scrolledUnder = MaterialState.scrolledUnder;
+  MaterialState disabled = MaterialState.disabled;
+  MaterialState error = MaterialState.error;
+
+  final MaterialPropertyResolver<MouseCursor?> resolveCallback;
+
+  Color getColor(Set<MaterialState> states) {
+    if (states.contains(MaterialState.disabled)) {
+      if (states.contains(MaterialState.selected)) {
+        return Color(0xFF000002);
+      }
+      return Color(0xFF000004);
+    }
+    if (states.contains(MaterialState.selected)) {
+      return Color(0xFF000001);
+    }
+    return Color(0xFF000003);
+  }
+
+  final MaterialStateProperty<Color> backgroundColor = MaterialStateColor.resolveWith(getColor);
+
+  class _MouseCursor extends MaterialStateMouseCursor {
+    const _MouseCursor(this.resolveCallback);
+
+    final MaterialPropertyResolver<MouseCursor?> resolveCallback;
+
+    @override
+    MouseCursor resolve(Set<MaterialState> states) => resolveCallback(states) ?? MouseCursor.uncontrolled;
+  }
+
+  MaterialStateBorderSide? get side {
+    return MaterialStateBorderSide.resolveWith((Set<MaterialState> states) {
+      if (states.contains(MaterialState.disabled)) {
+        if (states.contains(MaterialState.selected)) {
+          return const BorderSide(width: 2.0);
+        }
+        return BorderSide(width: 1.0);
+      }
+      if (states.contains(MaterialState.selected)) {
+        return const BorderSide(width: 1.5);
+      }
+      return BorderSide(width: 0.5);
+    });
+  }
+
+  class SelectedBorder extends RoundedRectangleBorder implements MaterialStateOutlinedBorder {
+    const SelectedBorder();
+
+    @override
+    OutlinedBorder? resolve(Set<MaterialState> states) {
+      if (states.contains(MaterialState.selected)) {
+        return const RoundedRectangleBorder();
+      }
+      return null;
+    }
+  }
+
+  TextStyle floatingLabelStyle = MaterialStateTextStyle.resolveWith(
+    (Set<MaterialState> states) {
+      final Color color =
+          states.contains(MaterialState.error) ? Theme.of(context).colorScheme.error : Colors.orange;
+      return TextStyle(color: color, letterSpacing: 1.3);
+    },
+  );
+
+  final MaterialStateProperty<Icon?> thumbIcon =
+      MaterialStateProperty.resolveWith<Icon?>((Set<MaterialState> states) {
+    if (states.contains(MaterialState.selected)) {
+      return const Icon(Icons.check);
+    }
+    return const Icon(Icons.close);
+  });
+
+  final Color backgroundColor = MaterialStatePropertyAll<Color>(
+    Colors.blue.withOpacity(0.12),
+  );
+
+  final MaterialStatesController statesController =
+    MaterialStatesController(<MaterialState>{if (widget.selected) MaterialState.selected});
+
+  class _MyWidget extends StatefulWidget {
+    const _MyWidget({
+      required this.controller,
+      required this.evaluator,
+      required this.materialState,
+    });
+
+    final bool Function(_MyWidgetState state) evaluator;
+
+    /// Stream passed down to the child [_InnerWidget] to begin the process.
+    /// This plays the role of an actual user interaction in the wild, but allows
+    /// us to engage the system without mocking pointers/hovers etc.
+    final StreamController<bool> controller;
+
+    /// The value we're watching in the given test.
+    final MaterialState materialState;
+
+    @override
+    State createState() => _MyWidgetState();
+  }
+
+}

packages/flutter/test_fixes/material/widget_state.dart.expect

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+void main() {
+  // Changes made in https://github.com/flutter/flutter/pull/142151
+  WidgetState selected = WidgetState.selected;
+  WidgetState hovered = WidgetState.hovered;
+  WidgetState focused = WidgetState.focused;
+  WidgetState pressed = WidgetState.pressed;
+  WidgetState dragged = WidgetState.dragged;
+  WidgetState scrolledUnder = WidgetState.scrolledUnder;
+  WidgetState disabled = WidgetState.disabled;
+  WidgetState error = WidgetState.error;
+
+  final WidgetPropertyResolver<MouseCursor?> resolveCallback;
+
+  Color getColor(Set<WidgetState> states) {
+    if (states.contains(WidgetState.disabled)) {
+      if (states.contains(WidgetState.selected)) {
+        return Color(0xFF000002);
+      }
+      return Color(0xFF000004);
+    }
+    if (states.contains(WidgetState.selected)) {
+      return Color(0xFF000001);
+    }
+    return Color(0xFF000003);
+  }
+
+  final WidgetStateProperty<Color> backgroundColor = WidgetStateColor.resolveWith(getColor);
+
+  class _MouseCursor extends WidgetStateMouseCursor {
+    const _MouseCursor(this.resolveCallback);
+
+    final WidgetPropertyResolver<MouseCursor?> resolveCallback;
+
+    @override
+    MouseCursor resolve(Set<WidgetState> states) => resolveCallback(states) ?? MouseCursor.uncontrolled;
+  }
+
+  WidgetStateBorderSide? get side {
+    return WidgetStateBorderSide.resolveWith((Set<WidgetState> states) {
+      if (states.contains(WidgetState.disabled)) {
+        if (states.contains(WidgetState.selected)) {
+          return const BorderSide(width: 2.0);
+        }
+        return BorderSide(width: 1.0);
+      }
+      if (states.contains(WidgetState.selected)) {
+        return const BorderSide(width: 1.5);
+      }
+      return BorderSide(width: 0.5);
+    });
+  }
+
+  class SelectedBorder extends RoundedRectangleBorder implements WidgetStateOutlinedBorder {
+    const SelectedBorder();
+
+    @override
+    OutlinedBorder? resolve(Set<WidgetState> states) {
+      if (states.contains(WidgetState.selected)) {
+        return const RoundedRectangleBorder();
+      }
+      return null;
+    }
+  }
+
+  TextStyle floatingLabelStyle = WidgetStateTextStyle.resolveWith(
+    (Set<WidgetState> states) {
+      final Color color =
+          states.contains(WidgetState.error) ? Theme.of(context).colorScheme.error : Colors.orange;
+      return TextStyle(color: color, letterSpacing: 1.3);
+    },
+  );
+
+  final WidgetStateProperty<Icon?> thumbIcon =
+      WidgetStateProperty.resolveWith<Icon?>((Set<WidgetState> states) {
+    if (states.contains(WidgetState.selected)) {
+      return const Icon(Icons.check);
+    }
+    return const Icon(Icons.close);
+  });
+
+  final Color backgroundColor = WidgetStatePropertyAll<Color>(
+    Colors.blue.withOpacity(0.12),
+  );
+
+  final WidgetStatesController statesController =
+    WidgetStatesController(<WidgetState>{if (widget.selected) WidgetState.selected});
+
+  class _MyWidget extends StatefulWidget {
+    const _MyWidget({
+      required this.controller,
+      required this.evaluator,
+      required this.materialState,
+    });
+
+    final bool Function(_MyWidgetState state) evaluator;
+
+    /// Stream passed down to the child [_InnerWidget] to begin the process.
+    /// This plays the role of an actual user interaction in the wild, but allows
+    /// us to engage the system without mocking pointers/hovers etc.
+    final StreamController<bool> controller;
+
+    /// The value we're watching in the given test.
+    final WidgetState materialState;
+
+    @override
+    State createState() => _MyWidgetState();
+  }
+
+}