@fluentui-react-native/menu 1.4.24 → 1.4.26

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 (31) hide show
  1. package/CHANGELOG.json +79 -1
  2. package/CHANGELOG.md +26 -2
  3. package/lib/Menu/Menu.d.ts.map +1 -1
  4. package/lib/Menu/Menu.js +9 -1
  5. package/lib/Menu/Menu.js.map +1 -1
  6. package/lib/MenuItem/MenuItem.d.ts.map +1 -1
  7. package/lib/MenuItem/MenuItem.js +6 -6
  8. package/lib/MenuItem/MenuItem.js.map +1 -1
  9. package/lib/MenuItemCheckbox/MenuItemCheckbox.d.ts.map +1 -1
  10. package/lib/MenuItemCheckbox/MenuItemCheckbox.js +5 -5
  11. package/lib/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
  12. package/lib/MenuList/MenuList.d.ts.map +1 -1
  13. package/lib/MenuList/MenuList.js +17 -2
  14. package/lib/MenuList/MenuList.js.map +1 -1
  15. package/lib-commonjs/Menu/Menu.d.ts.map +1 -1
  16. package/lib-commonjs/Menu/Menu.js +9 -1
  17. package/lib-commonjs/Menu/Menu.js.map +1 -1
  18. package/lib-commonjs/MenuItem/MenuItem.d.ts.map +1 -1
  19. package/lib-commonjs/MenuItem/MenuItem.js +6 -6
  20. package/lib-commonjs/MenuItem/MenuItem.js.map +1 -1
  21. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.d.ts.map +1 -1
  22. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js +5 -5
  23. package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
  24. package/lib-commonjs/MenuList/MenuList.d.ts.map +1 -1
  25. package/lib-commonjs/MenuList/MenuList.js +17 -2
  26. package/lib-commonjs/MenuList/MenuList.js.map +1 -1
  27. package/package.json +10 -10
  28. package/src/Menu/Menu.tsx +18 -1
  29. package/src/MenuItem/MenuItem.tsx +10 -6
  30. package/src/MenuItemCheckbox/MenuItemCheckbox.tsx +9 -5
  31. package/src/MenuList/MenuList.tsx +26 -3
package/CHANGELOG.json CHANGED
@@ -2,7 +2,85 @@
2
2
  "name": "@fluentui-react-native/menu",
