@fluentui-react-native/menu 1.0.72 → 1.0.74

package/src/MenuItem/MenuItemTokens.macos.ts

@@ -9,7 +9,7 @@ export const defaultMenuItemTokens: TokenSettings<MenuItemTokens, Theme> = (t: T
   checkmarkSize: 16,
   color: t.colors.menuItemText, // matches ContextualMenu
   fontFamily: t.typography.families.primary,
-  fontSize: globalTokens.font.size[300],
+  fontSize: globalTokens.font.size300,
   fontWeight: globalTokens.font.weight.regular as FontWeightValue,
   gap: globalTokens.spacing.xs,
   paddingHorizontal: 5, // hardcoded for now to match ContextualMenu

package/src/MenuItem/MenuItemTokens.ts

@@ -5,11 +5,11 @@ import { MenuItemTokens } from './MenuItem.types';
 
 export const defaultMenuItemTokens: TokenSettings<MenuItemTokens, Theme> = (t: Theme): MenuItemTokens => ({
   backgroundColor: t.colors.neutralBackground1,
-  borderRadius: globalTokens.corner.radius.medium,
+  borderRadius: globalTokens.corner.radius40,
   checkmarkSize: 16,
   color: t.colors.neutralForeground2,
   fontFamily: t.typography.families.primary,
-  fontSize: globalTokens.font.size[300],
+  fontSize: globalTokens.font.size300,
   fontWeight: globalTokens.font.weight.regular as FontWeightValue,
   gap: globalTokens.spacing.xs,
   minHeight: 32,

package/src/MenuItem/MenuItemTokens.win32.ts

@@ -5,11 +5,11 @@ import { MenuItemTokens } from './MenuItem.types';
 
 export const defaultMenuItemTokens: TokenSettings<MenuItemTokens, Theme> = (t: Theme): MenuItemTokens => ({
   backgroundColor: t.colors.neutralBackground1,
-  borderRadius: globalTokens.corner.radius.none,
+  borderRadius: globalTokens.corner.radiusNone,
   checkmarkSize: 16,
   color: t.colors.neutralForeground1,
   fontFamily: t.typography.families.primary,
-  fontSize: globalTokens.font.size[200],
+  fontSize: globalTokens.font.size200,
   fontWeight: globalTokens.font.weight.regular as FontWeightValue,
   gap: globalTokens.spacing.xs,
   minHeight: 24,

package/src/MenuItemCheckbox/MenuItemCheckboxTokens.macos.ts

@@ -11,7 +11,7 @@ export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens
   checkmarkVisibility: 0,
   color: t.colors.neutralForeground2,
   fontFamily: t.typography.families.primary,
-  fontSize: globalTokens.font.size[300],
+  fontSize: globalTokens.font.size300,
   fontWeight: globalTokens.font.weight.regular as FontWeightValue,
   gap: globalTokens.spacing.xs,
   paddingHorizontal: 5,

package/src/MenuItemCheckbox/MenuItemCheckboxTokens.ts

@@ -5,13 +5,13 @@ import { MenuItemCheckboxTokens } from './MenuItemCheckbox.types';
 
 export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens, Theme> = (t: Theme): MenuItemCheckboxTokens => ({
   backgroundColor: t.colors.neutralBackground1,
-  borderRadius: globalTokens.corner.radius.medium,
+  borderRadius: globalTokens.corner.radius40,
   checkmarkPadding: globalTokens.spacing.none,
   checkmarkSize: 16,
   checkmarkVisibility: 0,
   color: t.colors.neutralForeground2,
   fontFamily: t.typography.families.primary,
-  fontSize: globalTokens.font.size[300],
+  fontSize: globalTokens.font.size300,
   fontWeight: globalTokens.font.weight.regular as FontWeightValue,
   gap: globalTokens.spacing.xs,
   minHeight: 32,

package/src/MenuItemCheckbox/MenuItemCheckboxTokens.win32.ts

@@ -5,13 +5,13 @@ import { MenuItemCheckboxTokens } from './MenuItemCheckbox.types';
 
 export const defaultMenuItemCheckboxTokens: TokenSettings<MenuItemCheckboxTokens, Theme> = (t: Theme): MenuItemCheckboxTokens => ({
   backgroundColor: t.colors.neutralBackground1,
-  borderRadius: globalTokens.corner.radius.none,
+  borderRadius: globalTokens.corner.radiusNone,
   checkmarkPadding: globalTokens.spacing.xxs,
   checkmarkSize: 16,
   checkmarkVisibility: 0,
   color: t.colors.neutralForeground1,
   fontFamily: t.typography.families.primary,
-  fontSize: globalTokens.font.size[200],
+  fontSize: globalTokens.font.size200,
   fontWeight: globalTokens.font.weight.regular as FontWeightValue,
   gap: globalTokens.spacing.xs,
   minHeight: 24,

package/src/MenuTrigger/MenuTrigger.tsx

@@ -1,32 +1,24 @@
-import React from 'react';
-import { stagedComponent } from '@fluentui-react-native/framework';
-import { menuTriggerName } from './MenuTrigger.types';
+import * as React from 'react';
+import { menuTriggerName, MenuTriggerProps } from './MenuTrigger.types';
 import { useMenuTrigger } from './useMenuTrigger';
 import { MenuTriggerProvider } from '../context/menuTriggerContext';
-import { getRevisedProps } from './getRevisedProps';
 
-export const MenuTrigger = stagedComponent((_props: React.PropsWithChildren<Record<never, any>>) => {
-  const menuTrigger = useMenuTrigger();
-
-  return (_rest: React.PropsWithChildren<Record<never, any>>, children: React.ReactNode) => {
-    const childrenArray = React.Children.toArray(children) as React.ReactElement[];
-
-    if (__DEV__) {
-      if (childrenArray.length !== 1) {
-        console.warn('Only expecting one child for MenuTrigger');
-      }
+export const MenuTrigger: React.FunctionComponent<MenuTriggerProps> = (props: MenuTriggerProps) => {
+  if (__DEV__) {
+    if (!React.Children.only(props.children)) {
+      console.warn('Only expecting one child for MenuTrigger');
     }
+  }
+
+  const menuTrigger = useMenuTrigger(props.children.props);
 
-    // In order to properly support accessibility without erasing props set on the
-    // child component which may affect accessibility, we need to modify the
-    // state in the inner render so we can access the child component and its props.
-    const child = childrenArray[0];
-    const revisedProps = getRevisedProps(menuTrigger, child.props);
-    const revised = React.cloneElement(child, revisedProps);
+  // In order to properly support accessibility without erasing props set on the
+  // child component which may affect accessibility, we need to modify the
+  // state in the inner render so we can access the child component and its props.
+  const revised = React.cloneElement(props.children, menuTrigger.props);
 
-    return <MenuTriggerProvider value={menuTrigger.hasSubmenu}>{revised}</MenuTriggerProvider>;
-  };
-});
+  return <MenuTriggerProvider value={menuTrigger.hasSubmenu}>{revised}</MenuTriggerProvider>;
+};
 MenuTrigger.displayName = menuTriggerName;
 
 export default MenuTrigger;

package/src/MenuTrigger/MenuTrigger.types.ts

@@ -1,7 +1,19 @@
+import * as React from 'react';
 import { InteractionEvent, PressablePropsExtended } from '@fluentui-react-native/interactive-hooks';
 
 export const menuTriggerName = 'MenuTrigger';
 
+/**
+ * Represents single react element (or null), which is the
+ * type of the child of MenuTrigger. Notably this excludes string, number,
+ * and array of elements as children, which MenuTrigger doesn't support.
+ */
+type SingleReactElement = React.ReactElement | null;
+
+export interface MenuTriggerProps {
+  children?: SingleReactElement;
+}
+
 export interface MenuTriggerChildProps extends Omit<PressablePropsExtended, 'onPress'> {
   /**
    * A RefObject to refer to the trigger component.

package/src/MenuTrigger/useMenuTrigger.ts

@@ -1,16 +1,17 @@
 import { useMenuContext } from '../context/menuContext';
 import { InteractionEvent } from '@fluentui-react-native/interactive-hooks';
-import { MenuTriggerState } from './MenuTrigger.types';
+import { MenuTriggerChildProps, MenuTriggerState } from './MenuTrigger.types';
 import { AccessibilityActionEvent, AccessibilityActionName, Platform } from 'react-native';
 import React from 'react';
 import { hoverDelayDefault } from '../consts';
+import { useMergedRefs } from './useMergeRefs';
 
-const accessibilityActions =
+const baseAccessibilityActions =
   Platform.OS === ('win32' as any) ? [{ name: 'Expand' as AccessibilityActionName }, { name: 'Collapse' as AccessibilityActionName }] : [];
 const expandedState = { expanded: true };
 const collapsedState = { expanded: false };
 
-export const useMenuTrigger = (): MenuTriggerState => {
+export const useMenuTrigger = (childProps: MenuTriggerChildProps): MenuTriggerState => {
   const context = useMenuContext();
   const {
     hoverDelay = hoverDelayDefault,
@@ -23,7 +24,33 @@ export const useMenuTrigger = (): MenuTriggerState => {
     triggerRef,
   } = context;
 
-  const accessibilityState = open ? expandedState : collapsedState;
+  const {
+    accessibilityActions: childAccessibilityActions,
+    accessibilityState: childAccessibilityState,
+    onAccessibilityAction: childOnAccessibilityAction,
+    onClick: childOnClick,
+    onHoverIn: childOnHoverIn,
+    onHoverOut: childOnHoverOut,
+    componentRef: childComponentRef,
+  } = childProps;
+
+  const accessibilityActions = React.useMemo(() => {
+    if (childAccessibilityActions) {
+      return [...baseAccessibilityActions, ...childAccessibilityActions];
+    }
+
+    return baseAccessibilityActions;
+  }, [childAccessibilityActions]);
+
+  const accessibilityState = React.useMemo(() => {
+    const baseState = open ? expandedState : collapsedState;
+
+    if (childAccessibilityState) {
+      return { ...baseState, ...childAccessibilityState };
+    }
+
+    return baseState;
+  }, [childAccessibilityState, open]);
 
   const onAccessibilityAction = React.useCallback(
     (e: AccessibilityActionEvent) => {
@@ -38,8 +65,9 @@ export const useMenuTrigger = (): MenuTriggerState => {
             break;
         }
       }
+      childOnAccessibilityAction && childOnAccessibilityAction(e);
     },
-    [setOpen],
+    [childOnAccessibilityAction, setOpen],
   );
 
   const onHoverIn = React.useCallback(
@@ -52,8 +80,10 @@ export const useMenuTrigger = (): MenuTriggerState => {
           setOpen(e, true /* isOpen */);
         }, hoverDelay);
       }
+
+      childOnHoverIn && childOnHoverIn(e);
     },
-    [hoverDelay, openOnHover, setOpen, triggerHoverOutTimer, popoverHoverOutTimer],
+    [childOnHoverIn, hoverDelay, openOnHover, setOpen, triggerHoverOutTimer, popoverHoverOutTimer],
   );
 
   const onHoverOut = React.useCallback(
@@ -65,17 +95,22 @@ export const useMenuTrigger = (): MenuTriggerState => {
         }, hoverDelay);
         setTriggerHoverOutTimer(timer);
       }
+
+      childOnHoverOut && childOnHoverOut(e);
     },
-    [hoverDelay, openOnHover, setOpen, setTriggerHoverOutTimer],
+    [childOnHoverOut, hoverDelay, openOnHover, setOpen, setTriggerHoverOutTimer],
   );
 
   const onClick = React.useCallback(
     (e: InteractionEvent) => {
       setOpen(e, !open);
+      childOnClick && childOnClick(e);
     },
-    [open, setOpen],
+    [childOnClick, open, setOpen],
   );
 
+  const ref = useMergedRefs(triggerRef, childComponentRef);
+
   React.useEffect(() => {
     return function cleanup() {
       clearTimeout(triggerHoverOutTimer);
@@ -87,7 +122,7 @@ export const useMenuTrigger = (): MenuTriggerState => {
       onClick,
       onHoverIn,
       onHoverOut,
-      componentRef: triggerRef,
+      componentRef: ref,
       accessibilityState,
       accessibilityActions,
       onAccessibilityAction,

package/src/MenuTrigger/useMergeRefs.ts

@@ -0,0 +1,42 @@
+/**
+ * Copied from @fluentui/react-utilities
+ *
+ * Keeping the file local to Menu for now while looking into whether
+ * we can pull in @fluentui/react-utilities package
+ */
+
+import * as React from 'react';
+
+/**
+ * A Ref function which can be treated like a ref object in that it has an attached
+ * current property, which will be updated as the ref is evaluated.
+ */
+export type RefObjectFunction<T> = React.RefObject<T> & ((value: T) => void);
+
+/**
+ * React hook to merge multiple React refs (either MutableRefObjects or ref callbacks) into a single ref callback that
+ * updates all provided refs
+ * @param refs - Refs to collectively update with one ref value.
+ * @returns A function with an attached "current" prop, so that it can be treated like a RefObject.
+ */
+export function useMergedRefs<T>(...refs: (React.Ref<T> | undefined)[]): RefObjectFunction<T> {
+  const mergedCallback: RefObjectFunction<T> = React.useCallback(
+    (value: T) => {
+      // Update the "current" prop hanging on the function.
+      (mergedCallback as unknown as React.MutableRefObject<T>).current = value;
+
+      for (const ref of refs) {
+        if (typeof ref === 'function') {
+          ref(value);
+        } else if (ref) {
+          // work around the immutability of the React.Ref type
+          (ref as unknown as React.MutableRefObject<T>).current = value;
+        }
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- already exhaustive
+    [...refs],
+  ) as unknown as RefObjectFunction<T>;
+
+  return mergedCallback;
+}

package/src/__tests__/Menu.test.tsx

@@ -12,7 +12,7 @@ import { MenuItemCheckbox } from '../MenuItemCheckbox/MenuItemCheckbox';
 import { MenuDivider } from '../MenuDivider/MenuDivider';
 import { MenuItemRadio } from '../MenuItemRadio/MenuItemRadio';
 
-describe('Checkbox component tests', () => {
+describe('Menu component tests', () => {
   it('Menu default', () => {
     const tree = renderer
       .create(

package/src/__tests__/__snapshots__/Menu.test.tsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Checkbox component tests Menu default 1`] = `
+exports[`Menu component tests Menu default 1`] = `
 <View
   accessibilityActions={Array []}
   accessibilityLabel="Default"
@@ -32,13 +32,13 @@ exports[`Checkbox component tests Menu default 1`] = `
       "backgroundColor": "#f3f2f1",
       "borderColor": "#8a8886",
       "borderRadius": 4,
-      "borderWidth": 1.5,
+      "borderWidth": 1,
       "display": "flex",
       "flexDirection": "row",
       "justifyContent": "center",
       "minWidth": 96,
       "padding": 8,
-      "paddingHorizontal": 14.5,
+      "paddingHorizontal": 15,
       "width": undefined,
     }
   }
@@ -65,7 +65,7 @@ exports[`Checkbox component tests Menu default 1`] = `
 </View>
 `;
 
-exports[`Checkbox component tests Menu defaultOpen 1`] = `
+exports[`Menu component tests Menu defaultOpen 1`] = `
 Array [
   <View
     accessibilityActions={Array []}
@@ -98,13 +98,13 @@ Array [
         "backgroundColor": "#f3f2f1",
         "borderColor": "#8a8886",
         "borderRadius": 4,
-        "borderWidth": 1.5,
+        "borderWidth": 1,
         "display": "flex",
         "flexDirection": "row",
         "justifyContent": "center",
         "minWidth": 96,
         "padding": 8,
-        "paddingHorizontal": 14.5,
+        "paddingHorizontal": 15,
         "width": undefined,
       }
     }
@@ -273,7 +273,7 @@ Array [
 ]
 `;
 
-exports[`Checkbox component tests Menu open 1`] = `
+exports[`Menu component tests Menu open 1`] = `
 Array [
   <View
     accessibilityActions={Array []}
@@ -306,13 +306,13 @@ Array [
         "backgroundColor": "#f3f2f1",
         "borderColor": "#8a8886",
         "borderRadius": 4,
-        "borderWidth": 1.5,
+        "borderWidth": 1,
         "display": "flex",
         "flexDirection": "row",
         "justifyContent": "center",
         "minWidth": 96,
         "padding": 8,
-        "paddingHorizontal": 14.5,
+        "paddingHorizontal": 15,
         "width": undefined,
       }
     }
@@ -434,7 +434,7 @@ Array [
 ]
 `;
 
-exports[`Checkbox component tests Menu open checkbox and divider 1`] = `
+exports[`Menu component tests Menu open checkbox and divider 1`] = `
 Array [
   <View
     accessibilityActions={Array []}
@@ -467,13 +467,13 @@ Array [
         "backgroundColor": "#f3f2f1",
         "borderColor": "#8a8886",
         "borderRadius": 4,
-        "borderWidth": 1.5,
+        "borderWidth": 1,
         "display": "flex",
         "flexDirection": "row",
         "justifyContent": "center",
         "minWidth": 96,
         "padding": 8,
-        "paddingHorizontal": 14.5,
+        "paddingHorizontal": 15,
         "width": undefined,
       }
     }
@@ -654,7 +654,7 @@ Array [
             Object {
               "backgroundColor": "#d1d1d1",
               "display": "flex",
-              "height": 1.5,
+              "height": 1,
               "margin": 4,
               "marginVertical": undefined,
               "width": undefined,
@@ -780,7 +780,7 @@ Array [
 ]
 `;
 
-exports[`Checkbox component tests Menu open checkbox checked 1`] = `
+exports[`Menu component tests Menu open checkbox checked 1`] = `
 Array [
   <View
     accessibilityActions={Array []}
@@ -813,13 +813,13 @@ Array [
         "backgroundColor": "#f3f2f1",
         "borderColor": "#8a8886",
         "borderRadius": 4,
-        "borderWidth": 1.5,
+        "borderWidth": 1,
         "display": "flex",
         "flexDirection": "row",
         "justifyContent": "center",
         "minWidth": 96,
         "padding": 8,
-        "paddingHorizontal": 14.5,
+        "paddingHorizontal": 15,
         "width": undefined,
       }
     }
@@ -1000,7 +1000,7 @@ Array [
             Object {
               "backgroundColor": "#d1d1d1",
               "display": "flex",
-              "height": 1.5,
+              "height": 1,
               "margin": 4,
               "marginVertical": undefined,
               "width": undefined,
@@ -1126,7 +1126,7 @@ Array [
 ]
 `;
 
-exports[`Checkbox component tests Menu open checkbox defaultChecked 1`] = `
+exports[`Menu component tests Menu open checkbox defaultChecked 1`] = `
 Array [
   <View
     accessibilityActions={Array []}
@@ -1159,13 +1159,13 @@ Array [
         "backgroundColor": "#f3f2f1",
         "borderColor": "#8a8886",
         "borderRadius": 4,
-        "borderWidth": 1.5,
+        "borderWidth": 1,
         "display": "flex",
         "flexDirection": "row",
         "justifyContent": "center",
         "minWidth": 96,
         "padding": 8,
-        "paddingHorizontal": 14.5,
+        "paddingHorizontal": 15,
         "width": undefined,
       }
     }
@@ -1346,7 +1346,7 @@ Array [
             Object {
               "backgroundColor": "#d1d1d1",
               "display": "flex",
-              "height": 1.5,
+              "height": 1,
               "margin": 4,
               "marginVertical": undefined,
               "width": undefined,
@@ -1472,7 +1472,7 @@ Array [
 ]
 `;
 
-exports[`Checkbox component tests Menu open radio 1`] = `
+exports[`Menu component tests Menu open radio 1`] = `
 Array [
   <View
     accessibilityActions={Array []}
@@ -1505,13 +1505,13 @@ Array [
         "backgroundColor": "#f3f2f1",
         "borderColor": "#8a8886",
         "borderRadius": 4,
-        "borderWidth": 1.5,
+        "borderWidth": 1,
         "display": "flex",
         "flexDirection": "row",
         "justifyContent": "center",
         "minWidth": 96,
         "padding": 8,
-        "paddingHorizontal": 14.5,
+        "paddingHorizontal": 15,
         "width": undefined,
       }
     }
@@ -1806,7 +1806,7 @@ Array [
 ]
 `;
 
-exports[`Checkbox component tests Menu submenu 1`] = `
+exports[`Menu component tests Menu submenu 1`] = `
 Array [
   <View
     accessibilityActions={Array []}
@@ -1839,13 +1839,13 @@ Array [
         "backgroundColor": "#f3f2f1",
         "borderColor": "#8a8886",
         "borderRadius": 4,
-        "borderWidth": 1.5,
+        "borderWidth": 1,
         "display": "flex",
         "flexDirection": "row",
         "justifyContent": "center",
         "minWidth": 96,
         "padding": 8,
-        "paddingHorizontal": 14.5,
+        "paddingHorizontal": 15,
         "width": undefined,
       }
     }

package/lib/MenuTrigger/getRevisedProps.d.ts

@@ -1,11 +0,0 @@
-import { MenuTriggerChildProps, MenuTriggerState } from './MenuTrigger.types';
-/**
- * Creates a merged set of props between the MenuTrigger's child component's props
- * and the props that the MenuTrigger wants its child to have.
- *
- * Because children are not accessible in the outer render, we deal with the merge in this function.
- */
-export declare const getRevisedProps: typeof getRevisedPropsWorker;
-declare function getRevisedPropsWorker(state: MenuTriggerState, props: any): MenuTriggerChildProps;
-export {};
-//# sourceMappingURL=getRevisedProps.d.ts.map

package/lib/MenuTrigger/getRevisedProps.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getRevisedProps.d.ts","sourceRoot":"","sources":["../../src/MenuTrigger/getRevisedProps.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;GAKG;AACH,eAAO,MAAM,eAAe,8BAAiC,CAAC;AAC9D,iBAAS,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,GAAG,qBAAqB,CAuCzF"}

package/lib/MenuTrigger/getRevisedProps.js

@@ -1,45 +0,0 @@
-import { __assign, __spreadArray } from "tslib";
-import { memoize } from '@fluentui-react-native/framework';
-import { isMouseEvent } from '@fluentui-react-native/interactive-hooks';
-/**
- * Creates a merged set of props between the MenuTrigger's child component's props
- * and the props that the MenuTrigger wants its child to have.
- *
- * Because children are not accessible in the outer render, we deal with the merge in this function.
- */
-export var getRevisedProps = memoize(getRevisedPropsWorker);
-function getRevisedPropsWorker(state, props) {
-    var revisedProps = __assign({}, state.props);
-    if (props.accessibilityState) {
-        revisedProps.accessibilityState = __assign(__assign({}, state.props.accessibilityState), props.accessibilityState);
-    }
-    if (props.accessibilityActions) {
-        revisedProps.accessibilityActions = __spreadArray(__spreadArray([], state.props.accessibilityActions, true), props.accessibilityActions, true);
-    }
-    if (props.onAccessibilityAction) {
-        revisedProps.onAccessibilityAction = function (e) {
-            state.props.onAccessibilityAction(e);
-            props.onAccessibilityAction(e);
-        };
-    }
-    if (props.onClick) {
-        revisedProps.onClick = function (e) {
-            state.props.onClick(e);
-            props.onClick(e);
-        };
-    }
-    if (props.onHoverIn) {
-        revisedProps.onHoverIn = function (e) {
-            state.props.onHoverIn(isMouseEvent(e) && e);
-            props.onHoverIn(e);
-        };
-    }
-    if (props.onHoverOut) {
-        revisedProps.onHoverOut = function (e) {
-            state.props.onHoverOut(isMouseEvent(e) && e);
-            props.onHoverOut(e);
-        };
-    }
-    return __assign({}, revisedProps);
-}
-//# sourceMappingURL=getRevisedProps.js.map

package/lib/MenuTrigger/getRevisedProps.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getRevisedProps.js","sourceRoot":"","sources":["../../src/MenuTrigger/getRevisedProps.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAoB,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAG1F;;;;;GAKG;AACH,MAAM,CAAC,IAAM,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAC9D,SAAS,qBAAqB,CAAC,KAAuB,EAAE,KAAU;IAChE,IAAM,YAAY,gBAAQ,KAAK,CAAC,KAAK,CAAE,CAAC;IACxC,IAAI,KAAK,CAAC,kBAAkB,EAAE;QAC5B,YAAY,CAAC,kBAAkB,yBAAQ,KAAK,CAAC,KAAK,CAAC,kBAAkB,GAAK,KAAK,CAAC,kBAAkB,CAAE,CAAC;KACtG;IAED,IAAI,KAAK,CAAC,oBAAoB,EAAE;QAC9B,YAAY,CAAC,oBAAoB,mCAAO,KAAK,CAAC,KAAK,CAAC,oBAAoB,SAAK,KAAK,CAAC,oBAAoB,OAAC,CAAC;KAC1G;IAED,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,YAAY,CAAC,qBAAqB,GAAG,UAAC,CAA2B;YAC/D,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACrC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC;KACH;IAED,IAAI,KAAK,CAAC,OAAO,EAAE;QACjB,YAAY,CAAC,OAAO,GAAG,UAAC,CAAmB;YACzC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC;KACH;IAED,IAAI,KAAK,CAAC,SAAS,EAAE;QACnB,YAAY,CAAC,SAAS,GAAG,UAAC,CAAmB;YAC3C,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC;KACH;IAED,IAAI,KAAK,CAAC,UAAU,EAAE;QACpB,YAAY,CAAC,UAAU,GAAG,UAAC,CAAmB;YAC5C,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7C,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC,CAAC;KACH;IAED,oBAAY,YAAY,EAAG;AAC7B,CAAC"}

package/lib-commonjs/MenuTrigger/getRevisedProps.d.ts

@@ -1,11 +0,0 @@
-import { MenuTriggerChildProps, MenuTriggerState } from './MenuTrigger.types';
-/**
- * Creates a merged set of props between the MenuTrigger's child component's props
- * and the props that the MenuTrigger wants its child to have.
- *
- * Because children are not accessible in the outer render, we deal with the merge in this function.
- */
-export declare const getRevisedProps: typeof getRevisedPropsWorker;
-declare function getRevisedPropsWorker(state: MenuTriggerState, props: any): MenuTriggerChildProps;
-export {};
-//# sourceMappingURL=getRevisedProps.d.ts.map

package/lib-commonjs/MenuTrigger/getRevisedProps.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getRevisedProps.d.ts","sourceRoot":"","sources":["../../src/MenuTrigger/getRevisedProps.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;GAKG;AACH,eAAO,MAAM,eAAe,8BAAiC,CAAC;AAC9D,iBAAS,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,GAAG,qBAAqB,CAuCzF"}