feat: Mark MenuFlyoutItem as disabled when .onPressed is null (F…

…ixes #1074)
bdlukaa · Jun 23, 2024 · 00c3b19 · 00c3b19
1 parent eec6560
commit 00c3b19
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,8 @@
 * feat: Add `NumberBox.textInputAction` and `NumberBox.onEditingComplete` ([#1063](https://github.com/bdlukaa/fluent_ui/pull/1063))
 * feat: Add `Tab.color`, `Tab.selectedColor` and `Tab.outlineColor` to TabView  ([#1068](https://github.com/bdlukaa/fluent_ui/pull/1068))
 * feat: Added `NavigationView.onItemPressed` callback, called when the item is on tap ([#1067](https://github.com/bdlukaa/fluent_ui/pull/1067))
-* **BREAKING** feat: Removed `ButtonState`, `ButtonStates` and their related classes. Use `WidgetStateProperty`, `WidgetState` instead.
+* fix: Mark `MenuFlyoutItem` as disabled when `.onPressed` is `null` ([#1074](https://github.com/bdlukaa/fluent_ui/issues/1074))
+* **BREAKING** feat: Removed `ButtonState`, `ButtonStates` and their related classes. Use `WidgetStateProperty`, `WidgetState` instead. ([#1075](https://github.com/bdlukaa/fluent_ui/issues/1075))
   Before:
 
   ```dart

diff --git a/example/lib/screens/popups/flyout.dart b/example/lib/screens/popups/flyout.dart
@@ -309,7 +309,7 @@ FlyoutTarget(
                         ),
                         MenuFlyoutItem(
                           text: const Text('Select'),
-                          onPressed: Flyout.of(context).close,
+                          onPressed: null,
                         ),
                         const MenuFlyoutSeparator(),
                         MenuFlyoutSubItem(

diff --git a/lib/src/controls/flyouts/content.dart b/lib/src/controls/flyouts/content.dart
@@ -149,6 +149,8 @@ class FlyoutListTile extends StatelessWidget {
 
   final bool showSelectedIndicator;
 
+  bool get isEnabled => onPressed != null;
+
   @override
   Widget build(BuildContext context) {
     assert(debugCheckHasFluentTheme(context));
@@ -168,6 +170,9 @@ class FlyoutListTile extends StatelessWidget {
           states = {WidgetState.hovered};
         }
 
+        final foregroundColor =
+            ButtonThemeData.buttonForegroundColor(context, states);
+
         Widget content = Stack(children: [
           Container(
             decoration: BoxDecoration(
@@ -189,7 +194,7 @@ class FlyoutListTile extends StatelessWidget {
                 Padding(
                   padding: const EdgeInsetsDirectional.only(end: 10.0),
                   child: IconTheme.merge(
-                    data: const IconThemeData(size: 16.0),
+                    data: IconThemeData(size: 16.0, color: foregroundColor),
                     child: icon!,
                   ),
                 ),
@@ -203,7 +208,7 @@ class FlyoutListTile extends StatelessWidget {
                     style: TextStyle(
                       fontSize: 14.0,
                       letterSpacing: -0.15,
-                      color: theme.inactiveColor,
+                      color: foregroundColor,
                     ),
                     child: text,
                   ),

diff --git a/lib/src/controls/flyouts/menu.dart b/lib/src/controls/flyouts/menu.dart
@@ -280,10 +280,12 @@ class MenuFlyoutItem extends MenuFlyoutItemBase {
           data: const IconThemeData(size: 12.0),
           child: trailing ?? const SizedBox.shrink(),
         ),
-        onPressed: () {
-          Navigator.of(context).maybePop();
-          onPressed?.call();
-        },
+        onPressed: onPressed == null
+            ? null
+            : () {
+                Navigator.of(context).maybePop();
+                onPressed?.call();
+              },
       ),
     );
   }