@fluentui-react-native/menu 1.4.3 → 1.4.5
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/SPEC.md +12 -0
- package/lib/MenuItem/MenuItem.d.ts +1 -0
- package/lib/MenuItem/MenuItem.d.ts.map +1 -1
- package/lib/MenuItem/MenuItem.js +14 -3
- package/lib/MenuItem/MenuItem.js.map +1 -1
- package/lib/MenuItem/MenuItem.types.d.ts +4 -0
- package/lib/MenuItem/MenuItem.types.d.ts.map +1 -1
- package/lib/MenuItem/useMenuItem.d.ts.map +1 -1
- package/lib/MenuItem/useMenuItem.js +4 -4
- package/lib/MenuItem/useMenuItem.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.d.ts.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.js +4 -3
- package/lib/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.types.d.ts +3 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.types.d.ts.map +1 -1
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.js +3 -3
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
- package/lib/MenuList/MenuList.types.d.ts +7 -0
- package/lib/MenuList/MenuList.types.d.ts.map +1 -1
- package/lib/MenuList/useMenuListContextValue.js +1 -1
- package/lib/MenuList/useMenuListContextValue.js.map +1 -1
- package/lib/context/menuContext.d.ts.map +1 -1
- package/lib/context/menuContext.js +1 -0
- package/lib/context/menuContext.js.map +1 -1
- package/lib/context/menuListContext.d.ts +1 -0
- package/lib/context/menuListContext.d.ts.map +1 -1
- package/lib/context/menuListContext.js +1 -0
- package/lib/context/menuListContext.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.d.ts +1 -0
- package/lib-commonjs/MenuItem/MenuItem.d.ts.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.js +15 -4
- package/lib-commonjs/MenuItem/MenuItem.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.types.d.ts +4 -0
- package/lib-commonjs/MenuItem/MenuItem.types.d.ts.map +1 -1
- package/lib-commonjs/MenuItem/useMenuItem.d.ts.map +1 -1
- package/lib-commonjs/MenuItem/useMenuItem.js +4 -4
- package/lib-commonjs/MenuItem/useMenuItem.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.d.ts.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js +3 -2
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.types.d.ts +3 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.types.d.ts.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js +3 -3
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
- package/lib-commonjs/MenuList/MenuList.types.d.ts +7 -0
- package/lib-commonjs/MenuList/MenuList.types.d.ts.map +1 -1
- package/lib-commonjs/MenuList/useMenuListContextValue.js +1 -1
- package/lib-commonjs/MenuList/useMenuListContextValue.js.map +1 -1
- package/lib-commonjs/context/menuContext.d.ts.map +1 -1
- package/lib-commonjs/context/menuContext.js +1 -0
- package/lib-commonjs/context/menuContext.js.map +1 -1
- package/lib-commonjs/context/menuListContext.d.ts +1 -0
- package/lib-commonjs/context/menuListContext.d.ts.map +1 -1
- package/lib-commonjs/context/menuListContext.js +1 -0
- package/lib-commonjs/context/menuListContext.js.map +1 -1
- package/package.json +1 -1
- package/src/MenuItem/MenuItem.tsx +17 -3
- package/src/MenuItem/MenuItem.types.ts +5 -0
- package/src/MenuItem/useMenuItem.ts +4 -3
- package/src/MenuItemCheckbox/MenuItemCheckbox.tsx +4 -3
- package/src/MenuItemCheckbox/MenuItemCheckbox.types.ts +1 -1
- package/src/MenuItemCheckbox/useMenuItemCheckbox.ts +3 -2
- package/src/MenuList/MenuList.types.ts +8 -0
- package/src/MenuList/useMenuListContextValue.ts +1 -1
- package/src/__tests__/__snapshots__/Menu.test.tsx.snap +6 -24
- package/src/context/menuContext.ts +1 -0
- package/src/context/menuListContext.ts +2 -0
|
@@ -10,13 +10,13 @@ var menuContext_1 = require("../context/menuContext");
|
|
|
10
10
|
var menuListContext_1 = require("../context/menuListContext");
|
|
11
11
|
var menuTriggerContext_1 = require("../context/menuTriggerContext");
|
|
12
12
|
exports.triggerKeys = [' ', 'Enter'];
|
|
13
|
-
exports.submenuTriggerKeys = tslib_1.__spreadArray(
|
|
13
|
+
exports.submenuTriggerKeys = tslib_1.__spreadArray(['ArrowLeft', 'ArrowRight'], exports.triggerKeys, true);
|
|
14
14
|
var useMenuItem = function (props) {
|
|
15
15
|
// attach the pressable state handlers
|
|
16
16
|
var defaultComponentRef = React.useRef(null);
|
|
17
17
|
var onClick = props.onClick, accessibilityState = props.accessibilityState, _a = props.componentRef, componentRef = _a === void 0 ? defaultComponentRef : _a, disabled = props.disabled, persistOnClick = props.persistOnClick, rest = tslib_1.__rest(props, ["onClick", "accessibilityState", "componentRef", "disabled", "persistOnClick"]);
|
|
18
18
|
var _b = (0, menuContext_1.useMenuContext)(), isSubmenu = _b.isSubmenu, persistOnItemClick = _b.persistOnItemClick, setOpen = _b.setOpen;
|
|
19
|
-
var _c = (0, menuListContext_1.useMenuListContext)(), hasCheckmarks = _c.hasCheckmarks, onArrowClose = _c.onArrowClose;
|
|
19
|
+
var _c = (0, menuListContext_1.useMenuListContext)(), hasCheckmarks = _c.hasCheckmarks, hasTooltips = _c.hasTooltips, onArrowClose = _c.onArrowClose;
|
|
20
20
|
var isTrigger = (0, menuTriggerContext_1.useMenuTriggerContext)();
|
|
21
21
|
var shouldPersist = persistOnClick !== null && persistOnClick !== void 0 ? persistOnClick : persistOnItemClick;
|
|
22
22
|
var hasSubmenu = isSubmenu && isTrigger;
|
|
@@ -41,7 +41,7 @@ var useMenuItem = function (props) {
|
|
|
41
41
|
}, [componentRef, disabled, hasSubmenu, onArrowClose, onClick, setOpen, shouldPersist]);
|
|
42
42
|
var pressable = (0, interactive_hooks_1.usePressableState)(tslib_1.__assign(tslib_1.__assign({}, rest), { onPress: onInvoke }));
|
|
43
43
|
var itemRef = (0, interactive_hooks_1.useViewCommandFocus)(componentRef);
|
|
44
|
-
var keys = isSubmenu ? exports.submenuTriggerKeys : exports.triggerKeys;
|
|
44
|
+
var keys = disabled ? [] : isSubmenu ? exports.submenuTriggerKeys : exports.triggerKeys;
|
|
45
45
|
// Explicitly override onKeyDown to override the native behavior of moving focus with arrow keys.
|
|
46
46
|
var onKeyDownProps = interactive_hooks_1.useKeyDownProps.apply(void 0, tslib_1.__spreadArray([onInvoke], keys, false));
|
|
47
47
|
(0, exports.useHoverFocusEffect)(pressable.state.hovered, componentRef);
|
|
@@ -53,7 +53,7 @@ var useMenuItem = function (props) {
|
|
|
53
53
|
macos: !disabled,
|
|
54
54
|
default: true, // win32
|
|
55
55
|
}), ref: itemRef }), onKeyDownProps),
|
|
56
|
-
state: tslib_1.__assign(tslib_1.__assign({}, pressable.state), { hasSubmenu: hasSubmenu, hasCheckmarks: hasCheckmarks }),
|
|
56
|
+
state: tslib_1.__assign(tslib_1.__assign({}, pressable.state), { hasSubmenu: hasSubmenu, hasCheckmarks: hasCheckmarks, hasTooltips: hasTooltips }),
|
|
57
57
|
};
|
|
58
58
|
};
|
|
59
59
|
exports.useMenuItem = useMenuItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":";;;;AAAA,mDAA+B;AAE/B,6CAAqD;AAErD,8DAA2D;AAE3D,8EAAoI;AACpI,sDAAwD;AACxD,8DAAgE;AAChE,oEAAsE;AAEzD,QAAA,WAAW,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC7B,QAAA,kBAAkB,
|
|
1
|
+
{"version":3,"file":"useMenuItem.js","sourceRoot":"","sources":["../../src/MenuItem/useMenuItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAY,MAAM,kCAAkC,CAAC;AAGxE,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,eAAO,MAAM,gBAAgB,qLAc3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,oBAAoB,8CAE7B,MAAM,iBAAiB,CAAC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"MenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAY,MAAM,kCAAkC,CAAC;AAGxE,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EAErB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,eAAO,MAAM,gBAAgB,qLAc3B,CAAC;AAEH,eAAO,MAAM,mBAAmB,aACpB,oBAAoB,8CAE7B,MAAM,iBAAiB,CAAC,qBAAqB,CAkB/C,CAAC"}
|
|
@@ -22,12 +22,13 @@ exports.MenuItemCheckbox = (0, framework_1.compose)(tslib_1.__assign(tslib_1.__a
|
|
|
22
22
|
} }));
|
|
23
23
|
var menuItemFinalRender = function (menuItem, Slots) {
|
|
24
24
|
return function (final, children) {
|
|
25
|
-
var _a = (0, framework_1.mergeProps)(menuItem.props, final), accessibilityLabel = _a.accessibilityLabel, mergedProps = tslib_1.__rest(_a, ["accessibilityLabel"]);
|
|
25
|
+
var _a = (0, framework_1.mergeProps)(menuItem.props, final), accessibilityLabel = _a.accessibilityLabel, tooltip = _a.tooltip, mergedProps = tslib_1.__rest(_a, ["accessibilityLabel", "tooltip"]);
|
|
26
26
|
var checkmarkXml = "\n <svg>\n <path fill='currentColor' d='M9.85355 3.14645C10.0488 3.34171 10.0488 3.65829 9.85355 3.85355L5.35355 8.35355C5.15829 8.54882 4.84171 8.54882 4.64645 8.35355L2.64645 6.35355C2.45118 6.15829 2.45118 5.84171 2.64645 5.64645C2.84171 5.45118 3.15829 5.45118 3.35355 5.64645L5 7.29289L9.14645 3.14645C9.34171 2.95118 9.65829 2.95118 9.85355 3.14645Z' />\n </svg>";
|
|
27
27
|
var label = (0, MenuItem_1.getAccessibilityLabel)(accessibilityLabel, children[0]);
|
|
28
|
+
var tooltipResult = (0, MenuItem_1.getTooltip)(tooltip, menuItem.state.hasTooltips, children[0]);
|
|
28
29
|
return ((0, framework_1.withSlots)(Slots.root, tslib_1.__assign({}, mergedProps, { accessibilityLabel: label }),
|
|
29
30
|
(0, framework_1.withSlots)(Slots.checkmark, { xml: checkmarkXml }),
|
|
30
|
-
children && (0, framework_1.withSlots)(Slots.content,
|
|
31
|
+
children && (0, framework_1.withSlots)(Slots.content, { tooltip: tooltipResult }, children)));
|
|
31
32
|
};
|
|
32
33
|
};
|
|
33
34
|
exports.menuItemFinalRender = menuItemFinalRender;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":";;;;AAAA,qBAAqB;AACrB,6CAAyC;AACzC,qDAA0C;AAE1C,8DAAkF;AAClF,oDAA6D;AAO7D,mEAAgE;AAChE,6DAA4D;AAC5D,uEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"MenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.tsx"],"names":[],"mappings":";;;;AAAA,qBAAqB;AACrB,6CAAyC;AACzC,qDAA0C;AAE1C,8DAAkF;AAClF,oDAA6D;AAO7D,mEAAgE;AAChE,6DAA4D;AAC5D,uEAA6D;AAC7D,iDAAyE;AAG5D,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;KACd,EACD,SAAS,EAAE,UAAC,SAAgC,EAAE,QAAwC;QACpF,IAAM,QAAQ,GAAG,IAAA,yCAAmB,EAAC,SAAS,CAAC,CAAC;QAChD,IAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,EAAE,UAAC,KAAK,IAAc,OAAA,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,EAAzC,CAAyC,CAAC,CAAC;QAEjG,OAAO,IAAA,2BAAmB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC,IACD,CAAC;AAEI,IAAM,mBAAmB,GAAG,UACjC,QAA8B,EAC9B,KAAuC;IAEvC,OAAO,UAAC,KAA4B,EAAE,QAAyB;QAC7D,IAAM,KAAkD,IAAA,sBAAU,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,EAAjF,kBAAkB,wBAAA,EAAE,OAAO,aAAA,EAAK,WAAW,sBAA7C,iCAA+C,CAAoC,CAAC;QAC1F,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,QAAQ,IAAI,2BAAC,KAAK,CAAC,OAAO,IAAC,OAAO,EAAE,aAAa,IAAG,QAAQ,CAAiB,CACnE,CACd,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,mBAAmB,uBAqB9B"}
|
|
@@ -35,7 +35,9 @@ export interface MenuItemCheckboxProps extends MenuItemProps {
|
|
|
35
35
|
}
|
|
36
36
|
export interface MenuItemCheckboxInfo {
|
|
37
37
|
props: MenuItemCheckboxProps & React.ComponentPropsWithRef<any>;
|
|
38
|
-
state: PressableState
|
|
38
|
+
state: PressableState & {
|
|
39
|
+
hasTooltips: boolean;
|
|
40
|
+
};
|
|
39
41
|
}
|
|
40
42
|
export interface MenuItemCheckboxSlotProps {
|
|
41
43
|
root: React.PropsWithRef<PressablePropsExtended>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuItemCheckbox.types.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AACvG,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEhF,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AAEvD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,cAAc,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACjI;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAE5B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AACD,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAChE,KAAK,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"MenuItemCheckbox.types.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/MenuItemCheckbox.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AACvG,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEhF,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AAEvD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,cAAc,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACjI;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;IAE5B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AACD,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAChE,KAAK,EAAE,cAAc,GAAG;QAAE,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;CAClD;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,QAAQ,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,SAAS,EAAE,yBAAyB,CAAC;CACtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAE5F,OAAO,KAAK,EAAE,gBAAgB,EAAiB,MAAM,0CAA0C,CAAC;AAQhG,eAAO,MAAM,mBAAmB,UAAW,qBAAqB,KAAG,oBAgBlE,CAAC;AAUF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,UAC9B,qBAAqB,sBACR,gBAAgB,KAAK,IAAI,KAC5C,
|
|
1
|
+
{"version":3,"file":"useMenuItemCheckbox.d.ts","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAE5F,OAAO,KAAK,EAAE,gBAAgB,EAAiB,MAAM,0CAA0C,CAAC;AAQhG,eAAO,MAAM,mBAAmB,UAAW,qBAAqB,KAAG,oBAgBlE,CAAC;AAUF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,UAC9B,qBAAqB,sBACR,gBAAgB,KAAK,IAAI,KAC5C,oBA4FF,CAAC"}
|
|
@@ -43,7 +43,7 @@ var useMenuCheckboxInteraction = function (props, toggleCallback) {
|
|
|
43
43
|
var defaultComponentRef = React.useRef(null);
|
|
44
44
|
var accessibilityActions = props.accessibilityActions, accessibilityLabel = props.accessibilityLabel, accessibilityState = props.accessibilityState, _a = props.componentRef, componentRef = _a === void 0 ? defaultComponentRef : _a, disabled = props.disabled, name = props.name, onAccessibilityAction = props.onAccessibilityAction, rest = tslib_1.__rest(props, ["accessibilityActions", "accessibilityLabel", "accessibilityState", "componentRef", "disabled", "name", "onAccessibilityAction"]);
|
|
45
45
|
var isSubmenu = (0, menuContext_1.useMenuContext)().isSubmenu;
|
|
46
|
-
var _b = (0, menuListContext_1.useMenuListContext)(), checked = _b.checked, onArrowClose = _b.onArrowClose;
|
|
46
|
+
var _b = (0, menuListContext_1.useMenuListContext)(), checked = _b.checked, hasTooltips = _b.hasTooltips, onArrowClose = _b.onArrowClose;
|
|
47
47
|
var isChecked = checked === null || checked === void 0 ? void 0 : checked[name];
|
|
48
48
|
// Ensure focus is placed on checkbox after click
|
|
49
49
|
var toggleCheckedWithFocus = (0, interactive_hooks_1.useOnPressWithFocus)(componentRef, toggleCallback);
|
|
@@ -61,7 +61,7 @@ var useMenuCheckboxInteraction = function (props, toggleCallback) {
|
|
|
61
61
|
onArrowClose === null || onArrowClose === void 0 ? void 0 : onArrowClose(e);
|
|
62
62
|
}
|
|
63
63
|
}, [disabled, isSubmenu, onArrowClose, toggleCallback]);
|
|
64
|
-
var keys = isSubmenu ? useMenuItem_1.submenuTriggerKeys : useMenuItem_1.triggerKeys;
|
|
64
|
+
var keys = disabled ? [] : isSubmenu ? useMenuItem_1.submenuTriggerKeys : useMenuItem_1.triggerKeys;
|
|
65
65
|
var onKeyProps = interactive_hooks_1.useKeyDownProps.apply(void 0, tslib_1.__spreadArray([onKeysPressed], keys, false));
|
|
66
66
|
var accessibilityActionsProp = accessibilityActions
|
|
67
67
|
? tslib_1.__spreadArray(tslib_1.__spreadArray([], defaultAccessibilityActions, true), accessibilityActions, true) : defaultAccessibilityActions;
|
|
@@ -74,7 +74,7 @@ var useMenuCheckboxInteraction = function (props, toggleCallback) {
|
|
|
74
74
|
}
|
|
75
75
|
}, [disabled, toggleCallback, onAccessibilityAction]);
|
|
76
76
|
(0, useMenuItem_1.useHoverFocusEffect)(pressable.state.hovered, componentRef);
|
|
77
|
-
var state = tslib_1.__assign(tslib_1.__assign({}, pressable.state), { checked: isChecked, disabled: disabled });
|
|
77
|
+
var state = tslib_1.__assign(tslib_1.__assign({}, pressable.state), { checked: isChecked, disabled: disabled, hasTooltips: hasTooltips });
|
|
78
78
|
return {
|
|
79
79
|
props: tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, pressable.props), { accessible: true, accessibilityActions: accessibilityActionsProp, accessibilityLabel: accessibilityLabel, accessibilityRole: 'menuitem', accessibilityState: getAccessibilityState(disabled, state.checked, accessibilityState), disabled: disabled, enableFocusRing: react_native_1.Platform.select({
|
|
80
80
|
macos: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":";;;;AAAA,mDAA+B;AAE/B,6CAAqD;AAErD,8DAA2D;AAE3D,8EAAwI;AACxI,8DAAgE;AAChE,uDAA+F;AAC/F,sDAAwD;AAExD,IAAM,2BAA2B,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AAElD,IAAM,mBAAmB,GAAG,UAAC,KAA4B;;IACtD,IAAA,QAAQ,GAAW,KAAK,SAAhB,EAAE,IAAI,GAAK,KAAK,KAAV,CAAW;IACjC,IAAM,OAAO,GAAG,IAAA,oCAAkB,GAAE,CAAC;IACrC,IAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,IAAI,CAAC,CAAC;IACxC,IAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAEhD,IAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CACrC,UAAC,CAAmB;QAClB,IAAI,CAAC,QAAQ,EAAE;YACb,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;SACpC;IACH,CAAC,EACD,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC,CAC3C,CAAC;IAEF,OAAO,IAAA,kCAA0B,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC;AAhBW,QAAA,mBAAmB,uBAgB9B;AAEF,IAAM,qBAAqB,GAAG,IAAA,mBAAO,EAAC,2BAA2B,CAAC,CAAC;AACnE,SAAS,2BAA2B,CAAC,QAAiB,EAAE,OAAgB,EAAE,kBAAuC;IAC/G,IAAI,kBAAkB,EAAE;QACtB,0BAAS,QAAQ,UAAA,EAAE,OAAO,SAAA,IAAK,kBAAkB,EAAG;KACrD;IACD,OAAO,EAAE,QAAQ,UAAA,EAAE,OAAO,SAAA,EAAE,CAAC;AAC/B,CAAC;AAED;;;;;;;GAOG;AACI,IAAM,0BAA0B,GAAG,UACxC,KAA4B,EAC5B,cAA6C;IAE7C,IAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE7C,IAAA,oBAAoB,GAQlB,KAAK,qBARa,EACpB,kBAAkB,GAOhB,KAAK,mBAPW,EAClB,kBAAkB,GAMhB,KAAK,mBANW,EAClB,KAKE,KAAK,aAL2B,EAAlC,YAAY,mBAAG,mBAAmB,KAAA,EAClC,QAAQ,GAIN,KAAK,SAJC,EACR,IAAI,GAGF,KAAK,KAHH,EACJ,qBAAqB,GAEnB,KAAK,sBAFc,EAClB,IAAI,kBACL,KAAK,EATH,iIASL,CADQ,CACC;IAEV,IAAM,SAAS,GAAG,IAAA,4BAAc,GAAE,CAAC,SAAS,CAAC;IAEvC,IAAA,
|
|
1
|
+
{"version":3,"file":"useMenuItemCheckbox.js","sourceRoot":"","sources":["../../src/MenuItemCheckbox/useMenuItemCheckbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,13 @@ export interface MenuListProps extends Omit<IViewProps, 'onPress'> {
|
|
|
25
25
|
* States that menu items can contain selectable items and reserves space for item alignment
|
|
26
26
|
*/
|
|
27
27
|
hasCheckmarks?: boolean;
|
|
28
|
+
/**
|
|
29
|
+
* States that menu items all have tooltips with its text by default.
|
|
30
|
+
*
|
|
31
|
+
* This option is useful for programmatically generated items to provide
|
|
32
|
+
* text for options that end up having tuncated text.
|
|
33
|
+
*/
|
|
34
|
+
hasTooltips?: boolean;
|
|
28
35
|
/**
|
|
29
36
|
* Callback when checked items change
|
|
30
37
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuList.types.d.ts","sourceRoot":"","sources":["../../src/MenuList/MenuList.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,YAAY,aAAa,CAAC;AAEvC,MAAM,WAAW,cAAe,SAAQ,YAAY,EAAE,sBAAsB;IAC1E;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,cAAc,CAAC;CAC/B;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;IAChE;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACnE;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,iBAAiB,CAAC;IACvF,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC7C,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAClF,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,iBAAiB,CAAC;CAC9B"}
|
|
1
|
+
{"version":3,"file":"MenuList.types.d.ts","sourceRoot":"","sources":["../../src/MenuList/MenuList.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,eAAO,MAAM,YAAY,aAAa,CAAC;AAEvC,MAAM,WAAW,cAAe,SAAQ,YAAY,EAAE,sBAAsB;IAC1E;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,cAAc,CAAC;CAC/B;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;IAChE;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACnE;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,iBAAiB,CAAC;IACvF,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC7C,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAClF,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,iBAAiB,CAAC;CAC9B"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.useMenuListContextValue = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var useMenuListContextValue = function (state) {
|
|
6
|
-
return tslib_1.__assign({ hasCheckmarks: state.props.hasCheckmarks }, state);
|
|
6
|
+
return tslib_1.__assign({ hasCheckmarks: state.props.hasCheckmarks, hasTooltips: state.props.hasTooltips }, state);
|
|
7
7
|
};
|
|
8
8
|
exports.useMenuListContextValue = useMenuListContextValue;
|
|
9
9
|
//# sourceMappingURL=useMenuListContextValue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuListContextValue.js","sourceRoot":"","sources":["../../src/MenuList/useMenuListContextValue.ts"],"names":[],"mappings":";;;;AAGO,IAAM,uBAAuB,GAAG,UAAC,KAAoB;IAC1D,0BAAS,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,aAAa,IAAK,KAAK,EAAG;
|
|
1
|
+
{"version":3,"file":"useMenuListContextValue.js","sourceRoot":"","sources":["../../src/MenuList/useMenuListContextValue.ts"],"names":[],"mappings":";;;;AAGO,IAAM,uBAAuB,GAAG,UAAC,KAAoB;IAC1D,0BAAS,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,IAAK,KAAK,EAAG;AACtG,CAAC,CAAC;AAFW,QAAA,uBAAuB,2BAElC"}
|
|
@@ -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,
|
|
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,iCActB,CAAC;AAEH,eAAO,MAAM,YAAY,kCAAuB,CAAC;AACjD,eAAO,MAAM,cAAc,wBAAsC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menuContext.js","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";;;;AAAA,mDAA+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;IAChB,YAAY,EAAE,KAAK;IACnB,WAAW,EAAE,KAAK;CACnB,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,mDAA+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,WAAW,EAAE,KAAK;IAClB,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;IAChB,YAAY,EAAE,KAAK;IACnB,WAAW,EAAE,KAAK;CACnB,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"}
|
|
@@ -5,6 +5,7 @@ import type { MenuListState } from '../MenuList/MenuList.types';
|
|
|
5
5
|
*/
|
|
6
6
|
export type MenuListContextValue = Omit<MenuListState, 'props'> & {
|
|
7
7
|
hasCheckmarks: boolean;
|
|
8
|
+
hasTooltips: boolean;
|
|
8
9
|
};
|
|
9
10
|
export declare const MenuListContext: React.Context<MenuListContextValue>;
|
|
10
11
|
export declare const MenuListProvider: React.Provider<MenuListContextValue>;
|
|
@@ -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,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG;IAChE,aAAa,EAAE,OAAO,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,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG;IAChE,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,eAAe,qCAS1B,CAAC;AAEH,eAAO,MAAM,gBAAgB,sCAA2B,CAAC;AACzD,eAAO,MAAM,kBAAkB,4BAA0C,CAAC"}
|
|
@@ -7,6 +7,7 @@ exports.MenuListContext = React.createContext({
|
|
|
7
7
|
isCheckedControlled: false,
|
|
8
8
|
checked: {},
|
|
9
9
|
hasCheckmarks: false,
|
|
10
|
+
hasTooltips: false,
|
|
10
11
|
onCheckedChange: function () { return false; },
|
|
11
12
|
onArrowClose: function () { return false; },
|
|
12
13
|
addRadioItem: function () { return false; },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menuListContext.js","sourceRoot":"","sources":["../../src/context/menuListContext.ts"],"names":[],"mappings":";;;;AAAA,mDAA+B;
|
|
1
|
+
{"version":3,"file":"menuListContext.js","sourceRoot":"","sources":["../../src/context/menuListContext.ts"],"names":[],"mappings":";;;;AAAA,mDAA+B;AAWlB,QAAA,eAAe,GAAG,KAAK,CAAC,aAAa,CAAuB;IACvE,mBAAmB,EAAE,KAAK;IAC1B,OAAO,EAAE,EAAE;IACX,aAAa,EAAE,KAAK;IACpB,WAAW,EAAE,KAAK;IAClB,eAAe,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IAC5B,YAAY,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IACzB,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
|
@@ -24,7 +24,7 @@ export const MenuItem = compose<MenuItemType>({
|
|
|
24
24
|
const Slots = useSlots(userProps, (layer): boolean => menuItem.state[layer] || userProps[layer]);
|
|
25
25
|
|
|
26
26
|
return (final: MenuItemProps, children: React.ReactNode) => {
|
|
27
|
-
const { accessibilityLabel, ...mergedProps } = mergeProps(menuItem.props, final);
|
|
27
|
+
const { accessibilityLabel, tooltip, ...mergedProps } = mergeProps(menuItem.props, final);
|
|
28
28
|
const chevronXml = I18nManager.isRTL
|
|
29
29
|
? `
|
|
30
30
|
<svg>
|
|
@@ -37,11 +37,12 @@ export const MenuItem = compose<MenuItemType>({
|
|
|
37
37
|
|
|
38
38
|
// We only automatically support the one child string.
|
|
39
39
|
const label = getAccessibilityLabel(accessibilityLabel, children[0]);
|
|
40
|
+
const tooltipResult = getTooltip(tooltip, menuItem.state.hasTooltips, children[0]);
|
|
40
41
|
|
|
41
42
|
return (
|
|
42
43
|
<Slots.root {...mergedProps} accessibilityLabel={label}>
|
|
43
44
|
{menuItem.state.hasCheckmarks && <Slots.checkmark />}
|
|
44
|
-
{children && <Slots.content>{children}</Slots.content>}
|
|
45
|
+
{children && <Slots.content tooltip={tooltipResult}>{children}</Slots.content>}
|
|
45
46
|
{menuItem.state.hasSubmenu && <Slots.submenuIndicator xml={chevronXml} />}
|
|
46
47
|
</Slots.root>
|
|
47
48
|
);
|
|
@@ -58,6 +59,19 @@ const getAccessibilityLabelWorker = (accessibilityLabel: string, child: React.Re
|
|
|
58
59
|
return child;
|
|
59
60
|
}
|
|
60
61
|
|
|
61
|
-
return
|
|
62
|
+
return undefined;
|
|
62
63
|
};
|
|
63
64
|
export const getAccessibilityLabel = memoize(getAccessibilityLabelWorker);
|
|
65
|
+
|
|
66
|
+
const getTooltipWorker = (tooltip: string, hasTooltips: boolean, child: React.ReactNode) => {
|
|
67
|
+
if (tooltip !== undefined) {
|
|
68
|
+
return tooltip;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if (hasTooltips && typeof child === 'string') {
|
|
72
|
+
return child;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
return undefined;
|
|
76
|
+
};
|
|
77
|
+
export const getTooltip = memoize(getTooltipWorker);
|
|
@@ -67,6 +67,11 @@ export interface MenuItemState extends PressableState {
|
|
|
67
67
|
* If the menu item is a trigger for a submenu
|
|
68
68
|
*/
|
|
69
69
|
hasSubmenu?: boolean;
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* States that menu items all have tooltips with its text by default.
|
|
73
|
+
*/
|
|
74
|
+
hasTooltips?: boolean;
|
|
70
75
|
}
|
|
71
76
|
|
|
72
77
|
export interface MenuItemInfo {
|
|
@@ -10,14 +10,14 @@ import { useMenuListContext } from '../context/menuListContext';
|
|
|
10
10
|
import { useMenuTriggerContext } from '../context/menuTriggerContext';
|
|
11
11
|
|
|
12
12
|
export const triggerKeys = [' ', 'Enter'];
|
|
13
|
-
export const submenuTriggerKeys = [
|
|
13
|
+
export const submenuTriggerKeys = ['ArrowLeft', 'ArrowRight', ...triggerKeys];
|
|
14
14
|
|
|
15
15
|
export const useMenuItem = (props: MenuItemProps): MenuItemInfo => {
|
|
16
16
|
// attach the pressable state handlers
|
|
17
17
|
const defaultComponentRef = React.useRef(null);
|
|
18
18
|
const { onClick, accessibilityState, componentRef = defaultComponentRef, disabled, persistOnClick, ...rest } = props;
|
|
19
19
|
const { isSubmenu, persistOnItemClick, setOpen } = useMenuContext();
|
|
20
|
-
const { hasCheckmarks, onArrowClose } = useMenuListContext();
|
|
20
|
+
const { hasCheckmarks, hasTooltips, onArrowClose } = useMenuListContext();
|
|
21
21
|
const isTrigger = useMenuTriggerContext();
|
|
22
22
|
const shouldPersist = persistOnClick ?? persistOnItemClick;
|
|
23
23
|
|
|
@@ -53,7 +53,7 @@ export const useMenuItem = (props: MenuItemProps): MenuItemInfo => {
|
|
|
53
53
|
|
|
54
54
|
const pressable = usePressableState({ ...rest, onPress: onInvoke });
|
|
55
55
|
const itemRef = useViewCommandFocus(componentRef);
|
|
56
|
-
const keys = isSubmenu ? submenuTriggerKeys : triggerKeys;
|
|
56
|
+
const keys = disabled ? [] : isSubmenu ? submenuTriggerKeys : triggerKeys;
|
|
57
57
|
|
|
58
58
|
// Explicitly override onKeyDown to override the native behavior of moving focus with arrow keys.
|
|
59
59
|
const onKeyDownProps = useKeyDownProps(onInvoke, ...keys);
|
|
@@ -83,6 +83,7 @@ export const useMenuItem = (props: MenuItemProps): MenuItemInfo => {
|
|
|
83
83
|
...pressable.state,
|
|
84
84
|
hasSubmenu,
|
|
85
85
|
hasCheckmarks,
|
|
86
|
+
hasTooltips,
|
|
86
87
|
},
|
|
87
88
|
};
|
|
88
89
|
};
|
|
@@ -13,7 +13,7 @@ import type {
|
|
|
13
13
|
import { menuItemCheckboxName } from './MenuItemCheckbox.types';
|
|
14
14
|
import { useMenuItemCheckbox } from './useMenuItemCheckbox';
|
|
15
15
|
import { stylingSettings } from './MenuItemCheckbox.styling';
|
|
16
|
-
import { getAccessibilityLabel } from '../MenuItem/MenuItem';
|
|
16
|
+
import { getAccessibilityLabel, getTooltip } from '../MenuItem/MenuItem';
|
|
17
17
|
import React from 'react';
|
|
18
18
|
|
|
19
19
|
export const MenuItemCheckbox = compose<MenuItemCheckboxType>({
|
|
@@ -37,18 +37,19 @@ export const menuItemFinalRender = (
|
|
|
37
37
|
Slots: Slots<MenuItemCheckboxSlotProps>,
|
|
38
38
|
): React.FunctionComponent<MenuItemCheckboxProps> => {
|
|
39
39
|
return (final: MenuItemCheckboxProps, children: React.ReactNode) => {
|
|
40
|
-
const { accessibilityLabel, ...mergedProps } = mergeProps(menuItem.props, final);
|
|
40
|
+
const { accessibilityLabel, tooltip, ...mergedProps } = mergeProps(menuItem.props, final);
|
|
41
41
|
const checkmarkXml = `
|
|
42
42
|
<svg>
|
|
43
43
|
<path fill='currentColor' d='M9.85355 3.14645C10.0488 3.34171 10.0488 3.65829 9.85355 3.85355L5.35355 8.35355C5.15829 8.54882 4.84171 8.54882 4.64645 8.35355L2.64645 6.35355C2.45118 6.15829 2.45118 5.84171 2.64645 5.64645C2.84171 5.45118 3.15829 5.45118 3.35355 5.64645L5 7.29289L9.14645 3.14645C9.34171 2.95118 9.65829 2.95118 9.85355 3.14645Z' />
|
|
44
44
|
</svg>`;
|
|
45
45
|
|
|
46
46
|
const label = getAccessibilityLabel(accessibilityLabel, children[0]);
|
|
47
|
+
const tooltipResult = getTooltip(tooltip, menuItem.state.hasTooltips, children[0]);
|
|
47
48
|
|
|
48
49
|
return (
|
|
49
50
|
<Slots.root {...mergedProps} accessibilityLabel={label}>
|
|
50
51
|
<Slots.checkmark xml={checkmarkXml} />
|
|
51
|
-
{children && <Slots.content>{children}</Slots.content>}
|
|
52
|
+
{children && <Slots.content tooltip={tooltipResult}>{children}</Slots.content>}
|
|
52
53
|
</Slots.root>
|
|
53
54
|
);
|
|
54
55
|
};
|
|
@@ -42,7 +42,7 @@ export interface MenuItemCheckboxProps extends MenuItemProps {
|
|
|
42
42
|
}
|
|
43
43
|
export interface MenuItemCheckboxInfo {
|
|
44
44
|
props: MenuItemCheckboxProps & React.ComponentPropsWithRef<any>;
|
|
45
|
-
state: PressableState;
|
|
45
|
+
state: PressableState & { hasTooltips: boolean };
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
export interface MenuItemCheckboxSlotProps {
|
|
@@ -63,7 +63,7 @@ export const useMenuCheckboxInteraction = (
|
|
|
63
63
|
|
|
64
64
|
const isSubmenu = useMenuContext().isSubmenu;
|
|
65
65
|
|
|
66
|
-
const { checked, onArrowClose } = useMenuListContext();
|
|
66
|
+
const { checked, hasTooltips, onArrowClose } = useMenuListContext();
|
|
67
67
|
const isChecked = checked?.[name];
|
|
68
68
|
|
|
69
69
|
// Ensure focus is placed on checkbox after click
|
|
@@ -90,7 +90,7 @@ export const useMenuCheckboxInteraction = (
|
|
|
90
90
|
[disabled, isSubmenu, onArrowClose, toggleCallback],
|
|
91
91
|
);
|
|
92
92
|
|
|
93
|
-
const keys = isSubmenu ? submenuTriggerKeys : triggerKeys;
|
|
93
|
+
const keys = disabled ? [] : isSubmenu ? submenuTriggerKeys : triggerKeys;
|
|
94
94
|
const onKeyProps = useKeyDownProps(onKeysPressed, ...keys);
|
|
95
95
|
|
|
96
96
|
const accessibilityActionsProp = accessibilityActions
|
|
@@ -114,6 +114,7 @@ export const useMenuCheckboxInteraction = (
|
|
|
114
114
|
...pressable.state,
|
|
115
115
|
checked: isChecked,
|
|
116
116
|
disabled,
|
|
117
|
+
hasTooltips,
|
|
117
118
|
};
|
|
118
119
|
|
|
119
120
|
return {
|
|
@@ -31,6 +31,14 @@ export interface MenuListProps extends Omit<IViewProps, 'onPress'> {
|
|
|
31
31
|
*/
|
|
32
32
|
hasCheckmarks?: boolean;
|
|
33
33
|
|
|
34
|
+
/**
|
|
35
|
+
* States that menu items all have tooltips with its text by default.
|
|
36
|
+
*
|
|
37
|
+
* This option is useful for programmatically generated items to provide
|
|
38
|
+
* text for options that end up having tuncated text.
|
|
39
|
+
*/
|
|
40
|
+
hasTooltips?: boolean;
|
|
41
|
+
|
|
34
42
|
/**
|
|
35
43
|
* Callback when checked items change
|
|
36
44
|
*
|
|
@@ -2,5 +2,5 @@ import type { MenuListContextValue } from '../context/menuListContext';
|
|
|
2
2
|
import type { MenuListState } from './MenuList.types';
|
|
3
3
|
|
|
4
4
|
export const useMenuListContextValue = (state: MenuListState): MenuListContextValue => {
|
|
5
|
-
return { hasCheckmarks: state.props.hasCheckmarks, ...state };
|
|
5
|
+
return { hasCheckmarks: state.props.hasCheckmarks, hasTooltips: state.props.hasTooltips, ...state };
|
|
6
6
|
};
|
|
@@ -296,16 +296,7 @@ Array [
|
|
|
296
296
|
accessible={true}
|
|
297
297
|
enableFocusRing={true}
|
|
298
298
|
focusable={true}
|
|
299
|
-
keyDownEvents={
|
|
300
|
-
Array [
|
|
301
|
-
Object {
|
|
302
|
-
"key": " ",
|
|
303
|
-
},
|
|
304
|
-
Object {
|
|
305
|
-
"key": "Enter",
|
|
306
|
-
},
|
|
307
|
-
]
|
|
308
|
-
}
|
|
299
|
+
keyDownEvents={Array []}
|
|
309
300
|
onAccessibilityTap={[Function]}
|
|
310
301
|
onBlur={[Function]}
|
|
311
302
|
onClick={[Function]}
|
|
@@ -860,16 +851,7 @@ Array [
|
|
|
860
851
|
accessible={true}
|
|
861
852
|
enableFocusRing={true}
|
|
862
853
|
focusable={true}
|
|
863
|
-
keyDownEvents={
|
|
864
|
-
Array [
|
|
865
|
-
Object {
|
|
866
|
-
"key": " ",
|
|
867
|
-
},
|
|
868
|
-
Object {
|
|
869
|
-
"key": "Enter",
|
|
870
|
-
},
|
|
871
|
-
]
|
|
872
|
-
}
|
|
854
|
+
keyDownEvents={Array []}
|
|
873
855
|
onAccessibilityAction={[Function]}
|
|
874
856
|
onBlur={[Function]}
|
|
875
857
|
onClick={[Function]}
|
|
@@ -2414,16 +2396,16 @@ Array [
|
|
|
2414
2396
|
keyDownEvents={
|
|
2415
2397
|
Array [
|
|
2416
2398
|
Object {
|
|
2417
|
-
"key": "
|
|
2399
|
+
"key": "ArrowLeft",
|
|
2418
2400
|
},
|
|
2419
2401
|
Object {
|
|
2420
|
-
"key": "
|
|
2402
|
+
"key": "ArrowRight",
|
|
2421
2403
|
},
|
|
2422
2404
|
Object {
|
|
2423
|
-
"key": "
|
|
2405
|
+
"key": " ",
|
|
2424
2406
|
},
|
|
2425
2407
|
Object {
|
|
2426
|
-
"key": "
|
|
2408
|
+
"key": "Enter",
|
|
2427
2409
|
},
|
|
2428
2410
|
]
|
|
2429
2411
|
}
|
|
@@ -6,12 +6,14 @@ import type { MenuListState } from '../MenuList/MenuList.types';
|
|
|
6
6
|
*/
|
|
7
7
|
export type MenuListContextValue = Omit<MenuListState, 'props'> & {
|
|
8
8
|
hasCheckmarks: boolean;
|
|
9
|
+
hasTooltips: boolean;
|
|
9
10
|
};
|
|
10
11
|
|
|
11
12
|
export const MenuListContext = React.createContext<MenuListContextValue>({
|
|
12
13
|
isCheckedControlled: false,
|
|
13
14
|
checked: {},
|
|
14
15
|
hasCheckmarks: false,
|
|
16
|
+
hasTooltips: false,
|
|
15
17
|
onCheckedChange: () => false,
|
|
16
18
|
onArrowClose: () => false,
|
|
17
19
|
addRadioItem: () => false,
|