@fluentui-react-native/menu 1.0.52 → 1.0.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. package/CHANGELOG.json +61 -1
  2. package/CHANGELOG.md +23 -2
  3. package/lib/MenuItem/MenuItem.js +4 -4
  4. package/lib/MenuItem/MenuItem.js.map +1 -1
  5. package/lib/MenuItem/MenuItem.types.d.ts +8 -4
  6. package/lib/MenuItem/MenuItem.types.d.ts.map +1 -1
  7. package/lib/MenuItem/index.d.ts +1 -1
  8. package/lib/MenuItem/index.d.ts.map +1 -1
  9. package/lib/MenuItem/useMenuItem.d.ts +2 -2
  10. package/lib/MenuItem/useMenuItem.d.ts.map +1 -1
  11. package/lib/MenuItem/useMenuItem.js +4 -6
  12. package/lib/MenuItem/useMenuItem.js.map +1 -1
  13. package/lib/MenuItemCheckbox/MenuItemCheckbox.d.ts +2 -2
  14. package/lib/MenuItemCheckbox/MenuItemCheckbox.d.ts.map +1 -1
  15. package/lib/MenuItemCheckbox/MenuItemCheckbox.js +2 -2
  16. package/lib/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
  17. package/lib/MenuItemCheckbox/MenuItemCheckbox.types.d.ts +5 -4
  18. package/lib/MenuItemCheckbox/MenuItemCheckbox.types.d.ts.map +1 -1
  19. package/lib/MenuItemCheckbox/MenuItemCheckbox.types.js.map +1 -1
  20. package/lib/MenuItemCheckbox/index.d.ts +1 -1
  21. package/lib/MenuItemCheckbox/index.d.ts.map +1 -1
  22. package/lib/MenuItemCheckbox/useMenuItemCheckbox.d.ts +3 -3
  23. package/lib/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
  24. package/lib/MenuItemCheckbox/useMenuItemCheckbox.js +4 -4
  25. package/lib/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
  26. package/lib/MenuItemRadio/useMenuItemRadio.d.ts +2 -2
  27. package/lib/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
  28. package/lib/index.d.ts +2 -2
  29. package/lib/index.d.ts.map +1 -1
  30. package/lib/index.js.map +1 -1
  31. package/lib-commonjs/MenuItem/MenuItem.js +3 -3
  32. package/lib-commonjs/MenuItem/MenuItem.js.map +1 -1
  33. package/lib-commonjs/MenuItem/MenuItem.types.d.ts +8 -4
  34. package/lib-commonjs/MenuItem/MenuItem.types.d.ts.map +1 -1
  35. package/lib-commonjs/MenuItem/index.d.ts +1 -1
  36. package/lib-commonjs/MenuItem/index.d.ts.map +1 -1
  37. package/lib-commonjs/MenuItem/useMenuItem.d.ts +2 -2
  38. package/lib-commonjs/MenuItem/useMenuItem.d.ts.map +1 -1
  39. package/lib-commonjs/MenuItem/useMenuItem.js +3 -5
  40. package/lib-commonjs/MenuItem/useMenuItem.js.map +1 -1
  41. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.d.ts +2 -2
  42. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.d.ts.map +1 -1
  43. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js +1 -1
  44. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
  45. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.types.d.ts +5 -4
  46. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.types.d.ts.map +1 -1
  47. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.types.js.map +1 -1
  48. package/lib-commonjs/MenuItemCheckbox/index.d.ts +1 -1
  49. package/lib-commonjs/MenuItemCheckbox/index.d.ts.map +1 -1
  50. package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.d.ts +3 -3
  51. package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
  52. package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js +3 -3
  53. package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
  54. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.d.ts +2 -2
  55. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
  56. package/lib-commonjs/index.d.ts +2 -2
  57. package/lib-commonjs/index.d.ts.map +1 -1
  58. package/lib-commonjs/index.js.map +1 -1
  59. package/package.json +4 -4
  60. package/src/MenuItem/MenuItem.tsx +4 -4
  61. package/src/MenuItem/MenuItem.types.ts +9 -4
  62. package/src/MenuItem/index.ts +1 -1
  63. package/src/MenuItem/useMenuItem.ts +10 -7
  64. package/src/MenuItemCheckbox/MenuItemCheckbox.tsx +4 -4
  65. package/src/MenuItemCheckbox/MenuItemCheckbox.types.ts +6 -5
  66. package/src/MenuItemCheckbox/index.ts +1 -1
  67. package/src/MenuItemCheckbox/useMenuItemCheckbox.ts +7 -6
  68. package/src/MenuItemRadio/useMenuItemRadio.ts +2 -2
  69. package/src/__tests__/__snapshots__/Menu.test.tsx.snap +13 -17
  70. package/src/index.ts +3 -2
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/MenuItem/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/MenuItem/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACpI,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import * as React from 'react';
2
- import { MenuItemProps, MenuItemState } from './MenuItem.types';
2
+ import { MenuItemProps, MenuItemInfo } from './MenuItem.types';
3
3
  export declare const triggerKeys: string[];
4
4
  export declare const submenuTriggerKeys: string[];
5
- export declare const useMenuItem: (props: MenuItemProps) => MenuItemState;
5
+ export declare const useMenuItem: (props: MenuItemProps) => MenuItemInfo;
6
6
  export declare const useHoverFocusEffect: (hovered: boolean, componentRef: React.MutableRefObject<any>) => void;
7
7
  //# sourceMappingURL=useMenuItem.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAahE,eAAO,MAAM,WAAW,UAAiB,CAAC;AAC1C,eAAO,MAAM,kBAAkB,UAA8C,CAAC;AAE9E,eAAO,MAAM,WAAW,UAAW,aAAa,KAAG,aAqElD,CAAC;AAUF,eAAO,MAAM,mBAAmB,YAAa,OAAO,gBAAgB,MAAM,gBAAgB,CAAC,GAAG,CAAC,SAQ9F,CAAC"}
1
+ {"version":3,"file":"useMenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAa/D,eAAO,MAAM,WAAW,UAAiB,CAAC;AAC1C,eAAO,MAAM,kBAAkB,UAA8C,CAAC;AAE9E,eAAO,MAAM,WAAW,UAAW,aAAa,KAAG,YAwElD,CAAC;AAUF,eAAO,MAAM,mBAAmB,YAAa,OAAO,gBAAgB,MAAM,gBAAgB,CAAC,GAAG,CAAC,SAQ9F,CAAC"}
@@ -37,23 +37,21 @@ var useMenuItem = function (props) {
37
37
  onArrowClose === null || onArrowClose === void 0 ? void 0 : onArrowClose(e);
38
38
  }
39
39
  }, [disabled, hasSubmenu, onArrowClose, onClick, setOpen, shouldPersist]);
40
- var pressable = (0, interactive_hooks_1.useAsPressable)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, rest), { disabled: disabled, onPress: onInvoke }));
40
+ var pressable = (0, interactive_hooks_1.usePressableState)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, rest), { onPress: onInvoke }));
41
41
  var itemRef = (0, interactive_hooks_1.useViewCommandFocus)(componentRef);
42
42
  var keys = isSubmenu ? exports.submenuTriggerKeys : exports.triggerKeys;
43
43
  // Explicitly override onKeyDown to override the native behavior of moving focus with arrow keys.
44
44
  var onKeyDownProps = interactive_hooks_1.useKeyDownProps.apply(void 0, (0, tslib_1.__spreadArray)([onInvoke], keys, false));
