Add a way to pass context to the MenuItem action.

This is needed to pass the HTML element triggering menu interaction for a11y in the datepicker.

Remove nullAwareAction, it is a relic from the past.

PiperOrigin-RevId: 259777943

Author: rkj

angular_components/lib/material_menu/menu_item_groups.dart

@@ -271,7 +271,7 @@ class MenuItemGroupsComponent
   }
 
   void select(MenuItem item, MenuItemGroup group) {
-    item.nullAwareActionHandler();
+    item.action?.call();
 
     // Fire the event for activating the menu item. This does not mean the item
     // is selected, but merely that it was triggered (by mouse, keyboard, w/e).

angular_components/lib/model/menu/delegating_menu_item.dart

@@ -15,13 +15,21 @@ class DelegatingMenuItem<SubMenuType> implements MenuItem<SubMenuType> {
   DelegatingMenuItem(this._delegate);
 
   @override
-  Function get action => _delegate.action;
+  MenuAction get action => _delegate.action;
 
   @override
-  set action(Function action) {
+  set action(MenuAction action) {
     _delegate.action = action;
   }
 
+  @override
+  ActionWithContext get actionWithContext => _delegate.actionWithContext;
+
+  @override
+  set actionWithContext(ActionWithContext actionWithContext) {
+    _delegate.actionWithContext = actionWithContext;
+  }
+
   @override
   bool get enabled => _delegate.enabled;
 
@@ -51,9 +59,6 @@ class DelegatingMenuItem<SubMenuType> implements MenuItem<SubMenuType> {
   @override
   String get ariaLabel => _delegate.ariaLabel;
 
-  @override
-  Function get nullAwareActionHandler => _delegate.nullAwareActionHandler;
-
   @override
   bool get showTooltip => _delegate.showTooltip;
 

angular_components/lib/model/menu/menu.dart

@@ -153,7 +153,26 @@ class MenuItem<T> with MenuItemMixin implements HasUIDisplayName, HasIcon {
   final String labelAnnotation;
   final MenuModel<T> subMenu;
 
-  Function action;
+  // This should be final as all the other state in this class, but needs
+  // to first migrate clients.
+  ActionWithContext _actionWithContext;
+
+  /// Action to perform when user select an item in the menu.
+  ActionWithContext get actionWithContext => _actionWithContext;
+  @Deprecated('This should be final.')
+  set actionWithContext(ActionWithContext value) {
+    _actionWithContext = value;
+    _action = () => value(null);
+  }
+
+  MenuAction _action;
+
+  @Deprecated('Use actionWithContext')
+  MenuAction get action => _action;
+  set action(MenuAction value) {
+    _action = value;
+    _actionWithContext = (_) => value();
+  }
 
   final Icon icon;
 
@@ -185,7 +204,8 @@ class MenuItem<T> with MenuItemMixin implements HasUIDisplayName, HasIcon {
   MenuItem(this.label,
       {this.enabled = true,
       this.tooltip,
-      this.action,
+      @Deprecated('Use ActionWithContext') MenuAction action,
+      ActionWithContext actionWithContext,
       this.icon,
       this.labelAnnotation,
       Iterable<String> cssClasses,
@@ -201,6 +221,13 @@ class MenuItem<T> with MenuItemMixin implements HasUIDisplayName, HasIcon {
         ariaLabel = ariaLabel ?? label {
     assert(itemSuffix == null || itemSuffixes == null,
         'Only one of itemSuffix or itemSuffixes should be provided');
+    assert(action == null || actionWithContext == null,
+        'Only one of action or actionWithContext should be provided');
+    if (action != null) {
+      this.action = action;
+    } else if (actionWithContext != null) {
+      this.actionWithContext = actionWithContext;
+    }
   }
 
   @override
@@ -216,19 +243,24 @@ class MenuItem<T> with MenuItemMixin implements HasUIDisplayName, HasIcon {
 
 /// Required members to use [MenuItemMixin].
 abstract class _MenuItemBase {
-  Function get action;
+  ActionWithContext get actionWithContext;
   Icon get icon;
   String get label;
   String get secondaryLabel;
   String get tooltip;
   MenuModel get subMenu;
 }
 
+/// Action triggered by interaction with the menu.
+typedef MenuAction = void Function();
+
+/// Action triggered by interaction with the menu.
+///
+/// For web menus `context` should be the UIEvent.
+typedef ActionWithContext = void Function(dynamic context);
+
 /// Mixin to implement trivial getters on [MenuItem].
 abstract class MenuItemMixin implements _MenuItemBase {
-  void _noop() {}
-  Function get nullAwareActionHandler => action != null ? action : _noop;
-
   bool get hasIcon => icon != null;
 
   String get uiDisplayName => label;

angular_components/lib/model/menu/selectable_menu.dart

@@ -68,7 +68,8 @@ class MenuItemGroupWithSelection<SelectionItemType>
 /// A selectable [MenuItem].
 class SelectableMenuItem<ItemType> extends PropertyChangeNotifier
     implements MenuItem {
-  Function _action;
+  MenuAction _action;
+  ActionWithContext _actionWithContext;
   SelectableOption _selectableState;
   String ariaChecked;
 
@@ -132,20 +133,32 @@ class SelectableMenuItem<ItemType> extends PropertyChangeNotifier
       this.secondaryLabel,
       this.labelAnnotation,
       Iterable<String> cssClasses,
-      Function action = _noOp,
+      MenuAction action,
+      ActionWithContext actionWithContext,
       SelectableOption selectableState = SelectableOption.Selectable,
       bool shouldSelectOnItemClick,
       MenuItemAffix itemSuffix,
       ObservableList<MenuItemAffix> itemSuffixes})
-      : _action = action,
-        _selectableState = selectableState,
+      : _selectableState = selectableState,
         shouldSelectOnItemClick = shouldSelectOnItemClick ?? subMenu == null,
         itemSuffixes = itemSuffixes ??
             ObservableList<MenuItemAffix>.from(
                 Optional.fromNullable(itemSuffix)),
         cssClasses = BuiltList<String>(cssClasses ?? const []) {
     assert(itemSuffix == null || itemSuffixes == null,
         'Only one of itemSuffix or itemSuffixes should be provided');
+    assert(action == null || actionWithContext == null,
+        'Only one of action or actionWithContext should be provided');
+    if (action != null) {
+      _action = action;
+      _actionWithContext = (_) => action();
+    } else if (actionWithContext != null) {
+      _action = () => actionWithContext(null);
+      _actionWithContext = actionWithContext;
+    } else {
+      _action = _noOp;
+      _actionWithContext = _noOp2;
+    }
   }
 
   @override
@@ -154,9 +167,6 @@ class SelectableMenuItem<ItemType> extends PropertyChangeNotifier
   @override
   String get ariaLabel => label;
 
-  @override
-  Function get nullAwareActionHandler => _action ?? _noOp;
-
   @override
   bool get hasIcon => icon != null;
 
@@ -182,16 +192,29 @@ class SelectableMenuItem<ItemType> extends PropertyChangeNotifier
   }
 
   @override
-  Function get action => _action;
+  MenuAction get action => _action;
 
   @override
-  set action(Function value) {
+  set action(MenuAction value) {
     if (value == _action) return;
 
     _action = value;
+    _actionWithContext = (_) => value();
     notifyPropertyChange(#action, _action, value);
   }
 
+  @override
+  ActionWithContext get actionWithContext => _actionWithContext;
+
+  @override
+  set actionWithContext(ActionWithContext value) {
+    if (value == _actionWithContext) return;
+
+    _actionWithContext = value;
+    _action = () => value(null);
+    notifyPropertyChange(#actionWithContext, _actionWithContext, value);
+  }
+
   @override
   bool get hasSecondaryLabel => secondaryLabel != null;
 
@@ -207,3 +230,4 @@ class SelectableMenuItem<ItemType> extends PropertyChangeNotifier
 }
 
 void _noOp() {}
+void _noOp2(_) {}