@fluentui-react-native/menu 0.14.3 → 0.14.6

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 (147) hide show
  1. package/CHANGELOG.json +64 -1
  2. package/CHANGELOG.md +29 -2
  3. package/SPEC.md +5 -6
  4. package/lib/Menu/Menu.types.d.ts +1 -0
  5. package/lib/Menu/Menu.types.d.ts.map +1 -1
  6. package/lib/Menu/useMenu.d.ts.map +1 -1
  7. package/lib/Menu/useMenu.js +31 -11
  8. package/lib/Menu/useMenu.js.map +1 -1
  9. package/lib/MenuDivider/MenuDividerTokens.macos.d.ts +5 -0
  10. package/lib/MenuDivider/MenuDividerTokens.macos.d.ts.map +1 -0
  11. package/lib/MenuDivider/MenuDividerTokens.macos.js +7 -0
  12. package/lib/MenuDivider/MenuDividerTokens.macos.js.map +1 -0
  13. package/lib/MenuItem/MenuItem.styling.d.ts.map +1 -1
  14. package/lib/MenuItem/MenuItem.styling.js +4 -4
  15. package/lib/MenuItem/MenuItem.styling.js.map +1 -1
  16. package/lib/MenuItem/MenuItemTokens.macos.d.ts +5 -0
  17. package/lib/MenuItem/MenuItemTokens.macos.d.ts.map +1 -0
  18. package/lib/MenuItem/MenuItemTokens.macos.js +28 -0
  19. package/lib/MenuItem/MenuItemTokens.macos.js.map +1 -0
  20. package/lib/MenuItem/useMenuItem.d.ts.map +1 -1
  21. package/lib/MenuItem/useMenuItem.js +8 -2
  22. package/lib/MenuItem/useMenuItem.js.map +1 -1
  23. package/lib/MenuItemCheckbox/MenuItemCheckbox.styling.d.ts.map +1 -1
  24. package/lib/MenuItemCheckbox/MenuItemCheckbox.styling.js +2 -2
  25. package/lib/MenuItemCheckbox/MenuItemCheckbox.styling.js.map +1 -1
  26. package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.d.ts +5 -0
  27. package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.d.ts.map +1 -0
  28. package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js +44 -0
  29. package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js.map +1 -0
  30. package/lib/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
  31. package/lib/MenuItemCheckbox/useMenuItemCheckbox.js +9 -2
  32. package/lib/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
  33. package/lib/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
  34. package/lib/MenuItemRadio/useMenuItemRadio.js +9 -4
  35. package/lib/MenuItemRadio/useMenuItemRadio.js.map +1 -1
  36. package/lib/MenuList/MenuList.js +1 -1
  37. package/lib/MenuList/MenuList.js.map +1 -1
  38. package/lib/MenuList/MenuList.types.d.ts +11 -6
  39. package/lib/MenuList/MenuList.types.d.ts.map +1 -1
  40. package/lib/MenuList/MenuList.types.js.map +1 -1
  41. package/lib/MenuList/MenuListTokens.macos.d.ts +5 -0
  42. package/lib/MenuList/MenuListTokens.macos.d.ts.map +1 -0
  43. package/lib/MenuList/MenuListTokens.macos.js +7 -0
  44. package/lib/MenuList/MenuListTokens.macos.js.map +1 -0
  45. package/lib/MenuList/useMenuList.d.ts.map +1 -1
  46. package/lib/MenuList/useMenuList.js +73 -26
  47. package/lib/MenuList/useMenuList.js.map +1 -1
  48. package/lib/MenuList/useMenuListContextValue.js +1 -1
  49. package/lib/MenuList/useMenuListContextValue.js.map +1 -1
  50. package/lib/MenuPopover/useMenuPopover.d.ts.map +1 -1
  51. package/lib/MenuPopover/useMenuPopover.js +3 -1
  52. package/lib/MenuPopover/useMenuPopover.js.map +1 -1
  53. package/lib/MenuTrigger/useMenuTrigger.d.ts.map +1 -1
  54. package/lib/MenuTrigger/useMenuTrigger.js +2 -0
  55. package/lib/MenuTrigger/useMenuTrigger.js.map +1 -1
  56. package/lib/__tests__/Menu.test.js +2 -2
  57. package/lib/__tests__/Menu.test.js.map +1 -1
  58. package/lib/context/menuContext.d.ts.map +1 -1
  59. package/lib/context/menuContext.js +3 -2
  60. package/lib/context/menuContext.js.map +1 -1
  61. package/lib/context/menuListContext.d.ts +6 -4
  62. package/lib/context/menuListContext.d.ts.map +1 -1
  63. package/lib/context/menuListContext.js +2 -1
  64. package/lib/context/menuListContext.js.map +1 -1
  65. package/lib-commonjs/Menu/Menu.types.d.ts +1 -0
  66. package/lib-commonjs/Menu/Menu.types.d.ts.map +1 -1
  67. package/lib-commonjs/Menu/useMenu.d.ts.map +1 -1
  68. package/lib-commonjs/Menu/useMenu.js +31 -11
  69. package/lib-commonjs/Menu/useMenu.js.map +1 -1
  70. package/lib-commonjs/MenuDivider/MenuDividerTokens.macos.d.ts +5 -0
  71. package/lib-commonjs/MenuDivider/MenuDividerTokens.macos.d.ts.map +1 -0
  72. package/lib-commonjs/MenuDivider/MenuDividerTokens.macos.js +11 -0
  73. package/lib-commonjs/MenuDivider/MenuDividerTokens.macos.js.map +1 -0
  74. package/lib-commonjs/MenuItem/MenuItem.styling.d.ts.map +1 -1
  75. package/lib-commonjs/MenuItem/MenuItem.styling.js +3 -3
  76. package/lib-commonjs/MenuItem/MenuItem.styling.js.map +1 -1
  77. package/lib-commonjs/MenuItem/MenuItemTokens.macos.d.ts +5 -0
  78. package/lib-commonjs/MenuItem/MenuItemTokens.macos.d.ts.map +1 -0
  79. package/lib-commonjs/MenuItem/MenuItemTokens.macos.js +32 -0
  80. package/lib-commonjs/MenuItem/MenuItemTokens.macos.js.map +1 -0
  81. package/lib-commonjs/MenuItem/useMenuItem.d.ts.map +1 -1
  82. package/lib-commonjs/MenuItem/useMenuItem.js +7 -1
  83. package/lib-commonjs/MenuItem/useMenuItem.js.map +1 -1
  84. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.styling.d.ts.map +1 -1
  85. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.styling.js +1 -1
  86. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.styling.js.map +1 -1
  87. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.d.ts +5 -0
  88. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.d.ts.map +1 -0
  89. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js +48 -0
  90. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js.map +1 -0
  91. package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
  92. package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js +9 -2
  93. package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
  94. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
  95. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js +9 -4
  96. package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js.map +1 -1
  97. package/lib-commonjs/MenuList/MenuList.js +1 -1
  98. package/lib-commonjs/MenuList/MenuList.js.map +1 -1
  99. package/lib-commonjs/MenuList/MenuList.types.d.ts +11 -6
  100. package/lib-commonjs/MenuList/MenuList.types.d.ts.map +1 -1
  101. package/lib-commonjs/MenuList/MenuList.types.js.map +1 -1
  102. package/lib-commonjs/MenuList/MenuListTokens.macos.d.ts +5 -0
  103. package/lib-commonjs/MenuList/MenuListTokens.macos.d.ts.map +1 -0
  104. package/lib-commonjs/MenuList/MenuListTokens.macos.js +11 -0
  105. package/lib-commonjs/MenuList/MenuListTokens.macos.js.map +1 -0
  106. package/lib-commonjs/MenuList/useMenuList.d.ts.map +1 -1
  107. package/lib-commonjs/MenuList/useMenuList.js +74 -27
  108. package/lib-commonjs/MenuList/useMenuList.js.map +1 -1
  109. package/lib-commonjs/MenuList/useMenuListContextValue.js +1 -1
  110. package/lib-commonjs/MenuList/useMenuListContextValue.js.map +1 -1
  111. package/lib-commonjs/MenuPopover/useMenuPopover.d.ts.map +1 -1
  112. package/lib-commonjs/MenuPopover/useMenuPopover.js +3 -1
  113. package/lib-commonjs/MenuPopover/useMenuPopover.js.map +1 -1
  114. package/lib-commonjs/MenuTrigger/useMenuTrigger.d.ts.map +1 -1
  115. package/lib-commonjs/MenuTrigger/useMenuTrigger.js +2 -0
  116. package/lib-commonjs/MenuTrigger/useMenuTrigger.js.map +1 -1
  117. package/lib-commonjs/__tests__/Menu.test.js +2 -2
  118. package/lib-commonjs/__tests__/Menu.test.js.map +1 -1
  119. package/lib-commonjs/context/menuContext.d.ts.map +1 -1
  120. package/lib-commonjs/context/menuContext.js +3 -2
  121. package/lib-commonjs/context/menuContext.js.map +1 -1
  122. package/lib-commonjs/context/menuListContext.d.ts +6 -4
  123. package/lib-commonjs/context/menuListContext.d.ts.map +1 -1
  124. package/lib-commonjs/context/menuListContext.js +2 -1
  125. package/lib-commonjs/context/menuListContext.js.map +1 -1
  126. package/package.json +4 -4
  127. package/src/Menu/Menu.types.ts +1 -0
  128. package/src/Menu/useMenu.ts +45 -13
  129. package/src/MenuDivider/MenuDividerTokens.macos.ts +10 -0
  130. package/src/MenuItem/MenuItem.styling.ts +4 -3
  131. package/src/MenuItem/MenuItemTokens.macos.ts +31 -0
  132. package/src/MenuItem/useMenuItem.ts +9 -3
  133. package/src/MenuItemCheckbox/MenuItemCheckbox.styling.ts +2 -1
  134. package/src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts +47 -0
  135. package/src/MenuItemCheckbox/useMenuItemCheckbox.ts +10 -4
  136. package/src/MenuItemRadio/useMenuItemRadio.ts +11 -3
  137. package/src/MenuList/MenuList.tsx +1 -1
  138. package/src/MenuList/MenuList.types.ts +11 -5
  139. package/src/MenuList/MenuListTokens.macos.ts +10 -0
  140. package/src/MenuList/useMenuList.ts +76 -37
  141. package/src/MenuList/useMenuListContextValue.ts +1 -1
  142. package/src/MenuPopover/useMenuPopover.ts +3 -0
  143. package/src/MenuTrigger/useMenuTrigger.ts +2 -0
  144. package/src/__tests__/Menu.test.tsx +2 -2
  145. package/src/__tests__/__snapshots__/Menu.test.tsx.snap +28 -0
  146. package/src/context/menuContext.ts +3 -2
  147. package/src/context/menuListContext.ts +5 -2
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,6CAAqD;AAErD,sDAAwD;AAExD,oCAAqD;AAErD,IAAM,0BAA0B,GAAG,CAAC,yBAAyB,EAAE,8BAA8B,CAAuB,CAAC;AAE9G,IAAM,cAAc,GAAG,UAAC,MAAwB;IACrD,IAAM,OAAO,GAAG,IAAA,4BAAc,GAAE,CAAC;IAE/B,IAAA,OAAO,GASL,OAAO,QATF,EACP,UAAU,GAQR,OAAO,WARC,EACV,YAAY,GAOV,OAAO,aAPG,EACZ,SAAS,GAMP,OAAO,UANA,EACT,WAAW,GAKT,OAAO,YALE,EACX,0BAA0B,GAIxB,OAAO,2BAJiB,EAC1B,oBAAoB,GAGlB,OAAO,qBAHW,EACpB,uBAAuB,GAErB,OAAO,wBAFc,EACvB,oBAAoB,GAClB,OAAO,qBADW,CACV;IAEZ,IAAM,SAAS,GAAG,eAAK,CAAC,WAAW,CAAC,cAAM,OAAA,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,EAAtC,CAAsC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7F,IAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,IAAM,eAAe,GAAG,kBAAkB,CAAC,SAAS,EAAE,0BAAW,CAAC,KAAK,CAAC,CAAC;IAEzE,4EAA4E;IAC5E,8CAA8C;IAC9C,IAAM,eAAe,GAAG,uBAAQ,CAAC,EAAE,KAAM,OAAe,IAAI,uBAAQ,CAAC,EAAE,KAAK,SAAS,CAAC;IACtF,IAAM,uBAAuB,GAAG,WAAW,CAAC;IAC5C,IAAM,iBAAiB,GAAG,MAAM,CAAC;IAEjC,IAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CAAC;QACrC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,0BAA0B,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC7E,IAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,IAAM,KAAK,GAAG,UAAU,CAAC;YACvB,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE;YACL,iBAAiB,mBAAA;YACjB,MAAM,EAAE,UAAU;YAClB,SAAS,WAAA;YACT,eAAe,iBAAA;YACf,gBAAgB,kBAAA;YAChB,uBAAuB,yBAAA;YACvB,eAAe,iBAAA;SAChB;QACD,SAAS,EAAE;YACT,YAAY,cAAA;YACZ,YAAY,EAAE,iCAAwB,IAAI,YAAY;SACvD;KACF,CAAC;AACJ,CAAC,CAAC;AAvDW,QAAA,cAAc,kBAuDzB;AAEF,IAAM,kBAAkB,GAAG,UAAC,SAAkB,EAAE,KAAc;IAC5D,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,KAAK,EAAE;QACT,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC"}
1
+ {"version":3,"file":"useMenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,6CAAqD;AAErD,sDAAwD;AAExD,oCAAqD;AAErD,IAAM,0BAA0B,GAAG,CAAC,yBAAyB,EAAE,8BAA8B,CAAuB,CAAC;AAE9G,IAAM,cAAc,GAAG,UAAC,MAAwB;IACrD,IAAM,OAAO,GAAG,IAAA,4BAAc,GAAE,CAAC;IAE/B,IAAA,OAAO,GAUL,OAAO,QAVF,EACP,UAAU,GASR,OAAO,WATC,EACV,YAAY,GAQV,OAAO,aARG,EACZ,SAAS,GAOP,OAAO,UAPA,EACT,WAAW,GAMT,OAAO,YANE,EACX,0BAA0B,GAKxB,OAAO,2BALiB,EAC1B,oBAAoB,GAIlB,OAAO,qBAJW,EACpB,uBAAuB,GAGrB,OAAO,wBAHc,EACvB,sBAAsB,GAEpB,OAAO,uBAFa,EACtB,oBAAoB,GAClB,OAAO,qBADW,CACV;IAEZ,IAAM,SAAS,GAAG,eAAK,CAAC,WAAW,CAAC,cAAM,OAAA,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,EAAtC,CAAsC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7F,IAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,IAAM,eAAe,GAAG,kBAAkB,CAAC,SAAS,EAAE,0BAAW,CAAC,KAAK,CAAC,CAAC;IAEzE,4EAA4E;IAC5E,8CAA8C;IAC9C,IAAM,eAAe,GAAG,uBAAQ,CAAC,EAAE,KAAM,OAAe,IAAI,uBAAQ,CAAC,EAAE,KAAK,SAAS,CAAC;IACtF,IAAM,uBAAuB,GAAG,WAAW,CAAC;IAC5C,IAAM,iBAAiB,GAAG,MAAM,CAAC;IAEjC,IAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CAAC;QACrC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,0BAA0B,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC7E,IAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,IAAM,KAAK,GAAG,UAAU,CAAC;YACvB,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE;YACL,iBAAiB,mBAAA;YACjB,MAAM,EAAE,UAAU;YAClB,SAAS,WAAA;YACT,eAAe,iBAAA;YACf,gBAAgB,kBAAA;YAChB,uBAAuB,yBAAA;YACvB,eAAe,iBAAA;SAChB;QACD,SAAS,EAAE;YACT,YAAY,cAAA;YACZ,YAAY,EAAE,iCAAwB,IAAI,YAAY;YACtD,UAAU,EAAE,sBAAsB;YAClC,SAAS,EAAE,sBAAsB;SAClC;KACF,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,cAAc,kBA0DzB;AAEF,IAAM,kBAAkB,GAAG,UAAC,SAAkB,EAAE,KAAc;IAC5D,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,KAAK,EAAE;QACT,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuTrigger.d.ts","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAUvD,eAAO,MAAM,cAAc,QAAO,gBAmEjC,CAAC"}
1
+ {"version":3,"file":"useMenuTrigger.d.ts","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAUvD,eAAO,MAAM,cAAc,QAAO,gBAqEjC,CAAC"}
@@ -29,6 +29,7 @@ var useMenuTrigger = function () {
29
29
  if (openOnHover) {
30
30
  clearTimeout(popoverHoverOutTimer);
31
31
  clearTimeout(triggerHoverOutTimer);
32
+ e.persist();
32
33
  setTimeout(function () {
33
34
  setOpen(e, true /* isOpen */);
34
35
  }, consts_1.delayHover);
@@ -36,6 +37,7 @@ var useMenuTrigger = function () {
36
37
  }, [openOnHover, setOpen, triggerHoverOutTimer, popoverHoverOutTimer]);
37
38
  var onHoverOut = react_1.default.useCallback(function (e) {
38
39
  if (openOnHover) {
40
+ e.persist();
39
41
  var timer = setTimeout(function () {
40
42
  setOpen(e, false /* isOpen */);
41
43
  }, consts_1.delayHover);
@@ -1 +1 @@
1
- {"version":3,"file":"useMenuTrigger.js","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useMenuTrigger.js","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":"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"}
@@ -75,7 +75,7 @@ describe('Checkbox component tests', function () {
75
75
  });
76
76
  it('Menu open checkbox defaultChecked', function () {
77
77
  var tree = renderer
78
- .create(React.createElement(Menu_1.Menu, { open: true, defaultChecked: { 'Option 1': true } },
78
+ .create(React.createElement(Menu_1.Menu, { open: true, defaultChecked: ['Option 1'] },
79
79
  React.createElement(MenuTrigger_1.default, null,
80
80
  React.createElement(button_1.ButtonV1, null, "Open")),
81
81
  React.createElement(MenuPopover_1.default, null,
@@ -88,7 +88,7 @@ describe('Checkbox component tests', function () {
88
88
  });
89
89
  it('Menu open checkbox checked', function () {
90
90
  var tree = renderer
91
- .create(React.createElement(Menu_1.Menu, { open: true, checked: { 'Option 1': true } },
91
+ .create(React.createElement(Menu_1.Menu, { open: true, checked: ['Option 1'] },
92
92
  React.createElement(MenuTrigger_1.default, null,
93
93
  React.createElement(button_1.ButtonV1, null, "Open")),
94
94
  React.createElement(MenuPopover_1.default, null,
@@ -1 +1 @@
1
- {"version":3,"file":"Menu.test.js","sourceRoot":"","sources":["../../src/__tests__/Menu.test.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Menu.test.js","sourceRoot":"","sources":["../../src/__tests__/Menu.test.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"menuContext.d.ts","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACtC,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC1D,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,WAAW,iCAUtB,CAAC;AAEH,eAAO,MAAM,YAAY,kCAAuB,CAAC;AACjD,eAAO,MAAM,cAAc,wBAAsC,CAAC"}
1
+ {"version":3,"file":"menuContext.d.ts","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACtC,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC1D,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,WAAW,iCAWtB,CAAC;AAEH,eAAO,MAAM,YAAY,kCAAuB,CAAC;AACjD,eAAO,MAAM,cAAc,wBAAsC,CAAC"}
@@ -5,13 +5,14 @@ var tslib_1 = require("tslib");
5
5
  var React = (0, tslib_1.__importStar)(require("react"));
6
6
  exports.MenuContext = React.createContext({
7
7
  isControlled: false,
8
- checked: {},
9
- defaultChecked: {},
8
+ checked: [],
9
+ defaultChecked: [],
10
10
  hasCheckmarks: false,
11
11
  isSubmenu: false,
12
12
  open: false,
13
13
  onCheckedChange: function () { return false; },
14
14
  setOpen: function () { return false; },
15
+ shouldFocusOnContainer: false,
15
16
  triggerRef: null,
16
17
  });
17
18
  exports.MenuProvider = exports.MenuContext.Provider;
@@ -1 +1 @@
1
- {"version":3,"file":"menuContext.js","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;AAalB,QAAA,WAAW,GAAG,KAAK,CAAC,aAAa,CAAmB;IAC/D,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,EAAE;IACX,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,KAAK;IAChB,IAAI,EAAE,KAAK;IACX,eAAe,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IAC5B,OAAO,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IACpB,UAAU,EAAE,IAAI;CACjB,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,mBAAW,CAAC,QAAQ,CAAC;AAC1C,IAAM,cAAc,GAAG,cAAM,OAAA,KAAK,CAAC,UAAU,CAAC,mBAAW,CAAC,EAA7B,CAA6B,CAAC;AAArD,QAAA,cAAc,kBAAuC"}
1
+ {"version":3,"file":"menuContext.js","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;AAalB,QAAA,WAAW,GAAG,KAAK,CAAC,aAAa,CAAmB;IAC/D,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,EAAE;IACX,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,KAAK;IAChB,IAAI,EAAE,KAAK;IACX,eAAe,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IAC5B,OAAO,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IACpB,sBAAsB,EAAE,KAAK;IAC7B,UAAU,EAAE,IAAI;CACjB,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,mBAAW,CAAC,QAAQ,CAAC;AAC1C,IAAM,cAAc,GAAG,cAAM,OAAA,KAAK,CAAC,UAAU,CAAC,mBAAW,CAAC,EAA7B,CAA6B,CAAC;AAArD,QAAA,cAAc,kBAAuC"}
@@ -3,8 +3,10 @@ import type { MenuListState } from '../MenuList/MenuList.types';
3
3
  /**
4
4
  * Context shared between Menu and its child components
5
5
  */
6
- export declare type MenuListContextValue = MenuListState;
7
- export declare const MenuListContext: React.Context<MenuListState>;
8
- export declare const MenuListProvider: React.Provider<MenuListState>;
9
- export declare const useMenuListContext: () => MenuListState;
6
+ export declare type MenuListContextValue = Omit<MenuListState, 'props'> & {
7
+ hasCheckmarks: boolean;
8
+ };
9
+ export declare const MenuListContext: React.Context<MenuListContextValue>;
10
+ export declare const MenuListProvider: React.Provider<MenuListContextValue>;
11
+ export declare const useMenuListContext: () => MenuListContextValue;
10
12
  //# sourceMappingURL=menuListContext.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"menuListContext.d.ts","sourceRoot":"","sources":["../../src/context/menuListContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE;;GAEG;AACH,oBAAY,oBAAoB,GAAG,aAAa,CAAC;AAEjD,eAAO,MAAM,eAAe,8BAM1B,CAAC;AAEH,eAAO,MAAM,gBAAgB,+BAA2B,CAAC;AACzD,eAAO,MAAM,kBAAkB,qBAA0C,CAAC"}
1
+ {"version":3,"file":"menuListContext.d.ts","sourceRoot":"","sources":["../../src/context/menuListContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE;;GAEG;AACH,oBAAY,oBAAoB,GAAG,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG;IAChE,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,eAAe,qCAO1B,CAAC;AAEH,eAAO,MAAM,gBAAgB,sCAA2B,CAAC;AACzD,eAAO,MAAM,kBAAkB,4BAA0C,CAAC"}
@@ -6,9 +6,10 @@ var React = (0, tslib_1.__importStar)(require("react"));
6
6
  exports.MenuListContext = React.createContext({
7
7
  isCheckedControlled: false,
8
8
  checked: {},
9
- defaultChecked: {},
10
9
  hasCheckmarks: false,
11
10
  onCheckedChange: function () { return false; },
11
+ addRadioItem: function () { return false; },
12
+ removeRadioItem: function () { return false; },
12
13
  });
13
14
  exports.MenuListProvider = exports.MenuListContext.Provider;
14
15
  var useMenuListContext = function () { return React.useContext(exports.MenuListContext); };
@@ -1 +1 @@
1
- {"version":3,"file":"menuListContext.js","sourceRoot":"","sources":["../../src/context/menuListContext.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;AAQlB,QAAA,eAAe,GAAG,KAAK,CAAC,aAAa,CAAuB;IACvE,mBAAmB,EAAE,KAAK;IAC1B,OAAO,EAAE,EAAE;IACX,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;CAC7B,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,uBAAe,CAAC,QAAQ,CAAC;AAClD,IAAM,kBAAkB,GAAG,cAAM,OAAA,KAAK,CAAC,UAAU,CAAC,uBAAe,CAAC,EAAjC,CAAiC,CAAC;AAA7D,QAAA,kBAAkB,sBAA2C"}
1
+ {"version":3,"file":"menuListContext.js","sourceRoot":"","sources":["../../src/context/menuListContext.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;AAUlB,QAAA,eAAe,GAAG,KAAK,CAAC,aAAa,CAAuB;IACvE,mBAAmB,EAAE,KAAK;IAC1B,OAAO,EAAE,EAAE;IACX,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IAC5B,YAAY,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IACzB,eAAe,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;CAC7B,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,uBAAe,CAAC,QAAQ,CAAC;AAClD,IAAM,kBAAkB,GAAG,cAAM,OAAA,KAAK,CAAC,UAAU,CAAC,uBAAe,CAAC,EAAjC,CAAiC,CAAC;AAA7D,QAAA,kBAAkB,sBAA2C"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluentui-react-native/menu",
3
- "version": "0.14.3",
3
+ "version": "0.14.6",
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,10 +23,10 @@
23
23
  },
24
24
  "dependencies": {
25
25
  "@fluentui-react-native/adapters": ">=0.8.5 <1.0.0",
26
- "@fluentui-react-native/callout": ">=0.20.6 <1.0.0",
26
+ "@fluentui-react-native/callout": ">=0.20.7 <1.0.0",
27
27
  "@fluentui-react-native/experimental-text": ">=0.9.0 <1.0.0",
28
28
  "@fluentui-react-native/framework": "0.7.30",
29
- "@fluentui-react-native/interactive-hooks": ">=0.16.2 <1.0.0",
29
+ "@fluentui-react-native/interactive-hooks": ">=0.16.3 <1.0.0",
30
30
  "@fluentui-react-native/theme-tokens": ">=0.18.0 <1.0.0",
31
31
  "@fluentui-react-native/tokens": ">=0.14.0 <1.0.0",
32
32
  "@fluentui-react-native/use-styling": ">=0.8.3 <1.0.0",
@@ -34,7 +34,7 @@
34
34
  "tslib": "^2.3.1"
35
35
  },
36
36
  "devDependencies": {
37
- "@fluentui-react-native/button": ">=0.22.27 <1.0.0",
37
+ "@fluentui-react-native/button": ">=0.22.28 <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",
@@ -16,5 +16,6 @@ export interface MenuState extends MenuProps {
16
16
  isSubmenu: boolean;
17
17
  parentPopoverHoverOutTimer?: NodeJS.Timeout;
18
18
  setOpen: (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void;
19
+ shouldFocusOnContainer: boolean;
19
20
  triggerRef: React.RefObject<React.Component>;
20
21
  }
@@ -1,5 +1,6 @@
1
- import { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
1
+ import { InteractionEvent, isMouseEvent } from '@fluentui-react-native/interactive-hooks';
2
2
  import React from 'react';
3
+ import { Platform } from 'react-native';
3
4
  import { useMenuContext } from '../context/menuContext';
4
5
  import { MenuProps, MenuState } from './Menu.types';
5
6
 
@@ -14,8 +15,10 @@ export const useMenu = (props: MenuProps): MenuState => {
14
15
  const triggerRef = React.useRef();
15
16
  const context = useMenuContext();
16
17
  const isSubmenu = context.triggerRef !== null;
17
- const isControlled = typeof props.open !== 'undefined';
18
- const [open, setOpen] = useMenuOpenState(isControlled, props, context.setOpen);
18
+ const isOpenControlled = typeof props.open !== 'undefined';
19
+ const [open, shouldFocusOnContainer, setOpen] = useMenuOpenState(isOpenControlled, props, context.setOpen);
20
+
21
+ const [checked, onCheckedChange] = useMenuCheckedState(props);
19
22
 
20
23
  // Default behavior for submenu is to open on hover
21
24
  // the ...props line below will override this behavior for a submenu
@@ -33,9 +36,12 @@ export const useMenu = (props: MenuProps): MenuState => {
33
36
  ...props,
34
37
  open,
35
38
  setOpen,
39
+ shouldFocusOnContainer,
40
+ checked,
41
+ onCheckedChange,
36
42
  triggerRef,
37
43
  isSubmenu,
38
- isControlled,
44
+ isControlled: isOpenControlled,
39
45
  parentPopoverHoverOutTimer,
40
46
  };
41
47
  };
@@ -44,25 +50,30 @@ const useMenuOpenState = (
44
50
  isControlled: boolean,
45
51
  props: MenuProps,
46
52
  parentSetOpen: (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void,
47
- ): [boolean, (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void] => {
53
+ ): [boolean, boolean, (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void] => {
48
54
  const { defaultOpen, onOpenChange, open } = props;
49
55
  const initialState = typeof defaultOpen !== 'undefined' ? defaultOpen : !!open;
50
56
  const [openInternal, setOpenInternal] = React.useState<boolean>(initialState);
57
+ const [shouldFocusOnContainer, setShouldFocusOnContainer] = React.useState<boolean>(false);
51
58
 
52
59
  const state = isControlled ? open : openInternal;
53
60
 
54
61
  const setOpen = React.useCallback(
55
62
  (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => {
56
63
  const openPrev = state;
57
- if (!isControlled) {
58
- if (!isOpen || lastCloseTimestamp + delayOpen <= Date.now()) {
59
- setOpenInternal(isOpen);
60
- }
64
+ if (!isControlled && (!isOpen || lastCloseTimestamp + delayOpen <= Date.now())) {
65
+ setOpenInternal(isOpen);
66
+ }
67
+
68
+ if (isOpen && Platform.OS === ('win32' as any) && isMouseEvent(e)) {
69
+ setShouldFocusOnContainer(true);
70
+ }
61
71
 
62
- if (!isOpen) {
63
- lastCloseTimestamp = Date.now();
64
- }
72
+ if (!isOpen) {
73
+ setShouldFocusOnContainer(false);
74
+ lastCloseTimestamp = Date.now();
65
75
  }
76
+
66
77
  if (onOpenChange && openPrev !== isOpen) {
67
78
  onOpenChange(e, isOpen);
68
79
  }
@@ -74,5 +85,26 @@ const useMenuOpenState = (
74
85
  [isControlled, state, onOpenChange, setOpenInternal, parentSetOpen],
75
86
  );
76
87
 
77
- return [state, setOpen];
88
+ return [state, shouldFocusOnContainer, setOpen];
89
+ };
90
+
91
+ const useMenuCheckedState = (props: MenuProps): [string[], (e: InteractionEvent, checked: string[]) => void] => {
92
+ const { checked, defaultChecked, onCheckedChange: onCheckedChangeOriginal } = props;
93
+ const [checkedInternal, setCheckedInternal] = React.useState(defaultChecked ?? checked ?? []);
94
+
95
+ const isControlled = typeof checked !== 'undefined';
96
+ const state = isControlled ? checked : checkedInternal;
97
+
98
+ const onCheckedChange = React.useCallback(
99
+ (e: InteractionEvent, checked: string[]) => {
100
+ if (!isControlled) {
101
+ setCheckedInternal(checked);
102
+ }
103
+
104
+ onCheckedChangeOriginal?.(e, checked);
105
+ },
106
+ [isControlled, setCheckedInternal, onCheckedChangeOriginal],
107
+ );
108
+
109
+ return [state, onCheckedChange];
78
110
  };
@@ -0,0 +1,10 @@
1
+ import { Theme } from '@fluentui-react-native/framework';
2
+ import { globalTokens } from '@fluentui-react-native/theme-tokens';
3
+ import { TokenSettings } from '@fluentui-react-native/use-styling';
4
+ import { MenuDividerTokens } from './MenuDivider.types';
5
+
6
+ export const defaultMenuDividerTokens: TokenSettings<MenuDividerTokens, Theme> = (t: Theme): MenuDividerTokens => ({
7
+ backgroundColor: t.colors.neutralStroke2,
8
+ height: globalTokens.stroke.width.thin,
9
+ margin: globalTokens.spacing.xxs,
10
+ });
@@ -1,5 +1,5 @@
1
1
  import { Theme, UseStylingOptions, buildProps } from '@fluentui-react-native/framework';
2
- import { fontStyles, layoutStyles } from '@fluentui-react-native/tokens';
2
+ import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens';
3
3
  import { defaultMenuItemTokens } from './MenuItemTokens';
4
4
  import { menuItemName, MenuItemProps, MenuItemTokens, MenuItemSlotProps } from './MenuItem.types';
5
5
 
@@ -17,6 +17,7 @@ export const stylingSettings: UseStylingOptions<MenuItemProps, MenuItemSlotProps
17
17
  display: 'flex',
18
18
  flexDirection: 'row',
19
19
  ...layoutStyles.from(tokens, theme),
20
+ ...borderStyles.from(tokens, theme),
20
21
  },
21
22
  }),
22
23
  ['backgroundColor', ...layoutStyles.keys],
@@ -47,8 +48,8 @@ export const stylingSettings: UseStylingOptions<MenuItemProps, MenuItemSlotProps
47
48
  (tokens: MenuItemTokens) => {
48
49
  return {
49
50
  color: tokens.color,
50
- height: 16,
51
- width: 16,
51
+ height: tokens.submenuIndicatorSize,
52
+ width: tokens.submenuIndicatorSize,
52
53
  viewBox:
53
54
  '0 0 ' +
54
55
  (tokens.submenuIndicatorSize - tokens.submenuIndicatorPadding * 2) +
@@ -0,0 +1,31 @@
1
+ import { FontWeightValue, Theme } from '@fluentui-react-native/framework';
2
+ import { globalTokens } from '@fluentui-react-native/theme-tokens';
3
+ import { TokenSettings } from '@fluentui-react-native/use-styling';
4
+ import { MenuItemTokens } from './MenuItem.types';
5
+
6
+ export const defaultMenuItemTokens: TokenSettings<MenuItemTokens, Theme> = (t: Theme): MenuItemTokens => ({
7
+ backgroundColor: t.colors.transparentBackground,
8
+ borderRadius: 5, // hardcoded for now to match ContextualMenu
9
+ checkmarkSize: 16,
10
+ submenuIndicatorPadding: globalTokens.spacing.none,
11
+ submenuIndicatorSize: 16,
12
+ color: t.colors.neutralForeground2,
13
+ fontFamily: t.typography.families.primary,
14
+ fontSize: globalTokens.font.size[300],
15
+ fontWeight: globalTokens.font.weight.regular as FontWeightValue,
16
+ gap: globalTokens.spacing.xs,
17
+ paddingHorizontal: 5, // hardcoded for now to match ContextualMenu
18
+ paddingVertical: 3, // hardcoded for now to match ContextualMenu
19
+ focused: {
20
+ backgroundColor: t.colors.brandBackground,
21
+ color: t.colors.brandedContent,
22
+ },
23
+ pressed: {
24
+ backgroundColor: t.colors.brandBackgroundPressed,
25
+ color: t.colors.brandedPressedContent,
26
+ },
27
+ disabled: {
28
+ backgroundColor: t.colors.transparentBackground,
29
+ color: t.colors.neutralForegroundDisabled,
30
+ },
31
+ });
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { AccessibilityState, I18nManager } from 'react-native';
2
+ import { AccessibilityState, I18nManager, Platform } from 'react-native';
3
3
  import { MenuItemProps, MenuItemState } from './MenuItem.types';
4
4
  import { memoize } from '@fluentui-react-native/framework';
5
5
  import { InteractionEvent, isKeyPressEvent, useAsPressable, useKeyDownProps } from '@fluentui-react-native/interactive-hooks';
@@ -70,8 +70,14 @@ export const useMenuItem = (props: MenuItemProps): MenuItemState => {
70
70
  onAccessibilityTap: props.onAccessibilityTap || onInvoke,
71
71
  accessibilityLabel: props.accessibilityLabel || props.content,
72
72
  accessibilityState: getAccessibilityState(disabled, accessibilityState),
73
- enableFocusRing: true,
74
- focusable: true,
73
+ enableFocusRing: Platform.select({
74
+ macos: false,
75
+ default: true, // win32
76
+ }),
77
+ focusable: Platform.select({
78
+ macos: !disabled,
79
+ default: true, // win32
80
+ }),
75
81
  ref: componentRef,
76
82
  ...onKeyDownProps,
77
83
  },
@@ -1,5 +1,5 @@
1
1
  import { Theme, UseStylingOptions, buildProps } from '@fluentui-react-native/framework';
2
- import { fontStyles, layoutStyles } from '@fluentui-react-native/tokens';
2
+ import { borderStyles, fontStyles, layoutStyles } from '@fluentui-react-native/tokens';
3
3
  import { defaultMenuItemCheckboxTokens } from './MenuItemCheckboxTokens';
4
4
  import { menuItemCheckboxName, MenuItemCheckboxProps, MenuItemCheckboxTokens, MenuItemCheckboxSlotProps } from './MenuItemCheckbox.types';
5
5
 
@@ -17,6 +17,7 @@ export const stylingSettings: UseStylingOptions<MenuItemCheckboxProps, MenuItemC
17
17
  display: 'flex',
18
18
  flexDirection: 'row',
19
19
  ...layoutStyles.from(tokens, theme),
20
+ ...borderStyles.from(tokens, theme),
20
21
  },
21
22
  }),
22
23
  ['backgroundColor', ...layoutStyles.keys],
@@ -0,0 +1,47 @@
1
+ import { FontWeightValue, Theme } from '@fluentui-react-native/framework';
2
+ import { globalTokens } from '@fluentui-react-native/theme-tokens';
3
+ import { TokenSettings } from '@fluentui-react-native/use-styling';
4
+ import { MenuItemCheckboxTokens } from './MenuItemCheckbox.types';
5
+
6
+ export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens, Theme> = (t: Theme): MenuItemCheckboxTokens => ({
7
+ backgroundColor: t.colors.transparentBackground,
8
+ borderRadius: 5,
9
+ checkmarkPadding: globalTokens.spacing.none,
10
+ checkmarkSize: 16,
11
+ checkmarkVisibility: 0,
12
+ color: t.colors.neutralForeground2,
13
+ fontFamily: t.typography.families.primary,
14
+ fontSize: globalTokens.font.size[300],
15
+ fontWeight: globalTokens.font.weight.regular as FontWeightValue,
16
+ gap: globalTokens.spacing.xs,
17
+ paddingHorizontal: 5,
18
+ paddingVertical: 3,
19
+ focused: {
20
+ backgroundColor: t.colors.brandBackground,
21
+ color: t.colors.brandedContent,
22
+ checked: {
23
+ checkmarkColor: t.colors.neutralForeground2Hover,
24
+ checkmarkVisibility: 1,
25
+ },
26
+ },
27
+ pressed: {
28
+ backgroundColor: t.colors.brandBackgroundPressed,
29
+ color: t.colors.brandedPressedContent,
30
+ checked: {
31
+ checkmarkColor: t.colors.brandedPressedContent,
32
+ checkmarkVisibility: 1,
33
+ },
34
+ },
35
+ disabled: {
36
+ backgroundColor: t.colors.transparentBackground,
37
+ color: t.colors.brandForeground1Disabled,
38
+ checked: {
39
+ checkmarkColor: t.colors.brandForeground1Disabled,
40
+ checkmarkVisibility: 1,
41
+ },
42
+ },
43
+ checked: {
44
+ checkmarkColor: t.colors.neutralForeground2,
45
+ checkmarkVisibility: 1,
46
+ },
47
+ });
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { AccessibilityActionEvent, AccessibilityState } from 'react-native';
2
+ import { AccessibilityActionEvent, AccessibilityState, Platform } from 'react-native';
3
3
  import { MenuItemCheckboxProps, MenuItemCheckboxState } from './MenuItemCheckbox.types';
4
4
  import { memoize } from '@fluentui-react-native/framework';
5
5
  import {
@@ -67,7 +67,7 @@ export const useMenuCheckboxInteraction = (
67
67
  // Ensure focus is placed on checkbox after click
68
68
  const toggleCheckedWithFocus = useOnPressWithFocus(componentRef, toggleCallback);
69
69
 
70
- const pressable = useAsPressable({ onPress: toggleCheckedWithFocus, ...rest });
70
+ const pressable = useAsPressable({ ...rest, disabled, onPress: toggleCheckedWithFocus });
71
71
  const buttonRef = useViewCommandFocus(componentRef);
72
72
 
73
73
  const onKeyProps = useKeyProps(toggleCallback, ' ');
@@ -100,8 +100,14 @@ export const useMenuCheckboxInteraction = (
100
100
  accessibilityLabel: props.accessibilityLabel || props.content,
101
101
  accessibilityRole: 'menuitem',
102
102
  accessibilityState: getAccessibilityState(disabled, state.checked, accessibilityState),
103
- enableFocusRing: true,
104
- focusable: true,
103
+ enableFocusRing: Platform.select({
104
+ macos: false,
105
+ default: true, // win32
106
+ }),
107
+ focusable: Platform.select({
108
+ macos: !disabled,
109
+ default: true, // win32
110
+ }),
105
111
  onAccessibilityAction: onAccessibilityActionProp,
106
112
  ref: buttonRef,
107
113
  ...onKeyProps,
@@ -7,17 +7,25 @@ import { useMenuCheckboxInteraction } from '../MenuItemCheckbox/useMenuItemCheck
7
7
  export const useMenuItemRadio = (props: MenuItemCheckboxProps): MenuItemCheckboxState => {
8
8
  const { disabled, name } = props;
9
9
  const context = useMenuListContext();
10
- const checked = context.checked?.[name];
11
10
  const selectRadio = context.selectRadio;
12
11
 
13
12
  const toggleChecked = React.useCallback(
14
13
  (e: InteractionEvent) => {
15
14
  if (!disabled) {
16
- selectRadio(e, name, !checked);
15
+ selectRadio(e, name);
17
16
  }
18
17
  },
19
- [checked, disabled, name, selectRadio],
18
+ [disabled, name, selectRadio],
20
19
  );
21
20
 
21
+ // Explicitly only run on mount and unmount
22
+ React.useEffect(() => {
23
+ context.addRadioItem(name);
24
+
25
+ return () => {
26
+ context.removeRadioItem(name);
27
+ };
28
+ }, []); // eslint-disable-line react-hooks/exhaustive-deps
29
+
22
30
  return useMenuCheckboxInteraction(props, toggleChecked);
23
31
  };
@@ -37,7 +37,7 @@ export const MenuList = compose<MenuListType>({
37
37
  useRender: (userProps: MenuListProps, useSlots: UseSlots<MenuListType>) => {
38
38
  const menuList = useMenuList(userProps);
39
39
  const contextValue = useMenuListContextValue(menuList);
40
- const Slots = useSlots(menuList);
40
+ const Slots = useSlots(menuList.props);
41
41
 
42
42
  return (_final: MenuListProps, children: React.ReactNode) => {
43
43
  return (
@@ -1,6 +1,7 @@
1
1
  import type { IViewProps } from '@fluentui-react-native/adapters';
2
2
  import { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
3
3
  import { IBackgroundColorTokens, LayoutTokens } from '@fluentui-react-native/tokens';
4
+ import React from 'react';
4
5
 
5
6
  export const menuListName = 'MenuList';
6
7
 
@@ -9,15 +10,20 @@ export interface MenuListTokens extends LayoutTokens, IBackgroundColorTokens {
9
10
  }
10
11
 
11
12
  export interface MenuListProps extends Omit<IViewProps, 'onPress'> {
12
- checked?: Record<string, boolean>;
13
- defaultChecked?: Record<string, boolean>;
13
+ checked?: string[];
14
+ defaultChecked?: string[];
14
15
  hasCheckmarks?: boolean;
15
- onCheckedChange?: (e: InteractionEvent, name: string, isChecked: boolean) => void;
16
+ onCheckedChange?: (e: InteractionEvent, checked: string[]) => void;
16
17
  }
17
18
 
18
- export interface MenuListState extends MenuListProps {
19
+ export interface MenuListState extends Omit<MenuListProps, 'checked' | 'onCheckedChange'> {
20
+ props: MenuListProps;
21
+ checked?: Record<string, boolean>;
19
22
  isCheckedControlled: boolean;
20
- selectRadio?: (e: InteractionEvent, name: string, isChecked: boolean) => void;
23
+ onCheckedChange?: (e: InteractionEvent, name: string, isChecked: boolean) => void;
24
+ selectRadio?: (e: InteractionEvent, name: string) => void;
25
+ addRadioItem: (name: string) => void;
26
+ removeRadioItem: (name: string) => void;
21
27
  }
22
28
 
23
29
  export interface MenuListSlotProps {
@@ -0,0 +1,10 @@
1
+ import { Theme } from '@fluentui-react-native/framework';
2
+ import { globalTokens } from '@fluentui-react-native/theme-tokens';
3
+ import { TokenSettings } from '@fluentui-react-native/use-styling';
4
+ import { MenuListTokens } from './MenuList.types';
5
+
6
+ export const defaultMenuListTokens: TokenSettings<MenuListTokens, Theme> = (t: Theme): MenuListTokens => ({
7
+ padding: 5, // hardcoded for now to match ContextualMenu
8
+ backgroundColor: t.colors.transparentBackground,
9
+ gap: globalTokens.spacing.xxs,
10
+ });