3
3
  "entries": [
4
4
  {
5
- "date": "Tue, 14 Mar 2023 18:42:13 GMT",
5
+ "date": "Thu, 16 Mar 2023 21:46:27 GMT",
6
+ "tag": "@fluentui-react-native/menu_v1.4.26",
7
+ "version": "1.4.26",
8
+ "comments": {
9
+ "patch": [
10
+ {
11
+ "author": "ruaraki@microsoft.com",
12
+ "package": "@fluentui-react-native/menu",
13
+ "commit": "5d620cabc97c94ac6b23be4048d81a256a4a381d",
14
+ "comment": "Fix n of m MenuItems"
15
+ }
16
+ ]
17
+ }
18
+ },
19
+ {
20
+ "date": "Tue, 14 Mar 2023 20:50:45 GMT",
21
+ "tag": "@fluentui-react-native/menu_v1.4.25",
22
+ "version": "1.4.25",
23
+ "comments": {
24
+ "patch": [
25
+ {
26
+ "author": "beachball",
27
+ "package": "@fluentui-react-native/menu",
28
+ "comment": "Bump @fluentui-react-native/callout to v0.23.8",
29
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
30
+ },
31
+ {
32
+ "author": "beachball",
33
+ "package": "@fluentui-react-native/menu",
34
+ "comment": "Bump @fluentui-react-native/focus-zone to v0.11.37",
35
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
36
+ },
37
+ {
38
+ "author": "beachball",
39
+ "package": "@fluentui-react-native/menu",
40
+ "comment": "Bump @fluentui-react-native/framework to v0.9.6",
41
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
42
+ },
43
+ {
44
+ "author": "beachball",
45
+ "package": "@fluentui-react-native/menu",
46
+ "comment": "Bump @fluentui-react-native/icon to v0.17.20",
47
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
48
+ },
49
+ {
50
+ "author": "beachball",
51
+ "package": "@fluentui-react-native/menu",
52
+ "comment": "Bump @fluentui-react-native/interactive-hooks to v0.22.25",
53
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
54
+ },
55
+ {
56
+ "author": "beachball",
57
+ "package": "@fluentui-react-native/menu",
58
+ "comment": "Bump @fluentui-react-native/text to v0.19.27",
59
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
60
+ },
61
+ {
62
+ "author": "beachball",
63
+ "package": "@fluentui-react-native/menu",
64
+ "comment": "Bump @fluentui-react-native/theme-tokens to v0.24.5",
65
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
66
+ },
67
+ {
68
+ "author": "beachball",
69
+ "package": "@fluentui-react-native/menu",
70
+ "comment": "Bump @fluentui-react-native/tokens to v0.20.12",
71
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
72
+ },
73
+ {
74
+ "author": "beachball",
75
+ "package": "@fluentui-react-native/menu",
76
+ "comment": "Bump @fluentui-react-native/button to v0.32.44",
77
+ "commit": "b2d39b11dbaa12600bd96a9d54e0ebd013d9597f"
78
+ }
79
+ ]
80
+ }
81
+ },
82
+ {
83
+ "date": "Tue, 14 Mar 2023 18:43:06 GMT",
6
84
  "tag": "@fluentui-react-native/menu_v1.4.24",
7
85
  "version": "1.4.24",
8
86
  "comments": {
package/CHANGELOG.md CHANGED
@@ -1,12 +1,36 @@
1
1
  # Change Log - @fluentui-react-native/menu
2
2
 
3
- This log was last generated on Tue, 14 Mar 2023 18:42:13 GMT and should not be manually modified.
3
+ This log was last generated on Thu, 16 Mar 2023 21:46:27 GMT and should not be manually modified.
4
4
 
5
5
  <!-- Start content -->
6
6
 
7
+ ## 1.4.26
8
+
9
+ Thu, 16 Mar 2023 21:46:27 GMT
10
+
11
+ ### Patches
12
+
13
+ - Fix n of m MenuItems (ruaraki@microsoft.com)
14
+
15
+ ## 1.4.25
16
+
17
+ Tue, 14 Mar 2023 20:50:45 GMT
18
+
19
+ ### Patches
20
+
21
+ - Bump @fluentui-react-native/callout to v0.23.8
22
+ - Bump @fluentui-react-native/focus-zone to v0.11.37
23
+ - Bump @fluentui-react-native/framework to v0.9.6
24
+ - Bump @fluentui-react-native/icon to v0.17.20
25
+ - Bump @fluentui-react-native/interactive-hooks to v0.22.25
26
+ - Bump @fluentui-react-native/text to v0.19.27
27
+ - Bump @fluentui-react-native/theme-tokens to v0.24.5
28
+ - Bump @fluentui-react-native/tokens to v0.20.12
29
+ - Bump @fluentui-react-native/button to v0.32.44
30
+
7
31
  ## 1.4.24
8
32
 
9
- Tue, 14 Mar 2023 18:42:13 GMT
33
+ Tue, 14 Mar 2023 18:43:06 GMT
10
34
 
11
35
  ### Patches
12
36
 
package/lib/Menu/Menu.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM9C,eAAO,MAAM,IAAI,0EA0Bf,CAAC;AAGH,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM9C,eAAO,MAAM,IAAI,0EA2Cf,CAAC;AAGH,eAAe,IAAI,CAAC"}
package/lib/Menu/Menu.js CHANGED
@@ -8,7 +8,9 @@ export var Menu = stagedComponent(function (props) {
8
8
  var state = useMenu(props);
9
9
  var contextValue = useMenuContextValue(state);
10
10
  return function (_rest, children) {
11
+ var _a, _b;
11
12
  var childrenArray = React.Children.toArray(children);
13
+ var accessibilityPositionInSet = state.accessibilityPositionInSet, accessibilitySetSize = state.accessibilitySetSize;
12
14
  if (__DEV__) {
13
15
  if (childrenArray.length !== 2) {
14
16
  // eslint-disable-next-line no-console
@@ -17,8 +19,14 @@ export var Menu = stagedComponent(function (props) {
17
19
  }
18
20
  var menuTrigger = childrenArray[0];
19
21
  var menuPopover = childrenArray[1];
22
+ var menuTriggerChild = menuTrigger.props.children;
23
+ var menuTriggerChildWithSet = React.cloneElement(menuTriggerChild, {
24
+ accessibilityPositionInSet: (_a = menuTriggerChild.props.accessibilityPositionInSet) !== null && _a !== void 0 ? _a : accessibilityPositionInSet,
25
+ accessibilitySetSize: (_b = menuTriggerChild.props.accessibilitySetSize) !== null && _b !== void 0 ? _b : accessibilitySetSize, //win32
26
+ });
27
+ var menuTriggerWithSet = React.cloneElement(menuTrigger, {}, menuTriggerChildWithSet);
20
28
  return (React.createElement(MenuProvider, { value: contextValue },
21
- menuTrigger,
29
+ menuTriggerWithSet,
22
30
  state.open && state.shouldFocusOnContainer !== undefined && menuPopover));
23
31
  };
24
32
  });
package/lib/Menu/Menu.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,CAAC,IAAM,IAAI,GAAG,eAAe,CAAC,UAAC,KAAgB;IACnD,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAEhD,OAAO,UAAC,KAAgB,EAAE,QAAyB;QACjD,IAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAE/E,IAAI,OAAO,EAAE;YACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;aAChD;SACF;QAED,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACrC,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAErC,OAAO,CACL,oBAAC,YAAY,IAAC,KAAK,EAAE,YAAY;YAC9B,WAAW;YAGX,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,sBAAsB,KAAK,SAAS,IAAI,WAAW,CAC3D,CAChB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;AAE5B,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,CAAC,IAAM,IAAI,GAAG,eAAe,CAAC,UAAC,KAAgB;IACnD,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAEhD,OAAO,UAAC,KAAgB,EAAE,QAAyB;;QACjD,IAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAyB,CAAC;QACvE,IAAA,0BAA0B,GAA2B,KAAK,2BAAhC,EAAE,oBAAoB,GAAK,KAAK,qBAAV,CAAW;QAEnE,IAAI,OAAO,EAAE;YACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;aAChD;SACF;QAED,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACrC,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAErC,IAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC;QAEpD,IAAM,uBAAuB,GAAG,KAAK,CAAC,YAAY,CAChD,gBAA0F,EAC1F;YACE,0BAA0B,EAAE,MAAA,gBAAgB,CAAC,KAAK,CAAC,0BAA0B,mCAAI,0BAA0B;YAC3G,oBAAoB,EAAE,MAAA,gBAAgB,CAAC,KAAK,CAAC,oBAAoB,mCAAI,oBAAoB,EAAE,OAAO;SAC5F,CACT,CAAC;QAEF,IAAM,kBAAkB,GAAG,KAAK,CAAC,YAAY,CAC3C,WAAqF,EACrF,EAAS,EACT,uBAAuB,CACxB,CAAC;QAEF,OAAO,CACL,oBAAC,YAAY,IAAC,KAAK,EAAE,YAAY;YAC9B,kBAAkB;YAGlB,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,sBAAsB,KAAK,SAAS,IAAI,WAAW,CAC3D,CAChB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;AAE5B,eAAe,IAAI,CAAC"}
package/lib/MenuItem/MenuItem.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AAIpE,eAAO,MAAM,QAAQ,gLA+CnB,CAAC;AAaH,eAAO,MAAM,qBAAqB,uBAXuB,MAAM,SAAS,MAAM,SAAS,WAWd,CAAC;AAa1E,eAAO,MAAM,UAAU,YAXY,MAAM,eAAe,OAAO,SAAS,MAAM,SAAS,WAWpC,CAAC"}
1
+ {"version":3,"file":"MenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AAIpE,eAAO,MAAM,QAAQ,gLAmDnB,CAAC;AAaH,eAAO,MAAM,qBAAqB,uBAXuB,MAAM,SAAS,MAAM,SAAS,WAWd,CAAC;AAa1E,eAAO,MAAM,UAAU,YAXY,MAAM,eAAe,OAAO,SAAS,MAAM,SAAS,WAWpC,CAAC"}
package/lib/MenuItem/MenuItem.js CHANGED
@@ -27,12 +27,12 @@ export var MenuItem = compose(__assign(__assign({ displayName: menuItemName }, s
27
27
  var label = getAccessibilityLabel(accessibilityLabel, children[0]);
28
28
  var tooltipResult = getTooltip(tooltip, menuItem.state.hasTooltips, children[0]);
29
29
  return (withSlots(Slots.root, __assign({}, mergedProps, { accessibilityLabel: label }),
30
- menuItem.state.hasCheckmarks && withSlots(Slots.checkmark, null),
31
- (icon || menuItem.state.hasIcons) && (withSlots(Slots.iconPlaceholder, null,
32
- icon && icon.source && withSlots(Slots.imgIcon, __assign({}, icon)),
33
- icon && (icon.svgSource || icon.fontSource) && withSlots(Slots.fontOrSvgIcon, __assign({}, icon)))),
34
- children && withSlots(Slots.content, { tooltip: tooltipResult }, children),
35
- menuItem.state.hasSubmenu && withSlots(Slots.submenuIndicator, { xml: chevronXml })));
30
+ menuItem.state.hasCheckmarks && withSlots(Slots.checkmark, { accessible: false }),
31
+ (icon || menuItem.state.hasIcons) && (withSlots(Slots.iconPlaceholder, { accessible: false },
32
+ icon && icon.source && withSlots(Slots.imgIcon, __assign({ accessible: false }, icon)),
33
+ icon && (icon.svgSource || icon.fontSource) && withSlots(Slots.fontOrSvgIcon, __assign({ accessible: false }, icon)))),
34
+ children && (withSlots(Slots.content, { accessible: false, tooltip: tooltipResult }, children)),
35
+ menuItem.state.hasSubmenu && withSlots(Slots.submenuIndicator, { accessible: false, xml: chevronXml })));
36
36
  };
37
37
  } }));
38
38
  var getAccessibilityLabelWorker = function (accessibilityLabel, child) {
package/lib/MenuItem/MenuItem.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"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"}
package/lib/MenuItemCheckbox/MenuItemCheckbox.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,KAAK,EAAY,MAAM,kCAAkC,CAAC;AAOxE,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAKlC,eAAO,MAAM,gBAAgB,qLAiB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,oBAAoB,8CAE7B,MAAM,iBAAiB,CAAC,qBAAqB,CAwB/C,CAAC"}
1
+ {"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,KAAK,EAAY,MAAM,kCAAkC,CAAC;AAOxE,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAKlC,eAAO,MAAM,gBAAgB,qLAiB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,oBAAoB,8CAE7B,MAAM,iBAAiB,CAAC,qBAAqB,CA4B/C,CAAC"}
package/lib/MenuItemCheckbox/MenuItemCheckbox.js CHANGED
@@ -27,11 +27,11 @@ export var menuItemFinalRender = function (menuItem, Slots) {
27
27
  var label = getAccessibilityLabel(accessibilityLabel, children[0]);
28
28
  var tooltipResult = getTooltip(tooltip, menuItem.state.hasTooltips, children[0]);
29
29
  return (withSlots(Slots.root, __assign({}, mergedProps, { accessibilityLabel: label }),
30
- withSlots(Slots.checkmark, { xml: checkmarkXml }),
31
- (icon || menuItem.state.hasIcons) && (withSlots(Slots.iconPlaceholder, null,
32
- icon && icon.source && withSlots(Slots.imgIcon, __assign({}, icon)),
33
- icon && (icon.svgSource || icon.fontSource) && withSlots(Slots.fontOrSvgIcon, __assign({}, icon)))),
34
- children && withSlots(Slots.content, { tooltip: tooltipResult }, children)));
30
+ withSlots(Slots.checkmark, { accessible: false, xml: checkmarkXml }),
31
+ (icon || menuItem.state.hasIcons) && (withSlots(Slots.iconPlaceholder, { accessible: false },
32
+ icon && icon.source && withSlots(Slots.imgIcon, __assign({ accessible: false }, icon)),
33
+ icon && (icon.svgSource || icon.fontSource) && withSlots(Slots.fontOrSvgIcon, __assign({ accessible: false }, icon)))),
34
+ children && (withSlots(Slots.content, { accessible: false, tooltip: tooltipResult }, children))));
35
35
  };
