@fluentui-react-native/menu 1.3.1 → 1.3.3
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.
- package/CHANGELOG.json +31 -1
- package/CHANGELOG.md +18 -2
- package/lib/Menu/Menu.types.d.ts +2 -1
- package/lib/Menu/Menu.types.d.ts.map +1 -1
- package/lib/Menu/Menu.types.js.map +1 -1
- package/lib/MenuItem/MenuItem.js +2 -2
- package/lib/MenuItem/MenuItem.js.map +1 -1
- package/lib/MenuItem/MenuItem.styling.d.ts.map +1 -1
- package/lib/MenuItem/MenuItem.styling.js +1 -4
- package/lib/MenuItem/MenuItem.styling.js.map +1 -1
- package/lib/MenuList/useMenuList.d.ts.map +1 -1
- package/lib/MenuList/useMenuList.js +4 -2
- package/lib/MenuList/useMenuList.js.map +1 -1
- package/lib-commonjs/Menu/Menu.types.d.ts +2 -1
- package/lib-commonjs/Menu/Menu.types.d.ts.map +1 -1
- package/lib-commonjs/Menu/Menu.types.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.js +2 -2
- package/lib-commonjs/MenuItem/MenuItem.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.styling.d.ts.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.styling.js +1 -4
- package/lib-commonjs/MenuItem/MenuItem.styling.js.map +1 -1
- package/lib-commonjs/MenuList/useMenuList.d.ts.map +1 -1
- package/lib-commonjs/MenuList/useMenuList.js +4 -2
- package/lib-commonjs/MenuList/useMenuList.js.map +1 -1
- package/package.json +1 -1
- package/src/Menu/Menu.types.ts +2 -1
- package/src/MenuItem/MenuItem.styling.ts +1 -5
- package/src/MenuItem/MenuItem.tsx +2 -2
- package/src/MenuList/useMenuList.ts +3 -2
- package/src/__tests__/__snapshots__/Menu.test.tsx.snap +4 -4
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,37 @@
|
|
|
2
2
|
"name": "@fluentui-react-native/menu",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Thu, 09 Feb 2023 17:09:38 GMT",
|
|
6
|
+
"tag": "@fluentui-react-native/menu_v1.3.3",
|
|
7
|
+
"version": "1.3.3",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "email not defined",
|
|
12
|
+
"package": "@fluentui-react-native/menu",
|
|
13
|
+
"commit": "45ec15bee779228352575ebbea9efba4c20b33aa",
|
|
14
|
+
"comment": "Fix Menu keyboard navigation"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Thu, 09 Feb 2023 02:18:16 GMT",
|
|
21
|
+
"tag": "@fluentui-react-native/menu_v1.3.2",
|
|
22
|
+
"version": "1.3.2",
|
|
23
|
+
"comments": {
|
|
24
|
+
"patch": [
|
|
25
|
+
{
|
|
26
|
+
"author": "amchiu@microsoft.com",
|
|
27
|
+
"package": "@fluentui-react-native/menu",
|
|
28
|
+
"commit": "45469ad3f3a8c3adb3d936b4485e8917964dc842",
|
|
29
|
+
"comment": "Update submenuIndicatorPadding"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Wed, 08 Feb 2023 19:29:35 GMT",
|
|
6
36
|
"tag": "@fluentui-react-native/menu_v1.3.1",
|
|
7
37
|
"version": "1.3.1",
|
|
8
38
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,28 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/menu
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Thu, 09 Feb 2023 17:09:38 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 1.3.3
|
|
8
|
+
|
|
9
|
+
Thu, 09 Feb 2023 17:09:38 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Fix Menu keyboard navigation (email not defined)
|
|
14
|
+
|
|
15
|
+
## 1.3.2
|
|
16
|
+
|
|
17
|
+
Thu, 09 Feb 2023 02:18:16 GMT
|
|
18
|
+
|
|
19
|
+
### Patches
|
|
20
|
+
|
|
21
|
+
- Update submenuIndicatorPadding (amchiu@microsoft.com)
|
|
22
|
+
|
|
7
23
|
## 1.3.1
|
|
8
24
|
|
|
9
|
-
Wed, 08 Feb 2023 19:29:
|
|
25
|
+
Wed, 08 Feb 2023 19:29:35 GMT
|
|
10
26
|
|
|
11
27
|
### Patches
|
|
12
28
|
|
package/lib/Menu/Menu.types.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
|
|
3
3
|
import type React from 'react';
|
|
4
|
+
import type { View } from 'react-native';
|
|
4
5
|
import type { MenuListProps } from '../MenuList/MenuList.types';
|
|
5
6
|
export declare const menuName = "Menu";
|
|
6
7
|
export interface MenuProps extends MenuListProps {
|
|
@@ -32,7 +33,7 @@ export interface MenuState extends MenuProps {
|
|
|
32
33
|
parentPopoverHoverOutTimer?: NodeJS.Timeout;
|
|
33
34
|
setOpen: (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void;
|
|
34
35
|
shouldFocusOnContainer: boolean;
|
|
35
|
-
triggerRef: React.RefObject<
|
|
36
|
+
triggerRef: React.RefObject<View>;
|
|
36
37
|
hasMaxHeight?: boolean;
|
|
37
38
|
hasMaxWidth?: boolean;
|
|
38
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.types.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAK9D,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1E,sBAAsB,EAAE,OAAO,CAAC;IAChC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"Menu.types.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAK9D,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1E,sBAAsB,EAAE,OAAO,CAAC;IAChC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.types.js","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Menu.types.js","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,IAAM,QAAQ,GAAG,MAAM,CAAC"}
|
package/lib/MenuItem/MenuItem.js
CHANGED
|
@@ -18,8 +18,8 @@ export var MenuItem = compose(__assign(__assign({ displayName: menuItemName }, s
|
|
|
18
18
|
return function (final, children) {
|
|
19
19
|
var _a = mergeProps(menuItem.props, final), accessibilityLabel = _a.accessibilityLabel, mergedProps = __rest(_a, ["accessibilityLabel"]);
|
|
20
20
|
var chevronXml = I18nManager.isRTL
|
|
21
|
-
? "\n <svg>\n
|
|
22
|
-
: "\n <svg>\n
|
|
21
|
+
? "\n <svg>\n <path fill='currentColor' d=\"M10.2603 3.20041C10.5639 3.48226 10.5814 3.95681 10.2996 4.26034L6.77348 8L10.2996 11.7397C10.5814 12.0432 10.5639 12.5177 10.2603 12.7996C9.9568 13.0815 9.48226 13.0639 9.2004 12.7603L5.2004 8.51034C4.9332 8.22258 4.9332 7.77743 5.2004 7.48966L9.20041 3.23966C9.48226 2.93613 9.95681 2.91856 10.2603 3.20041Z\"/>\n </svg>"
|
|
22
|
+
: "\n <svg>\n <path fill='currentColor' d=\"M5.73966 3.20041C5.43613 3.48226 5.41856 3.95681 5.70041 4.26034L9.22652 8L5.70041 11.7397C5.41856 12.0432 5.43613 12.5177 5.73967 12.7996C6.0432 13.0815 6.51775 13.0639 6.7996 12.7603L10.7996 8.51034C11.0668 8.22258 11.0668 7.77743 10.7996 7.48966L6.7996 3.23966C6.51775 2.93613 6.0432 2.91856 5.73966 3.20041Z\"/>\n </svg>";
|
|
23
23
|
// We only automatically support the one child string.
|
|
24
24
|
var label = getAccessibilityLabel(accessibilityLabel, children[0]);
|
|
25
25
|
return (withSlots(Slots.root, __assign({}, mergedProps, { accessibilityLabel: label }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":";AAAA,qBAAqB;AACrB,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC3F,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,CAAC,IAAM,QAAQ,GAAG,OAAO,qBAC7B,WAAW,EAAE,YAAY,IACtB,eAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,SAAS;QACf,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,gBAAgB,EAAE,MAAM;KACzB,EACD,SAAS,EAAE,UAAC,SAAwB,EAAE,QAAgC;QACpE,IAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QACxC,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,UAAC,KAAoB,EAAE,QAAyB;YACrD,IAAM,KAAyC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAxE,kBAAkB,wBAAA,EAAK,WAAW,cAApC,sBAAsC,CAAoC,CAAC;YACjF,IAAM,UAAU,GAAG,WAAW,CAAC,KAAK;gBAClC,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":";AAAA,qBAAqB;AACrB,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC3F,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,CAAC,IAAM,QAAQ,GAAG,OAAO,qBAC7B,WAAW,EAAE,YAAY,IACtB,eAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,SAAS;QACf,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,gBAAgB,EAAE,MAAM;KACzB,EACD,SAAS,EAAE,UAAC,SAAwB,EAAE,QAAgC;QACpE,IAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QACxC,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,UAAC,KAAoB,EAAE,QAAyB;YACrD,IAAM,KAAyC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAxE,kBAAkB,wBAAA,EAAK,WAAW,cAApC,sBAAsC,CAAoC,CAAC;YACjF,IAAM,UAAU,GAAG,WAAW,CAAC,KAAK;gBAClC,CAAC,CAAC,wYAGO;gBACT,CAAC,CAAC,0YAGO,CAAC;YAEZ,sDAAsD;YACtD,IAAM,KAAK,GAAG,qBAAqB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAErE,OAAO,CACL,UAAC,KAAK,CAAC,IAAI,eAAK,WAAW,IAAE,kBAAkB,EAAE,KAAK;gBACnD,QAAQ,CAAC,KAAK,CAAC,aAAa,IAAI,UAAC,KAAK,CAAC,SAAS,OAAG;gBACnD,QAAQ,IAAI,UAAC,KAAK,CAAC,OAAO,QAAE,QAAQ,CAAiB;gBACrD,QAAQ,CAAC,KAAK,CAAC,UAAU,IAAI,UAAC,KAAK,CAAC,gBAAgB,IAAC,GAAG,EAAE,UAAU,GAAI,CAC9D,CACd,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,IACD,CAAC;AAEH,IAAM,2BAA2B,GAAG,UAAC,kBAA0B,EAAE,KAAsB;IACrF,IAAI,kBAAkB,KAAK,SAAS,EAAE;QACpC,OAAO,kBAAkB,CAAC;KAC3B;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AACF,MAAM,CAAC,IAAM,qBAAqB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItem.styling.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGzF,eAAO,MAAM,cAAc,EAAE,CAAC,MAAM,cAAc,CAAC,EAAkD,CAAC;AAEtG,eAAO,MAAM,eAAe,EAAE,iBAAiB,CAAC,aAAa,EAAE,iBAAiB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"MenuItem.styling.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGzF,eAAO,MAAM,cAAc,EAAE,CAAC,MAAM,cAAc,CAAC,EAAkD,CAAC;AAEtG,eAAO,MAAM,eAAe,EAAE,iBAAiB,CAAC,aAAa,EAAE,iBAAiB,EAAE,cAAc,CAmD/F,CAAC"}
|
|
@@ -29,10 +29,7 @@ export var stylingSettings = {
|
|
|
29
29
|
color: tokens.submenuIndicatorColor,
|
|
30
30
|
height: tokens.submenuIndicatorSize,
|
|
31
31
|
width: tokens.submenuIndicatorSize,
|
|
32
|
-
viewBox:
|
|
33
|
-
(tokens.submenuIndicatorSize - tokens.submenuIndicatorPadding * 2) +
|
|
34
|
-
' ' +
|
|
35
|
-
(tokens.submenuIndicatorSize - tokens.submenuIndicatorPadding * 2),
|
|
32
|
+
viewBox: "0 0 ".concat(tokens.submenuIndicatorSize, " ").concat(tokens.submenuIndicatorSize),
|
|
36
33
|
};
|
|
37
34
|
}, ['submenuIndicatorColor', 'submenuIndicatorPadding', 'submenuIndicatorSize']),
|
|
38
35
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItem.styling.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,CAAC,IAAM,cAAc,GAA6B,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAEtG,MAAM,CAAC,IAAM,eAAe,GAAwE;IAClG,MAAM,EAAE,CAAC,qBAAqB,EAAE,YAAY,CAAC;IAC7C,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE;QACT,IAAI,EAAE,UAAU,CACd,UAAC,MAAsB,EAAE,KAAY,IAAK,OAAA,CAAC;YACzC,KAAK,sBACH,UAAU,EAAE,QAAQ,EACpB,eAAe,EAAE,MAAM,CAAC,eAAe,EACvC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,KAAK,IACjB,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,GAChC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CACpC;SACF,CAAC,EATwC,CASxC,+BACD,iBAAiB,GAAK,YAAY,CAAC,IAAI,SAAK,YAAY,CAAC,IAAI,QAC/D;QACD,SAAS,EAAE,UAAU,CACnB,UAAC,MAAsB,IAAK,OAAA,CAAC;YAC3B,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,CAAC,aAAa;gBAC5B,KAAK,EAAE,MAAM,CAAC,aAAa;gBAC3B,SAAS,EAAE,MAAM,CAAC,GAAG;aACtB;SACF,CAAC,EAN0B,CAM1B,EACF,CAAC,eAAe,EAAE,KAAK,CAAC,CACzB;QACD,OAAO,EAAE,UAAU,CACjB,UAAC,MAAsB,EAAE,KAAY;YACnC,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,aACH,QAAQ,EAAE,CAAC,IACR,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAClC;aACF,CAAC;QACJ,CAAC,iBACA,OAAO,GAAK,UAAU,CAAC,IAAI,QAC7B;QACD,gBAAgB,EAAE,UAAU,CAC1B,UAAC,MAAsB;YACrB,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,qBAAqB;gBACnC,MAAM,EAAE,MAAM,CAAC,oBAAoB;gBACnC,KAAK,EAAE,MAAM,CAAC,oBAAoB;gBAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"MenuItem.styling.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,CAAC,IAAM,cAAc,GAA6B,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAEtG,MAAM,CAAC,IAAM,eAAe,GAAwE;IAClG,MAAM,EAAE,CAAC,qBAAqB,EAAE,YAAY,CAAC;IAC7C,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE;QACT,IAAI,EAAE,UAAU,CACd,UAAC,MAAsB,EAAE,KAAY,IAAK,OAAA,CAAC;YACzC,KAAK,sBACH,UAAU,EAAE,QAAQ,EACpB,eAAe,EAAE,MAAM,CAAC,eAAe,EACvC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,KAAK,IACjB,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,GAChC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CACpC;SACF,CAAC,EATwC,CASxC,+BACD,iBAAiB,GAAK,YAAY,CAAC,IAAI,SAAK,YAAY,CAAC,IAAI,QAC/D;QACD,SAAS,EAAE,UAAU,CACnB,UAAC,MAAsB,IAAK,OAAA,CAAC;YAC3B,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,CAAC,aAAa;gBAC5B,KAAK,EAAE,MAAM,CAAC,aAAa;gBAC3B,SAAS,EAAE,MAAM,CAAC,GAAG;aACtB;SACF,CAAC,EAN0B,CAM1B,EACF,CAAC,eAAe,EAAE,KAAK,CAAC,CACzB;QACD,OAAO,EAAE,UAAU,CACjB,UAAC,MAAsB,EAAE,KAAY;YACnC,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,aACH,QAAQ,EAAE,CAAC,IACR,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAClC;aACF,CAAC;QACJ,CAAC,iBACA,OAAO,GAAK,UAAU,CAAC,IAAI,QAC7B;QACD,gBAAgB,EAAE,UAAU,CAC1B,UAAC,MAAsB;YACrB,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,qBAAqB;gBACnC,MAAM,EAAE,MAAM,CAAC,oBAAoB;gBACnC,KAAK,EAAE,MAAM,CAAC,oBAAoB;gBAClC,OAAO,EAAE,cAAO,MAAM,CAAC,oBAAoB,cAAI,MAAM,CAAC,oBAAoB,CAAE;aAC7E,CAAC;QACJ,CAAC,EACD,CAAC,uBAAuB,EAAE,yBAAyB,EAAE,sBAAsB,CAAC,CAC7E;KACF;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAcrE,eAAO,MAAM,WAAW,WAAY,aAAa,KAAG,
|
|
1
|
+
{"version":3,"file":"useMenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAcrE,eAAO,MAAM,WAAW,WAAY,aAAa,KAAG,aA6GnD,CAAC"}
|
|
@@ -16,7 +16,7 @@ export var useMenuList = function (_props) {
|
|
|
16
16
|
var context = useMenuContext();
|
|
17
17
|
// MenuList v2 needs to be able to be standalone, but this is not in scope for v1
|
|
18
18
|
// Assuming that checked information will come from parent Menu
|
|
19
|
-
var defaultChecked = context.defaultChecked, onCheckedChangeOriginal = context.onCheckedChange, checkedOriginal = context.checked, isSubmenu = context.isSubmenu, setOpen = context.setOpen;
|
|
19
|
+
var defaultChecked = context.defaultChecked, onCheckedChangeOriginal = context.onCheckedChange, checkedOriginal = context.checked, isSubmenu = context.isSubmenu, setOpen = context.setOpen, triggerRef = context.triggerRef;
|
|
20
20
|
// Convert passed in array to map so that i's easier to look up checked state
|
|
21
21
|
var checkedMap = React.useMemo(function () {
|
|
22
22
|
var state = {};
|
|
@@ -81,11 +81,13 @@ export var useMenuList = function (_props) {
|
|
|
81
81
|
// trigger and popover. Listening to key events directly here to handle this case doesn't work
|
|
82
82
|
// since left and right arrow key events are already handled and swallowed by native behavior
|
|
83
83
|
var onArrowClose = React.useCallback(function (e) {
|
|
84
|
+
var _a;
|
|
84
85
|
if (!isSubmenu) {
|
|
85
86
|
return;
|
|
86
87
|
}
|
|
87
88
|
setOpen(e, false /* isOpen */, false /* bubble */);
|
|
88
|
-
|
|
89
|
+
(_a = triggerRef === null || triggerRef === void 0 ? void 0 : triggerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
|
|
90
|
+
}, [isSubmenu, setOpen, triggerRef]);
|
|
89
91
|
return {
|
|
90
92
|
props: __assign({}, context),
|
|
91
93
|
isCheckedControlled: isCheckedControlled,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,2FAA2F;AAC3F,4CAA4C;AAC5C,qGAAqG;AACrG,2HAA2H;AAC3H,IAAM,UAAU,GAAG,EAAE,CAAC;AACtB,IAAM,YAAY,GAAG,UAAC,IAAY;IAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC;AACF,IAAM,eAAe,GAAG,UAAC,IAAY;IACnC,UAAU,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,KAAK,IAAI,EAAb,CAAa,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,MAAqB;IAC/C,IAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IAEjC,iFAAiF;IACjF,+DAA+D;IACvD,IAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
|
|
3
3
|
import type React from 'react';
|
|
4
|
+
import type { View } from 'react-native';
|
|
4
5
|
import type { MenuListProps } from '../MenuList/MenuList.types';
|
|
5
6
|
export declare const menuName = "Menu";
|
|
6
7
|
export interface MenuProps extends MenuListProps {
|
|
@@ -32,7 +33,7 @@ export interface MenuState extends MenuProps {
|
|
|
32
33
|
parentPopoverHoverOutTimer?: NodeJS.Timeout;
|
|
33
34
|
setOpen: (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void;
|
|
34
35
|
shouldFocusOnContainer: boolean;
|
|
35
|
-
triggerRef: React.RefObject<
|
|
36
|
+
triggerRef: React.RefObject<View>;
|
|
36
37
|
hasMaxHeight?: boolean;
|
|
37
38
|
hasMaxWidth?: boolean;
|
|
38
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.types.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAK9D,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1E,sBAAsB,EAAE,OAAO,CAAC;IAChC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"Menu.types.d.ts","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAK9D,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS;IAC1C,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1E,sBAAsB,EAAE,OAAO,CAAC;IAChC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Menu.types.js","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Menu.types.js","sourceRoot":"","sources":["../../src/Menu/Menu.types.ts"],"names":[],"mappings":";;;AAKa,QAAA,QAAQ,GAAG,MAAM,CAAC"}
|
|
@@ -21,8 +21,8 @@ exports.MenuItem = (0, framework_1.compose)(tslib_1.__assign(tslib_1.__assign({
|
|
|
21
21
|
return function (final, children) {
|
|
22
22
|
var _a = (0, framework_1.mergeProps)(menuItem.props, final), accessibilityLabel = _a.accessibilityLabel, mergedProps = tslib_1.__rest(_a, ["accessibilityLabel"]);
|
|
23
23
|
var chevronXml = react_native_1.I18nManager.isRTL
|
|
24
|
-
? "\n <svg>\n
|
|
25
|
-
: "\n <svg>\n
|
|
24
|
+
? "\n <svg>\n <path fill='currentColor' d=\"M10.2603 3.20041C10.5639 3.48226 10.5814 3.95681 10.2996 4.26034L6.77348 8L10.2996 11.7397C10.5814 12.0432 10.5639 12.5177 10.2603 12.7996C9.9568 13.0815 9.48226 13.0639 9.2004 12.7603L5.2004 8.51034C4.9332 8.22258 4.9332 7.77743 5.2004 7.48966L9.20041 3.23966C9.48226 2.93613 9.95681 2.91856 10.2603 3.20041Z\"/>\n </svg>"
|
|
25
|
+
: "\n <svg>\n <path fill='currentColor' d=\"M5.73966 3.20041C5.43613 3.48226 5.41856 3.95681 5.70041 4.26034L9.22652 8L5.70041 11.7397C5.41856 12.0432 5.43613 12.5177 5.73967 12.7996C6.0432 13.0815 6.51775 13.0639 6.7996 12.7603L10.7996 8.51034C11.0668 8.22258 11.0668 7.77743 10.7996 7.48966L6.7996 3.23966C6.51775 2.93613 6.0432 2.91856 5.73966 3.20041Z\"/>\n </svg>";
|
|
26
26
|
// We only automatically support the one child string.
|
|
27
27
|
var label = (0, exports.getAccessibilityLabel)(accessibilityLabel, children[0]);
|
|
28
28
|
return ((0, framework_1.withSlots)(Slots.root, tslib_1.__assign({}, mergedProps, { accessibilityLabel: label }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":";;;;AAAA,qBAAqB;AACrB,6CAA4D;AAC5D,qDAA0C;AAE1C,8DAA2F;AAC3F,oDAA6D;AAE7D,mDAAgD;AAChD,6CAA4C;AAC5C,uDAAqD;AAGxC,QAAA,QAAQ,GAAG,IAAA,mBAAO,sCAC7B,WAAW,EAAE,6BAAY,IACtB,kCAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,wBAAS;QACf,SAAS,EAAE,mBAAI;QACf,OAAO,EAAE,aAAI;QACb,gBAAgB,EAAE,yBAAM;KACzB,EACD,SAAS,EAAE,UAAC,SAAwB,EAAE,QAAgC;QACpE,IAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAS,CAAC,CAAC;QACxC,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,UAAC,KAAoB,EAAE,QAAyB;YACrD,IAAM,KAAyC,IAAA,sBAAU,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAxE,kBAAkB,wBAAA,EAAK,WAAW,sBAApC,sBAAsC,CAAoC,CAAC;YACjF,IAAM,UAAU,GAAG,0BAAW,CAAC,KAAK;gBAClC,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"MenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.tsx"],"names":[],"mappings":";;;;AAAA,qBAAqB;AACrB,6CAA4D;AAC5D,qDAA0C;AAE1C,8DAA2F;AAC3F,oDAA6D;AAE7D,mDAAgD;AAChD,6CAA4C;AAC5C,uDAAqD;AAGxC,QAAA,QAAQ,GAAG,IAAA,mBAAO,sCAC7B,WAAW,EAAE,6BAAY,IACtB,kCAAe,KAClB,KAAK,EAAE;QACL,IAAI,EAAE,wBAAS;QACf,SAAS,EAAE,mBAAI;QACf,OAAO,EAAE,aAAI;QACb,gBAAgB,EAAE,yBAAM;KACzB,EACD,SAAS,EAAE,UAAC,SAAwB,EAAE,QAAgC;QACpE,IAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAS,CAAC,CAAC;QACxC,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,UAAC,KAAoB,EAAE,QAAyB;YACrD,IAAM,KAAyC,IAAA,sBAAU,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAxE,kBAAkB,wBAAA,EAAK,WAAW,sBAApC,sBAAsC,CAAoC,CAAC;YACjF,IAAM,UAAU,GAAG,0BAAW,CAAC,KAAK;gBAClC,CAAC,CAAC,wYAGO;gBACT,CAAC,CAAC,0YAGO,CAAC;YAEZ,sDAAsD;YACtD,IAAM,KAAK,GAAG,IAAA,6BAAqB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAErE,OAAO,CACL,2BAAC,KAAK,CAAC,IAAI,uBAAK,WAAW,IAAE,kBAAkB,EAAE,KAAK;gBACnD,QAAQ,CAAC,KAAK,CAAC,aAAa,IAAI,2BAAC,KAAK,CAAC,SAAS,OAAG;gBACnD,QAAQ,IAAI,2BAAC,KAAK,CAAC,OAAO,QAAE,QAAQ,CAAiB;gBACrD,QAAQ,CAAC,KAAK,CAAC,UAAU,IAAI,2BAAC,KAAK,CAAC,gBAAgB,IAAC,GAAG,EAAE,UAAU,GAAI,CAC9D,CACd,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,IACD,CAAC;AAEH,IAAM,2BAA2B,GAAG,UAAC,kBAA0B,EAAE,KAAsB;IACrF,IAAI,kBAAkB,KAAK,SAAS,EAAE;QACpC,OAAO,kBAAkB,CAAC;KAC3B;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AACW,QAAA,qBAAqB,GAAG,IAAA,mBAAO,EAAC,2BAA2B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItem.styling.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGzF,eAAO,MAAM,cAAc,EAAE,CAAC,MAAM,cAAc,CAAC,EAAkD,CAAC;AAEtG,eAAO,MAAM,eAAe,EAAE,iBAAiB,CAAC,aAAa,EAAE,iBAAiB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"MenuItem.styling.d.ts","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAIjF,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGzF,eAAO,MAAM,cAAc,EAAE,CAAC,MAAM,cAAc,CAAC,EAAkD,CAAC;AAEtG,eAAO,MAAM,eAAe,EAAE,iBAAiB,CAAC,aAAa,EAAE,iBAAiB,EAAE,cAAc,CAmD/F,CAAC"}
|
|
@@ -32,10 +32,7 @@ exports.stylingSettings = {
|
|
|
32
32
|
color: tokens.submenuIndicatorColor,
|
|
33
33
|
height: tokens.submenuIndicatorSize,
|
|
34
34
|
width: tokens.submenuIndicatorSize,
|
|
35
|
-
viewBox:
|
|
36
|
-
(tokens.submenuIndicatorSize - tokens.submenuIndicatorPadding * 2) +
|
|
37
|
-
' ' +
|
|
38
|
-
(tokens.submenuIndicatorSize - tokens.submenuIndicatorPadding * 2),
|
|
35
|
+
viewBox: "0 0 ".concat(tokens.submenuIndicatorSize, " ").concat(tokens.submenuIndicatorSize),
|
|
39
36
|
};
|
|
40
37
|
}, ['submenuIndicatorColor', 'submenuIndicatorPadding', 'submenuIndicatorSize']),
|
|
41
38
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItem.styling.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":";;;;AACA,8DAA8D;AAC9D,wDAAuF;AACvF,mDAAyD;AAEzD,mDAAgD;AAEnC,QAAA,cAAc,GAA6B,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAEzF,QAAA,eAAe,GAAwE;IAClG,MAAM,EAAE,CAAC,sCAAqB,EAAE,6BAAY,CAAC;IAC7C,MAAM,EAAE,sBAAc;IACtB,SAAS,EAAE;QACT,IAAI,EAAE,IAAA,sBAAU,EACd,UAAC,MAAsB,EAAE,KAAY,IAAK,OAAA,CAAC;YACzC,KAAK,sCACH,UAAU,EAAE,QAAQ,EACpB,eAAe,EAAE,MAAM,CAAC,eAAe,EACvC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,KAAK,IACjB,qBAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,GAChC,qBAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CACpC;SACF,CAAC,EATwC,CASxC,+CACD,iBAAiB,GAAK,qBAAY,CAAC,IAAI,SAAK,qBAAY,CAAC,IAAI,QAC/D;QACD,SAAS,EAAE,IAAA,sBAAU,EACnB,UAAC,MAAsB,IAAK,OAAA,CAAC;YAC3B,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,CAAC,aAAa;gBAC5B,KAAK,EAAE,MAAM,CAAC,aAAa;gBAC3B,SAAS,EAAE,MAAM,CAAC,GAAG;aACtB;SACF,CAAC,EAN0B,CAM1B,EACF,CAAC,eAAe,EAAE,KAAK,CAAC,CACzB;QACD,OAAO,EAAE,IAAA,sBAAU,EACjB,UAAC,MAAsB,EAAE,KAAY;YACnC,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,qBACH,QAAQ,EAAE,CAAC,IACR,mBAAU,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAClC;aACF,CAAC;QACJ,CAAC,yBACA,OAAO,GAAK,mBAAU,CAAC,IAAI,QAC7B;QACD,gBAAgB,EAAE,IAAA,sBAAU,EAC1B,UAAC,MAAsB;YACrB,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,qBAAqB;gBACnC,MAAM,EAAE,MAAM,CAAC,oBAAoB;gBACnC,KAAK,EAAE,MAAM,CAAC,oBAAoB;gBAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"MenuItem.styling.js","sourceRoot":"","sources":["../../src/MenuItem/MenuItem.styling.ts"],"names":[],"mappings":";;;;AACA,8DAA8D;AAC9D,wDAAuF;AACvF,mDAAyD;AAEzD,mDAAgD;AAEnC,QAAA,cAAc,GAA6B,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAEzF,QAAA,eAAe,GAAwE;IAClG,MAAM,EAAE,CAAC,sCAAqB,EAAE,6BAAY,CAAC;IAC7C,MAAM,EAAE,sBAAc;IACtB,SAAS,EAAE;QACT,IAAI,EAAE,IAAA,sBAAU,EACd,UAAC,MAAsB,EAAE,KAAY,IAAK,OAAA,CAAC;YACzC,KAAK,sCACH,UAAU,EAAE,QAAQ,EACpB,eAAe,EAAE,MAAM,CAAC,eAAe,EACvC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,KAAK,IACjB,qBAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,GAChC,qBAAY,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CACpC;SACF,CAAC,EATwC,CASxC,+CACD,iBAAiB,GAAK,qBAAY,CAAC,IAAI,SAAK,qBAAY,CAAC,IAAI,QAC/D;QACD,SAAS,EAAE,IAAA,sBAAU,EACnB,UAAC,MAAsB,IAAK,OAAA,CAAC;YAC3B,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM,CAAC,aAAa;gBAC5B,KAAK,EAAE,MAAM,CAAC,aAAa;gBAC3B,SAAS,EAAE,MAAM,CAAC,GAAG;aACtB;SACF,CAAC,EAN0B,CAM1B,EACF,CAAC,eAAe,EAAE,KAAK,CAAC,CACzB;QACD,OAAO,EAAE,IAAA,sBAAU,EACjB,UAAC,MAAsB,EAAE,KAAY;YACnC,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,qBACH,QAAQ,EAAE,CAAC,IACR,mBAAU,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAClC;aACF,CAAC;QACJ,CAAC,yBACA,OAAO,GAAK,mBAAU,CAAC,IAAI,QAC7B;QACD,gBAAgB,EAAE,IAAA,sBAAU,EAC1B,UAAC,MAAsB;YACrB,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,qBAAqB;gBACnC,MAAM,EAAE,MAAM,CAAC,oBAAoB;gBACnC,KAAK,EAAE,MAAM,CAAC,oBAAoB;gBAClC,OAAO,EAAE,cAAO,MAAM,CAAC,oBAAoB,cAAI,MAAM,CAAC,oBAAoB,CAAE;aAC7E,CAAC;QACJ,CAAC,EACD,CAAC,uBAAuB,EAAE,yBAAyB,EAAE,sBAAsB,CAAC,CAC7E;KACF;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAcrE,eAAO,MAAM,WAAW,WAAY,aAAa,KAAG,
|
|
1
|
+
{"version":3,"file":"useMenuList.d.ts","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAcrE,eAAO,MAAM,WAAW,WAAY,aAAa,KAAG,aA6GnD,CAAC"}
|
|
@@ -19,7 +19,7 @@ var useMenuList = function (_props) {
|
|
|
19
19
|
var context = (0, menuContext_1.useMenuContext)();
|
|
20
20
|
// MenuList v2 needs to be able to be standalone, but this is not in scope for v1
|
|
21
21
|
// Assuming that checked information will come from parent Menu
|
|
22
|
-
var defaultChecked = context.defaultChecked, onCheckedChangeOriginal = context.onCheckedChange, checkedOriginal = context.checked, isSubmenu = context.isSubmenu, setOpen = context.setOpen;
|
|
22
|
+
var defaultChecked = context.defaultChecked, onCheckedChangeOriginal = context.onCheckedChange, checkedOriginal = context.checked, isSubmenu = context.isSubmenu, setOpen = context.setOpen, triggerRef = context.triggerRef;
|
|
23
23
|
// Convert passed in array to map so that i's easier to look up checked state
|
|
24
24
|
var checkedMap = react_1.default.useMemo(function () {
|
|
25
25
|
var state = {};
|
|
@@ -84,11 +84,13 @@ var useMenuList = function (_props) {
|
|
|
84
84
|
// trigger and popover. Listening to key events directly here to handle this case doesn't work
|
|
85
85
|
// since left and right arrow key events are already handled and swallowed by native behavior
|
|
86
86
|
var onArrowClose = react_1.default.useCallback(function (e) {
|
|
87
|
+
var _a;
|
|
87
88
|
if (!isSubmenu) {
|
|
88
89
|
return;
|
|
89
90
|
}
|
|
90
91
|
setOpen(e, false /* isOpen */, false /* bubble */);
|
|
91
|
-
|
|
92
|
+
(_a = triggerRef === null || triggerRef === void 0 ? void 0 : triggerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
|
|
93
|
+
}, [isSubmenu, setOpen, triggerRef]);
|
|
92
94
|
return {
|
|
93
95
|
props: tslib_1.__assign({}, context),
|
|
94
96
|
isCheckedControlled: isCheckedControlled,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":";;;;AACA,wDAA0B;AAC1B,sDAAwD;AAGxD,2FAA2F;AAC3F,4CAA4C;AAC5C,qGAAqG;AACrG,2HAA2H;AAC3H,IAAM,UAAU,GAAG,EAAE,CAAC;AACtB,IAAM,YAAY,GAAG,UAAC,IAAY;IAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC;AACF,IAAM,eAAe,GAAG,UAAC,IAAY;IACnC,UAAU,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,KAAK,IAAI,EAAb,CAAa,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEK,IAAM,WAAW,GAAG,UAAC,MAAqB;IAC/C,IAAM,OAAO,GAAG,IAAA,4BAAc,GAAE,CAAC;IAEjC,iFAAiF;IACjF,+DAA+D;IACvD,IAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Menu/Menu.types.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
|
|
2
2
|
import type React from 'react';
|
|
3
|
+
import type { View } from 'react-native';
|
|
3
4
|
import type { MenuListProps } from '../MenuList/MenuList.types';
|
|
4
5
|
|
|
5
6
|
export const menuName = 'Menu';
|
|
@@ -42,7 +43,7 @@ export interface MenuState extends MenuProps {
|
|
|
42
43
|
parentPopoverHoverOutTimer?: NodeJS.Timeout;
|
|
43
44
|
setOpen: (e: InteractionEvent, isOpen: boolean, bubble?: boolean) => void;
|
|
44
45
|
shouldFocusOnContainer: boolean;
|
|
45
|
-
triggerRef: React.RefObject<
|
|
46
|
+
triggerRef: React.RefObject<View>;
|
|
46
47
|
hasMaxHeight?: boolean;
|
|
47
48
|
hasMaxWidth?: boolean;
|
|
48
49
|
}
|
|
@@ -52,11 +52,7 @@ export const stylingSettings: UseStylingOptions<MenuItemProps, MenuItemSlotProps
|
|
|
52
52
|
color: tokens.submenuIndicatorColor,
|
|
53
53
|
height: tokens.submenuIndicatorSize,
|
|
54
54
|
width: tokens.submenuIndicatorSize,
|
|
55
|
-
viewBox:
|
|
56
|
-
'0 0 ' +
|
|
57
|
-
(tokens.submenuIndicatorSize - tokens.submenuIndicatorPadding * 2) +
|
|
58
|
-
' ' +
|
|
59
|
-
(tokens.submenuIndicatorSize - tokens.submenuIndicatorPadding * 2),
|
|
55
|
+
viewBox: `0 0 ${tokens.submenuIndicatorSize} ${tokens.submenuIndicatorSize}`,
|
|
60
56
|
};
|
|
61
57
|
},
|
|
62
58
|
['submenuIndicatorColor', 'submenuIndicatorPadding', 'submenuIndicatorSize'],
|
|
@@ -28,11 +28,11 @@ export const MenuItem = compose<MenuItemType>({
|
|
|
28
28
|
const chevronXml = I18nManager.isRTL
|
|
29
29
|
? `
|
|
30
30
|
<svg>
|
|
31
|
-
|
|
31
|
+
<path fill='currentColor' d="M10.2603 3.20041C10.5639 3.48226 10.5814 3.95681 10.2996 4.26034L6.77348 8L10.2996 11.7397C10.5814 12.0432 10.5639 12.5177 10.2603 12.7996C9.9568 13.0815 9.48226 13.0639 9.2004 12.7603L5.2004 8.51034C4.9332 8.22258 4.9332 7.77743 5.2004 7.48966L9.20041 3.23966C9.48226 2.93613 9.95681 2.91856 10.2603 3.20041Z"/>
|
|
32
32
|
</svg>`
|
|
33
33
|
: `
|
|
34
34
|
<svg>
|
|
35
|
-
|
|
35
|
+
<path fill='currentColor' d="M5.73966 3.20041C5.43613 3.48226 5.41856 3.95681 5.70041 4.26034L9.22652 8L5.70041 11.7397C5.41856 12.0432 5.43613 12.5177 5.73967 12.7996C6.0432 13.0815 6.51775 13.0639 6.7996 12.7603L10.7996 8.51034C11.0668 8.22258 11.0668 7.77743 10.7996 7.48966L6.7996 3.23966C6.51775 2.93613 6.0432 2.91856 5.73966 3.20041Z"/>
|
|
36
36
|
</svg>`;
|
|
37
37
|
|
|
38
38
|
// We only automatically support the one child string.
|
|
@@ -20,7 +20,7 @@ export const useMenuList = (_props: MenuListProps): MenuListState => {
|
|
|
20
20
|
|
|
21
21
|
// MenuList v2 needs to be able to be standalone, but this is not in scope for v1
|
|
22
22
|
// Assuming that checked information will come from parent Menu
|
|
23
|
-
const { defaultChecked, onCheckedChange: onCheckedChangeOriginal, checked: checkedOriginal, isSubmenu, setOpen } = context;
|
|
23
|
+
const { defaultChecked, onCheckedChange: onCheckedChangeOriginal, checked: checkedOriginal, isSubmenu, setOpen, triggerRef } = context;
|
|
24
24
|
|
|
25
25
|
// Convert passed in array to map so that i's easier to look up checked state
|
|
26
26
|
const checkedMap = React.useMemo(() => {
|
|
@@ -105,8 +105,9 @@ export const useMenuList = (_props: MenuListProps): MenuListState => {
|
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
setOpen(e, false /* isOpen */, false /* bubble */);
|
|
108
|
+
triggerRef?.current?.focus();
|
|
108
109
|
},
|
|
109
|
-
[isSubmenu, setOpen],
|
|
110
|
+
[isSubmenu, setOpen, triggerRef],
|
|
110
111
|
);
|
|
111
112
|
|
|
112
113
|
return {
|
|
@@ -2498,17 +2498,17 @@ Array [
|
|
|
2498
2498
|
]
|
|
2499
2499
|
}
|
|
2500
2500
|
tintColor={4280558628}
|
|
2501
|
-
vbHeight={
|
|
2502
|
-
vbWidth={
|
|
2501
|
+
vbHeight={16}
|
|
2502
|
+
vbWidth={16}
|
|
2503
2503
|
width={16}
|
|
2504
2504
|
xml="
|
|
2505
2505
|
<svg>
|
|
2506
|
-
|
|
2506
|
+
<path fill='currentColor' d=\\"M5.73966 3.20041C5.43613 3.48226 5.41856 3.95681 5.70041 4.26034L9.22652 8L5.70041 11.7397C5.41856 12.0432 5.43613 12.5177 5.73967 12.7996C6.0432 13.0815 6.51775 13.0639 6.7996 12.7603L10.7996 8.51034C11.0668 8.22258 11.0668 7.77743 10.7996 7.48966L6.7996 3.23966C6.51775 2.93613 6.0432 2.91856 5.73966 3.20041Z\\"/>
|
|
2507
2507
|
</svg>"
|
|
2508
2508
|
>
|
|
2509
2509
|
<RNSVGGroup>
|
|
2510
2510
|
<RNSVGPath
|
|
2511
|
-
d="
|
|
2511
|
+
d="M5.73966 3.20041C5.43613 3.48226 5.41856 3.95681 5.70041 4.26034L9.22652 8L5.70041 11.7397C5.41856 12.0432 5.43613 12.5177 5.73967 12.7996C6.0432 13.0815 6.51775 13.0639 6.7996 12.7603L10.7996 8.51034C11.0668 8.22258 11.0668 7.77743 10.7996 7.48966L6.7996 3.23966C6.51775 2.93613 6.0432 2.91856 5.73966 3.20041Z"
|
|
2512
2512
|
fill={
|
|
2513
2513
|
Array [
|
|
2514
2514
|
2,
|