@fluentui-react-native/menu 0.12.0 → 0.14.0
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 +46 -1
- package/CHANGELOG.md +26 -2
- package/jest.config.js +2 -0
- package/lib/Menu/Menu.types.d.ts +2 -0
- package/lib/Menu/Menu.types.d.ts.map +1 -1
- package/lib/Menu/useMenu.d.ts.map +1 -1
- package/lib/Menu/useMenu.js +8 -3
- package/lib/Menu/useMenu.js.map +1 -1
- package/lib/Menu/useMenuContextValue.d.ts.map +1 -1
- package/lib/Menu/useMenuContextValue.js +4 -1
- package/lib/Menu/useMenuContextValue.js.map +1 -1
- package/lib/MenuItem/MenuItem.js +1 -1
- package/lib/MenuItem/MenuItem.js.map +1 -1
- package/lib/MenuItem/useMenuItem.d.ts.map +1 -1
- package/lib/MenuItem/useMenuItem.js +34 -6
- package/lib/MenuItem/useMenuItem.js.map +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.js +1 -1
- package/lib/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.js +12 -8
- package/lib/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
- package/lib/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
- package/lib/MenuItemRadio/useMenuItemRadio.js +5 -3
- package/lib/MenuItemRadio/useMenuItemRadio.js.map +1 -1
- package/lib/MenuPopover/MenuPopover.d.ts.map +1 -1
- package/lib/MenuPopover/MenuPopover.js +7 -3
- package/lib/MenuPopover/MenuPopover.js.map +1 -1
- package/lib/MenuPopover/MenuPopover.types.d.ts +4 -10
- package/lib/MenuPopover/MenuPopover.types.d.ts.map +1 -1
- package/lib/MenuPopover/useMenuPopover.d.ts.map +1 -1
- package/lib/MenuPopover/useMenuPopover.js +35 -8
- package/lib/MenuPopover/useMenuPopover.js.map +1 -1
- package/lib/MenuTrigger/MenuTrigger.js +8 -8
- package/lib/MenuTrigger/MenuTrigger.js.map +1 -1
- package/lib/MenuTrigger/useMenuTrigger.d.ts.map +1 -1
- package/lib/MenuTrigger/useMenuTrigger.js +21 -20
- package/lib/MenuTrigger/useMenuTrigger.js.map +1 -1
- package/lib/__tests__/Menu.test.d.ts +2 -0
- package/lib/__tests__/Menu.test.d.ts.map +1 -0
- package/lib/__tests__/Menu.test.js +145 -0
- package/lib/__tests__/Menu.test.js.map +1 -0
- package/lib/consts.d.ts +3 -0
- package/lib/consts.d.ts.map +1 -0
- package/lib/consts.js +7 -0
- package/lib/consts.js.map +1 -0
- package/lib/context/menuContext.d.ts +10 -4
- package/lib/context/menuContext.d.ts.map +1 -1
- package/lib/context/menuContext.js.map +1 -1
- package/lib-commonjs/Menu/Menu.types.d.ts +2 -0
- package/lib-commonjs/Menu/Menu.types.d.ts.map +1 -1
- package/lib-commonjs/Menu/useMenu.d.ts.map +1 -1
- package/lib-commonjs/Menu/useMenu.js +8 -3
- package/lib-commonjs/Menu/useMenu.js.map +1 -1
- package/lib-commonjs/Menu/useMenuContextValue.d.ts.map +1 -1
- package/lib-commonjs/Menu/useMenuContextValue.js +4 -1
- package/lib-commonjs/Menu/useMenuContextValue.js.map +1 -1
- package/lib-commonjs/MenuItem/MenuItem.js +1 -1
- package/lib-commonjs/MenuItem/MenuItem.js.map +1 -1
- package/lib-commonjs/MenuItem/useMenuItem.d.ts.map +1 -1
- package/lib-commonjs/MenuItem/useMenuItem.js +32 -4
- package/lib-commonjs/MenuItem/useMenuItem.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js +1 -1
- package/lib-commonjs/MenuItemCheckbox/MenuItemCheckbox.js.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.d.ts.map +1 -1
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js +12 -8
- package/lib-commonjs/MenuItemCheckbox/useMenuItemCheckbox.js.map +1 -1
- package/lib-commonjs/MenuItemRadio/useMenuItemRadio.d.ts.map +1 -1
- package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js +5 -3
- package/lib-commonjs/MenuItemRadio/useMenuItemRadio.js.map +1 -1
- package/lib-commonjs/MenuPopover/MenuPopover.d.ts.map +1 -1
- package/lib-commonjs/MenuPopover/MenuPopover.js +5 -2
- package/lib-commonjs/MenuPopover/MenuPopover.js.map +1 -1
- package/lib-commonjs/MenuPopover/MenuPopover.types.d.ts +4 -10
- package/lib-commonjs/MenuPopover/MenuPopover.types.d.ts.map +1 -1
- package/lib-commonjs/MenuPopover/useMenuPopover.d.ts.map +1 -1
- package/lib-commonjs/MenuPopover/useMenuPopover.js +35 -8
- package/lib-commonjs/MenuPopover/useMenuPopover.js.map +1 -1
- package/lib-commonjs/MenuTrigger/MenuTrigger.js +8 -8
- package/lib-commonjs/MenuTrigger/MenuTrigger.js.map +1 -1
- package/lib-commonjs/MenuTrigger/useMenuTrigger.d.ts.map +1 -1
- package/lib-commonjs/MenuTrigger/useMenuTrigger.js +21 -20
- package/lib-commonjs/MenuTrigger/useMenuTrigger.js.map +1 -1
- package/lib-commonjs/__tests__/Menu.test.d.ts +2 -0
- package/lib-commonjs/__tests__/Menu.test.d.ts.map +1 -0
- package/lib-commonjs/__tests__/Menu.test.js +148 -0
- package/lib-commonjs/__tests__/Menu.test.js.map +1 -0
- package/lib-commonjs/consts.d.ts +3 -0
- package/lib-commonjs/consts.d.ts.map +1 -0
- package/lib-commonjs/consts.js +10 -0
- package/lib-commonjs/consts.js.map +1 -0
- package/lib-commonjs/context/menuContext.d.ts +10 -4
- package/lib-commonjs/context/menuContext.d.ts.map +1 -1
- package/lib-commonjs/context/menuContext.js.map +1 -1
- package/package.json +3 -1
- package/src/Menu/Menu.types.ts +1 -0
- package/src/Menu/useMenu.ts +9 -2
- package/src/Menu/useMenuContextValue.ts +4 -1
- package/src/MenuItem/MenuItem.tsx +1 -1
- package/src/MenuItem/useMenuItem.ts +48 -8
- package/src/MenuItemCheckbox/MenuItemCheckbox.tsx +1 -1
- package/src/MenuItemCheckbox/useMenuItemCheckbox.ts +12 -8
- package/src/MenuItemRadio/useMenuItemRadio.ts +5 -3
- package/src/MenuPopover/MenuPopover.tsx +7 -14
- package/src/MenuPopover/MenuPopover.types.ts +4 -9
- package/src/MenuPopover/useMenuPopover.ts +48 -8
- package/src/MenuTrigger/MenuTrigger.tsx +9 -9
- package/src/MenuTrigger/useMenuTrigger.ts +36 -26
- package/src/__tests__/Menu.test.tsx +235 -0
- package/src/__tests__/__snapshots__/Menu.test.tsx.snap +2098 -0
- package/src/consts.ts +8 -0
- package/src/context/menuContext.ts +6 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopover.d.ts","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MenuPopover.d.ts","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,uHAatB,CAAC;AAGH,eAAe,WAAW,CAAC"}
|
|
@@ -7,11 +7,14 @@ var framework_1 = require("@fluentui-react-native/framework");
|
|
|
7
7
|
var callout_1 = require("@fluentui-react-native/callout");
|
|
8
8
|
var MenuPopover_types_1 = require("./MenuPopover.types");
|
|
9
9
|
var useMenuPopover_1 = require("./useMenuPopover");
|
|
10
|
+
var react_native_1 = require("react-native");
|
|
10
11
|
exports.MenuPopover = (0, framework_1.stagedComponent)(function (props) {
|
|
11
12
|
var state = (0, useMenuPopover_1.useMenuPopover)(props);
|
|
12
13
|
var theme = (0, framework_1.useFluentTheme)();
|
|
13
|
-
return function (
|
|
14
|
-
|
|
14
|
+
return function (final, children) {
|
|
15
|
+
var mergedProps = (0, framework_1.mergeProps)(state.props, final);
|
|
16
|
+
var content = react_1.default.createElement(react_native_1.View, state.innerView, children);
|
|
17
|
+
return (react_1.default.createElement(callout_1.Callout, (0, tslib_1.__assign)({ borderWidth: 1, borderColor: theme.colors.neutralStrokeAccessible }, mergedProps), content));
|
|
15
18
|
};
|
|
16
19
|
});
|
|
17
20
|
exports.MenuPopover.displayName = MenuPopover_types_1.menuPopoverName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.tsx"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"MenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.tsx"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,8DAA+F;AAC/F,0DAAyD;AACzD,yDAAwE;AACxE,mDAAkD;AAClD,6CAAoC;AAEvB,QAAA,WAAW,GAAG,IAAA,2BAAe,EAAC,UAAC,KAAuB;IACjE,IAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,KAAK,CAAC,CAAC;IACpC,IAAM,KAAK,GAAG,IAAA,0BAAc,GAAE,CAAC;IAE/B,OAAO,UAAC,KAAuB,EAAE,QAAyB;QACxD,IAAM,WAAW,GAAG,IAAA,sBAAU,EAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnD,IAAM,OAAO,GAAG,eAAK,CAAC,aAAa,CAAC,mBAAI,EAAE,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACrE,OAAO,CACL,8BAAC,iBAAO,0BAAC,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,uBAAuB,IAAM,WAAW,GACxF,OAAO,CACA,CACX,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,mBAAW,CAAC,WAAW,GAAG,mCAAe,CAAC;AAE1C,kBAAe,mBAAW,CAAC"}
|
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import { AccessibilityRole } from 'react-native';
|
|
1
|
+
import { IViewProps } from '@fluentui-react-native/adapters';
|
|
2
|
+
import { ICalloutProps } from '@fluentui-react-native/callout';
|
|
4
3
|
export declare const menuPopoverName = "MenuPopover";
|
|
5
4
|
export declare type MenuPopoverProps = ICalloutProps;
|
|
6
5
|
export interface MenuPopoverState {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
dismissBehaviors: DismissBehaviors[];
|
|
10
|
-
doNotTakePointerCapture: boolean;
|
|
11
|
-
onDismiss: () => void;
|
|
12
|
-
setInitialFocus: boolean;
|
|
13
|
-
triggerRef: React.RefObject<React.Component>;
|
|
6
|
+
props: ICalloutProps;
|
|
7
|
+
innerView: IViewProps;
|
|
14
8
|
}
|
|
15
9
|
//# sourceMappingURL=MenuPopover.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuPopover.types.d.ts","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MenuPopover.types.d.ts","sourceRoot":"","sources":["../../src/MenuPopover/MenuPopover.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,oBAAY,gBAAgB,GAAG,aAAa,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,UAAU,CAAC;CACvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuPopover.d.ts","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"useMenuPopover.d.ts","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAKzE,eAAO,MAAM,cAAc,WAAY,gBAAgB,KAAG,gBAuDzD,CAAC"}
|
|
@@ -5,21 +5,48 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var react_1 = (0, tslib_1.__importDefault)(require("react"));
|
|
6
6
|
var react_native_1 = require("react-native");
|
|
7
7
|
var menuContext_1 = require("../context/menuContext");
|
|
8
|
+
var consts_1 = require("../consts");
|
|
9
|
+
var controlledDismissBehaviors = ['preventDismissOnKeyDown', 'preventDismissOnClickOutside'];
|
|
8
10
|
var useMenuPopover = function (_props) {
|
|
9
11
|
var context = (0, menuContext_1.useMenuContext)();
|
|
10
|
-
var setOpen = context.setOpen;
|
|
11
|
-
var triggerRef = context.triggerRef;
|
|
12
|
+
var setOpen = context.setOpen, triggerRef = context.triggerRef, isControlled = context.isControlled, isSubmenu = context.isSubmenu, openOnHover = context.openOnHover, parentPopoverHoverOutTimer = context.parentPopoverHoverOutTimer, popoverHoverOutTimer = context.popoverHoverOutTimer, setPopoverHoverOutTimer = context.setPopoverHoverOutTimer, triggerHoverOutTimer = context.triggerHoverOutTimer;
|
|
12
13
|
var onDismiss = react_1.default.useCallback(function () { return setOpen(undefined, false /* isOpen */); }, [setOpen]);
|
|
13
|
-
var dismissBehaviors =
|
|
14
|
-
|
|
15
|
-
: undefined;
|
|
16
|
-
var directionalHint = getDirectionalHint(context.isSubmenu, react_native_1.I18nManager.isRTL);
|
|
14
|
+
var dismissBehaviors = isControlled ? controlledDismissBehaviors : undefined;
|
|
15
|
+
var directionalHint = getDirectionalHint(isSubmenu, react_native_1.I18nManager.isRTL);
|
|
17
16
|
// Initial focus behavior differs per platform, Windows platforms move focus
|
|
18
17
|
// automatically onto first element of Callout
|
|
19
18
|
var setInitialFocus = react_native_1.Platform.OS === 'win32' || react_native_1.Platform.OS === 'windows';
|
|
20
|
-
var doNotTakePointerCapture =
|
|
19
|
+
var doNotTakePointerCapture = openOnHover;
|
|
21
20
|
var accessibilityRole = 'menu';
|
|
22
|
-
|
|
21
|
+
var onMouseEnter = react_1.default.useCallback(function () {
|
|
22
|
+
clearTimeout(triggerHoverOutTimer);
|
|
23
|
+
clearTimeout(popoverHoverOutTimer);
|
|
24
|
+
clearTimeout(parentPopoverHoverOutTimer);
|
|
25
|
+
}, [parentPopoverHoverOutTimer, popoverHoverOutTimer, triggerHoverOutTimer]);
|
|
26
|
+
var onMouseLeave = react_1.default.useCallback(function () {
|
|
27
|
+
if (!openOnHover) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
var timer = setTimeout(function () {
|
|
31
|
+
setOpen(undefined, false /* isOpen */);
|
|
32
|
+
}, 500);
|
|
33
|
+
setPopoverHoverOutTimer(timer);
|
|
34
|
+
}, [openOnHover, setOpen, setPopoverHoverOutTimer]);
|
|
35
|
+
return {
|
|
36
|
+
props: {
|
|
37
|
+
accessibilityRole: accessibilityRole,
|
|
38
|
+
target: triggerRef,
|
|
39
|
+
onDismiss: onDismiss,
|
|
40
|
+
directionalHint: directionalHint,
|
|
41
|
+
dismissBehaviors: dismissBehaviors,
|
|
42
|
+
doNotTakePointerCapture: doNotTakePointerCapture,
|
|
43
|
+
setInitialFocus: setInitialFocus,
|
|
44
|
+
},
|
|
45
|
+
innerView: {
|
|
46
|
+
onMouseEnter: onMouseEnter,
|
|
47
|
+
onMouseLeave: consts_1.isCloseOnHoverOutEnabled && onMouseLeave,
|
|
48
|
+
},
|
|
49
|
+
};
|
|
23
50
|
};
|
|
24
51
|
exports.useMenuPopover = useMenuPopover;
|
|
25
52
|
var getDirectionalHint = function (isSubmenu, isRtl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,6CAAqD;AAErD,sDAAwD;
|
|
1
|
+
{"version":3,"file":"useMenuPopover.js","sourceRoot":"","sources":["../../src/MenuPopover/useMenuPopover.ts"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,6CAAqD;AAErD,sDAAwD;AAExD,oCAAqD;AAErD,IAAM,0BAA0B,GAAG,CAAC,yBAAyB,EAAE,8BAA8B,CAAuB,CAAC;AAE9G,IAAM,cAAc,GAAG,UAAC,MAAwB;IACrD,IAAM,OAAO,GAAG,IAAA,4BAAc,GAAE,CAAC;IAE/B,IAAA,OAAO,GASL,OAAO,QATF,EACP,UAAU,GAQR,OAAO,WARC,EACV,YAAY,GAOV,OAAO,aAPG,EACZ,SAAS,GAMP,OAAO,UANA,EACT,WAAW,GAKT,OAAO,YALE,EACX,0BAA0B,GAIxB,OAAO,2BAJiB,EAC1B,oBAAoB,GAGlB,OAAO,qBAHW,EACpB,uBAAuB,GAErB,OAAO,wBAFc,EACvB,oBAAoB,GAClB,OAAO,qBADW,CACV;IAEZ,IAAM,SAAS,GAAG,eAAK,CAAC,WAAW,CAAC,cAAM,OAAA,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,EAAtC,CAAsC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7F,IAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,IAAM,eAAe,GAAG,kBAAkB,CAAC,SAAS,EAAE,0BAAW,CAAC,KAAK,CAAC,CAAC;IAEzE,4EAA4E;IAC5E,8CAA8C;IAC9C,IAAM,eAAe,GAAG,uBAAQ,CAAC,EAAE,KAAM,OAAe,IAAI,uBAAQ,CAAC,EAAE,KAAK,SAAS,CAAC;IACtF,IAAM,uBAAuB,GAAG,WAAW,CAAC;IAC5C,IAAM,iBAAiB,GAAG,MAAM,CAAC;IAEjC,IAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CAAC;QACrC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACnC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,0BAA0B,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC7E,IAAM,YAAY,GAAG,eAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,IAAM,KAAK,GAAG,UAAU,CAAC;YACvB,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE;YACL,iBAAiB,mBAAA;YACjB,MAAM,EAAE,UAAU;YAClB,SAAS,WAAA;YACT,eAAe,iBAAA;YACf,gBAAgB,kBAAA;YAChB,uBAAuB,yBAAA;YACvB,eAAe,iBAAA;SAChB;QACD,SAAS,EAAE;YACT,YAAY,cAAA;YACZ,YAAY,EAAE,iCAAwB,IAAI,YAAY;SACvD;KACF,CAAC;AACJ,CAAC,CAAC;AAvDW,QAAA,cAAc,kBAuDzB;AAEF,IAAM,kBAAkB,GAAG,UAAC,SAAkB,EAAE,KAAc;IAC5D,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,KAAK,EAAE;QACT,OAAO,aAAa,CAAC;KACtB;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC"}
|
|
@@ -20,28 +20,28 @@ exports.MenuTrigger = (0, framework_1.stagedComponent)(function (props) {
|
|
|
20
20
|
// child component which may affect accessibility, we need to modify the
|
|
21
21
|
// state in the inner render so we can access the child component and its props.
|
|
22
22
|
var child = childrenArray[0];
|
|
23
|
-
var
|
|
24
|
-
var revised = react_1.default.cloneElement(child,
|
|
23
|
+
var revisedProps = getRevisedState(menuTrigger, child.props);
|
|
24
|
+
var revised = react_1.default.cloneElement(child, revisedProps);
|
|
25
25
|
return react_1.default.createElement(menuTriggerContext_1.MenuTriggerProvider, { value: menuTrigger.hasSubmenu }, revised);
|
|
26
26
|
};
|
|
27
27
|
});
|
|
28
28
|
exports.MenuTrigger.displayName = MenuTrigger_types_1.menuTriggerName;
|
|
29
29
|
var getRevisedState = (0, framework_1.memoize)(getRevisedStateWorker);
|
|
30
30
|
function getRevisedStateWorker(state, props) {
|
|
31
|
-
var
|
|
31
|
+
var revisedProps = state.props;
|
|
32
32
|
if (props.accessibilityState) {
|
|
33
|
-
|
|
33
|
+
revisedProps.accessibilityState = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, revisedProps.accessibilityState), props.accessibilityState);
|
|
34
34
|
}
|
|
35
35
|
if (props.accessibilityActions) {
|
|
36
|
-
|
|
36
|
+
revisedProps.accessibilityActions = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, revisedProps.accessibilityActions), props.accessibilityActions);
|
|
37
37
|
}
|
|
38
38
|
if (props.onAccessibilityAction) {
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
revisedProps.onAccessibilityAction = function (e) {
|
|
40
|
+
revisedProps.onAccessibilityAction(e);
|
|
41
41
|
props.onAccessibilityAction(e);
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
|
-
return
|
|
44
|
+
return revisedProps;
|
|
45
45
|
}
|
|
46
46
|
exports.default = exports.MenuTrigger;
|
|
47
47
|
//# sourceMappingURL=MenuTrigger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MenuTrigger.js","sourceRoot":"","sources":["../../src/MenuTrigger/MenuTrigger.tsx"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,8DAA4E;AAC5E,yDAA0F;AAC1F,mDAAkD;AAElD,oEAAoE;AAEvD,QAAA,WAAW,GAAG,IAAA,2BAAe,EAAC,UAAC,KAAuB;IACjE,IAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,KAAK,CAAC,CAAC;IAE1C,OAAO,UAAC,KAAuB,EAAE,QAAyB;QACxD,IAAM,aAAa,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAE/E,IAAI,OAAO,EAAE;YACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;aACzD;SACF;QAED,8EAA8E;QAC9E,wEAAwE;QACxE,gFAAgF;QAChF,IAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAM,YAAY,GAAG,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAM,OAAO,GAAG,eAAK,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAExD,OAAO,8BAAC,wCAAmB,IAAC,KAAK,EAAE,WAAW,CAAC,UAAU,IAAG,OAAO,CAAuB,CAAC;IAC7F,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,mBAAW,CAAC,WAAW,GAAG,mCAAe,CAAC;AAE1C,IAAM,eAAe,GAAG,IAAA,mBAAO,EAAC,qBAAqB,CAAC,CAAC;AACvD,SAAS,qBAAqB,CAAC,KAAuB,EAAE,KAAU;IAChE,IAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"MenuTrigger.js","sourceRoot":"","sources":["../../src/MenuTrigger/MenuTrigger.tsx"],"names":[],"mappings":";;;;AAAA,6DAA0B;AAC1B,8DAA4E;AAC5E,yDAA0F;AAC1F,mDAAkD;AAElD,oEAAoE;AAEvD,QAAA,WAAW,GAAG,IAAA,2BAAe,EAAC,UAAC,KAAuB;IACjE,IAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,KAAK,CAAC,CAAC;IAE1C,OAAO,UAAC,KAAuB,EAAE,QAAyB;QACxD,IAAM,aAAa,GAAG,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAE/E,IAAI,OAAO,EAAE;YACX,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;aACzD;SACF;QAED,8EAA8E;QAC9E,wEAAwE;QACxE,gFAAgF;QAChF,IAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAM,YAAY,GAAG,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAM,OAAO,GAAG,eAAK,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAExD,OAAO,8BAAC,wCAAmB,IAAC,KAAK,EAAE,WAAW,CAAC,UAAU,IAAG,OAAO,CAAuB,CAAC;IAC7F,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,mBAAW,CAAC,WAAW,GAAG,mCAAe,CAAC;AAE1C,IAAM,eAAe,GAAG,IAAA,mBAAO,EAAC,qBAAqB,CAAC,CAAC;AACvD,SAAS,qBAAqB,CAAC,KAAuB,EAAE,KAAU;IAChE,IAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;IACjC,IAAI,KAAK,CAAC,kBAAkB,EAAE;QAC5B,YAAY,CAAC,kBAAkB,mDAAQ,YAAY,CAAC,kBAAkB,GAAK,KAAK,CAAC,kBAAkB,CAAE,CAAC;KACvG;IAED,IAAI,KAAK,CAAC,oBAAoB,EAAE;QAC9B,YAAY,CAAC,oBAAoB,mDAAQ,YAAY,CAAC,oBAAoB,GAAK,KAAK,CAAC,oBAAoB,CAAE,CAAC;KAC7G;IAED,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,YAAY,CAAC,qBAAqB,GAAG,UAAC,CAA2B;YAC/D,YAAY,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACtC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC;KACH;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,kBAAe,mBAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuTrigger.d.ts","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"useMenuTrigger.d.ts","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAUzE,eAAO,MAAM,cAAc,WAAY,gBAAgB,KAAG,gBAmEzD,CAAC"}
|
|
@@ -5,14 +5,14 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var menuContext_1 = require("../context/menuContext");
|
|
6
6
|
var react_native_1 = require("react-native");
|
|
7
7
|
var react_1 = (0, tslib_1.__importDefault)(require("react"));
|
|
8
|
+
var consts_1 = require("../consts");
|
|
8
9
|
var accessibilityActions = react_native_1.Platform.OS === 'win32' ? [{ name: 'Expand' }, { name: 'Collapse' }] : [];
|
|
10
|
+
var expandedState = { expanded: true };
|
|
11
|
+
var collapsedState = { expanded: false };
|
|
9
12
|
var useMenuTrigger = function (_props) {
|
|
10
13
|
var context = (0, menuContext_1.useMenuContext)();
|
|
11
|
-
var setOpen = context.setOpen;
|
|
12
|
-
var
|
|
13
|
-
var openOnHover = context.openOnHover;
|
|
14
|
-
var triggerRef = context.triggerRef;
|
|
15
|
-
var accessibilityState = context.open ? { expanded: true } : { expanded: false };
|
|
14
|
+
var open = context.open, openOnHover = context.openOnHover, popoverHoverOutTimer = context.popoverHoverOutTimer, setOpen = context.setOpen, setTriggerHoverOutTimer = context.setTriggerHoverOutTimer, triggerHoverOutTimer = context.triggerHoverOutTimer, triggerRef = context.triggerRef;
|
|
15
|
+
var accessibilityState = open ? expandedState : collapsedState;
|
|
16
16
|
var onAccessibilityAction = react_1.default.useCallback(function (e) {
|
|
17
17
|
if (react_native_1.Platform.OS === 'win32') {
|
|
18
18
|
switch (e.nativeEvent.actionName) {
|
|
@@ -25,31 +25,32 @@ var useMenuTrigger = function (_props) {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
}, [setOpen]);
|
|
28
|
-
var
|
|
29
|
-
macos: 100,
|
|
30
|
-
default: 500, // win32
|
|
31
|
-
});
|
|
32
|
-
var onHoverIn = function (e) {
|
|
28
|
+
var onHoverIn = react_1.default.useCallback(function (e) {
|
|
33
29
|
if (openOnHover) {
|
|
34
|
-
|
|
30
|
+
clearTimeout(popoverHoverOutTimer);
|
|
31
|
+
clearTimeout(triggerHoverOutTimer);
|
|
32
|
+
setTimeout(function () {
|
|
33
|
+
setOpen(e, true /* isOpen */);
|
|
34
|
+
}, consts_1.delayHover);
|
|
35
35
|
}
|
|
36
|
-
};
|
|
37
|
-
var onHoverOut = function (e) {
|
|
36
|
+
}, [openOnHover, setOpen, triggerHoverOutTimer, popoverHoverOutTimer]);
|
|
37
|
+
var onHoverOut = react_1.default.useCallback(function (e) {
|
|
38
38
|
if (openOnHover) {
|
|
39
|
-
|
|
39
|
+
var timer = setTimeout(function () {
|
|
40
|
+
setOpen(e, false /* isOpen */);
|
|
41
|
+
}, consts_1.delayHover);
|
|
42
|
+
setTriggerHoverOutTimer(timer);
|
|
40
43
|
}
|
|
41
|
-
};
|
|
42
|
-
var onClick = function (e) {
|
|
44
|
+
}, [openOnHover, setOpen, setTriggerHoverOutTimer]);
|
|
45
|
+
var onClick = react_1.default.useCallback(function (e) {
|
|
43
46
|
setOpen(e, !open);
|
|
44
|
-
};
|
|
47
|
+
}, [open, setOpen]);
|
|
45
48
|
return {
|
|
46
49
|
props: {
|
|
47
50
|
onClick: onClick,
|
|
48
51
|
onHoverIn: onHoverIn,
|
|
49
|
-
onHoverOut:
|
|
52
|
+
onHoverOut: consts_1.isCloseOnHoverOutEnabled && onHoverOut,
|
|
50
53
|
componentRef: triggerRef,
|
|
51
|
-
delayHoverIn: delayHover,
|
|
52
|
-
delayHoverOut: react_native_1.Platform.OS === 'win32' && delayHover,
|
|
53
54
|
accessibilityState: accessibilityState,
|
|
54
55
|
accessibilityActions: accessibilityActions,
|
|
55
56
|
onAccessibilityAction: onAccessibilityAction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMenuTrigger.js","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":";;;;AAAA,sDAAwD;AAGxD,6CAA2F;AAC3F,6DAA0B;
|
|
1
|
+
{"version":3,"file":"useMenuTrigger.js","sourceRoot":"","sources":["../../src/MenuTrigger/useMenuTrigger.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Menu.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/Menu.test.tsx"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var tslib_1 = require("tslib");
|
|
4
|
+
var React = (0, tslib_1.__importStar)(require("react"));
|
|
5
|
+
var renderer = (0, tslib_1.__importStar)(require("react-test-renderer"));
|
|
6
|
+
var Menu_1 = require("../Menu/Menu");
|
|
7
|
+
var test_tools_1 = require("@fluentui-react-native/test-tools");
|
|
8
|
+
var MenuTrigger_1 = (0, tslib_1.__importDefault)(require("../MenuTrigger/MenuTrigger"));
|
|
9
|
+
var button_1 = require("@fluentui-react-native/button");
|
|
10
|
+
var MenuPopover_1 = (0, tslib_1.__importDefault)(require("../MenuPopover/MenuPopover"));
|
|
11
|
+
var MenuList_1 = require("../MenuList/MenuList");
|
|
12
|
+
var MenuItem_1 = require("../MenuItem/MenuItem");
|
|
13
|
+
var MenuItemCheckbox_1 = require("../MenuItemCheckbox/MenuItemCheckbox");
|
|
14
|
+
var MenuDivider_1 = require("../MenuDivider/MenuDivider");
|
|
15
|
+
var MenuItemRadio_1 = require("../MenuItemRadio/MenuItemRadio");
|
|
16
|
+
describe('Checkbox component tests', function () {
|
|
17
|
+
it('Menu default', function () {
|
|
18
|
+
var tree = renderer
|
|
19
|
+
.create(React.createElement(Menu_1.Menu, null,
|
|
20
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
21
|
+
React.createElement(button_1.ButtonV1, null, "Default")),
|
|
22
|
+
React.createElement(MenuPopover_1.default, null,
|
|
23
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
24
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 1" })))))
|
|
25
|
+
.toJSON();
|
|
26
|
+
expect(tree).toMatchSnapshot();
|
|
27
|
+
});
|
|
28
|
+
it('Menu open', function () {
|
|
29
|
+
var tree = renderer
|
|
30
|
+
.create(React.createElement(Menu_1.Menu, { open: true },
|
|
31
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
32
|
+
React.createElement(button_1.ButtonV1, null, "Open")),
|
|
33
|
+
React.createElement(MenuPopover_1.default, null,
|
|
34
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
35
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 1" })))))
|
|
36
|
+
.toJSON();
|
|
37
|
+
expect(tree).toMatchSnapshot();
|
|
38
|
+
});
|
|
39
|
+
it('Menu defaultOpen', function () {
|
|
40
|
+
var tree = renderer
|
|
41
|
+
.create(React.createElement(Menu_1.Menu, { defaultOpen: true },
|
|
42
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
43
|
+
React.createElement(button_1.ButtonV1, null, "Open")),
|
|
44
|
+
React.createElement(MenuPopover_1.default, null,
|
|
45
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
46
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 1" }),
|
|
47
|
+
React.createElement(MenuItem_1.MenuItem, { disabled: true, content: "Option 2" })))))
|
|
48
|
+
.toJSON();
|
|
49
|
+
expect(tree).toMatchSnapshot();
|
|
50
|
+
});
|
|
51
|
+
it('Menu open checkbox and divider', function () {
|
|
52
|
+
var tree = renderer
|
|
53
|
+
.create(React.createElement(Menu_1.Menu, { open: true },
|
|
54
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
55
|
+
React.createElement(button_1.ButtonV1, null, "Open")),
|
|
56
|
+
React.createElement(MenuPopover_1.default, null,
|
|
57
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
58
|
+
React.createElement(MenuItemCheckbox_1.MenuItemCheckbox, { content: "Option 1", name: "Option 1" }),
|
|
59
|
+
React.createElement(MenuDivider_1.MenuDivider, null),
|
|
60
|
+
React.createElement(MenuItemCheckbox_1.MenuItemCheckbox, { disabled: true, content: "Option 2", name: "Option 2" })))))
|
|
61
|
+
.toJSON();
|
|
62
|
+
expect(tree).toMatchSnapshot();
|
|
63
|
+
});
|
|
64
|
+
it('Menu open radio', function () {
|
|
65
|
+
var tree = renderer
|
|
66
|
+
.create(React.createElement(Menu_1.Menu, { open: true },
|
|
67
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
68
|
+
React.createElement(button_1.ButtonV1, null, "Open")),
|
|
69
|
+
React.createElement(MenuPopover_1.default, null,
|
|
70
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
71
|
+
React.createElement(MenuItemRadio_1.MenuItemRadio, { content: "Option 1", name: "Option 1" }),
|
|
72
|
+
React.createElement(MenuItemRadio_1.MenuItemRadio, { content: "Option 2", name: "Option 2" })))))
|
|
73
|
+
.toJSON();
|
|
74
|
+
expect(tree).toMatchSnapshot();
|
|
75
|
+
});
|
|
76
|
+
it('Menu open checkbox defaultChecked', function () {
|
|
77
|
+
var tree = renderer
|
|
78
|
+
.create(React.createElement(Menu_1.Menu, { open: true, defaultChecked: { 'Option 1': true } },
|
|
79
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
80
|
+
React.createElement(button_1.ButtonV1, null, "Open")),
|
|
81
|
+
React.createElement(MenuPopover_1.default, null,
|
|
82
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
83
|
+
React.createElement(MenuItemCheckbox_1.MenuItemCheckbox, { content: "Option 1", name: "Option 1" }),
|
|
84
|
+
React.createElement(MenuDivider_1.MenuDivider, null),
|
|
85
|
+
React.createElement(MenuItemCheckbox_1.MenuItemCheckbox, { content: "Option 2", name: "Option 2" })))))
|
|
86
|
+
.toJSON();
|
|
87
|
+
expect(tree).toMatchSnapshot();
|
|
88
|
+
});
|
|
89
|
+
it('Menu open checkbox checked', function () {
|
|
90
|
+
var tree = renderer
|
|
91
|
+
.create(React.createElement(Menu_1.Menu, { open: true, checked: { 'Option 1': true } },
|
|
92
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
93
|
+
React.createElement(button_1.ButtonV1, null, "Open")),
|
|
94
|
+
React.createElement(MenuPopover_1.default, null,
|
|
95
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
96
|
+
React.createElement(MenuItemCheckbox_1.MenuItemCheckbox, { content: "Option 1", name: "Option 1" }),
|
|
97
|
+
React.createElement(MenuDivider_1.MenuDivider, null),
|
|
98
|
+
React.createElement(MenuItemCheckbox_1.MenuItemCheckbox, { content: "Option 2", name: "Option 2" })))))
|
|
99
|
+
.toJSON();
|
|
100
|
+
expect(tree).toMatchSnapshot();
|
|
101
|
+
});
|
|
102
|
+
it('Menu submenu', function () {
|
|
103
|
+
var tree = renderer
|
|
104
|
+
.create(React.createElement(Menu_1.Menu, { open: true },
|
|
105
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
106
|
+
React.createElement(button_1.ButtonV1, null, "Default")),
|
|
107
|
+
React.createElement(MenuPopover_1.default, null,
|
|
108
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
109
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 1" }),
|
|
110
|
+
React.createElement(Menu_1.Menu, null,
|
|
111
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
112
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 2" })),
|
|
113
|
+
React.createElement(MenuPopover_1.default, null,
|
|
114
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
115
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 1" }))))))))
|
|
116
|
+
.toJSON();
|
|
117
|
+
expect(tree).toMatchSnapshot();
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
describe('Menu rerender tests', function () {
|
|
121
|
+
it('Menu re-renders correctly', function () {
|
|
122
|
+
(0, test_tools_1.checkReRender)(function () { return (React.createElement(Menu_1.Menu, { open: true },
|
|
123
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
124
|
+
React.createElement(button_1.ButtonV1, null, "Rerender twice")),
|
|
125
|
+
React.createElement(MenuPopover_1.default, null,
|
|
126
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
127
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 1" }))))); }, 3);
|
|
128
|
+
});
|
|
129
|
+
it('Menu re-renders correctly with style', function () {
|
|
130
|
+
var style = { backgroundColor: 'black' };
|
|
131
|
+
(0, test_tools_1.checkReRender)(function () { return (React.createElement(Menu_1.Menu, null,
|
|
132
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
133
|
+
React.createElement(button_1.ButtonV1, { style: style }, "Rerender twice")),
|
|
134
|
+
React.createElement(MenuPopover_1.default, null,
|
|
135
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
136
|
+
React.createElement(MenuItem_1.MenuItem, { content: "Option 1" }))))); }, 3);
|
|
137
|
+
});
|
|
138
|
+
it('Menu re-renders correctly with accessibilityAction', function () {
|
|
139
|
+
var action = [{ name: 'Expand' }];
|
|
140
|
+
(0, test_tools_1.checkReRender)(function () { return (React.createElement(Menu_1.Menu, null,
|
|
141
|
+
React.createElement(MenuTrigger_1.default, null,
|
|
142
|
+
React.createElement(button_1.ButtonV1, null, "Rerender twice")),
|
|
143
|
+
React.createElement(MenuPopover_1.default, null,
|
|
144
|
+
React.createElement(MenuList_1.MenuList, null,
|
|
145
|
+
React.createElement(MenuItem_1.MenuItem, { accessibilityActions: action, content: "Option 1" }))))); }, 3);
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
//# sourceMappingURL=Menu.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Menu.test.js","sourceRoot":"","sources":["../../src/__tests__/Menu.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,QAGrB,CAAC;AAEH,eAAO,MAAM,wBAAwB,SAAmC,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isCloseOnHoverOutEnabled = exports.delayHover = void 0;
|
|
4
|
+
var react_native_1 = require("react-native");
|
|
5
|
+
exports.delayHover = react_native_1.Platform.select({
|
|
6
|
+
macos: 100,
|
|
7
|
+
default: 500, // win32
|
|
8
|
+
});
|
|
9
|
+
exports.isCloseOnHoverOutEnabled = react_native_1.Platform.OS === 'win32';
|
|
10
|
+
//# sourceMappingURL=consts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AAE3B,QAAA,UAAU,GAAG,uBAAQ,CAAC,MAAM,CAAC;IACxC,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,GAAG,EAAE,QAAQ;CACvB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,uBAAQ,CAAC,EAAE,KAAM,OAAe,CAAC"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import * as React from 'react';
|
|
2
3
|
import type { MenuState } from '../Menu/Menu.types';
|
|
3
4
|
/**
|
|
4
5
|
* Context shared between Menu and its child components
|
|
5
6
|
*/
|
|
6
|
-
export
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
export interface MenuContextValue extends MenuState {
|
|
8
|
+
popoverHoverOutTimer?: NodeJS.Timeout;
|
|
9
|
+
triggerHoverOutTimer?: NodeJS.Timeout;
|
|
10
|
+
setPopoverHoverOutTimer?: (timer: NodeJS.Timeout) => void;
|
|
11
|
+
setTriggerHoverOutTimer?: (timer: NodeJS.Timeout) => void;
|
|
12
|
+
}
|
|
13
|
+
export declare const MenuContext: React.Context<MenuContextValue>;
|
|
14
|
+
export declare const MenuProvider: React.Provider<MenuContextValue>;
|
|
15
|
+
export declare const useMenuContext: () => MenuContextValue;
|
|
10
16
|
//# sourceMappingURL=menuContext.d.ts.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"menuContext.d.ts","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IACtC,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC1D,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,WAAW,iCAUtB,CAAC;AAEH,eAAO,MAAM,YAAY,kCAAuB,CAAC;AACjD,eAAO,MAAM,cAAc,wBAAsC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menuContext.js","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;
|
|
1
|
+
{"version":3,"file":"menuContext.js","sourceRoot":"","sources":["../../src/context/menuContext.ts"],"names":[],"mappings":";;;;AAAA,wDAA+B;AAalB,QAAA,WAAW,GAAG,KAAK,CAAC,aAAa,CAAmB;IAC/D,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,EAAE;IACX,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,KAAK;IACpB,SAAS,EAAE,KAAK;IAChB,IAAI,EAAE,KAAK;IACX,eAAe,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IAC5B,OAAO,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK;IACpB,UAAU,EAAE,IAAI;CACjB,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,mBAAW,CAAC,QAAQ,CAAC;AAC1C,IAAM,cAAc,GAAG,cAAM,OAAA,KAAK,CAAC,UAAU,CAAC,mBAAW,CAAC,EAA7B,CAA6B,CAAC;AAArD,QAAA,cAAc,kBAAuC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui-react-native/menu",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.0",
|
|
4
4
|
"description": "A cross-platform Menu component using the Fluent Design System",
|
|
5
5
|
"main": "lib-commonjs/index.js",
|
|
6
6
|
"module": "lib/index.js",
|
|
@@ -34,8 +34,10 @@
|
|
|
34
34
|
"tslib": "^2.3.1"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
+
"@fluentui-react-native/button": ">=0.22.26 <1.0.0",
|
|
37
38
|
"@fluentui-react-native/eslint-config-rules": "^0.1.1",
|
|
38
39
|
"@fluentui-react-native/scripts": "^0.1.1",
|
|
40
|
+
"@fluentui-react-native/test-tools": ">=0.1.1 <1.0.0",
|
|
39
41
|
"@types/react-native": "^0.64.0",
|
|
40
42
|
"react-native": "^0.64.3"
|
|
41
43
|
},
|
package/src/Menu/Menu.types.ts
CHANGED
|
@@ -14,6 +14,7 @@ export interface MenuProps extends MenuListProps {
|
|
|
14
14
|
export interface MenuState extends MenuProps {
|
|
15
15
|
isControlled: boolean;
|
|
16
16
|
isSubmenu: boolean;
|
|
17
|
+
parentPopoverHoverOutTimer?: NodeJS.Timeout;
|
|
17
18
|
setOpen: (e: InteractionEvent, isOpen: boolean) => void;
|
|
18
19
|
triggerRef: React.RefObject<React.Component>;
|
|
19
20
|
}
|
package/src/Menu/useMenu.ts
CHANGED
|
@@ -4,17 +4,23 @@ import { useMenuContext } from '../context/menuContext';
|
|
|
4
4
|
import { MenuProps, MenuState } from './Menu.types';
|
|
5
5
|
|
|
6
6
|
export const useMenu = (props: MenuProps): MenuState => {
|
|
7
|
-
const triggerRef = React.useRef(
|
|
7
|
+
const triggerRef = React.useRef();
|
|
8
8
|
const context = useMenuContext();
|
|
9
9
|
const isSubmenu = context.triggerRef !== null;
|
|
10
10
|
const isControlled = typeof props.open !== 'undefined';
|
|
11
11
|
const [open, setOpen] = useMenuOpenState(isControlled, props);
|
|
12
12
|
|
|
13
|
-
// Default
|
|
13
|
+
// Default behavior for submenu is to open on hover
|
|
14
14
|
// the ...props line below will override this behavior for a submenu
|
|
15
15
|
// or apply openOnHover if passed into a root Menu.
|
|
16
16
|
const openOnHover = isSubmenu;
|
|
17
17
|
|
|
18
|
+
// We need to be able to cancel the timer that gets set on
|
|
19
|
+
// hover out of the parent popover if the parent popover
|
|
20
|
+
// is also set to open/close on hover out. Otherwise
|
|
21
|
+
// the parent menu will close when the timeout passes.
|
|
22
|
+
const parentPopoverHoverOutTimer = isSubmenu ? context.popoverHoverOutTimer : undefined;
|
|
23
|
+
|
|
18
24
|
return {
|
|
19
25
|
openOnHover,
|
|
20
26
|
...props,
|
|
@@ -23,6 +29,7 @@ export const useMenu = (props: MenuProps): MenuState => {
|
|
|
23
29
|
triggerRef,
|
|
24
30
|
isSubmenu,
|
|
25
31
|
isControlled,
|
|
32
|
+
parentPopoverHoverOutTimer,
|
|
26
33
|
};
|
|
27
34
|
};
|
|
28
35
|
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import React from 'react';
|
|
1
2
|
import { MenuContextValue } from '../context/menuContext';
|
|
2
3
|
import { MenuState } from './Menu.types';
|
|
3
4
|
|
|
4
5
|
export const useMenuContextValue = (state: MenuState): MenuContextValue => {
|
|
5
|
-
|
|
6
|
+
const [triggerHoverOutTimer, setTriggerHoverOutTimer] = React.useState<NodeJS.Timeout | undefined>();
|
|
7
|
+
const [popoverHoverOutTimer, setPopoverHoverOutTimer] = React.useState<NodeJS.Timeout>();
|
|
8
|
+
return { ...state, popoverHoverOutTimer, triggerHoverOutTimer, setPopoverHoverOutTimer, setTriggerHoverOutTimer };
|
|
6
9
|
};
|
|
@@ -18,7 +18,7 @@ export const MenuItem = compose<MenuItemType>({
|
|
|
18
18
|
},
|
|
19
19
|
useRender: (userProps: MenuItemProps, useSlots: UseSlots<MenuItemType>) => {
|
|
20
20
|
const menuItem = useMenuItem(userProps);
|
|
21
|
-
const Slots = useSlots(userProps, (layer): boolean => menuItem.state[layer]);
|
|
21
|
+
const Slots = useSlots(userProps, (layer): boolean => menuItem.state[layer] || userProps[layer]);
|
|
22
22
|
|
|
23
23
|
return (final: MenuItemProps) => {
|
|
24
24
|
const mergedProps = mergeProps(menuItem.props, final);
|