36
36
  };
37
37
  //# sourceMappingURL=MenuItemCheckbox.js.map
package/lib/MenuItemCheckbox/MenuItemCheckbox.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGtD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAO7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEzE,MAAM,CAAC,IAAM,gBAAgB,GAAG,OAAO,qBACrC,WAAW,EAAE,oBAAoB,IAC9B,eAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,SAAS;QACf,SAAS,EAAE,MAAM;QACjB,OAAO,EAAE,IAAI;QACb,eAAe,EAAE,IAAI;QACrB,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,IAAI;KACpB,EACD,SAAS,EAAE,UAAC,SAAgC,EAAE,QAAwC;QACpF,IAAM,QAAQ,GAAG,mBAAmB,CAAC,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,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,IACD,CAAC;AAEH,MAAM,CAAC,IAAM,mBAAmB,GAAG,UACjC,QAA8B,EAC9B,KAAuC;IAEvC,OAAO,UAAC,KAA4B,EAAE,QAAyB;QAC7D,IAAM,KAAwD,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAvF,kBAAkB,wBAAA,EAAE,IAAI,UAAA,EAAE,OAAO,aAAA,EAAK,WAAW,cAAnD,yCAAqD,CAAoC,CAAC;QAChG,IAAM,YAAY,GAAG,6XAGd,CAAC;QAER,IAAM,KAAK,GAAG,qBAAqB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAM,aAAa,GAAG,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnF,OAAO,CACL,UAAC,KAAK,CAAC,IAAI,eAAK,WAAW,IAAE,kBAAkB,EAAE,KAAK;YACpD,UAAC,KAAK,CAAC,SAAS,IAAC,GAAG,EAAE,YAAY,GAAI;YACrC,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CACpC,UAAC,KAAK,CAAC,eAAe;gBACnB,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,UAAC,KAAK,CAAC,OAAO,eAAK,IAAI,EAAI;gBAClD,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,UAAC,KAAK,CAAC,aAAa,eAAK,IAAI,EAAI,CAC3D,CACzB;YACA,QAAQ,IAAI,UAAC,KAAK,CAAC,OAAO,IAAC,OAAO,EAAE,aAAa,IAAG,QAAQ,CAAiB,CACnE,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"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"}
package/lib/MenuList/MenuList.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AA0BnF,eAAO,MAAM,cAAc,UAAW,MAAM,SAAS,aAAa,aAAa,aAAa,KAAG,OAE9F,CAAC;AACF,eAAO,MAAM,QAAQ,gLAmDnB,CAAC"}
1
+ {"version":3,"file":"MenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AA0BnF,eAAO,MAAM,cAAc,UAAW,MAAM,SAAS,aAAa,aAAa,aAAa,KAAG,OAE9F,CAAC;AACF,eAAO,MAAM,QAAQ,gLA0EnB,CAAC"}
package/lib/MenuList/MenuList.js CHANGED
@@ -41,12 +41,27 @@ export var MenuList = compose(__assign(__assign({ displayName: menuListName }, s
41
41
  (_a = focusZoneRef === null || focusZoneRef === void 0 ? void 0 : focusZoneRef.current) === null || _a === void 0 ? void 0 : _a.focus();
42
42
  }, []);
43
43
  return function (_final, children) {
44
+ var itemCount = React.Children.toArray(children).filter(function (child) { return React.isValidElement(child) && child.type.displayName !== 'MenuDivider'; }).length;
45
+ var itemPosition = 0;
46
+ var childrenWithSet = React.Children.toArray(children).map(function (child) {
47
+ var _a, _b;
48
+ if (React.isValidElement(child)) {
49
+ if (child.type.displayName !== 'MenuDivider') {
50
+ itemPosition++;
51
+ }
52
+ return React.cloneElement(child, {
53
+ accessibilityPositionInSet: (_a = child.props.accessibilityPositionInSet) !== null && _a !== void 0 ? _a : itemPosition,
54
+ accessibilitySetSize: (_b = child.props.accessibilitySetSize) !== null && _b !== void 0 ? _b : itemCount, //win32
55
+ });
56
+ }
57
+ return child;
58
+ });
44
59
  var content = Platform.OS === 'macos' ? (withSlots(Slots.root, null,
45
60
  withSlots(Slots.scrollView, { accessibilityRole: "menu", showsVerticalScrollIndicator: menuContext.hasMaxHeight, showsHorizontalScrollIndicator: menuContext.hasMaxWidth },
46
61
  withSlots(Slots.focusZone, { componentRef: focusZoneRef, focusZoneDirection: 'vertical', defaultTabbableElement: focusZoneRef,
47
62
  // @ts-ignore FocusZone takes ViewProps, but that isn't defined on it's type.
48
- enableFocusRing: false }, children)))) : menuContext.hasMaxHeight ? (withSlots(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} },
49
- withSlots(Slots.scrollView, null, children))) : (withSlots(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} }, children));
63
+ enableFocusRing: false }, childrenWithSet)))) : menuContext.hasMaxHeight ? (withSlots(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} },
64
+ withSlots(Slots.scrollView, null, childrenWithSet))) : (withSlots(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} }, childrenWithSet));
50
65
  return withSlots(MenuListProvider, { value: menuListContextValue }, content);