45
45
  (0, exports.useHoverFocusEffect)(pressable.state.hovered, componentRef);
46
46
  return {
47
- props: (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, pressable.props), { accessible: true, accessibilityRole: 'menuitem', onAccessibilityTap: props.onAccessibilityTap || onInvoke, accessibilityState: getAccessibilityState(disabled, accessibilityState), enableFocusRing: react_native_1.Platform.select({
47
+ props: (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, pressable.props), { accessible: true, accessibilityRole: 'menuitem', onAccessibilityTap: props.onAccessibilityTap || onInvoke, accessibilityState: getAccessibilityState(disabled, accessibilityState), disabled: disabled, enableFocusRing: react_native_1.Platform.select({
48
48
  macos: false,
49
49
  default: !pressable.state.hovered, // win32
50
50
  }), focusable: react_native_1.Platform.select({
51
51
  macos: !disabled,
52
52
  default: true, // win32
53
53
  }), ref: itemRef }), onKeyDownProps),
54
- state: pressable.state,
55
- hasSubmenu: hasSubmenu,
56
- hasCheckmarks: hasCheckmarks,
54
+ state: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, pressable.state), { hasSubmenu: hasSubmenu, hasCheckmarks: hasCheckmarks }),
57
55
  };
58
56
  };
59
57
  exports.useMenuItem = useMenuItem;
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;AAC/B,6CAAyE;AAEzE,8DAA2D;AAC3D,8EAMkD;AAClD,sDAAwD;AACxD,8DAAgE;AAChE,oEAAsE;AAEzD,QAAA,WAAW,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC7B,QAAA,kBAAkB,6DAAO,mBAAW,UAAE,WAAW,EAAE,YAAY,UAAE;AAEvE,IAAM,WAAW,GAAG,UAAC,KAAoB;IAC9C,sCAAsC;IACtC,IAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,IAAA,OAAO,GAAgG,KAAK,QAArG,EAAE,kBAAkB,GAA4E,KAAK,mBAAjF,EAAE,KAA0E,KAAK,aAA7C,EAAlC,YAAY,mBAAG,mBAAmB,KAAA,EAAE,QAAQ,GAA8B,KAAK,SAAnC,EAAE,cAAc,GAAc,KAAK,eAAnB,EAAK,IAAI,uBAAK,KAAK,EAA9G,+EAAsG,CAAF,CAAW;IAC/G,IAAA,KAA6C,IAAA,4BAAc,GAAE,EAA3D,SAAS,eAAA,EAAE,kBAAkB,wBAAA,EAAE,OAAO,aAAqB,CAAC;IAC9D,IAAA,KAAkC,IAAA,oCAAkB,GAAE,EAApD,aAAa,mBAAA,EAAE,YAAY,kBAAyB,CAAC;IAC7D,IAAM,SAAS,GAAG,IAAA,0CAAqB,GAAE,CAAC;IAC1C,IAAM,aAAa,GAAG,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,kBAAkB,CAAC;IAE3D,IAAM,UAAU,GAAG,SAAS,IAAI,SAAS,CAAC;IAE1C,IAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAChC,UAAC,CAAmB;QAClB,IAAM,KAAK,GAAG,0BAAW,CAAC,KAAK,CAAC;QAEhC,IAAM,UAAU,GAAG,IAAA,mCAAe,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,YAAY,CAAC,CAAC;QACnH,IAAM,WAAW,GACf,UAAU;YACV,IAAA,mCAAe,EAAC,CAAC,CAAC;YAClB,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC;QAEnG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,UAAU,IAAI,WAAW,CAAC,EAAE;YAC7C,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,CAAC,CAAC,CAAC;SACd;QAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,IAAI,CAAC,aAAa,EAAE;YAChD,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC/C;QAED,IAAM,YAAY,GAChB,IAAA,mCAAe,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC;QACzH,IAAI,YAAY,EAAE;YAChB,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,CAAC,CAAC,CAAC;SACnB;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,CACtE,CAAC;IAEF,IAAM,SAAS,GAAG,IAAA,kCAAc,kDAAM,IAAI,KAAE,QAAQ,UAAA,EAAE,OAAO,EAAE,QAAQ,IAAG,CAAC;IAC3E,IAAM,OAAO,GAAG,IAAA,uCAAmB,EAAC,YAAY,CAAC,CAAC;IAClD,IAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,0BAAkB,CAAC,CAAC,CAAC,mBAAW,CAAC;IAE1D,iGAAiG;IACjG,IAAM,cAAc,GAAG,mCAAe,2CAAC,QAAQ,GAAK,IAAI,SAAC,CAAC;IAE1D,IAAA,2BAAmB,EAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE3D,OAAO;QACL,KAAK,wEACA,SAAS,CAAC,KAAK,KAClB,UAAU,EAAE,IAAI,EAChB,iBAAiB,EAAE,UAAU,EAC7B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,IAAI,QAAQ,EACxD,kBAAkB,EAAE,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EACvE,eAAe,EAAE,uBAAQ,CAAC,MAAM,CAAC;gBAC/B,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ;aAC5C,CAAC,EACF,SAAS,EAAE,uBAAQ,CAAC,MAAM,CAAC;gBACzB,KAAK,EAAE,CAAC,QAAQ;gBAChB,OAAO,EAAE,IAAI,EAAE,QAAQ;aACxB,CAAC,EACF,GAAG,EAAE,OAAO,KACT,cAAc,CAClB;QACD,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,UAAU,YAAA;QACV,aAAa,eAAA;KACd,CAAC;AACJ,CAAC,CAAC;AArEW,QAAA,WAAW,eAqEtB;AAEF,IAAM,qBAAqB,GAAG,IAAA,mBAAO,EAAC,2BAA2B,CAAC,CAAC;AACnE,SAAS,2BAA2B,CAAC,QAAiB,EAAE,kBAAuC;IAC7F,IAAI,kBAAkB,EAAE;QACtB,+BAAS,QAAQ,UAAA,IAAK,kBAAkB,EAAG;KAC5C;IACD,OAAO,EAAE,QAAQ,UAAA,EAAE,CAAC;AACtB,CAAC;AAEM,IAAM,mBAAmB,GAAG,UAAC,OAAgB,EAAE,YAAyC;IAC7F,KAAK,CAAC,eAAe,CAAC;;QACpB,IAAI,OAAO,EAAE;YACX,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAC;SAChC;aAAM;YACL,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,IAAI,EAAE,CAAC;SAC/B;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;AAC9B,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B"}
1
+ {"version":3,"file":"useMenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { Slots } from '@fluentui-react-native/framework';
2
- import { MenuItemCheckboxProps, MenuItemCheckboxSlotProps, MenuItemCheckboxState } from './MenuItemCheckbox.types';
2
+ import { MenuItemCheckboxProps, MenuItemCheckboxSlotProps, MenuItemCheckboxInfo } from './MenuItemCheckbox.types';
3
3
  import React from 'react';
4
4
  export declare const MenuItemCheckbox: import("@fluentui-react-native/framework").ComposableComponent<MenuItemCheckboxProps, MenuItemCheckboxSlotProps, import("./MenuItemCheckbox.types").MenuItemCheckboxTokens, object>;
5
- export declare const menuItemFinalRender: (menuItem: MenuItemCheckboxState, Slots: Slots<MenuItemCheckboxSlotProps>) => React.FunctionComponent<MenuItemCheckboxProps>;
5
+ export declare const menuItemFinalRender: (menuItem: MenuItemCheckboxInfo, Slots: Slots<MenuItemCheckboxSlotProps>) => React.FunctionComponent<MenuItemCheckboxProps>;
6
6
  //# sourceMappingURL=MenuItemCheckbox.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,EAAuB,MAAM,kCAAkC,CAAC;AAEnG,OAAO,EAEL,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EAEtB,MAAM,0BAA0B,CAAC;AAIlC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,eAAO,MAAM,gBAAgB,qLAc3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,qBAAqB,8CAE9B,MAAM,iBAAiB,CAAC,qBAAqB,CAiB/C,CAAC"}
1
+ {"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,EAAuB,MAAM,kCAAkC,CAAC;AAEnG,OAAO,EAEL,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAIlC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,eAAO,MAAM,gBAAgB,qLAc3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,oBAAoB,8CAE7B,MAAM,iBAAiB,CAAC,qBAAqB,CAiB/C,CAAC"}
@@ -12,7 +12,7 @@ var useMenuItemCheckbox_1 = require("./useMenuItemCheckbox");
12
12
  var MenuItemCheckbox_styling_1 = require("./MenuItemCheckbox.styling");
13
13
  var MenuItem_1 = require("../MenuItem/MenuItem");
14
14
  exports.MenuItemCheckbox = (0, framework_1.compose)((0, tslib_1.__assign)((0, tslib_1.__assign)({ displayName: MenuItemCheckbox_types_1.menuItemCheckboxName }, MenuItemCheckbox_styling_1.stylingSettings), { slots: {
15
- root: react_native_1.View,
15
+ root: react_native_1.Pressable,
16
16
  checkmark: react_native_svg_1.SvgXml,
17
17
  content: text_1.TextV1,
18
18
  }, useRender: function (userProps, useSlots) {
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":";;;;AAAA,qBAAqB;AACrB,6CAAoC;AACpC,qDAA0C;AAC1C,8DAAmG;AACnG,oDAA6D;AAC7D,mEAMkC;AAClC,6DAA4D;AAC5D,uEAA6D;AAC7D,iDAA6D;AAGhD,QAAA,gBAAgB,GAAG,IAAA,mBAAO,gDACrC,WAAW,EAAE,6CAAoB,IAC9B,0CAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,mBAAI;QACV,SAAS,EAAE,yBAAM;QACjB,OAAO,EAAE,aAAI;KACd,EACD,SAAS,EAAE,UAAC,SAAgC,EAAE,QAAwC;QACpF,IAAM,QAAQ,GAAG,IAAA,yCAAmB,EAAC,SAAS,CAAC,CAAC;QAChD,IAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,EAAE,UAAC,KAAK,IAAc,OAAA,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAzC,CAAyC,CAAC,CAAC;QAEjG,OAAO,IAAA,2BAAmB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,IACD,CAAC;AAEI,IAAM,mBAAmB,GAAG,UACjC,QAA+B,EAC/B,KAAuC;IAEvC,OAAO,UAAC,KAA4B,EAAE,QAAyB;QAC7D,IAAM,KAAyC,IAAA,sBAAU,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAxE,kBAAkB,wBAAA,EAAK,WAAW,2BAApC,sBAAsC,CAAoC,CAAC;QACjF,IAAM,YAAY,GAAG,6XAGd,CAAC;QAER,IAAM,KAAK,GAAG,IAAA,gCAAqB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAErE,OAAO,CACL,2BAAC,KAAK,CAAC,IAAI,4BAAK,WAAW,IAAE,kBAAkB,EAAE,KAAK;YACpD,2BAAC,KAAK,CAAC,SAAS,IAAC,GAAG,EAAE,YAAY,GAAI;YACrC,QAAQ,IAAI,2BAAC,KAAK,CAAC,OAAO,QAAE,QAAQ,CAAiB,CAC3C,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}
1
+ {"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":";;;;AAAA,qBAAqB;AACrB,6CAAyC;AACzC,qDAA0C;AAC1C,8DAAmG;AACnG,oDAA6D;AAC7D,mEAMkC;AAClC,6DAA4D;AAC5D,uEAA6D;AAC7D,iDAA6D;AAGhD,QAAA,gBAAgB,GAAG,IAAA,mBAAO,gDACrC,WAAW,EAAE,6CAAoB,IAC9B,0CAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,wBAAS;QACf,SAAS,EAAE,yBAAM;QACjB,OAAO,EAAE,aAAI;KACd,EACD,SAAS,EAAE,UAAC,SAAgC,EAAE,QAAwC;QACpF,IAAM,QAAQ,GAAG,IAAA,yCAAmB,EAAC,SAAS,CAAC,CAAC;QAChD,IAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,EAAE,UAAC,KAAK,IAAc,OAAA,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAzC,CAAyC,CAAC,CAAC;QAEjG,OAAO,IAAA,2BAAmB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,IACD,CAAC;AAEI,IAAM,mBAAmB,GAAG,UACjC,QAA8B,EAC9B,KAAuC;IAEvC,OAAO,UAAC,KAA4B,EAAE,QAAyB;QAC7D,IAAM,KAAyC,IAAA,sBAAU,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAxE,kBAAkB,wBAAA,EAAK,WAAW,2BAApC,sBAAsC,CAAoC,CAAC;QACjF,IAAM,YAAY,GAAG,6XAGd,CAAC;QAER,IAAM,KAAK,GAAG,IAAA,gCAAqB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAErE,OAAO,CACL,2BAAC,KAAK,CAAC,IAAI,4BAAK,WAAW,IAAE,kBAAkB,EAAE,KAAK;YACpD,2BAAC,KAAK,CAAC,SAAS,IAAC,GAAG,EAAE,YAAY,GAAI;YACrC,QAAQ,IAAI,2BAAC,KAAK,CAAC,OAAO,QAAE,QAAQ,CAAiB,CAC3C,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}
@@ -1,9 +1,8 @@
1
1
  import * as React from 'react';
2
2
  import { ColorValue } from 'react-native';
3
3
  import { XmlProps } from 'react-native-svg';
4
- import type { IViewProps } from '@fluentui-react-native/adapters';
5
4
  import { TextProps } from '@fluentui-react-native/text';
6
- import { IPressableHooks } from '@fluentui-react-native/interactive-hooks';
5
+ import { PressablePropsExtended, PressableState } from '@fluentui-react-native/interactive-hooks';
7
6
  import { MenuItemProps, MenuItemTokens } from '../MenuItem/MenuItem.types';
8
7
  export declare const menuItemCheckboxName = "MenuItemCheckbox";
9
8
  export interface MenuItemCheckboxTokens extends Omit<MenuItemTokens, 'submenuIndicatorPadding' | 'submenuIndicatorSize' | 'disabled' | 'focused' | 'hovered' | 'pressed'> {
@@ -34,10 +33,12 @@ export interface MenuItemCheckboxProps extends MenuItemProps {
34
33
  */
35
34
  name: string;
36
35
  }
37
- export interface MenuItemCheckboxState extends IPressableHooks<MenuItemCheckboxProps & React.ComponentPropsWithRef<any>> {
36
+ export interface MenuItemCheckboxInfo {
37
+ props: MenuItemCheckboxProps & React.ComponentPropsWithRef<any>;
38
+ state: PressableState;
38
39
  }
39
40
  export interface MenuItemCheckboxSlotProps {
40
- root: React.PropsWithRef<IViewProps>;
41
+ root: React.PropsWithRef<PressablePropsExtended>;
41
42
  checkmark?: XmlProps;
42
43
  content?: TextProps;
43
44
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.types.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE3E,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AAEvD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,cAAc,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACjI;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAE5B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe,CAAC,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;CAAG;AAE3H,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACrC,SAAS,CAAC,EAAE,QAAQ,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,SAAS,EAAE,yBAAyB,CAAC;CACtC"}
1
+ {"version":3,"file":"MenuItemCheckbox.types.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE3E,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AAEvD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,cAAc,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACjI;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAE5B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AACD,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAChE,KAAK,EAAE,cAAc,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,QAAQ,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,SAAS,EAAE,yBAAyB,CAAC;CACtC"}
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.types.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.types.ts"],"names":[],"mappings":";;;AAQa,QAAA,oBAAoB,GAAG,kBAAkB,CAAC"}
1
+ {"version":3,"file":"MenuItemCheckbox.types.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.types.ts"],"names":[],"mappings":";;;AAOa,QAAA,oBAAoB,GAAG,kBAAkB,CAAC"}
@@ -1,5 +1,5 @@
1
1
  export { MenuItemCheckbox } from './MenuItemCheckbox';
2
2
  export { menuItemCheckboxName } from './MenuItemCheckbox.types';
3
- export type { MenuItemCheckboxProps, MenuItemCheckboxState, MenuItemCheckboxTokens, MenuItemCheckboxSlotProps, MenuItemCheckboxType, } from './MenuItemCheckbox.types';
3
+ export type { MenuItemCheckboxProps, MenuItemCheckboxInfo, MenuItemCheckboxTokens, MenuItemCheckboxSlotProps, MenuItemCheckboxType, } from './MenuItemCheckbox.types';
4
4
  export { useMenuItemCheckbox, useMenuCheckboxInteraction } from './useMenuItemCheckbox';
5
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,YAAY,EACV,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC"}
@@ -1,6 +1,6 @@
1
- import { MenuItemCheckboxProps, MenuItemCheckboxState } from './MenuItemCheckbox.types';
1
+ import { MenuItemCheckboxProps, MenuItemCheckboxInfo } from './MenuItemCheckbox.types';
2
2
  import { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
3
- export declare const useMenuItemCheckbox: (props: MenuItemCheckboxProps) => MenuItemCheckboxState;
3
+ export declare const useMenuItemCheckbox: (props: MenuItemCheckboxProps) => MenuItemCheckboxInfo;
4
4
  /**
5
5
  * Create interactivity and accessibility props to be passed into the inner render.
6
6
  * This logic is shared between Checkbox and Radio versions of MenuItem.
@@ -9,5 +9,5 @@ export declare const useMenuItemCheckbox: (props: MenuItemCheckboxProps) => Menu
9
9
  * @param toggleCallback Function to be called when item is toggled
10
10
  * @returns Props and additional state needed to render the component
11
11
  */
12
- export declare const useMenuCheckboxInteraction: (props: MenuItemCheckboxProps, toggleCallback: (e: InteractionEvent) => void) => MenuItemCheckboxState;
12
+ export declare const useMenuCheckboxInteraction: (props: MenuItemCheckboxProps, toggleCallback: (e: InteractionEvent) => void) => MenuItemCheckboxInfo;
13
13
  //# sourceMappingURL=useMenuItemCheckbox.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAExF,OAAO,EACL,gBAAgB,EAMjB,MAAM,0CAA0C,CAAC;AAOlD,eAAO,MAAM,mBAAmB,UAAW,qBAAqB,KAAG,qBAgBlE,CAAC;AAUF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,UAC9B,qBAAqB,sBACR,gBAAgB,KAAK,IAAI,KAC5C,qBA0FF,CAAC"}
1
+ {"version":3,"file":"useMenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EACL,gBAAgB,EAMjB,MAAM,0CAA0C,CAAC;AAOlD,eAAO,MAAM,mBAAmB,UAAW,qBAAqB,KAAG,oBAgBlE,CAAC;AAUF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,UAC9B,qBAAqB,sBACR,gBAAgB,KAAK,IAAI,KAC5C,oBA2FF,CAAC"}
@@ -47,7 +47,7 @@ var useMenuCheckboxInteraction = function (props, toggleCallback) {
47
47
  var isChecked = checked === null || checked === void 0 ? void 0 : checked[name];
48
48
  // Ensure focus is placed on checkbox after click
49
49
  var toggleCheckedWithFocus = (0, interactive_hooks_1.useOnPressWithFocus)(componentRef, toggleCallback);
50
- var pressable = (0, interactive_hooks_1.useAsPressable)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, rest), { disabled: disabled, onPress: toggleCheckedWithFocus }));
50
+ var pressable = (0, interactive_hooks_1.usePressableState)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, rest), { onPress: toggleCheckedWithFocus }));
51
51
  var buttonRef = (0, interactive_hooks_1.useViewCommandFocus)(componentRef);
52
52
  var onKeysPressed = React.useCallback(function (e) {
53
53
  var invokeKey = e.nativeEvent.key === ' ' || e.nativeEvent.key === 'Enter';
@@ -74,9 +74,9 @@ var useMenuCheckboxInteraction = function (props, toggleCallback) {
74
74
  }
75
75
  }, [disabled, toggleCallback, onAccessibilityAction]);
76
76
  (0, useMenuItem_1.useHoverFocusEffect)(pressable.state.hovered, componentRef);
77
- var state = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, pressable.state), { disabled: !!props.disabled, checked: isChecked });
77
+ var state = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, pressable.state), { checked: isChecked, disabled: disabled });
78
78
  return {
79
- props: (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, pressable.props), { accessible: true, accessibilityActions: accessibilityActionsProp, accessibilityLabel: accessibilityLabel, accessibilityRole: 'menuitem', accessibilityState: getAccessibilityState(disabled, state.checked, accessibilityState), enableFocusRing: react_native_1.Platform.select({
79
+ props: (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, pressable.props), { accessible: true, accessibilityActions: accessibilityActionsProp, accessibilityLabel: accessibilityLabel, accessibilityRole: 'menuitem', accessibilityState: getAccessibilityState(disabled, state.checked, accessibilityState), disabled: disabled, enableFocusRing: react_native_1.Platform.select({
80
80
  macos: false,
81
81
  default: !pressable.state.hovered, // win32
82
82
  }), focusable: react_native_1.Platform.select({
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;AAC/B,6CAAmG;AAEnG,8DAA2D;AAC3D,8EAOkD;AAClD,8DAAgE;AAChE,uDAA+F;AAC/F,sDAAwD;AAExD,IAAM,2BAA2B,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AAElD,IAAM,mBAAmB,GAAG,UAAC,KAA4B;;IACtD,IAAA,QAAQ,GAAW,KAAK,SAAhB,EAAE,IAAI,GAAK,KAAK,KAAV,CAAW;IACjC,IAAM,OAAO,GAAG,IAAA,oCAAkB,GAAE,CAAC;IACrC,IAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,IAAI,CAAC,CAAC;IACxC,IAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAEhD,IAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CACrC,UAAC,CAAmB;QAClB,IAAI,CAAC,QAAQ,EAAE;YACb,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;SACpC;IACH,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC,CAC3C,CAAC;IAEF,OAAO,IAAA,kCAA0B,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC;AAhBW,QAAA,mBAAmB,uBAgB9B;AAEF,IAAM,qBAAqB,GAAG,IAAA,mBAAO,EAAC,2BAA2B,CAAC,CAAC;AACnE,SAAS,2BAA2B,CAAC,QAAiB,EAAE,OAAgB,EAAE,kBAAuC;IAC/G,IAAI,kBAAkB,EAAE;QACtB,+BAAS,QAAQ,UAAA,EAAE,OAAO,SAAA,IAAK,kBAAkB,EAAG;KACrD;IACD,OAAO,EAAE,QAAQ,UAAA,EAAE,OAAO,SAAA,EAAE,CAAC;AAC/B,CAAC;AAED;;;;;;;GAOG;AACI,IAAM,0BAA0B,GAAG,UACxC,KAA4B,EAC5B,cAA6C;IAE7C,IAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE7C,IAAA,oBAAoB,GAQlB,KAAK,qBARa,EACpB,kBAAkB,GAOhB,KAAK,mBAPW,EAClB,kBAAkB,GAMhB,KAAK,mBANW,EAClB,KAKE,KAAK,aAL2B,EAAlC,YAAY,mBAAG,mBAAmB,KAAA,EAClC,QAAQ,GAIN,KAAK,SAJC,EACR,IAAI,GAGF,KAAK,KAHH,EACJ,qBAAqB,GAEnB,KAAK,sBAFc,EAClB,IAAI,uBACL,KAAK,EATH,iIASL,CADQ,CACC;IAEV,IAAM,SAAS,GAAG,IAAA,4BAAc,GAAE,CAAC,SAAS,CAAC;IAEvC,IAAA,KAA4B,IAAA,oCAAkB,GAAE,EAA9C,OAAO,aAAA,EAAE,YAAY,kBAAyB,CAAC;IACvD,IAAM,SAAS,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAAI,CAAC,CAAC;IAElC,iDAAiD;IACjD,IAAM,sBAAsB,GAAG,IAAA,uCAAmB,EAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAEjF,IAAM,SAAS,GAAG,IAAA,kCAAc,kDAAM,IAAI,KAAE,QAAQ,UAAA,EAAE,OAAO,EAAE,sBAAsB,IAAG,CAAC;IACzF,IAAM,SAAS,GAAG,IAAA,uCAAmB,EAAC,YAAY,CAAC,CAAC;IAEpD,IAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CACrC,UAAC,CAAgB;QACf,IAAM,SAAS,GAAG,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,OAAO,CAAC;QAC7E,IAAI,CAAC,QAAQ,IAAI,SAAS,EAAE;YAC1B,cAAc,CAAC,CAAC,CAAC,CAAC;YAClB,OAAO;SACR;QAED,IAAM,KAAK,GAAG,0BAAW,CAAC,KAAK,CAAC;QAChC,IAAM,YAAY,GAAG,SAAS,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,WAAW,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC;QAEnI,IAAI,YAAY,EAAE;YAChB,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,CAAC,CAAC,CAAC;SACnB;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,CAAC,CACpD,CAAC;IAEF,IAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,gCAAkB,CAAC,CAAC,CAAC,yBAAW,CAAC;IAC1D,IAAM,UAAU,GAAG,mCAAe,2CAAC,aAAa,GAAK,IAAI,SAAC,CAAC;IAE3D,IAAM,wBAAwB,GAAG,oBAAoB;QACnD,CAAC,2DAAK,2BAA2B,SAAK,oBAAoB,QAC1D,CAAC,CAAC,2BAA2B,CAAC;IAChC,IAAM,yBAAyB,GAAG,KAAK,CAAC,WAAW,CACjD,UAAC,KAA+B;QAC9B,IAAI,CAAC,QAAQ,EAAE;YACb,IAAI,KAAK,CAAC,WAAW,CAAC,UAAU,KAAK,QAAQ,EAAE;gBAC7C,cAAc,CAAC,KAAK,CAAC,CAAC;aACvB;YACD,qBAAqB,IAAI,qBAAqB,CAAC,KAAK,CAAC,CAAC;SACvD;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,cAAc,EAAE,qBAAqB,CAAC,CAClD,CAAC;IAEF,IAAA,iCAAmB,EAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE3D,IAAM,KAAK,mDACN,SAAS,CAAC,KAAK,KAClB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAC1B,OAAO,EAAE,SAAS,GACnB,CAAC;IAEF,OAAO;QACL,KAAK,wEACA,SAAS,CAAC,KAAK,KAClB,UAAU,EAAE,IAAI,EAChB,oBAAoB,EAAE,wBAAwB,EAC9C,kBAAkB,oBAAA,EAClB,iBAAiB,EAAE,UAAU,EAC7B,kBAAkB,EAAE,qBAAqB,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC,EACtF,eAAe,EAAE,uBAAQ,CAAC,MAAM,CAAC;gBAC/B,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ;aAC5C,CAAC,EACF,SAAS,EAAE,uBAAQ,CAAC,MAAM,CAAC;gBACzB,KAAK,EAAE,CAAC,QAAQ;gBAChB,OAAO,EAAE,IAAI,EAAE,QAAQ;aACxB,CAAC,EACF,qBAAqB,EAAE,yBAAyB,EAChD,GAAG,EAAE,SAAS,KACX,UAAU,CACd;QACD,KAAK,EAAE,KAAK;KACb,CAAC;AACJ,CAAC,CAAC;AA7FW,QAAA,0BAA0B,8BA6FrC"}
1
+ {"version":3,"file":"useMenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- import { MenuItemCheckboxProps, MenuItemCheckboxState } from '../MenuItemCheckbox/MenuItemCheckbox.types';
2
- export declare const useMenuItemRadio: (props: MenuItemCheckboxProps) => MenuItemCheckboxState;
1
+ import { MenuItemCheckboxProps, MenuItemCheckboxInfo } from '../MenuItemCheckbox/MenuItemCheckbox.types';
2
+ export declare const useMenuItemRadio: (props: MenuItemCheckboxProps) => MenuItemCheckboxInfo;
3
3
  //# sourceMappingURL=useMenuItemRadio.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuItemRadio.d.ts","sourceRoot":"","sources":["../../src/MenuItemRadio/useMenuItemRadio.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAI1G,eAAO,MAAM,gBAAgB,UAAW,qBAAqB,KAAG,qBA+B/D,CAAC"}
1
+ {"version":3,"file":"useMenuItemRadio.d.ts","sourceRoot":"","sources":["../../src/MenuItemRadio/useMenuItemRadio.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAIzG,eAAO,MAAM,gBAAgB,UAAW,qBAAqB,KAAG,oBA+B/D,CAAC"}
@@ -2,8 +2,8 @@ export { useMenuContext, MenuContext, MenuContextValue, MenuProvider, useMenuLis
2
2
  export { Menu, menuName, MenuProps, MenuState, useMenu, useMenuContextValue } from './Menu';
3
3
  export { MenuTrigger, menuTriggerName, MenuTriggerChildProps, MenuTriggerState, useMenuTrigger } from './MenuTrigger';
4
4
  export { MenuPopover, menuPopoverName, MenuPopoverProps, MenuPopoverState, MenuPopoverTokens, useMenuPopover } from './MenuPopover';
5
- export { MenuItem, menuItemName, MenuItemProps, MenuItemSlotProps, MenuItemState, MenuItemTokens, MenuItemType, useMenuItem, } from './MenuItem';
6
- export { MenuItemCheckbox, menuItemCheckboxName, MenuItemCheckboxProps, MenuItemCheckboxSlotProps, MenuItemCheckboxState, MenuItemCheckboxTokens, MenuItemCheckboxType, useMenuCheckboxInteraction, useMenuItemCheckbox, } from './MenuItemCheckbox';
5
+ export { MenuItem, menuItemName, MenuItemProps, MenuItemState, MenuItemInfo, MenuItemSlotProps, MenuItemTokens, MenuItemType, useMenuItem, } from './MenuItem';
6
+ export { MenuItemCheckbox, menuItemCheckboxName, MenuItemCheckboxProps, MenuItemCheckboxInfo, MenuItemCheckboxSlotProps, MenuItemCheckboxTokens, MenuItemCheckboxType, useMenuCheckboxInteraction, useMenuItemCheckbox, } from './MenuItemCheckbox';
7
7
  export { MenuItemRadio, menuItemRadioName, useMenuItemRadio } from './MenuItemRadio';
8
8
  export { MenuList, menuListName, MenuListProps, MenuListSlotProps, MenuListState, MenuListTokens, MenuListType, useMenuList, useMenuListContextValue, } from './MenuList';
9
9
  export { MenuDivider, menuDividerName, MenuDividerProps, MenuDividerSlotProps, MenuDividerTokens, MenuDividerType } from './MenuDivider';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpI,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,WAAW,EACX,uBAAuB,GACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpI,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,aAAa,EACb,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACtB,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,WAAW,EACX,uBAAuB,GACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAYmB;AAXjB,yGAAA,cAAc,OAAA;AACd,sGAAA,WAAW,OAAA;AAEX,uGAAA,YAAY,OAAA;AACZ,6GAAA,kBAAkB,OAAA;AAClB,0GAAA,eAAe,OAAA;AAEf,2GAAA,gBAAgB,OAAA;AAChB,gHAAA,qBAAqB,OAAA;AACrB,6GAAA,kBAAkB,OAAA;AAClB,8GAAA,mBAAmB,OAAA;AAErB,+BAA4F;AAAnF,4FAAA,IAAI,OAAA;AAAE,gGAAA,QAAQ,OAAA;AAAwB,+FAAA,OAAO,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAC3E,6CAAsH;AAA7G,0GAAA,WAAW,OAAA;AAAE,8GAAA,eAAe,OAAA;AAA2C,6GAAA,cAAc,OAAA;AAC9F,6CAAoI;AAA3H,0GAAA,WAAW,OAAA;AAAE,8GAAA,eAAe,OAAA;AAAyD,6GAAA,cAAc,OAAA;AAC5G,uCASoB;AARlB,oGAAA,QAAQ,OAAA;AACR,wGAAA,YAAY,OAAA;AAMZ,uGAAA,WAAW,OAAA;AAEb,uDAU4B;AAT1B,oHAAA,gBAAgB,OAAA;AAChB,wHAAA,oBAAoB,OAAA;AAMpB,8HAAA,0BAA0B,OAAA;AAC1B,uHAAA,mBAAmB,OAAA;AAErB,iDAAqF;AAA5E,8GAAA,aAAa,OAAA;AAAE,kHAAA,iBAAiB,OAAA;AAAE,iHAAA,gBAAgB,OAAA;AAC3D,uCAUoB;AATlB,oGAAA,QAAQ,OAAA;AACR,wGAAA,YAAY,OAAA;AAMZ,uGAAA,WAAW,OAAA;AACX,mHAAA,uBAAuB,OAAA;AAEzB,6CAAyI;AAAhI,0GAAA,WAAW,OAAA;AAAE,8GAAA,eAAe,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAYmB;AAXjB,yGAAA,cAAc,OAAA;AACd,sGAAA,WAAW,OAAA;AAEX,uGAAA,YAAY,OAAA;AACZ,6GAAA,kBAAkB,OAAA;AAClB,0GAAA,eAAe,OAAA;AAEf,2GAAA,gBAAgB,OAAA;AAChB,gHAAA,qBAAqB,OAAA;AACrB,6GAAA,kBAAkB,OAAA;AAClB,8GAAA,mBAAmB,OAAA;AAErB,+BAA4F;AAAnF,4FAAA,IAAI,OAAA;AAAE,gGAAA,QAAQ,OAAA;AAAwB,+FAAA,OAAO,OAAA;AAAE,2GAAA,mBAAmB,OAAA;AAC3E,6CAAsH;AAA7G,0GAAA,WAAW,OAAA;AAAE,8GAAA,eAAe,OAAA;AAA2C,6GAAA,cAAc,OAAA;AAC9F,6CAAoI;AAA3H,0GAAA,WAAW,OAAA;AAAE,8GAAA,eAAe,OAAA;AAAyD,6GAAA,cAAc,OAAA;AAC5G,uCAUoB;AATlB,oGAAA,QAAQ,OAAA;AACR,wGAAA,YAAY,OAAA;AAOZ,uGAAA,WAAW,OAAA;AAEb,uDAU4B;AAT1B,oHAAA,gBAAgB,OAAA;AAChB,wHAAA,oBAAoB,OAAA;AAMpB,8HAAA,0BAA0B,OAAA;AAC1B,uHAAA,mBAAmB,OAAA;AAErB,iDAAqF;AAA5E,8GAAA,aAAa,OAAA;AAAE,kHAAA,iBAAiB,OAAA;AAAE,iHAAA,gBAAgB,OAAA;AAC3D,uCAUoB;AATlB,oGAAA,QAAQ,OAAA;AACR,wGAAA,YAAY,OAAA;AAMZ,uGAAA,WAAW,OAAA;AACX,mHAAA,uBAAuB,OAAA;AAEzB,6CAAyI;AAAhI,0GAAA,WAAW,OAAA;AAAE,8GAAA,eAAe,OAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluentui-react-native/menu",
3
- "version": "1.0.52",
3
+ "version": "1.0.54",
4
4
  "description": "A cross-platform Menu component using the Fluent Design System",
5
5
  "main": "lib-commonjs/index.js",
6
6
  "module": "lib/index.js",
@@ -23,9 +23,9 @@
23
23
  },
24
24
  "dependencies": {
25
25
  "@fluentui-react-native/adapters": ">=0.9.3 <1.0.0",
26
- "@fluentui-react-native/callout": ">=0.21.23 <1.0.0",
26
+ "@fluentui-react-native/callout": ">=0.21.25 <1.0.0",
27
27
  "@fluentui-react-native/framework": "0.8.12",
28
- "@fluentui-react-native/interactive-hooks": ">=0.18.15 <1.0.0",
28
+ "@fluentui-react-native/interactive-hooks": ">=0.19.1 <1.0.0",
29
29
  "@fluentui-react-native/text": ">=0.15.8 <1.0.0",
30
30
  "@fluentui-react-native/theme-tokens": ">=0.20.0 <1.0.0",
31
31
  "@fluentui-react-native/tokens": ">=0.17.5 <1.0.0",
@@ -34,7 +34,7 @@
34
34
  "tslib": "^2.3.1"
35
35
  },
36
36
  "devDependencies": {
37
- "@fluentui-react-native/button": ">=0.25.12 <1.0.0",
37
+ "@fluentui-react-native/button": ">=0.26.1 <1.0.0",
38
38
  "@fluentui-react-native/eslint-config-rules": "^0.1.1",
39
39
  "@fluentui-react-native/scripts": "^0.1.1",
40
40
  "@fluentui-react-native/test-tools": ">=0.1.1 <1.0.0",
@@ -1,5 +1,5 @@
1
1
  /** @jsx withSlots */
2
- import { I18nManager, View } from 'react-native';
2
+ import { I18nManager, Pressable, View } from 'react-native';
3
3
  import { SvgXml } from 'react-native-svg';
4
4
  import { compose, memoize, mergeProps, UseSlots, withSlots } from '@fluentui-react-native/framework';
5
5
  import { TextV1 as Text } from '@fluentui-react-native/text';
@@ -12,7 +12,7 @@ export const MenuItem = compose<MenuItemType>({
12
12
  displayName: menuItemName,
13
13
  ...stylingSettings,
14
14
  slots: {
15
- root: View,
15
+ root: Pressable,
16
16
  checkmark: View,
17
17
  content: Text,
18
18
  submenuIndicator: SvgXml,
@@ -38,9 +38,9 @@ export const MenuItem = compose<MenuItemType>({
38
38
 
39
39
  return (
40
40
  <Slots.root {...mergedProps} accessibilityLabel={label}>
41
- {menuItem.hasCheckmarks && <Slots.checkmark />}
41
+ {menuItem.state.hasCheckmarks && <Slots.checkmark />}
42
42
  {children && <Slots.content>{children}</Slots.content>}
43
- {menuItem.hasSubmenu && <Slots.submenuIndicator xml={chevronXml} />}
43
+ {menuItem.state.hasSubmenu && <Slots.submenuIndicator xml={chevronXml} />}
44
44
  </Slots.root>
45
45
  );
46
46
  };
@@ -3,7 +3,7 @@ import { ColorValue } from 'react-native';
3
3
  import { XmlProps } from 'react-native-svg';
4
4
  import type { IViewProps } from '@fluentui-react-native/adapters';
5
5
  import { TextProps } from '@fluentui-react-native/text';
6
- import { IFocusable, InteractionEvent, IPressableHooks, IWithPressableOptions } from '@fluentui-react-native/interactive-hooks';
6
+ import { IFocusable, InteractionEvent, PressablePropsExtended, PressableState } from '@fluentui-react-native/interactive-hooks';
7
7
  import { FontTokens, IBorderTokens, IColorTokens, LayoutTokens } from '@fluentui-react-native/tokens';
8
8
 
9
9
  export const menuItemName = 'MenuItem';
@@ -43,7 +43,7 @@ export interface MenuItemTokens extends LayoutTokens, FontTokens, IBorderTokens,
43
43
  pressed?: MenuItemTokens;
44
44
  }
45
45
 
46
- export interface MenuItemProps extends Omit<IWithPressableOptions<IViewProps>, 'onPress'> {
46
+ export interface MenuItemProps extends Omit<PressablePropsExtended, 'onPress'> {
47
47
  /**
48
48
  * A RefObject to access the IButton interface. Use this to access the public methods and properties of the component.
49
49
  */
@@ -60,7 +60,7 @@ export interface MenuItemProps extends Omit<IWithPressableOptions<IViewProps>, '
60
60
  persistOnClick?: boolean;
61
61
  }
62
62
 
63
- export interface MenuItemState extends IPressableHooks<MenuItemProps & React.ComponentPropsWithRef<any>> {
63
+ export interface MenuItemState extends PressableState {
64
64
  hasCheckmarks?: boolean;
65
65
 
66
66
  /**
@@ -69,8 +69,13 @@ export interface MenuItemState extends IPressableHooks<MenuItemProps & React.Com
69
69
  hasSubmenu?: boolean;
70
70
  }
71
71
 
72
+ export interface MenuItemInfo {
73
+ props: MenuItemProps & React.ComponentPropsWithRef<any>;
74
+ state: MenuItemState;
75
+ }
76
+
72
77
  export interface MenuItemSlotProps {
73
- root: React.PropsWithRef<IViewProps>;
78
+ root: React.PropsWithRef<PressablePropsExtended>;
74
79
  content?: TextProps;
75
80
  checkmark?: React.PropsWithRef<IViewProps>;
76
81
  submenuIndicator?: XmlProps;
@@ -1,4 +1,4 @@
1
1
  export { MenuItem } from './MenuItem';
2
2
  export { menuItemName } from './MenuItem.types';
3
- export type { MenuItemProps, MenuItemState, MenuItemTokens, MenuItemSlotProps, MenuItemType } from './MenuItem.types';
3
+ export type { MenuItemProps, MenuItemState, MenuItemInfo, MenuItemTokens, MenuItemSlotProps, MenuItemType } from './MenuItem.types';
4
4
  export { useMenuItem } from './useMenuItem';
@@ -1,11 +1,11 @@
1
1
  import * as React from 'react';
2
2
  import { AccessibilityState, I18nManager, Platform } from 'react-native';
3
- import { MenuItemProps, MenuItemState } from './MenuItem.types';
3
+ import { MenuItemProps, MenuItemInfo } from './MenuItem.types';
4
4
  import { memoize } from '@fluentui-react-native/framework';
5
5
  import {
6
6
  InteractionEvent,
7
7
  isKeyPressEvent,
8
- useAsPressable,
8
+ usePressableState,
9
9
  useKeyDownProps,
10
10
  useViewCommandFocus,
11
11
  } from '@fluentui-react-native/interactive-hooks';
@@ -16,7 +16,7 @@ import { useMenuTriggerContext } from '../context/menuTriggerContext';
16
16
  export const triggerKeys = [' ', 'Enter'];
17
17
  export const submenuTriggerKeys = [...triggerKeys, 'ArrowLeft', 'ArrowRight'];
18
18
 
19
- export const useMenuItem = (props: MenuItemProps): MenuItemState => {
19
+ export const useMenuItem = (props: MenuItemProps): MenuItemInfo => {
20
20
  // attach the pressable state handlers
21
21
  const defaultComponentRef = React.useRef(null);
22
22
  const { onClick, accessibilityState, componentRef = defaultComponentRef, disabled, persistOnClick, ...rest } = props;
@@ -54,7 +54,7 @@ export const useMenuItem = (props: MenuItemProps): MenuItemState => {
54
54
  [disabled, hasSubmenu, onArrowClose, onClick, setOpen, shouldPersist],
55
55
  );
56
56
 
57
- const pressable = useAsPressable({ ...rest, disabled, onPress: onInvoke });
57
+ const pressable = usePressableState({ ...rest, onPress: onInvoke });
58
58
  const itemRef = useViewCommandFocus(componentRef);
59
59
  const keys = isSubmenu ? submenuTriggerKeys : triggerKeys;
60
60
 
@@ -70,6 +70,7 @@ export const useMenuItem = (props: MenuItemProps): MenuItemState => {
70
70
  accessibilityRole: 'menuitem',
71
71
  onAccessibilityTap: props.onAccessibilityTap || onInvoke,
72
72
  accessibilityState: getAccessibilityState(disabled, accessibilityState),
73
+ disabled,
73
74
  enableFocusRing: Platform.select({
74
75
  macos: false,
75
76
  default: !pressable.state.hovered, // win32
@@ -81,9 +82,11 @@ export const useMenuItem = (props: MenuItemProps): MenuItemState => {
81
82
  ref: itemRef,
82
83
  ...onKeyDownProps,
83
84
  },
84
- state: pressable.state,
85
- hasSubmenu,
86
- hasCheckmarks,
85
+ state: {
86
+ ...pressable.state,
87
+ hasSubmenu,
88
+ hasCheckmarks,
89
+ },
87
90
  };
88
91
  };
89
92
 
@@ -1,5 +1,5 @@
1
1
  /** @jsx withSlots */
2
- import { View } from 'react-native';
2
+ import { Pressable } from 'react-native';
3
3
  import { SvgXml } from 'react-native-svg';
4
4
  import { compose, mergeProps, Slots, UseSlots, withSlots } from '@fluentui-react-native/framework';
5
5
  import { TextV1 as Text } from '@fluentui-react-native/text';
@@ -7,7 +7,7 @@ import {
7
7
  menuItemCheckboxName,
8
8
  MenuItemCheckboxProps,
9
9
  MenuItemCheckboxSlotProps,
10
- MenuItemCheckboxState,
10
+ MenuItemCheckboxInfo,
11
11
  MenuItemCheckboxType,
12
12
  } from './MenuItemCheckbox.types';
13
13
  import { useMenuItemCheckbox } from './useMenuItemCheckbox';
@@ -19,7 +19,7 @@ export const MenuItemCheckbox = compose<MenuItemCheckboxType>({
19
19
  displayName: menuItemCheckboxName,
20
20
  ...stylingSettings,
21
21
  slots: {
22
- root: View,
22
+ root: Pressable,
23
23
  checkmark: SvgXml,
24
24
  content: Text,
25
25
  },
@@ -32,7 +32,7 @@ export const MenuItemCheckbox = compose<MenuItemCheckboxType>({
32
32
  });
33
33
 
34
34
  export const menuItemFinalRender = (
35
- menuItem: MenuItemCheckboxState,
35
+ menuItem: MenuItemCheckboxInfo,
36
36
  Slots: Slots<MenuItemCheckboxSlotProps>,
37
37
  ): React.FunctionComponent<MenuItemCheckboxProps> => {
38
38
  return (final: MenuItemCheckboxProps, children: React.ReactNode) => {
@@ -1,9 +1,8 @@
1
1
  import * as React from 'react';
2
2
  import { ColorValue } from 'react-native';
3
3
  import { XmlProps } from 'react-native-svg';
4
- import type { IViewProps } from '@fluentui-react-native/adapters';
5
4
  import { TextProps } from '@fluentui-react-native/text';
6
- import { IPressableHooks } from '@fluentui-react-native/interactive-hooks';
5
+ import { PressablePropsExtended, PressableState } from '@fluentui-react-native/interactive-hooks';
7
6
  import { MenuItemProps, MenuItemTokens } from '../MenuItem/MenuItem.types';
8
7
 
9
8
  export const menuItemCheckboxName = 'MenuItemCheckbox';
@@ -41,11 +40,13 @@ export interface MenuItemCheckboxProps extends MenuItemProps {
41
40
  */
42
41
  name: string;
43
42
  }
44
-
45
- export interface MenuItemCheckboxState extends IPressableHooks<MenuItemCheckboxProps & React.ComponentPropsWithRef<any>> {}
43
+ export interface MenuItemCheckboxInfo {
44
+ props: MenuItemCheckboxProps & React.ComponentPropsWithRef<any>;
45
+ state: PressableState;
46
+ }
46
47
 
47
48
  export interface MenuItemCheckboxSlotProps {
48
- root: React.PropsWithRef<IViewProps>;
49
+ root: React.PropsWithRef<PressablePropsExtended>;
49
50
  checkmark?: XmlProps;
50
51
  content?: TextProps;
51
52
  }
@@ -2,7 +2,7 @@ export { MenuItemCheckbox } from './MenuItemCheckbox';
2
2
  export { menuItemCheckboxName } from './MenuItemCheckbox.types';
3
3
  export type {
4
4
  MenuItemCheckboxProps,
5
- MenuItemCheckboxState,
5
+ MenuItemCheckboxInfo,
6
6
  MenuItemCheckboxTokens,
7
7
  MenuItemCheckboxSlotProps,
8
8
  MenuItemCheckboxType,
@@ -1,11 +1,11 @@
1
1
  import * as React from 'react';
2
2
  import { AccessibilityActionEvent, AccessibilityState, I18nManager, Platform } from 'react-native';
3
- import { MenuItemCheckboxProps, MenuItemCheckboxState } from './MenuItemCheckbox.types';
3
+ import { MenuItemCheckboxProps, MenuItemCheckboxInfo } from './MenuItemCheckbox.types';
4
4
  import { memoize } from '@fluentui-react-native/framework';
5
5
  import {
6
6
  InteractionEvent,
7
7
  KeyPressEvent,
8
- useAsPressable,
8
+ usePressableState,
9
9
  useKeyDownProps,
10
10
  useOnPressWithFocus,
11
11
  useViewCommandFocus,
@@ -16,7 +16,7 @@ import { useMenuContext } from '../context/menuContext';
16
16
 
17
17
  const defaultAccessibilityActions = [{ name: 'Toggle' }];
18
18
 
19
- export const useMenuItemCheckbox = (props: MenuItemCheckboxProps): MenuItemCheckboxState => {
19
+ export const useMenuItemCheckbox = (props: MenuItemCheckboxProps): MenuItemCheckboxInfo => {
20
20
  const { disabled, name } = props;
21
21
  const context = useMenuListContext();
22
22
  const checked = context.checked?.[name];
@@ -53,7 +53,7 @@ function getAccessibilityStateWorker(disabled: boolean, checked: boolean, access
53
53
  export const useMenuCheckboxInteraction = (
54
54
  props: MenuItemCheckboxProps,
55
55
  toggleCallback: (e: InteractionEvent) => void,
56
- ): MenuItemCheckboxState => {
56
+ ): MenuItemCheckboxInfo => {
57
57
  const defaultComponentRef = React.useRef(null);
58
58
  const {
59
59
  accessibilityActions,
@@ -74,7 +74,7 @@ export const useMenuCheckboxInteraction = (
74
74
  // Ensure focus is placed on checkbox after click
75
75
  const toggleCheckedWithFocus = useOnPressWithFocus(componentRef, toggleCallback);
76
76
 
77
- const pressable = useAsPressable({ ...rest, disabled, onPress: toggleCheckedWithFocus });
77
+ const pressable = usePressableState({ ...rest, onPress: toggleCheckedWithFocus });
78
78
  const buttonRef = useViewCommandFocus(componentRef);
79
79
 
80
80
  const onKeysPressed = React.useCallback(
@@ -117,8 +117,8 @@ export const useMenuCheckboxInteraction = (
117
117
 
118
118
  const state = {
119
119
  ...pressable.state,
120
- disabled: !!props.disabled,
121
120
  checked: isChecked,
121
+ disabled,
122
122
  };
123
123
 
124
124
  return {
@@ -129,6 +129,7 @@ export const useMenuCheckboxInteraction = (
129
129
  accessibilityLabel,
130
130
  accessibilityRole: 'menuitem',
131
131
  accessibilityState: getAccessibilityState(disabled, state.checked, accessibilityState),
132
+ disabled,
132
133
  enableFocusRing: Platform.select({
133
134
  macos: false,
134
135
  default: !pressable.state.hovered, // win32
@@ -1,11 +1,11 @@
1
1
  import * as React from 'react';
2
2
  import { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
3
3
  import { useMenuListContext } from '../context/menuListContext';
4
- import { MenuItemCheckboxProps, MenuItemCheckboxState } from '../MenuItemCheckbox/MenuItemCheckbox.types';
4
+ import { MenuItemCheckboxProps, MenuItemCheckboxInfo } from '../MenuItemCheckbox/MenuItemCheckbox.types';
5
5
  import { useMenuCheckboxInteraction } from '../MenuItemCheckbox/useMenuItemCheckbox';
6
6
  import { useMenuContext } from '../context/menuContext';
7
7
 
8
- export const useMenuItemRadio = (props: MenuItemCheckboxProps): MenuItemCheckboxState => {
8
+ export const useMenuItemRadio = (props: MenuItemCheckboxProps): MenuItemCheckboxInfo => {
9
9
  const { disabled, name, persistOnClick } = props;
10
10
  const context = useMenuContext();
11
11
  const listContext = useMenuListContext();