@fluentui-react-native/menu 1.14.22 → 1.14.24
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 +65 -0
- package/CHANGELOG.md +17 -1
- package/eslint.config.js +3 -0
- package/lib/Menu/Menu.js +5 -5
- package/lib/Menu/Menu.js.map +1 -1
- package/lib/Menu/Menu.types.js +1 -1
- package/lib/Menu/Menu.types.js.map +1 -1
- package/lib/Menu/renderMenu.android.js +5 -5
- package/lib/Menu/renderMenu.android.js.map +1 -1
- package/lib/Menu/renderMenu.js +3 -3
- package/lib/Menu/renderMenu.js.map +1 -1
- package/lib/Menu/useMenu.android.js +86 -61
- package/lib/Menu/useMenu.android.js.map +1 -1
- package/lib/Menu/useMenu.js +39 -29
- package/lib/Menu/useMenu.js.map +1 -1
- package/lib/Menu/useMenuContextValue.js +4 -5
- package/lib/Menu/useMenuContextValue.js.map +1 -1
- package/lib/MenuCallout/MenuCallout.android.js +7 -8
- package/lib/MenuCallout/MenuCallout.android.js.map +1 -1
- package/lib/MenuCallout/MenuCallout.js +4 -5
- package/lib/MenuCallout/MenuCallout.js.map +1 -1
- package/lib/MenuCallout/MenuCallout.types.js +1 -1
- package/lib/MenuCallout/MenuCallout.types.js.map +1 -1
- package/lib/MenuDivider/MenuDivider.js +11 -7
- package/lib/MenuDivider/MenuDivider.js.map +1 -1
- package/lib/MenuDivider/MenuDivider.styling.js +12 -5
- package/lib/MenuDivider/MenuDivider.styling.js.map +1 -1
- package/lib/MenuDivider/MenuDivider.types.js +2 -2
- package/lib/MenuDivider/MenuDivider.types.js.map +1 -1
- package/lib/MenuDivider/MenuDividerTokens.android.js +2 -2
- package/lib/MenuDivider/MenuDividerTokens.android.js.map +1 -1
- package/lib/MenuDivider/MenuDividerTokens.js +2 -2
- package/lib/MenuDivider/MenuDividerTokens.js.map +1 -1
- package/lib/MenuDivider/MenuDividerTokens.macos.js +2 -2
- package/lib/MenuDivider/MenuDividerTokens.macos.js.map +1 -1
- package/lib/MenuDivider/MenuDividerTokens.win32.js +2 -2
- package/lib/MenuDivider/MenuDividerTokens.win32.js.map +1 -1
- package/lib/MenuGroup/MenuGroup.js +25 -30
- package/lib/MenuGroup/MenuGroup.js.map +1 -1
- package/lib/MenuGroup/MenuGroup.types.js +1 -1
- package/lib/MenuGroup/MenuGroup.types.js.map +1 -1
- package/lib/MenuGroupHeader/MenuGroupHeader.js +12 -8
- package/lib/MenuGroupHeader/MenuGroupHeader.js.map +1 -1
- package/lib/MenuGroupHeader/MenuGroupHeader.styling.js +6 -4
- package/lib/MenuGroupHeader/MenuGroupHeader.styling.js.map +1 -1
- package/lib/MenuGroupHeader/MenuGroupHeader.types.js +1 -1
- package/lib/MenuGroupHeader/MenuGroupHeader.types.js.map +1 -1
- package/lib/MenuGroupHeader/MenuGroupHeaderTokens.js +2 -2
- package/lib/MenuGroupHeader/MenuGroupHeaderTokens.js.map +1 -1
- package/lib/MenuGroupHeader/MenuGroupHeaderTokens.macos.js +2 -2
- package/lib/MenuGroupHeader/MenuGroupHeaderTokens.macos.js.map +1 -1
- package/lib/MenuItem/MenuItem.js +31 -21
- package/lib/MenuItem/MenuItem.js.map +1 -1
- package/lib/MenuItem/MenuItem.styling.js +27 -18
- package/lib/MenuItem/MenuItem.styling.js.map +1 -1
- package/lib/MenuItem/MenuItem.types.js +1 -1
- package/lib/MenuItem/MenuItem.types.js.map +1 -1
- package/lib/MenuItem/MenuItemTokens.android.js +2 -2
- package/lib/MenuItem/MenuItemTokens.android.js.map +1 -1
- package/lib/MenuItem/MenuItemTokens.js +2 -2
- package/lib/MenuItem/MenuItemTokens.js.map +1 -1
- package/lib/MenuItem/MenuItemTokens.macos.js +2 -2
- package/lib/MenuItem/MenuItemTokens.macos.js.map +1 -1
- package/lib/MenuItem/MenuItemTokens.win32.js +2 -2
- package/lib/MenuItem/MenuItemTokens.win32.js.map +1 -1
- package/lib/MenuItem/useMenuItem.js +57 -41
- package/lib/MenuItem/useMenuItem.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.js +34 -16
- package/lib/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.styling.js +54 -27
- package/lib/MenuItemCheckbox/MenuItemCheckbox.styling.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.types.js +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.types.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.android.js +2 -2
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.android.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.js +2 -2
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js +2 -2
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.win32.js +2 -2
- package/lib/MenuItemCheckbox/MenuItemCheckboxTokens.win32.js.map +1 -1
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.js +60 -40
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
- package/lib/MenuItemRadio/MenuItemRadio.js +23 -16
- package/lib/MenuItemRadio/MenuItemRadio.js.map +1 -1
- package/lib/MenuItemRadio/MenuItemRadio.styling.android.js +29 -18
- package/lib/MenuItemRadio/MenuItemRadio.styling.android.js.map +1 -1
- package/lib/MenuItemRadio/MenuItemRadio.styling.js +33 -18
- package/lib/MenuItemRadio/MenuItemRadio.styling.js.map +1 -1
- package/lib/MenuItemRadio/MenuItemRadio.types.js +1 -1
- package/lib/MenuItemRadio/MenuItemRadio.types.js.map +1 -1
- package/lib/MenuItemRadio/MenuItemRadioTokens.android.js +2 -2
- package/lib/MenuItemRadio/MenuItemRadioTokens.android.js.map +1 -1
- package/lib/MenuItemRadio/MenuItemRadioTokens.js +2 -2
- package/lib/MenuItemRadio/MenuItemRadioTokens.js.map +1 -1
- package/lib/MenuItemRadio/MenuItemRadioTokens.macos.js +2 -2
- package/lib/MenuItemRadio/MenuItemRadioTokens.macos.js.map +1 -1
- package/lib/MenuItemRadio/useMenuItemRadio.js +11 -11
- package/lib/MenuItemRadio/useMenuItemRadio.js.map +1 -1
- package/lib/MenuList/MenuList.js +46 -39
- package/lib/MenuList/MenuList.js.map +1 -1
- package/lib/MenuList/MenuList.styling.js +10 -6
- package/lib/MenuList/MenuList.styling.js.map +1 -1
- package/lib/MenuList/MenuList.types.js +1 -1
- package/lib/MenuList/MenuList.types.js.map +1 -1
- package/lib/MenuList/MenuListTokens.android.js +2 -2
- package/lib/MenuList/MenuListTokens.android.js.map +1 -1
- package/lib/MenuList/MenuListTokens.js +2 -2
- package/lib/MenuList/MenuListTokens.js.map +1 -1
- package/lib/MenuList/MenuListTokens.macos.js +2 -2
- package/lib/MenuList/MenuListTokens.macos.js.map +1 -1
- package/lib/MenuList/MenuListTokens.win32.js +2 -2
- package/lib/MenuList/MenuListTokens.win32.js.map +1 -1
- package/lib/MenuList/useMenuList.js +63 -69
- package/lib/MenuList/useMenuList.js.map +1 -1
- package/lib/MenuList/useMenuListContextValue.js +2 -3
- package/lib/MenuList/useMenuListContextValue.js.map +1 -1
- package/lib/MenuPopover/MenuPopover.d.ts +1 -1
- package/lib/MenuPopover/MenuPopover.js +29 -27
- package/lib/MenuPopover/MenuPopover.js.map +1 -1
- package/lib/MenuPopover/MenuPopover.types.js +1 -1
- package/lib/MenuPopover/MenuPopover.types.js.map +1 -1
- package/lib/MenuPopover/MenuPopoverTokens.android.js +2 -2
- package/lib/MenuPopover/MenuPopoverTokens.android.js.map +1 -1
- package/lib/MenuPopover/MenuPopoverTokens.d.ts +1 -1
- package/lib/MenuPopover/MenuPopoverTokens.js +1 -1
- package/lib/MenuPopover/MenuPopoverTokens.js.map +1 -1
- package/lib/MenuPopover/MenuPopoverTokens.macos.d.ts +1 -1
- package/lib/MenuPopover/MenuPopoverTokens.macos.js +2 -2
- package/lib/MenuPopover/MenuPopoverTokens.macos.js.map +1 -1
- package/lib/MenuPopover/useMenuPopover.js +33 -35
- package/lib/MenuPopover/useMenuPopover.js.map +1 -1
- package/lib/MenuTrigger/MenuTrigger.js +6 -4
- package/lib/MenuTrigger/MenuTrigger.js.map +1 -1
- package/lib/MenuTrigger/MenuTrigger.types.js +1 -1
- package/lib/MenuTrigger/MenuTrigger.types.js.map +1 -1
- package/lib/MenuTrigger/useMenuTrigger.js +29 -30
- package/lib/MenuTrigger/useMenuTrigger.js.map +1 -1
- package/lib/MenuTrigger/useMergeRefs.js +6 -10
- package/lib/MenuTrigger/useMergeRefs.js.map +1 -1
- package/lib/__tests__/Menu.test.js +21 -21
- package/lib/__tests__/Menu.test.js.map +1 -1
- package/lib/consts.js +1 -1
- package/lib/consts.js.map +1 -1
- package/lib/context/menuContext.js +5 -5
- package/lib/context/menuContext.js.map +1 -1
- package/lib/context/menuListContext.js +9 -9
- package/lib/context/menuListContext.js.map +1 -1
- package/lib/context/menuTriggerContext.js +3 -3
- package/lib/context/menuTriggerContext.js.map +1 -1
- package/lib-commonjs/Menu/Menu.js +12 -12
- package/lib-commonjs/Menu/Menu.js.map +1 -1
- package/lib-commonjs/Menu/renderMenu.android.js +9 -9
- package/lib-commonjs/Menu/renderMenu.android.js.map +1 -1
- package/lib-commonjs/Menu/renderMenu.js +6 -6
- package/lib-commonjs/Menu/renderMenu.js.map +1 -1
- package/lib-commonjs/Menu/useMenu.android.js +91 -65
- package/lib-commonjs/Menu/useMenu.android.js.map +1 -1
- package/lib-commonjs/Menu/useMenu.js +44 -33
- package/lib-commonjs/Menu/useMenu.js.map +1 -1
- package/lib-commonjs/Menu/useMenuContextValue.js +6 -6
- package/lib-commonjs/Menu/useMenuContextValue.js.map +1 -1
- package/lib-commonjs/MenuCallout/MenuCallout.android.js +14 -14
- package/lib-commonjs/MenuCallout/MenuCallout.android.js.map +1 -1
- package/lib-commonjs/MenuCallout/MenuCallout.js +10 -10
- package/lib-commonjs/MenuCallout/MenuCallout.js.map +1 -1
- package/lib-commonjs/MenuDivider/MenuDivider.js +15 -11
- package/lib-commonjs/MenuDivider/MenuDivider.js.map +1 -1
- package/lib-commonjs/MenuDivider/MenuDivider.styling.js +15 -8
- package/lib-commonjs/MenuDivider/MenuDivider.styling.js.map +1 -1
- package/lib-commonjs/MenuDivider/MenuDividerTokens.android.js +3 -3
- package/lib-commonjs/MenuDivider/MenuDividerTokens.android.js.map +1 -1
- package/lib-commonjs/MenuDivider/MenuDividerTokens.js +3 -3
- package/lib-commonjs/MenuDivider/MenuDividerTokens.js.map +1 -1
- package/lib-commonjs/MenuDivider/MenuDividerTokens.macos.js +3 -3
- package/lib-commonjs/MenuDivider/MenuDividerTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuDivider/MenuDividerTokens.win32.js +3 -3
- package/lib-commonjs/MenuDivider/MenuDividerTokens.win32.js.map +1 -1
- package/lib-commonjs/MenuGroup/MenuGroup.js +30 -34
- package/lib-commonjs/MenuGroup/MenuGroup.js.map +1 -1
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeader.js +16 -12
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeader.js.map +1 -1
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeader.styling.js +9 -7
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeader.styling.js.map +1 -1
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeaderTokens.js +3 -3
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeaderTokens.js.map +1 -1
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeaderTokens.macos.js +3 -3
- package/lib-commonjs/MenuGroupHeader/MenuGroupHeaderTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.js +37 -27
- package/lib-commonjs/MenuItem/MenuItem.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.styling.js +30 -21
- package/lib-commonjs/MenuItem/MenuItem.styling.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItemTokens.android.js +3 -3
- package/lib-commonjs/MenuItem/MenuItemTokens.android.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItemTokens.js +3 -3
- package/lib-commonjs/MenuItem/MenuItemTokens.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItemTokens.macos.js +3 -3
- package/lib-commonjs/MenuItem/MenuItemTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItemTokens.win32.js +3 -3
- package/lib-commonjs/MenuItem/MenuItemTokens.win32.js.map +1 -1
- package/lib-commonjs/MenuItem/useMenuItem.js +65 -48
- package/lib-commonjs/MenuItem/useMenuItem.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js +43 -25
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.styling.js +57 -30
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.styling.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.android.js +3 -3
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.android.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.js +3 -3
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js +3 -3
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.win32.js +3 -3
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckboxTokens.win32.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js +69 -48
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/MenuItemRadio.js +32 -25
- package/lib-commonjs/MenuItemRadio/MenuItemRadio.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/MenuItemRadio.styling.android.js +32 -21
- package/lib-commonjs/MenuItemRadio/MenuItemRadio.styling.android.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/MenuItemRadio.styling.js +36 -21
- package/lib-commonjs/MenuItemRadio/MenuItemRadio.styling.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/MenuItemRadioTokens.android.js +3 -3
- package/lib-commonjs/MenuItemRadio/MenuItemRadioTokens.android.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/MenuItemRadioTokens.js +3 -3
- package/lib-commonjs/MenuItemRadio/MenuItemRadioTokens.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/MenuItemRadioTokens.macos.js +3 -3
- package/lib-commonjs/MenuItemRadio/MenuItemRadioTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js +16 -16
- package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js.map +1 -1
- package/lib-commonjs/MenuList/MenuList.js +56 -48
- package/lib-commonjs/MenuList/MenuList.js.map +1 -1
- package/lib-commonjs/MenuList/MenuList.styling.js +13 -9
- package/lib-commonjs/MenuList/MenuList.styling.js.map +1 -1
- package/lib-commonjs/MenuList/MenuListTokens.android.js +3 -3
- package/lib-commonjs/MenuList/MenuListTokens.android.js.map +1 -1
- package/lib-commonjs/MenuList/MenuListTokens.js +3 -3
- package/lib-commonjs/MenuList/MenuListTokens.js.map +1 -1
- package/lib-commonjs/MenuList/MenuListTokens.macos.js +3 -3
- package/lib-commonjs/MenuList/MenuListTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuList/MenuListTokens.win32.js +3 -3
- package/lib-commonjs/MenuList/MenuListTokens.win32.js.map +1 -1
- package/lib-commonjs/MenuList/useMenuList.js +68 -73
- package/lib-commonjs/MenuList/useMenuList.js.map +1 -1
- package/lib-commonjs/MenuList/useMenuListContextValue.js +2 -3
- package/lib-commonjs/MenuList/useMenuListContextValue.js.map +1 -1
- package/lib-commonjs/MenuPopover/MenuPopover.d.ts +1 -1
- package/lib-commonjs/MenuPopover/MenuPopover.js +38 -35
- package/lib-commonjs/MenuPopover/MenuPopover.js.map +1 -1
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.android.js +6 -6
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.android.js.map +1 -1
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.d.ts +1 -1
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.js +3 -3
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.js.map +1 -1
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.macos.d.ts +1 -1
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.macos.js +5 -5
- package/lib-commonjs/MenuPopover/MenuPopoverTokens.macos.js.map +1 -1
- package/lib-commonjs/MenuPopover/useMenuPopover.js +37 -39
- package/lib-commonjs/MenuPopover/useMenuPopover.js.map +1 -1
- package/lib-commonjs/MenuTrigger/MenuTrigger.js +11 -8
- package/lib-commonjs/MenuTrigger/MenuTrigger.js.map +1 -1
- package/lib-commonjs/MenuTrigger/useMenuTrigger.js +35 -35
- package/lib-commonjs/MenuTrigger/useMenuTrigger.js.map +1 -1
- package/lib-commonjs/MenuTrigger/useMergeRefs.js +8 -11
- package/lib-commonjs/MenuTrigger/useMergeRefs.js.map +1 -1
- package/lib-commonjs/__tests__/Menu.test.js +35 -35
- package/lib-commonjs/__tests__/Menu.test.js.map +1 -1
- package/lib-commonjs/consts.js +1 -1
- package/lib-commonjs/consts.js.map +1 -1
- package/lib-commonjs/context/menuContext.js +5 -5
- package/lib-commonjs/context/menuContext.js.map +1 -1
- package/lib-commonjs/context/menuListContext.js +9 -9
- package/lib-commonjs/context/menuListContext.js.map +1 -1
- package/lib-commonjs/context/menuTriggerContext.js +3 -3
- package/lib-commonjs/context/menuTriggerContext.js.map +1 -1
- package/package.json +45 -26
- package/.eslintrc.js +0 -3
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { __assign } from "tslib";
|
|
2
1
|
import React from 'react';
|
|
3
2
|
import { Platform } from 'react-native';
|
|
4
3
|
import { useMenuContext } from '../context/menuContext';
|
|
@@ -7,50 +6,47 @@ import { useMenuListContext } from '../context/menuListContext';
|
|
|
7
6
|
// Purposefully left out of the hook because
|
|
8
7
|
// 1. RadioItems just keeps track of information - changing this array doesn't need to force rerender
|
|
9
8
|
// 2. Keeping them here means these consts are not recreated on every render, which would force rerendering of all children
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
const radioItems = [];
|
|
10
|
+
const addRadioItem = (name) => {
|
|
12
11
|
radioItems.push(name);
|
|
13
12
|
};
|
|
14
|
-
|
|
15
|
-
radioItems.filter(
|
|
13
|
+
const removeRadioItem = (name) => {
|
|
14
|
+
radioItems.filter((item) => item !== name);
|
|
16
15
|
};
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
export
|
|
21
|
-
|
|
22
|
-
var context = useMenuContext();
|
|
16
|
+
const platformsWithoutFocusOnDisabled = ['ios', 'macos'];
|
|
17
|
+
const handledKeys = ['Home', 'End'];
|
|
18
|
+
const handleFocusOnMouseLevae = Platform.OS === 'macos';
|
|
19
|
+
export const useMenuList = (_props) => {
|
|
20
|
+
const context = useMenuContext();
|
|
23
21
|
// MenuList v2 needs to be able to be standalone, but this is not in scope for v1
|
|
24
22
|
// Assuming that checked information will come from parent Menu
|
|
25
|
-
|
|
23
|
+
const { defaultChecked, onCheckedChange: onCheckedChangeOriginal, checked: checkedOriginal, isSubmenu, setOpen, triggerRef } = context;
|
|
26
24
|
// Convert passed in array to map so that i's easier to look up checked state
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
const checkedMap = React.useMemo(() => {
|
|
26
|
+
const state = {};
|
|
29
27
|
if (!checkedOriginal) {
|
|
30
28
|
return state;
|
|
31
29
|
}
|
|
32
|
-
for (
|
|
33
|
-
var key = checkedOriginal_1[_i];
|
|
30
|
+
for (const key of checkedOriginal) {
|
|
34
31
|
state[key] = true;
|
|
35
32
|
}
|
|
36
33
|
return state;
|
|
37
34
|
}, [checkedOriginal]);
|
|
38
|
-
|
|
35
|
+
const [checkedInternal, setCheckedInternal] = React.useState(() => {
|
|
39
36
|
if (checkedMap) {
|
|
40
37
|
return checkedMap;
|
|
41
38
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
for (
|
|
45
|
-
var key = initialChecked_1[_i];
|
|
39
|
+
const initialChecked = defaultChecked ?? [];
|
|
40
|
+
const state = {};
|
|
41
|
+
for (const key of initialChecked) {
|
|
46
42
|
state[key] = true;
|
|
47
43
|
}
|
|
48
44
|
return state;
|
|
49
|
-
})
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
45
|
+
});
|
|
46
|
+
const isCheckedControlled = typeof checkedOriginal !== 'undefined';
|
|
47
|
+
const checked = isCheckedControlled ? checkedMap : checkedInternal;
|
|
48
|
+
const onCheckedChange = React.useCallback((e, name, isChecked) => {
|
|
49
|
+
const updatedChecked = { ...checked };
|
|
54
50
|
if (isChecked) {
|
|
55
51
|
updatedChecked[name] = true;
|
|
56
52
|
}
|
|
@@ -64,10 +60,9 @@ export var useMenuList = function (_props) {
|
|
|
64
60
|
onCheckedChangeOriginal(e, Object.keys(updatedChecked));
|
|
65
61
|
}
|
|
66
62
|
}, [isCheckedControlled, checked, onCheckedChangeOriginal, setCheckedInternal]);
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
for (
|
|
70
|
-
var checkedName = _a[_i];
|
|
63
|
+
const selectRadio = React.useCallback((e, name) => {
|
|
64
|
+
const updatedChecked = {};
|
|
65
|
+
for (const checkedName of Object.keys(checked)) {
|
|
71
66
|
if (!radioItems.includes(checkedName)) {
|
|
72
67
|
// Preserve checked state if non-radio items
|
|
73
68
|
updatedChecked[checkedName] = checked[checkedName];
|
|
@@ -86,13 +81,12 @@ export var useMenuList = function (_props) {
|
|
|
86
81
|
// because it is considered to be inside the submenu due to the Menu component wrapping both the
|
|
87
82
|
// trigger and popover. Listening to key events directly here to handle this case doesn't work
|
|
88
83
|
// since left and right arrow key events are already handled and swallowed by native behavior
|
|
89
|
-
|
|
90
|
-
var _a;
|
|
84
|
+
const onArrowClose = React.useCallback((e) => {
|
|
91
85
|
if (!isSubmenu) {
|
|
92
86
|
return;
|
|
93
87
|
}
|
|
94
88
|
setOpen(e, false /* isOpen */, false /* bubble */);
|
|
95
|
-
|
|
89
|
+
triggerRef?.current?.focus();
|
|
96
90
|
}, [isSubmenu, setOpen, triggerRef]);
|
|
97
91
|
// Handle 'Home' and 'End' keypresses here. Native menus allow 'Home' and 'End' keypresses to jump to the
|
|
98
92
|
// start and end of each menu list. We need to keep track of all MenuItems in our list, and we need access to
|
|
@@ -100,18 +94,15 @@ export var useMenuList = function (_props) {
|
|
|
100
94
|
// and don't allow focus for disabled items.
|
|
101
95
|
// Instead of calling useState to instantiate an array, we call useMemo because we don't want to re-render the
|
|
102
96
|
// MenuList on adding / removing items.
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
var onListKeyDown = function (e) {
|
|
109
|
-
var _a;
|
|
110
|
-
var key = e.nativeEvent.key;
|
|
97
|
+
const trackedMenuItems = React.useMemo(() => [], []);
|
|
98
|
+
const trackMenuItem = React.useCallback((item) => trackedMenuItems.push(item), [trackedMenuItems]);
|
|
99
|
+
const untrackMenuItem = React.useCallback((item) => trackedMenuItems.splice(trackedMenuItems.findIndex((x) => x.ref === item.ref), 1), [trackedMenuItems]);
|
|
100
|
+
const onListKeyDown = (e) => {
|
|
101
|
+
const key = e.nativeEvent.key;
|
|
111
102
|
if (handledKeys.includes(key)) {
|
|
112
103
|
// For iOS and macOS, 'Home' and 'End' must set focus on the first and last enabled item.
|
|
113
104
|
// For other platforms, we can just jump to the first and last keys.
|
|
114
|
-
|
|
105
|
+
let increment, idx;
|
|
115
106
|
if (key === 'Home') {
|
|
116
107
|
increment = 1;
|
|
117
108
|
idx = 0;
|
|
@@ -123,50 +114,53 @@ export var useMenuList = function (_props) {
|
|
|
123
114
|
while (platformsWithoutFocusOnDisabled.includes(Platform.OS) && trackedMenuItems[idx].disabled) {
|
|
124
115
|
idx += increment;
|
|
125
116
|
}
|
|
126
|
-
|
|
117
|
+
trackedMenuItems[idx].ref.current?.focus();
|
|
127
118
|
}
|
|
128
119
|
};
|
|
129
|
-
React.useEffect(
|
|
120
|
+
React.useEffect(() => {
|
|
130
121
|
return function cleanup() {
|
|
131
122
|
clearTimeout(context.triggerHoverOutTimer);
|
|
132
123
|
};
|
|
133
124
|
});
|
|
134
125
|
// focus management
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
(_a = focusZoneRef === null || focusZoneRef === void 0 ? void 0 : focusZoneRef.current) === null || _a === void 0 ? void 0 : _a.focus();
|
|
126
|
+
const focusZoneRef = React.useRef();
|
|
127
|
+
const setFocusZoneFocus = () => {
|
|
128
|
+
focusZoneRef?.current?.focus();
|
|
139
129
|
};
|
|
140
|
-
React.useEffect(
|
|
130
|
+
React.useEffect(() => {
|
|
141
131
|
setFocusZoneFocus();
|
|
142
132
|
}, []);
|
|
143
133
|
return {
|
|
144
|
-
props:
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
134
|
+
props: {
|
|
135
|
+
...context,
|
|
136
|
+
onMouseLeave: handleFocusOnMouseLevae ? setFocusZoneFocus : context.onMouseLeave,
|
|
137
|
+
onKeyDown: onListKeyDown,
|
|
138
|
+
},
|
|
139
|
+
isCheckedControlled,
|
|
140
|
+
checked,
|
|
141
|
+
onArrowClose,
|
|
142
|
+
onCheckedChange,
|
|
143
|
+
selectRadio,
|
|
144
|
+
addRadioItem,
|
|
145
|
+
removeRadioItem,
|
|
146
|
+
trackMenuItem,
|
|
147
|
+
untrackMenuItem,
|
|
148
|
+
hasMaxHeight: context.hasMaxHeight ?? false,
|
|
149
|
+
hasMaxWidth: context.hasMaxWidth ?? false,
|
|
156
150
|
focusZoneRef: focusZoneRef,
|
|
157
151
|
};
|
|
158
152
|
};
|
|
159
153
|
// Hook called in individual MenuItems to keep track of their refs - this is for "Home" and "End" functionality.
|
|
160
|
-
export
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
ref
|
|
164
|
-
disabled
|
|
165
|
-
})
|
|
154
|
+
export const useMenuItemTracking = (ref, disabled) => {
|
|
155
|
+
const { trackMenuItem, untrackMenuItem } = useMenuListContext();
|
|
156
|
+
const item = React.useMemo(() => ({
|
|
157
|
+
ref,
|
|
158
|
+
disabled,
|
|
159
|
+
}), [ref, disabled]);
|
|
166
160
|
// We only want to call this once - when the item initially renders.
|
|
167
|
-
React.useEffect(
|
|
161
|
+
React.useEffect(() => {
|
|
168
162
|
trackMenuItem(item);
|
|
169
|
-
return
|
|
163
|
+
return () => untrackMenuItem(item);
|
|
170
164
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
171
165
|
}, []);
|
|
172
166
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useMenuList.js","sourceRoot":"","sources":["../../src/MenuList/useMenuList.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
return __assign({ hasCheckmarks: state.props.hasCheckmarks, hasIcons: state.props.hasIcons, hasTooltips: state.props.hasTooltips }, state);
|
|
1
|
+
export const useMenuListContextValue = (state) => {
|
|
2
|
+
return { hasCheckmarks: state.props.hasCheckmarks, hasIcons: state.props.hasIcons, hasTooltips: state.props.hasTooltips, ...state };
|
|
4
3
|
};
|
|
5
4
|
//# sourceMappingURL=useMenuListContextValue.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuListContextValue.js","sourceRoot":"","sources":["../../src/MenuList/useMenuListContextValue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useMenuListContextValue.js","sourceRoot":"","sources":["../../src/MenuList/useMenuListContextValue.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAoB,EAAwB,EAAE;IACpF,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,KAAK,EAAE,CAAC;AACtI,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare const MenuPopover: import("@fluentui-react-native/
|
|
1
|
+
export declare const MenuPopover: import("@fluentui-react-native/framework").CustomizableComponent<import("@fluentui-react-native/callout").ICalloutProps, Omit<import("@fluentui-react-native/callout").ICalloutTokens, "anchorRect" | "beakWidth" | "dismissBehaviors"> & {
|
|
2
2
|
borderRadius?: import("react-native").AnimatableNumericValue;
|
|
3
3
|
elevation?: number;
|
|
4
4
|
}, import("@fluentui-react-native/framework").Theme>;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { __assign } from "tslib";
|
|
2
1
|
import React from 'react';
|
|
3
2
|
import { Platform, View } from 'react-native';
|
|
4
3
|
import { compressible, mergeProps, patchTokens, useFluentTheme } from '@fluentui-react-native/framework';
|
|
@@ -7,36 +6,39 @@ import { useMenuPopoverTokens } from './MenuPopoverTokens';
|
|
|
7
6
|
import { useMenuPopover } from './useMenuPopover';
|
|
8
7
|
import { useMenuContext } from '../context';
|
|
9
8
|
import { MenuCallout } from '../MenuCallout';
|
|
10
|
-
export
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
var _b = useTokens(theme), tokens = _b[0], cache = _b[1];
|
|
9
|
+
export const MenuPopover = compressible((props, useTokens) => {
|
|
10
|
+
const { directionalHint, gapSpace, maxHeight, maxWidth, minWidth, minPadding, borderWidth, borderColor, backgroundColor } = props;
|
|
11
|
+
const state = useMenuPopover(props);
|
|
12
|
+
const theme = useFluentTheme();
|
|
13
|
+
const context = useMenuContext();
|
|
14
|
+
let [tokens, cache] = useTokens(theme);
|
|
17
15
|
context.hasMaxHeight = maxHeight != undefined;
|
|
18
|
-
context.minWidth = minWidth
|
|
19
|
-
|
|
20
|
-
directionalHint
|
|
21
|
-
gapSpace
|
|
22
|
-
maxHeight
|
|
23
|
-
maxWidth
|
|
24
|
-
minWidth
|
|
25
|
-
minPadding
|
|
26
|
-
borderWidth
|
|
27
|
-
borderColor
|
|
28
|
-
backgroundColor
|
|
29
|
-
})
|
|
30
|
-
return
|
|
31
|
-
|
|
32
|
-
|
|
16
|
+
context.minWidth = minWidth ?? context.minWidth;
|
|
17
|
+
[tokens, cache] = patchTokens(tokens, cache, {
|
|
18
|
+
directionalHint,
|
|
19
|
+
gapSpace,
|
|
20
|
+
maxHeight,
|
|
21
|
+
maxWidth,
|
|
22
|
+
minWidth,
|
|
23
|
+
minPadding,
|
|
24
|
+
borderWidth,
|
|
25
|
+
borderColor,
|
|
26
|
+
backgroundColor,
|
|
27
|
+
});
|
|
28
|
+
return (final, children) => {
|
|
29
|
+
const mergedProps = mergeProps(tokens, state.props, final);
|
|
30
|
+
const innerViewProps =
|
|
33
31
|
//For windows platforms, styling needs to be set on container view instead of the callout itself for the scrollview to reflect correct width and height
|
|
34
32
|
Platform.OS === 'windows' || Platform.OS === 'win32'
|
|
35
|
-
?
|
|
33
|
+
? {
|
|
34
|
+
...state.innerView,
|
|
35
|
+
style: {
|
|
36
36
|
maxHeight: mergedProps.maxHeight,
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
},
|
|
38
|
+
}
|
|
39
|
+
: state.innerView;
|
|
40
|
+
const content = React.createElement(View, innerViewProps, children);
|
|
41
|
+
return (React.createElement(MenuCallout, { tokens: tokens, ...mergedProps }, content));
|
|
40
42
|
};
|
|
41
43
|
}, useMenuPopoverTokens);
|
|
42
44
|
MenuPopover.displayName = menuPopoverName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGzG,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CACrC,CAAC,KAAuB,EAAE,SAAuC,EAAE,EAAE;IACnE,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAClI,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAEvC,OAAO,CAAC,YAAY,GAAG,SAAS,IAAI,SAAS,CAAC;IAC9C,OAAO,CAAC,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IAEhD,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE;QAC3C,eAAe;QACf,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,UAAU;QACV,WAAW;QACX,WAAW;QACX,eAAe;KAChB,CAAC,CAAC;IAEH,OAAO,CAAC,KAAuB,EAAE,QAAyB,EAAE,EAAE;QAC5D,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3D,MAAM,cAAc;QAClB,uJAAuJ;QACvJ,QAAQ,CAAC,EAAE,KAAK,SAAS,IAAI,QAAQ,CAAC,EAAE,KAAM,OAAe;YAC3D,CAAC,CAAC;gBACE,GAAG,KAAK,CAAC,SAAS;gBAClB,KAAK,EAAE;oBACL,SAAS,EAAE,WAAW,CAAC,SAAS;iBACjC;aACF;YACH,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;QACtB,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;QACpE,OAAO,CACL,oBAAC,WAAW,IAAC,MAAM,EAAE,MAAM,KAAM,WAAW,IACzC,OAAO,CACI,CACf,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,EACD,oBAAoB,CACrB,CAAC;AACF,WAAW,CAAC,WAAW,GAAG,eAAe,CAAC;AAE1C,eAAe,WAAW,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export const menuPopoverName = 'MenuPopover';
|
|
2
2
|
//# sourceMappingURL=MenuPopover.types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopover.types.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.types.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"MenuPopover.types.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.types.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { Dimensions } from 'react-native';
|
|
|
2
2
|
import { buildUseTokens } from '@fluentui-react-native/framework';
|
|
3
3
|
import { globalTokens } from '@fluentui-react-native/theme-tokens';
|
|
4
4
|
import { menuPopoverName } from './MenuPopover.types';
|
|
5
|
-
export
|
|
5
|
+
export const useMenuPopoverTokens = buildUseTokens((t) => ({
|
|
6
6
|
borderWidth: 1,
|
|
7
7
|
borderColor: t.colors.neutralStrokeAccessible,
|
|
8
8
|
maxHeight: Dimensions.get('window').height / 2 - globalTokens.size320,
|
|
@@ -10,5 +10,5 @@ export var useMenuPopoverTokens = buildUseTokens(function (t) { return ({
|
|
|
10
10
|
cornerRadius: globalTokens.corner.radius80,
|
|
11
11
|
elevation: globalTokens.size160,
|
|
12
12
|
minPadding: globalTokens.size160,
|
|
13
|
-
})
|
|
13
|
+
}), menuPopoverName);
|
|
14
14
|
//# sourceMappingURL=MenuPopoverTokens.android.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopoverTokens.android.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopoverTokens.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"MenuPopoverTokens.android.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopoverTokens.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,cAAc,CAChD,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC;IACb,WAAW,EAAE,CAAC;IACd,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,uBAAuB;IAC7C,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,YAAY,CAAC,OAAO;IACrE,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,GAAG,YAAY,CAAC,OAAO;IAC/D,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ;IAC1C,SAAS,EAAE,YAAY,CAAC,OAAO;IAC/B,UAAU,EAAE,YAAY,CAAC,OAAO;CACjC,CAAC,EACF,eAAe,CAChB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const useMenuPopoverTokens: import("@fluentui-react-native/framework").UseTokens<Omit<import("@fluentui-react-native/callout").ICalloutTokens, "anchorRect" | "beakWidth" | "dismissBehaviors"> & {
|
|
2
|
-
borderRadius?: import("react-native/types").AnimatableNumericValue;
|
|
2
|
+
borderRadius?: import("react-native/types/index").AnimatableNumericValue;
|
|
3
3
|
elevation?: number;
|
|
4
4
|
}>;
|
|
5
5
|
//# sourceMappingURL=MenuPopoverTokens.d.ts.map
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { buildUseTokens } from '@fluentui-react-native/framework';
|
|
2
2
|
import { menuPopoverName } from './MenuPopover.types';
|
|
3
|
-
export
|
|
3
|
+
export const useMenuPopoverTokens = buildUseTokens((t) => ({ borderWidth: 1, borderColor: t.colors.neutralStrokeAccessible }), menuPopoverName);
|
|
4
4
|
//# sourceMappingURL=MenuPopoverTokens.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopoverTokens.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopoverTokens.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"MenuPopoverTokens.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopoverTokens.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,cAAc,CAChD,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC,EACjF,eAAe,CAChB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const useMenuPopoverTokens: import("@fluentui-react-native/framework").UseTokens<Omit<import("@fluentui-react-native/callout").ICalloutTokens, "anchorRect" | "beakWidth" | "dismissBehaviors"> & {
|
|
2
|
-
borderRadius?: import("react-native/types").AnimatableNumericValue;
|
|
2
|
+
borderRadius?: import("react-native/types/index").AnimatableNumericValue;
|
|
3
3
|
elevation?: number;
|
|
4
4
|
}>;
|
|
5
5
|
//# sourceMappingURL=MenuPopoverTokens.macos.d.ts.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { buildUseTokens } from '@fluentui-react-native/framework';
|
|
2
2
|
import { getCurrentAppearance, isHighContrast } from '@fluentui-react-native/theming-utils';
|
|
3
3
|
import { menuPopoverName } from './MenuPopover.types';
|
|
4
|
-
export
|
|
4
|
+
export const useMenuPopoverTokens = buildUseTokens((t) => ({
|
|
5
5
|
borderWidth: 1,
|
|
6
6
|
borderRadius: 5,
|
|
7
7
|
borderColor: isHighContrast()
|
|
@@ -9,5 +9,5 @@ export var useMenuPopoverTokens = buildUseTokens(function (t) { return ({
|
|
|
9
9
|
: getCurrentAppearance(t.host.appearance, 'light') === 'dark'
|
|
10
10
|
? t.colors.neutralStroke3
|
|
11
11
|
: t.colors.transparentStroke,
|
|
12
|
-
})
|
|
12
|
+
}), menuPopoverName);
|
|
13
13
|
//# sourceMappingURL=MenuPopoverTokens.macos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopoverTokens.macos.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopoverTokens.macos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAG5F,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"MenuPopoverTokens.macos.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopoverTokens.macos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAG5F,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,cAAc,CAChD,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC;IACb,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;IACf,WAAW,EAAE,cAAc,EAAE;QAC3B,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc;QACzB,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,MAAM;YAC7D,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc;YACzB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB;CAC/B,CAAC,EACF,eAAe,CAChB,CAAC"}
|
|
@@ -1,38 +1,36 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { I18nManager } from 'react-native';
|
|
3
3
|
import { useMenuContext } from '../context/menuContext';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
var _a;
|
|
13
|
-
(_a = props.onDismiss) === null || _a === void 0 ? void 0 : _a.call(props);
|
|
4
|
+
const controlledDismissBehaviors = ['preventDismissOnKeyDown', 'preventDismissOnClickOutside'];
|
|
5
|
+
const stopPropagationKeys = ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight', 'Tab', 'Home', 'End', 'Escape'];
|
|
6
|
+
export const useMenuPopover = (props) => {
|
|
7
|
+
const context = useMenuContext();
|
|
8
|
+
const { setOpen, triggerRef, isControlled, isSubmenu, openOnHover, parentPopoverHoverOutTimer, popoverHoverOutTimer, setPopoverHoverOutTimer, shouldFocusOnContainer, triggerHoverOutTimer, } = context;
|
|
9
|
+
const { onKeyDown: onKeyDownProp, onKeyUp: onKeyUpProp } = props;
|
|
10
|
+
const onDismiss = React.useCallback(() => {
|
|
11
|
+
props.onDismiss?.();
|
|
14
12
|
setOpen(undefined, false /* isOpen */), [setOpen];
|
|
15
13
|
}, [props.onDismiss, setOpen]);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
14
|
+
const dismissBehaviors = isControlled ? controlledDismissBehaviors : undefined;
|
|
15
|
+
const directionalHint = props.directionalHint ?? getDirectionalHint(isSubmenu, I18nManager.isRTL);
|
|
16
|
+
const setInitialFocus = true;
|
|
17
|
+
const doNotTakePointerCapture = props.doNotTakePointerCapture ?? openOnHover;
|
|
18
|
+
const accessibilityRole = 'menu';
|
|
19
|
+
const onMouseEnter = React.useCallback(() => {
|
|
22
20
|
clearTimeout(triggerHoverOutTimer);
|
|
23
21
|
clearTimeout(popoverHoverOutTimer);
|
|
24
22
|
clearTimeout(parentPopoverHoverOutTimer);
|
|
25
23
|
}, [parentPopoverHoverOutTimer, popoverHoverOutTimer, triggerHoverOutTimer]);
|
|
26
|
-
|
|
24
|
+
const onMouseLeave = React.useCallback(() => {
|
|
27
25
|
if (!openOnHover) {
|
|
28
26
|
return;
|
|
29
27
|
}
|
|
30
|
-
|
|
28
|
+
const timer = setTimeout(() => {
|
|
31
29
|
setOpen(undefined, false /* isOpen */);
|
|
32
30
|
}, 500);
|
|
33
31
|
setPopoverHoverOutTimer(timer);
|
|
34
32
|
}, [openOnHover, setOpen, setPopoverHoverOutTimer]);
|
|
35
|
-
|
|
33
|
+
const onKeyDown = React.useCallback((e) => {
|
|
36
34
|
onKeyDownProp && onKeyDownProp(e);
|
|
37
35
|
// Mark key events that move selection as handled.
|
|
38
36
|
// These key events are handled on the native side.
|
|
@@ -40,7 +38,7 @@ export var useMenuPopover = function (props) {
|
|
|
40
38
|
e.stopPropagation();
|
|
41
39
|
}
|
|
42
40
|
}, [onKeyDownProp]);
|
|
43
|
-
|
|
41
|
+
const onKeyUp = React.useCallback((e) => {
|
|
44
42
|
onKeyUpProp && onKeyUpProp(e);
|
|
45
43
|
// Mark key events that move selection as handled.
|
|
46
44
|
// These key events are handled on the native side.
|
|
@@ -48,38 +46,38 @@ export var useMenuPopover = function (props) {
|
|
|
48
46
|
e.stopPropagation();
|
|
49
47
|
}
|
|
50
48
|
}, [onKeyUpProp]);
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
const [canFocusOnPopover, setCanFocusOnPopover] = React.useState(shouldFocusOnContainer);
|
|
50
|
+
const onBlur = React.useCallback(() => {
|
|
53
51
|
setCanFocusOnPopover(false);
|
|
54
52
|
}, [setCanFocusOnPopover]);
|
|
55
|
-
React.useEffect(
|
|
53
|
+
React.useEffect(() => {
|
|
56
54
|
return function cleanup() {
|
|
57
55
|
clearTimeout(popoverHoverOutTimer);
|
|
58
56
|
};
|
|
59
57
|
});
|
|
60
58
|
return {
|
|
61
59
|
props: {
|
|
62
|
-
accessibilityRole
|
|
60
|
+
accessibilityRole,
|
|
63
61
|
target: triggerRef,
|
|
64
|
-
onDismiss
|
|
62
|
+
onDismiss,
|
|
65
63
|
onShow: props.onShow,
|
|
66
|
-
directionalHint
|
|
67
|
-
dismissBehaviors
|
|
68
|
-
doNotTakePointerCapture
|
|
69
|
-
setInitialFocus
|
|
64
|
+
directionalHint,
|
|
65
|
+
dismissBehaviors,
|
|
66
|
+
doNotTakePointerCapture,
|
|
67
|
+
setInitialFocus,
|
|
70
68
|
},
|
|
71
69
|
innerView: {
|
|
72
|
-
onMouseEnter
|
|
73
|
-
onMouseLeave
|
|
74
|
-
onKeyDown
|
|
75
|
-
onKeyUp
|
|
70
|
+
onMouseEnter,
|
|
71
|
+
onMouseLeave,
|
|
72
|
+
onKeyDown,
|
|
73
|
+
onKeyUp,
|
|
76
74
|
accessible: shouldFocusOnContainer,
|
|
77
75
|
focusable: canFocusOnPopover,
|
|
78
|
-
onBlur
|
|
76
|
+
onBlur,
|
|
79
77
|
},
|
|
80
78
|
};
|
|
81
79
|
};
|
|
82
|
-
|
|
80
|
+
const getDirectionalHint = (isSubmenu, isRtl) => {
|
|
83
81
|
if (!isSubmenu) {
|
|
84
82
|
return undefined;
|
|
85
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,
|
|
1
|
+
{"version":3,"file":"useMenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,0BAA0B,GAAG,CAAC,yBAAyB,EAAE,8BAA8B,CAAuB,CAAC;AACrH,MAAM,mBAAmB,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAU,CAAC;AAEzH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAuB,EAAoB,EAAE;IAC1E,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,MAAM,EACJ,OAAO,EACP,UAAU,EACV,YAAY,EACZ,SAAS,EACT,WAAW,EACX,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,GACrB,GAAG,OAAO,CAAC;IAEZ,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAEjE,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACvC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;QACpB,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/B,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,IAAI,kBAAkB,CAAC,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAElG,MAAM,eAAe,GAAG,IAAI,CAAC;IAC7B,MAAM,uBAAuB,GAAG,KAAK,CAAC,uBAAuB,IAAI,WAAW,CAAC;IAC7E,MAAM,iBAAiB,GAAG,MAAM,CAAC;IAEjC,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC1C,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,0BAA0B,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAE7E,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QAC1C,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAEpD,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CACjC,CAAC,CAAC,EAAE,EAAE;QACJ,aAAa,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;QAElC,kDAAkD;QAClD,mDAAmD;QACnD,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YACnD,CAAC,CAAC,eAAe,EAAE,CAAC;SACrB;IACH,CAAC,EACD,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAC/B,CAAC,CAAC,EAAE,EAAE;QACJ,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;QAE9B,kDAAkD;QAClD,mDAAmD;QACnD,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YACnD,CAAC,CAAC,eAAe,EAAE,CAAC;SACrB;IACH,CAAC,EACD,CAAC,WAAW,CAAC,CACd,CAAC;IAEF,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,sBAAsB,CAAC,CAAC;IAClG,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE;QACpC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE3B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,OAAO,SAAS,OAAO;YACrB,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACrC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE;YACL,iBAAiB;YACjB,MAAM,EAAE,UAAU;YAClB,SAAS;YACT,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,eAAe;YACf,gBAAgB;YAChB,uBAAuB;YACvB,eAAe;SAChB;QACD,SAAS,EAAE;YACT,YAAY;YACZ,YAAY;YACZ,SAAS;YACT,OAAO;YACP,UAAU,EAAE,sBAAsB;YAClC,SAAS,EAAE,iBAAiB;YAC5B,MAAM;SACP;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,SAAkB,EAAE,KAAc,EAA+B,EAAE;IAC7F,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,KAAK,EAAE;QACT,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC"}
|
|
@@ -1,19 +1,21 @@
|
|
|
1
|
-
import { __assign } from "tslib";
|
|
2
1
|
import * as React from 'react';
|
|
3
2
|
import { menuTriggerName } from './MenuTrigger.types';
|
|
4
3
|
import { useMenuTrigger } from './useMenuTrigger';
|
|
5
4
|
import { MenuTriggerProvider } from '../context/menuTriggerContext';
|
|
6
|
-
export
|
|
5
|
+
export const MenuTrigger = (props) => {
|
|
7
6
|
if (__DEV__) {
|
|
8
7
|
if (!React.Children.only(props.children)) {
|
|
9
8
|
console.warn('Only expecting one child for MenuTrigger');
|
|
10
9
|
}
|
|
11
10
|
}
|
|
12
|
-
|
|
11
|
+
const menuTrigger = useMenuTrigger(props.children.props);
|
|
13
12
|
// In order to properly support accessibility without erasing props set on the
|
|
14
13
|
// child component which may affect accessibility, we need to modify the
|
|
15
14
|
// state in the inner render so we can access the child component and its props.
|
|
16
|
-
|
|
15
|
+
const revised = React.cloneElement(props.children, {
|
|
16
|
+
...(props.children.props.tooltip && { alwaysShowToolTip: true }),
|
|
17
|
+
...menuTrigger.props,
|
|
18
|
+
});
|
|
17
19
|
return React.createElement(MenuTriggerProvider, { value: menuTrigger.hasSubmenu }, revised);
|
|
18
20
|
};
|
|
19
21
|
MenuTrigger.displayName = menuTriggerName;
|