51
66
  };
52
67
  } }));
package/lib/MenuList/MenuList.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuList.js","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MenuList.js","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":"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"}
package/lib-commonjs/Menu/Menu.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM9C,eAAO,MAAM,IAAI,0EA0Bf,CAAC;AAGH,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM9C,eAAO,MAAM,IAAI,0EA2Cf,CAAC;AAGH,eAAe,IAAI,CAAC"}
package/lib-commonjs/Menu/Menu.js CHANGED
@@ -12,7 +12,9 @@ exports.Menu = (0, framework_1.stagedComponent)(function (props) {
12
12
  var state = (0, useMenu_1.useMenu)(props);
13
13
  var contextValue = (0, useMenuContextValue_1.useMenuContextValue)(state);
14
14
  return function (_rest, children) {
15
+ var _a, _b;
15
16
  var childrenArray = react_1.default.Children.toArray(children);
17
+ var accessibilityPositionInSet = state.accessibilityPositionInSet, accessibilitySetSize = state.accessibilitySetSize;
16
18
  if (__DEV__) {
17
19
  if (childrenArray.length !== 2) {
18
20
  // eslint-disable-next-line no-console
@@ -21,8 +23,14 @@ exports.Menu = (0, framework_1.stagedComponent)(function (props) {
21
23
  }
22
24
  var menuTrigger = childrenArray[0];
23
25
  var menuPopover = childrenArray[1];
26
+ var menuTriggerChild = menuTrigger.props.children;
27
+ var menuTriggerChildWithSet = react_1.default.cloneElement(menuTriggerChild, {
28
+ accessibilityPositionInSet: (_a = menuTriggerChild.props.accessibilityPositionInSet) !== null && _a !== void 0 ? _a : accessibilityPositionInSet,
29
+ accessibilitySetSize: (_b = menuTriggerChild.props.accessibilitySetSize) !== null && _b !== void 0 ? _b : accessibilitySetSize, //win32
30
+ });
31
+ var menuTriggerWithSet = react_1.default.cloneElement(menuTrigger, {}, menuTriggerChildWithSet);
24
32
  return (react_1.default.createElement(menuContext_1.MenuProvider, { value: contextValue },
25
- menuTrigger,
33
+ menuTriggerWithSet,
26
34
  state.open && state.shouldFocusOnContainer !== undefined && menuPopover));
27
35
  };
28
36
  });
package/lib-commonjs/Menu/Menu.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAE1B,8DAAmE;AAGnE,2CAAwC;AACxC,qCAAoC;AACpC,6DAA4D;AAC5D,sDAAsD;AAEzC,QAAA,IAAI,GAAG,IAAA,2BAAe,EAAC,UAAC,KAAgB;IACnD,IAAM,KAAK,GAAG,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;IAC7B,IAAM,YAAY,GAAG,IAAA,yCAAmB,EAAC,KAAK,CAAC,CAAC;IAEhD,OAAO,UAAC,KAAgB,EAAE,QAAyB;QACjD,IAAM,aAAa,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAE/E,IAAI,OAAO,EAAE;YACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;aAChD;SACF;QAED,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACrC,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAErC,OAAO,CACL,8BAAC,0BAAY,IAAC,KAAK,EAAE,YAAY;YAC9B,WAAW;YAGX,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,sBAAsB,KAAK,SAAS,IAAI,WAAW,CAC3D,CAChB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,YAAI,CAAC,WAAW,GAAG,qBAAQ,CAAC;AAE5B,kBAAe,YAAI,CAAC"}
1
+ {"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../src/Menu/Menu.tsx"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAE1B,8DAAmE;AAGnE,2CAAwC;AACxC,qCAAoC;AACpC,6DAA4D;AAC5D,sDAAsD;AAEzC,QAAA,IAAI,GAAG,IAAA,2BAAe,EAAC,UAAC,KAAgB;IACnD,IAAM,KAAK,GAAG,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;IAC7B,IAAM,YAAY,GAAG,IAAA,yCAAmB,EAAC,KAAK,CAAC,CAAC;IAEhD,OAAO,UAAC,KAAgB,EAAE,QAAyB;;QACjD,IAAM,aAAa,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAyB,CAAC;QACvE,IAAA,0BAA0B,GAA2B,KAAK,2BAAhC,EAAE,oBAAoB,GAAK,KAAK,qBAAV,CAAW;QAEnE,IAAI,OAAO,EAAE;YACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;aAChD;SACF;QAED,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACrC,IAAM,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAErC,IAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC;QAEpD,IAAM,uBAAuB,GAAG,eAAK,CAAC,YAAY,CAChD,gBAA0F,EAC1F;YACE,0BAA0B,EAAE,MAAA,gBAAgB,CAAC,KAAK,CAAC,0BAA0B,mCAAI,0BAA0B;YAC3G,oBAAoB,EAAE,MAAA,gBAAgB,CAAC,KAAK,CAAC,oBAAoB,mCAAI,oBAAoB,EAAE,OAAO;SAC5F,CACT,CAAC;QAEF,IAAM,kBAAkB,GAAG,eAAK,CAAC,YAAY,CAC3C,WAAqF,EACrF,EAAS,EACT,uBAAuB,CACxB,CAAC;QAEF,OAAO,CACL,8BAAC,0BAAY,IAAC,KAAK,EAAE,YAAY;YAC9B,kBAAkB;YAGlB,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,sBAAsB,KAAK,SAAS,IAAI,WAAW,CAC3D,CAChB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,YAAI,CAAC,WAAW,GAAG,qBAAQ,CAAC;AAE5B,kBAAe,YAAI,CAAC"}
package/lib-commonjs/MenuItem/MenuItem.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AAIpE,eAAO,MAAM,QAAQ,gLA+CnB,CAAC;AAaH,eAAO,MAAM,qBAAqB,uBAXuB,MAAM,SAAS,MAAM,SAAS,WAWd,CAAC;AAa1E,eAAO,MAAM,UAAU,YAXY,MAAM,eAAe,OAAO,SAAS,MAAM,SAAS,WAWpC,CAAC"}
1
+ {"version":3,"file":"MenuItem.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AAIpE,eAAO,MAAM,QAAQ,gLAmDnB,CAAC;AAaH,eAAO,MAAM,qBAAqB,uBAXuB,MAAM,SAAS,MAAM,SAAS,WAWd,CAAC;AAa1E,eAAO,MAAM,UAAU,YAXY,MAAM,eAAe,OAAO,SAAS,MAAM,SAAS,WAWpC,CAAC"}
package/lib-commonjs/MenuItem/MenuItem.js CHANGED
@@ -30,12 +30,12 @@ exports.MenuItem = (0, framework_1.compose)(tslib_1.__assign(tslib_1.__assign({
30
30
  var label = (0, exports.getAccessibilityLabel)(accessibilityLabel, children[0]);
31
31
  var tooltipResult = (0, exports.getTooltip)(tooltip, menuItem.state.hasTooltips, children[0]);
32
32
  return ((0, framework_1.withSlots)(Slots.root, tslib_1.__assign({}, mergedProps, { accessibilityLabel: label }),
33
- menuItem.state.hasCheckmarks && (0, framework_1.withSlots)(Slots.checkmark, null),
34
- (icon || menuItem.state.hasIcons) && ((0, framework_1.withSlots)(Slots.iconPlaceholder, null,
35
- icon && icon.source && (0, framework_1.withSlots)(Slots.imgIcon, tslib_1.__assign({}, icon)),
36
- icon && (icon.svgSource || icon.fontSource) && (0, framework_1.withSlots)(Slots.fontOrSvgIcon, tslib_1.__assign({}, icon)))),
37
- children && (0, framework_1.withSlots)(Slots.content, { tooltip: tooltipResult }, children),
38
- menuItem.state.hasSubmenu && (0, framework_1.withSlots)(Slots.submenuIndicator, { xml: chevronXml })));
33
+ menuItem.state.hasCheckmarks && (0, framework_1.withSlots)(Slots.checkmark, { accessible: false }),
34
+ (icon || menuItem.state.hasIcons) && ((0, framework_1.withSlots)(Slots.iconPlaceholder, { accessible: false },
35
+ icon && icon.source && (0, framework_1.withSlots)(Slots.imgIcon, tslib_1.__assign({ accessible: false }, icon)),
36
+ icon && (icon.svgSource || icon.fontSource) && (0, framework_1.withSlots)(Slots.fontOrSvgIcon, tslib_1.__assign({ accessible: false }, icon)))),
37
+ children && ((0, framework_1.withSlots)(Slots.content, { accessible: false, tooltip: tooltipResult }, children)),
38
+ menuItem.state.hasSubmenu && (0, framework_1.withSlots)(Slots.submenuIndicator, { accessible: false, xml: chevronXml })));
39
39
  };
40
40
  } }));
41
41
  var getAccessibilityLabelWorker = function (accessibilityLabel, child) {
package/lib-commonjs/MenuItem/MenuItem.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":"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"}
package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,KAAK,EAAY,MAAM,kCAAkC,CAAC;AAOxE,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAKlC,eAAO,MAAM,gBAAgB,qLAiB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,oBAAoB,8CAE7B,MAAM,iBAAiB,CAAC,qBAAqB,CAwB/C,CAAC"}
1
+ {"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,KAAK,EAAY,MAAM,kCAAkC,CAAC;AAOxE,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAKlC,eAAO,MAAM,gBAAgB,qLAiB3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,oBAAoB,8CAE7B,MAAM,iBAAiB,CAAC,qBAAqB,CA4B/C,CAAC"}
package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js CHANGED
@@ -30,11 +30,11 @@ var menuItemFinalRender = function (menuItem, Slots) {
30
30
  var label = (0, MenuItem_1.getAccessibilityLabel)(accessibilityLabel, children[0]);
31
31
  var tooltipResult = (0, MenuItem_1.getTooltip)(tooltip, menuItem.state.hasTooltips, children[0]);
32
32
  return ((0, framework_1.withSlots)(Slots.root, tslib_1.__assign({}, mergedProps, { accessibilityLabel: label }),
33
- (0, framework_1.withSlots)(Slots.checkmark, { xml: checkmarkXml }),
34
- (icon || menuItem.state.hasIcons) && ((0, framework_1.withSlots)(Slots.iconPlaceholder, null,
35
- icon && icon.source && (0, framework_1.withSlots)(Slots.imgIcon, tslib_1.__assign({}, icon)),
36
- icon && (icon.svgSource || icon.fontSource) && (0, framework_1.withSlots)(Slots.fontOrSvgIcon, tslib_1.__assign({}, icon)))),
37
- children && (0, framework_1.withSlots)(Slots.content, { tooltip: tooltipResult }, children)));
33
+ (0, framework_1.withSlots)(Slots.checkmark, { accessible: false, xml: checkmarkXml }),
34
+ (icon || menuItem.state.hasIcons) && ((0, framework_1.withSlots)(Slots.iconPlaceholder, { accessible: false },
35
+ icon && icon.source && (0, framework_1.withSlots)(Slots.imgIcon, tslib_1.__assign({ accessible: false }, icon)),
36
+ icon && (icon.svgSource || icon.fontSource) && (0, framework_1.withSlots)(Slots.fontOrSvgIcon, tslib_1.__assign({ accessible: false }, icon)))),
37
+ children && ((0, framework_1.withSlots)(Slots.content, { accessible: false, tooltip: tooltipResult }, children))));
38
38
  };
39
39
  };
40
40
  exports.menuItemFinalRender = menuItemFinalRender;
package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":";;;;AAEA,6CAAsD;AAGtD,8DAAkF;AAClF,oDAA6D;AAC7D,oDAA6D;AAC7D,qDAA0C;AAE1C,uEAA6D;AAO7D,mEAAgE;AAChE,6DAA4D;AAC5D,iDAAyE;AAE5D,QAAA,gBAAgB,GAAG,IAAA,mBAAO,sCACrC,WAAW,EAAE,6CAAoB,IAC9B,0CAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,wBAAS;QACf,SAAS,EAAE,yBAAM;QACjB,OAAO,EAAE,aAAI;QACb,eAAe,EAAE,mBAAI;QACrB,OAAO,EAAE,oBAAK;QACd,aAAa,EAAE,aAAI;KACpB,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,KAAwD,IAAA,sBAAU,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAvF,kBAAkB,wBAAA,EAAE,IAAI,UAAA,EAAE,OAAO,aAAA,EAAK,WAAW,sBAAnD,yCAAqD,CAAoC,CAAC;QAChG,IAAM,YAAY,GAAG,6XAGd,CAAC;QAER,IAAM,KAAK,GAAG,IAAA,gCAAqB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAM,aAAa,GAAG,IAAA,qBAAU,EAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnF,OAAO,CACL,2BAAC,KAAK,CAAC,IAAI,uBAAK,WAAW,IAAE,kBAAkB,EAAE,KAAK;YACpD,2BAAC,KAAK,CAAC,SAAS,IAAC,GAAG,EAAE,YAAY,GAAI;YACrC,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CACpC,2BAAC,KAAK,CAAC,eAAe;gBACnB,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,2BAAC,KAAK,CAAC,OAAO,uBAAK,IAAI,EAAI;gBAClD,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,2BAAC,KAAK,CAAC,aAAa,uBAAK,IAAI,EAAI,CAC3D,CACzB;YACA,QAAQ,IAAI,2BAAC,KAAK,CAAC,OAAO,IAAC,OAAO,EAAE,aAAa,IAAG,QAAQ,CAAiB,CACnE,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,mBAAmB,uBA2B9B"}
1
+ {"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":";;;;AAEA,6CAAsD;AAGtD,8DAAkF;AAClF,oDAA6D;AAC7D,oDAA6D;AAC7D,qDAA0C;AAE1C,uEAA6D;AAO7D,mEAAgE;AAChE,6DAA4D;AAC5D,iDAAyE;AAE5D,QAAA,gBAAgB,GAAG,IAAA,mBAAO,sCACrC,WAAW,EAAE,6CAAoB,IAC9B,0CAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,wBAAS;QACf,SAAS,EAAE,yBAAM;QACjB,OAAO,EAAE,aAAI;QACb,eAAe,EAAE,mBAAI;QACrB,OAAO,EAAE,oBAAK;QACd,aAAa,EAAE,aAAI;KACpB,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,KAAwD,IAAA,sBAAU,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAvF,kBAAkB,wBAAA,EAAE,IAAI,UAAA,EAAE,OAAO,aAAA,EAAK,WAAW,sBAAnD,yCAAqD,CAAoC,CAAC;QAChG,IAAM,YAAY,GAAG,6XAGd,CAAC;QAER,IAAM,KAAK,GAAG,IAAA,gCAAqB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAM,aAAa,GAAG,IAAA,qBAAU,EAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnF,OAAO,CACL,2BAAC,KAAK,CAAC,IAAI,uBAAK,WAAW,IAAE,kBAAkB,EAAE,KAAK;YACpD,2BAAC,KAAK,CAAC,SAAS,IAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,GAAI;YACxD,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CACpC,2BAAC,KAAK,CAAC,eAAe,IAAC,UAAU,EAAE,KAAK;gBACrC,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,2BAAC,KAAK,CAAC,OAAO,qBAAC,UAAU,EAAE,KAAK,IAAM,IAAI,EAAI;gBACrE,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,2BAAC,KAAK,CAAC,aAAa,qBAAC,UAAU,EAAE,KAAK,IAAM,IAAI,EAAI,CAC9E,CACzB;YACA,QAAQ,IAAI,CACX,2BAAC,KAAK,CAAC,OAAO,IAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,IACrD,QAAQ,CACK,CACjB,CACU,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AA/BW,QAAA,mBAAmB,uBA+B9B"}
package/lib-commonjs/MenuList/MenuList.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AA0BnF,eAAO,MAAM,cAAc,UAAW,MAAM,SAAS,aAAa,aAAa,aAAa,KAAG,OAE9F,CAAC;AACF,eAAO,MAAM,QAAQ,gLAmDnB,CAAC"}
1
+ {"version":3,"file":"MenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAgB,MAAM,kBAAkB,CAAC;AA0BnF,eAAO,MAAM,cAAc,UAAW,MAAM,SAAS,aAAa,aAAa,aAAa,KAAG,OAE9F,CAAC;AACF,eAAO,MAAM,QAAQ,gLA0EnB,CAAC"}
package/lib-commonjs/MenuList/MenuList.js CHANGED
@@ -45,12 +45,27 @@ exports.MenuList = (0, framework_1.compose)(tslib_1.__assign(tslib_1.__assign({
45
45
  (_a = focusZoneRef === null || focusZoneRef === void 0 ? void 0 : focusZoneRef.current) === null || _a === void 0 ? void 0 : _a.focus();
46
46
  }, []);
47
47
  return function (_final, children) {
48
+ var itemCount = react_1.default.Children.toArray(children).filter(function (child) { return react_1.default.isValidElement(child) && child.type.displayName !== 'MenuDivider'; }).length;
49
+ var itemPosition = 0;
50
+ var childrenWithSet = react_1.default.Children.toArray(children).map(function (child) {
51
+ var _a, _b;
52
+ if (react_1.default.isValidElement(child)) {
53
+ if (child.type.displayName !== 'MenuDivider') {
54
+ itemPosition++;
55
+ }
56
+ return react_1.default.cloneElement(child, {
57
+ accessibilityPositionInSet: (_a = child.props.accessibilityPositionInSet) !== null && _a !== void 0 ? _a : itemPosition,
58
+ accessibilitySetSize: (_b = child.props.accessibilitySetSize) !== null && _b !== void 0 ? _b : itemCount, //win32
59
+ });
60
+ }
61
+ return child;
62
+ });
48
63
  var content = react_native_1.Platform.OS === 'macos' ? ((0, framework_1.withSlots)(Slots.root, null,
49
64
  (0, framework_1.withSlots)(Slots.scrollView, { accessibilityRole: "menu", showsVerticalScrollIndicator: menuContext.hasMaxHeight, showsHorizontalScrollIndicator: menuContext.hasMaxWidth },
50
65
  (0, framework_1.withSlots)(Slots.focusZone, { componentRef: focusZoneRef, focusZoneDirection: 'vertical', defaultTabbableElement: focusZoneRef,
51
66
  // @ts-ignore FocusZone takes ViewProps, but that isn't defined on it's type.
52
- enableFocusRing: false }, children)))) : menuContext.hasMaxHeight ? ((0, framework_1.withSlots)(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} },
53
- (0, framework_1.withSlots)(Slots.scrollView, null, children))) : ((0, framework_1.withSlots)(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} }, children));
67
+ enableFocusRing: false }, childrenWithSet)))) : menuContext.hasMaxHeight ? ((0, framework_1.withSlots)(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} },
68
+ (0, framework_1.withSlots)(Slots.scrollView, null, childrenWithSet))) : ((0, framework_1.withSlots)(Slots.root, { style: menuContext.minWidth ? { minWidth: menuContext.minWidth } : {} }, childrenWithSet));
54
69
  return (0, framework_1.withSlots)(menuListContext_1.MenuListProvider, { value: menuListContextValue }, content);
55
70
  };
56
71
  } }));
package/lib-commonjs/MenuList/MenuList.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MenuList.js","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MenuList.js","sourceRoot":"","sources":["../../src/MenuList/MenuList.tsx"],"names":[],"mappings":";;;;AAAA,qBAAqB;AACrB,wDAA0B;AAC1B,6CAA0D;AAG1D,gEAA8D;AAE9D,8DAAmG;AAEnG,uDAAqD;AAErD,mDAAgD;AAChD,6CAA4C;AAC5C,qEAAoE;AACpE,sCAA4C;AAC5C,8DAA8D;AAE9D,IAAM,SAAS,GAAG,IAAA,2BAAe,EAAC,UAAC,KAAwD;IACjF,IAAA,GAAG,GAAc,KAAK,IAAnB,EAAK,IAAI,kBAAK,KAAK,EAAxB,OAAgB,CAAF,CAAW;IAC/B,OAAO,UAAC,KAAwD,EAAE,QAAyB;QACzF,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC,IAAI,QAAQ,EAAE;YAC9B,6DAA6D;YAC7D,yCAAyC;YACzC,QAAQ,GAAG,eAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,KAAuB,EAAE,KAAa;gBAC7E,IAAI,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE;oBAC5C,OAAO,eAAK,CAAC,YAAY,CAAC,KAAK,EAAE,IAAA,sBAAU,EAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;iBAC1F;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,2BAAC,mBAAI,uBAAK,IAAA,sBAAU,EAAC,IAAI,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAQ,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;AAE7B,IAAM,cAAc,GAAG,UAAC,KAAa,EAAE,KAAoB,EAAE,SAAwB;IAC1F,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,cAAc,CAAC;AACtE,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AACW,QAAA,QAAQ,GAAG,IAAA,mBAAO,sCAC7B,WAAW,EAAE,6BAAY,IACtB,kCAAe,KAClB,KAAK,qBACH,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,yBAAU,IACnB,CAAC,uBAAQ,CAAC,EAAE,KAAK,OAAO,IAAI,EAAE,SAAS,EAAE,sBAAS,EAAE,CAAC,GAE1D,SAAS,EAAE,UAAC,SAAwB,EAAE,QAAgC;QACpE,IAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAS,CAAC,CAAC;QACxC,IAAM,WAAW,GAAG,IAAA,wBAAc,GAAE,CAAC;QACrC,IAAM,oBAAoB,GAAG,IAAA,iDAAuB,EAAC,QAAQ,CAAC,CAAC;QAC/D,IAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAC,KAAK,IAAK,OAAA,IAAA,sBAAc,EAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAA1C,CAA0C,CAAC,CAAC;QAE9F,IAAM,YAAY,GAAG,eAAK,CAAC,MAAM,EAAQ,CAAC;QAE1C,eAAK,CAAC,SAAS,CAAC;;YACd,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAC;QACjC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,UAAC,MAAqB,EAAE,QAAyB;YACtD,IAAM,SAAS,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CACvD,UAAC,KAAK,IAAK,OAAA,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAK,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,aAAa,EAAhF,CAAgF,CAC5F,CAAC,MAAM,CAAC;YACT,IAAI,YAAY,GAAG,CAAC,CAAC;YAErB,IAAM,eAAe,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAC,KAAK;;gBACjE,IAAI,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;oBAC/B,IAAK,KAAa,CAAC,IAAI,CAAC,WAAW,KAAK,aAAa,EAAE;wBACrD,YAAY,EAAE,CAAC;qBAChB;oBAED,OAAO,eAAK,CAAC,YAAY,CACvB,KAA+E,EAC/E;wBACE,0BAA0B,EAAE,MAAA,KAAK,CAAC,KAAK,CAAC,0BAA0B,mCAAI,YAAY;wBAClF,oBAAoB,EAAE,MAAA,KAAK,CAAC,KAAK,CAAC,oBAAoB,mCAAI,SAAS,EAAE,OAAO;qBACtE,CACT,CAAC;iBACH;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,IAAM,OAAO,GACX,uBAAQ,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CACxB,2BAAC,KAAK,CAAC,IAAI;gBACT,2BAAC,KAAK,CAAC,UAAU,IACf,iBAAiB,EAAC,MAAM,EACxB,4BAA4B,EAAE,WAAW,CAAC,YAAY,EACtD,8BAA8B,EAAE,WAAW,CAAC,WAAW;oBAEvD,2BAAC,KAAK,CAAC,SAAS,IACd,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,UAAU,EAC9B,sBAAsB,EAAE,YAAY;wBACpC,6EAA6E;wBAC7E,eAAe,EAAE,KAAK,IAErB,eAAe,CACA,CACD,CACR,CACd,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAC7B,2BAAC,KAAK,CAAC,IAAI,IAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC/E,2BAAC,KAAK,CAAC,UAAU,QAAE,eAAe,CAAoB,CAC3C,CACd,CAAC,CAAC,CAAC,CACF,2BAAC,KAAK,CAAC,IAAI,IAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAG,eAAe,CAAc,CAClH,CAAC;YAEJ,OAAO,2BAAC,kCAAgB,IAAC,KAAK,EAAE,oBAAoB,IAAG,OAAO,CAAoB,CAAC;QACrF,CAAC,CAAC;IACJ,CAAC,IACD,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluentui-react-native/menu",
3
- "version": "1.4.24",
3
+ "version": "1.4.26",
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,19 +23,19 @@
23
23
  },
24
24
  "dependencies": {
25
25
  "@fluentui-react-native/adapters": ">=0.10.2 <1.0.0",
26
- "@fluentui-react-native/callout": ">=0.23.7 <1.0.0",
27
- "@fluentui-react-native/focus-zone": ">=0.11.36 <1.0.0",
28
- "@fluentui-react-native/framework": "0.9.5",
29
- "@fluentui-react-native/icon": "^0.17.19",
30
- "@fluentui-react-native/interactive-hooks": ">=0.22.24 <1.0.0",
31
- "@fluentui-react-native/text": ">=0.19.26 <1.0.0",
32
- "@fluentui-react-native/theme-tokens": ">=0.24.4 <1.0.0",
33
- "@fluentui-react-native/tokens": ">=0.20.11 <1.0.0",
26
+ "@fluentui-react-native/callout": ">=0.23.8 <1.0.0",
27
+ "@fluentui-react-native/focus-zone": ">=0.11.37 <1.0.0",
28
+ "@fluentui-react-native/framework": "0.9.6",
29
+ "@fluentui-react-native/icon": "^0.17.20",
30
+ "@fluentui-react-native/interactive-hooks": ">=0.22.25 <1.0.0",
31
+ "@fluentui-react-native/text": ">=0.19.27 <1.0.0",
32
+ "@fluentui-react-native/theme-tokens": ">=0.24.5 <1.0.0",
33
+ "@fluentui-react-native/tokens": ">=0.20.12 <1.0.0",
34
34
  "@fluentui-react-native/use-styling": ">=0.9.4 <1.0.0",
35
35
  "tslib": "^2.3.1"
36
36
  },
37
37
  "devDependencies": {
38
- "@fluentui-react-native/button": ">=0.32.43 <1.0.0",
38
+ "@fluentui-react-native/button": ">=0.32.44 <1.0.0",
39
39
  "@fluentui-react-native/eslint-config-rules": "^0.1.1",
40
40
  "@fluentui-react-native/scripts": "^0.1.1",
41
41
  "@fluentui-react-native/test-tools": ">=0.1.1 <1.0.0",
package/src/Menu/Menu.tsx CHANGED
@@ -14,6 +14,7 @@ export const Menu = stagedComponent((props: MenuProps) => {
14
14
 
15
15
  return (_rest: MenuProps, children: React.ReactNode) => {
16
16
  const childrenArray = React.Children.toArray(children) as React.ReactElement[];
17
+ const { accessibilityPositionInSet, accessibilitySetSize } = state;
17
18
 
18
19
  if (__DEV__) {
19
20
  if (childrenArray.length !== 2) {
@@ -25,9 +26,25 @@ export const Menu = stagedComponent((props: MenuProps) => {
25
26
  const menuTrigger = childrenArray[0];
26
27
  const menuPopover = childrenArray[1];
27
28
 
29
+ const menuTriggerChild = menuTrigger.props.children;
30
+
31
+ const menuTriggerChildWithSet = React.cloneElement(
32
+ menuTriggerChild as React.ReactElement<unknown, string | React.JSXElementConstructor<any>>,
33
+ {
34
+ accessibilityPositionInSet: menuTriggerChild.props.accessibilityPositionInSet ?? accessibilityPositionInSet, // win32
35
+ accessibilitySetSize: menuTriggerChild.props.accessibilitySetSize ?? accessibilitySetSize, //win32
36
+ } as any,
37
+ );
38
+
39
+ const menuTriggerWithSet = React.cloneElement(
40
+ menuTrigger as React.ReactElement<unknown, string | React.JSXElementConstructor<any>>,
41
+ {} as any,
42
+ menuTriggerChildWithSet,
43
+ );
44
+
28
45
  return (
29
46
  <MenuProvider value={contextValue}>
30
- {menuTrigger}
47
+ {menuTriggerWithSet}
31
48
  {/* GH#2661: Make sure that shouldFocusOnContainer is defined before initializing
32
49
  the popover so that focus is put in the correct place */}
33
50
  {state.open && state.shouldFocusOnContainer !== undefined && menuPopover}
package/src/MenuItem/MenuItem.tsx CHANGED
@@ -47,15 +47,19 @@ export const MenuItem = compose<MenuItemType>({
47
47
 
48
48
  return (
49
49
  <Slots.root {...mergedProps} accessibilityLabel={label}>
50
- {menuItem.state.hasCheckmarks && <Slots.checkmark />}
50
+ {menuItem.state.hasCheckmarks && <Slots.checkmark accessible={false} />}
51
51
  {(icon || menuItem.state.hasIcons) && (
52
- <Slots.iconPlaceholder>
53
- {icon && icon.source && <Slots.imgIcon {...icon} />}
54
- {icon && (icon.svgSource || icon.fontSource) && <Slots.fontOrSvgIcon {...icon} />}
52
+ <Slots.iconPlaceholder accessible={false}>
53
+ {icon && icon.source && <Slots.imgIcon accessible={false} {...icon} />}
54
+ {icon && (icon.svgSource || icon.fontSource) && <Slots.fontOrSvgIcon accessible={false} {...icon} />}
55
55
  </Slots.iconPlaceholder>
56
56
  )}
57
- {children && <Slots.content tooltip={tooltipResult}>{children}</Slots.content>}
58
- {menuItem.state.hasSubmenu && <Slots.submenuIndicator xml={chevronXml} />}
57
+ {children && (
58
+ <Slots.content accessible={false} tooltip={tooltipResult}>
59
+ {children}
60
+ </Slots.content>
61
+ )}
62
+ {menuItem.state.hasSubmenu && <Slots.submenuIndicator accessible={false} xml={chevronXml} />}
59
63
  </Slots.root>
60
64
  );
61
65
  };
package/src/MenuItemCheckbox/MenuItemCheckbox.tsx CHANGED
@@ -54,14 +54,18 @@ export const menuItemFinalRender = (
54
54
 
55
55
  return (
56
56
  <Slots.root {...mergedProps} accessibilityLabel={label}>
57
- <Slots.checkmark xml={checkmarkXml} />
57
+ <Slots.checkmark accessible={false} xml={checkmarkXml} />
58
58
  {(icon || menuItem.state.hasIcons) && (
59
- <Slots.iconPlaceholder>
60
- {icon && icon.source && <Slots.imgIcon {...icon} />}
61
- {icon && (icon.svgSource || icon.fontSource) && <Slots.fontOrSvgIcon {...icon} />}
59
+ <Slots.iconPlaceholder accessible={false}>
60
+ {icon && icon.source && <Slots.imgIcon accessible={false} {...icon} />}
61
+ {icon && (icon.svgSource || icon.fontSource) && <Slots.fontOrSvgIcon accessible={false} {...icon} />}
62
62
  </Slots.iconPlaceholder>
63
63
  )}
64
- {children && <Slots.content tooltip={tooltipResult}>{children}</Slots.content>}
64
+ {children && (
65
+ <Slots.content accessible={false} tooltip={tooltipResult}>
66
+ {children}
67
+ </Slots.content>
68
+ )}
65
69
  </Slots.root>
66
70
  );
67
71
  };
package/src/MenuList/MenuList.tsx CHANGED
@@ -58,6 +58,29 @@ export const MenuList = compose<MenuListType>({
58
58
  }, []);
59
59
 
60
60
  return (_final: MenuListProps, children: React.ReactNode) => {
61
+ const itemCount = React.Children.toArray(children).filter(
62
+ (child) => React.isValidElement(child) && (child as any).type.displayName !== 'MenuDivider',
63
+ ).length;
64
+ let itemPosition = 0;
65
+
66
+ const childrenWithSet = React.Children.toArray(children).map((child) => {
67
+ if (React.isValidElement(child)) {
68
+ if ((child as any).type.displayName !== 'MenuDivider') {
69
+ itemPosition++;
70
+ }
71
+
72
+ return React.cloneElement(
73
+ child as React.ReactElement<unknown, string | React.JSXElementConstructor<any>>,
74
+ {
75
+ accessibilityPositionInSet: child.props.accessibilityPositionInSet ?? itemPosition, // win32
76
+ accessibilitySetSize: child.props.accessibilitySetSize ?? itemCount, //win32
77
+ } as any,
78
+ );
79
+ }
80
+
81
+ return child;
82
+ });
83
+
61
84
  const content =
62
85
  Platform.OS === 'macos' ? (
63
86
  <Slots.root>
@@ -73,16 +96,16 @@ export const MenuList = compose<MenuListType>({
73
96
  // @ts-ignore FocusZone takes ViewProps, but that isn't defined on it's type.
74
97
  enableFocusRing={false}
75
98
  >
76
- {children}
99
+ {childrenWithSet}
77
100
  </Slots.focusZone>
78
101
  </Slots.scrollView>
79
102
  </Slots.root>
80
103
  ) : menuContext.hasMaxHeight ? (
81
104
  <Slots.root style={menuContext.minWidth ? { minWidth: menuContext.minWidth } : {}}>
82
- <Slots.scrollView>{children}</Slots.scrollView>
105
+ <Slots.scrollView>{childrenWithSet}</Slots.scrollView>
83
106
  </Slots.root>
84
107
  ) : (
85
- <Slots.root style={menuContext.minWidth ? { minWidth: menuContext.minWidth } : {}}>{children}</Slots.root>
108
+ <Slots.root style={menuContext.minWidth ? { minWidth: menuContext.minWidth } : {}}>{childrenWithSet}</Slots.root>
86
109
  );
87
110
 
88
111
  return <MenuListProvider value={menuListContextValue}>{content}</MenuListProvider>;