@tamagui/menu 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/esm/createNonNativeMenu.mjs

@@ -1,343 +1,357 @@
 import { createBaseMenu } from "@tamagui/create-menu";
+import { usePopperContextSlow } from "@tamagui/popper";
+import { ScrollView } from "@tamagui/scroll-view";
 import { useControllableState } from "@tamagui/use-controllable-state";
-import { composeEventHandlers, composeRefs, createStyledContext, isAndroid, isWeb, Slot, useIsTouchDevice, View, withStaticProperties } from "@tamagui/web";
+import { composeEventHandlers, composeRefs, createStyledContext, isAndroid, isWeb, Slot, styled, useEvent, useIsTouchDevice, View, withStaticProperties } from "@tamagui/web";
 import * as React from "react";
 import { useId } from "react";
 import { jsx } from "react/jsx-runtime";
 const DROPDOWN_MENU_CONTEXT = "MenuContext";
+function useMenuTriggerSetup(open) {
+  const triggerStateSettersRef = React.useRef(/* @__PURE__ */new Map());
+  const activeTriggerIdRef = React.useRef(null);
+  const setActiveTrigger = useEvent(id => {
+    const prevId = activeTriggerIdRef.current;
+    if (prevId === id) return;
+    if (prevId) {
+      triggerStateSettersRef.current.get(prevId)?.(false);
+    }
+    activeTriggerIdRef.current = id;
+    if (id && open) {
+      triggerStateSettersRef.current.get(id)?.(true);
+    }
+  });
+  const registerTrigger = useEvent((id, setOpenState) => {
+    triggerStateSettersRef.current.set(id, setOpenState);
+    setOpenState(activeTriggerIdRef.current === id && open);
+  });
+  const unregisterTrigger = useEvent(id => {
+    triggerStateSettersRef.current.delete(id);
+    if (activeTriggerIdRef.current === id) {
+      activeTriggerIdRef.current = null;
+    }
+  });
+  React.useEffect(() => {
+    if (!open) {
+      setActiveTrigger(null);
+      return;
+    }
+    const activeId = activeTriggerIdRef.current;
+    if (activeId) {
+      triggerStateSettersRef.current.get(activeId)?.(true);
+    }
+  }, [open, setActiveTrigger]);
+  return {
+    setActiveTrigger,
+    registerTrigger,
+    unregisterTrigger
+  };
+}
 function createNonNativeMenu(params) {
   const {
-      Menu
-    } = createBaseMenu(params),
-    DROPDOWN_MENU_NAME = "Menu",
-    {
-      Provider: MenuProvider,
-      useStyledContext: useMenuContext
-    } = createStyledContext(),
-    MenuComp = props => {
-      const {
-          scope,
-          children,
-          dir,
-          open: openProp,
-          defaultOpen,
-          onOpenChange,
-          modal = !0,
-          ...rest
-        } = props,
-        triggerRef = React.useRef(null),
-        [open = !1, setOpen] = useControllableState({
-          prop: openProp,
-          defaultProp: defaultOpen,
-          onChange: onOpenChange
-        });
-      return /* @__PURE__ */jsx(MenuProvider, {
-        scope,
-        triggerId: useId(),
-        triggerRef,
-        contentId: useId(),
+    Menu
+  } = createBaseMenu(params);
+  const DROPDOWN_MENU_NAME = "Menu";
+  const {
+    Provider: MenuProvider,
+    useStyledContext: useMenuContext
+  } = createStyledContext();
+  const MenuComp = props => {
+    const {
+      scope,
+      children,
+      dir,
+      open: openProp,
+      defaultOpen,
+      onOpenChange,
+      modal = true,
+      ...rest
+    } = props;
+    const triggerRef = React.useRef(null);
+    const [open = false, setOpen] = useControllableState({
+      prop: openProp,
+      defaultProp: defaultOpen,
+      onChange: onOpenChange
+    });
+    const openRef = React.useRef(open);
+    openRef.current = open;
+    const {
+      setActiveTrigger,
+      registerTrigger,
+      unregisterTrigger
+    } = useMenuTriggerSetup(open);
+    return /* @__PURE__ */jsx(MenuProvider, {
+      scope,
+      triggerId: useId(),
+      triggerRef,
+      contentId: useId(),
+      openRef,
+      onOpenChange: React.useCallback(nextOpen => setOpen(nextOpen), [setOpen]),
+      onOpenToggle: React.useCallback(() => setOpen(prevOpen => !prevOpen), [setOpen]),
+      modal,
+      setActiveTrigger,
+      registerTrigger,
+      unregisterTrigger,
+      children: /* @__PURE__ */jsx(Menu, {
+        scope: scope || DROPDOWN_MENU_CONTEXT,
         open,
         onOpenChange: setOpen,
-        onOpenToggle: React.useCallback(() => setOpen(prevOpen => !prevOpen), [setOpen]),
+        dir,
         modal,
-        children: /* @__PURE__ */jsx(Menu, {
-          scope: scope || DROPDOWN_MENU_CONTEXT,
-          open,
-          onOpenChange: setOpen,
-          dir,
-          modal,
-          ...rest,
-          children
-        })
-      });
-    };
+        ...rest,
+        children
+      })
+    });
+  };
   MenuComp.displayName = DROPDOWN_MENU_NAME;
-  const TRIGGER_NAME = "MenuTrigger",
-    MenuTriggerFrame = Menu.Anchor,
-    MenuTrigger = View.styleable((props, forwardedRef) => {
-      const {
-          scope,
-          asChild,
-          children,
-          disabled = !1,
-          onKeydown,
-          ...triggerProps
-        } = props,
-        context = useMenuContext(scope),
-        Comp = asChild ? Slot : View,
-        isTouchDevice = useIsTouchDevice(),
-        pressEvent = isWeb ? isTouchDevice ? "onClick" : "onPointerDown" : "onPress";
-      return /* @__PURE__ */jsx(MenuTriggerFrame, {
-        asChild: !0,
-        componentName: TRIGGER_NAME,
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        children: /* @__PURE__ */jsx(Comp, {
-          role: "button",
-          id: context.triggerId,
-          "aria-haspopup": "menu",
-          "aria-expanded": context.open,
-          "aria-controls": context.open ? context.contentId : void 0,
-          "data-state": context.open ? "open" : "closed",
-          "data-disabled": disabled ? "" : void 0,
-          "aria-disabled": disabled || void 0,
-          ref: composeRefs(forwardedRef, context.triggerRef),
+  const TRIGGER_NAME = "MenuTrigger";
+  const MenuTriggerFrame = Menu.Anchor;
+  const MenuTrigger = View.styleable((props, forwardedRef) => {
+    const {
+      scope,
+      asChild,
+      children,
+      disabled = false,
+      onKeydown,
+      ...triggerProps
+    } = props;
+    const context = useMenuContext(scope);
+    const popperCtx = usePopperContextSlow(scope || DROPDOWN_MENU_CONTEXT);
+    const Comp = asChild ? Slot : View;
+    const isTouchDevice = useIsTouchDevice();
+    const triggerElRef = React.useRef(null);
+    const triggerId = React.useId();
+    const [triggerOpen, setTriggerOpen] = React.useState(false);
+    const {
+      registerTrigger,
+      unregisterTrigger
+    } = context;
+    React.useEffect(() => {
+      registerTrigger(triggerId, setTriggerOpen);
+      return () => unregisterTrigger(triggerId);
+    }, [registerTrigger, unregisterTrigger, triggerId]);
+    const activateSelf = React.useCallback(() => {
+      context.setActiveTrigger(triggerId);
+      const el = triggerElRef.current;
+      if (el) {
+        context.triggerRef.current = el;
+        if (el instanceof HTMLElement) {
+          popperCtx.refs?.setReference(el);
+          requestAnimationFrame(() => popperCtx.update?.());
+        }
+      }
+    }, [context, triggerId, popperCtx]);
+    const pressEvent = isWeb ? isTouchDevice ? "onClick" : "onPointerDown" : "onPress";
+    return /* @__PURE__ */jsx(MenuTriggerFrame, {
+      asChild: true,
+      componentName: TRIGGER_NAME,
+      scope: scope || DROPDOWN_MENU_CONTEXT,
+      children: /* @__PURE__ */jsx(Comp, {
+        role: "button",
+        id: context.triggerId,
+        "aria-haspopup": "menu",
+        "aria-expanded": triggerOpen,
+        "aria-controls": triggerOpen ? context.contentId : void 0,
+        "data-state": triggerOpen ? "open" : "closed",
+        "data-disabled": disabled ? "" : void 0,
+        "aria-disabled": disabled || void 0,
+        ref: composeRefs(forwardedRef, context.triggerRef, triggerElRef),
+        ...{
           [pressEvent]: composeEventHandlers(
           //@ts-ignore
           props[pressEvent], event => {
             if (!disabled) {
-              if (isWeb && event instanceof PointerEvent && event.button !== 0 && event.ctrlKey === !0) return;
-              context.onOpenToggle(), context.open || event.preventDefault();
+              if (isWeb && event instanceof PointerEvent && event.button !== 0 && event.ctrlKey === true) return;
+              if (context.openRef.current) {
+                context.setActiveTrigger(null);
+              } else {
+                activateSelf();
+              }
+              context.onOpenToggle();
+              if (!context.openRef.current) event.preventDefault();
+            }
+          })
+        },
+        ...(isWeb && {
+          onKeyDown: composeEventHandlers(onKeydown, event => {
+            if (disabled) return;
+            if (["Enter", " "].includes(event.key)) {
+              if (context.openRef.current) {
+                context.setActiveTrigger(null);
+              } else {
+                activateSelf();
+              }
+              context.onOpenToggle();
             }
-          }),
-          ...(isWeb && {
-            onKeyDown: composeEventHandlers(onKeydown, event => {
-              disabled || (["Enter", " "].includes(event.key) && context.onOpenToggle(), event.key === "ArrowDown" && context.onOpenChange(!0), ["Enter", " ", "ArrowDown"].includes(event.key) && event.preventDefault());
-            })
-          }),
-          ...triggerProps,
-          children
-        })
-      });
+            if (event.key === "ArrowDown") {
+              activateSelf();
+              context.onOpenChange(true);
+            }
+            if (["Enter", " ", "ArrowDown"].includes(event.key)) event.preventDefault();
+          })
+        }),
+        ...triggerProps,
+        children
+      })
     });
+  });
   MenuTrigger.displayName = TRIGGER_NAME;
-  const PORTAL_NAME = "MenuPortal",
-    MenuPortal = props => {
-      const {
-          scope,
-          children,
-          ...portalProps
-        } = props,
-        context = isAndroid ? useMenuContext(scope) : null,
-        content = isAndroid ? /* @__PURE__ */jsx(MenuProvider, {
-          ...context,
-          children
-        }) : children;
-      return /* @__PURE__ */jsx(Menu.Portal, {
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...portalProps,
-        children: content
-      });
-    };
+  const PORTAL_NAME = "MenuPortal";
+  const MenuPortal = props => {
+    const {
+      scope,
+      children,
+      ...portalProps
+    } = props;
+    const context = isAndroid ? useMenuContext(scope) : null;
+    const content = isAndroid ? /* @__PURE__ */jsx(MenuProvider, {
+      ...context,
+      children
+    }) : children;
+    return /* @__PURE__ */jsx(Menu.Portal, {
+      scope: scope || DROPDOWN_MENU_CONTEXT,
+      ...portalProps,
+      children: content
+    });
+  };
   MenuPortal.displayName = PORTAL_NAME;
-  const CONTENT_NAME = "MenuContent",
-    MenuContent = React.forwardRef((props, forwardedRef) => {
-      const {
-          scope,
-          ...contentProps
-        } = props,
-        context = useMenuContext(scope),
-        hasInteractedOutsideRef = React.useRef(!1);
-      return /* @__PURE__ */jsx(Menu.Content, {
-        id: context.contentId,
-        "aria-labelledby": context.triggerId,
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...contentProps,
-        ref: forwardedRef,
-        onCloseAutoFocus: composeEventHandlers(props.onCloseAutoFocus, event => {
-          hasInteractedOutsideRef.current || context.triggerRef.current?.focus(), hasInteractedOutsideRef.current = !1, event.preventDefault();
-        }),
-        onInteractOutside: composeEventHandlers(props.onInteractOutside, event => {
-          const originalEvent = event.detail.originalEvent,
-            ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === !0,
-            isRightClick = originalEvent.button === 2 || ctrlLeftClick;
-          (!context.modal || isRightClick) && (hasInteractedOutsideRef.current = !0);
-        }),
-        ...props.style
-      });
+  const CONTENT_NAME = "MenuContent";
+  const MenuContent = React.forwardRef((props, forwardedRef) => {
+    const {
+      scope,
+      ...contentProps
+    } = props;
+    const context = useMenuContext(scope);
+    const hasInteractedOutsideRef = React.useRef(false);
+    return /* @__PURE__ */jsx(Menu.Content, {
+      id: context.contentId,
+      "aria-labelledby": context.triggerId,
+      scope: scope || DROPDOWN_MENU_CONTEXT,
+      ...contentProps,
+      ref: forwardedRef,
+      onCloseAutoFocus: composeEventHandlers(props.onCloseAutoFocus, event => {
+        if (!hasInteractedOutsideRef.current) {
+          requestAnimationFrame(() => {
+            const activeEl = document.activeElement;
+            if (!activeEl || activeEl === document.body) {
+              context.triggerRef.current?.focus();
+            }
+          });
+        }
+        hasInteractedOutsideRef.current = false;
+        event.preventDefault();
+      }),
+      onInteractOutside: composeEventHandlers(props.onInteractOutside, event => {
+        const originalEvent = event.detail.originalEvent;
+        const ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === true;
+        const isRightClick = originalEvent.button === 2 || ctrlLeftClick;
+        if (!context.modal || isRightClick) hasInteractedOutsideRef.current = true;
+      }),
+      style: isWeb ? {
+        ...props.style,
+        ...{
+          "--tamagui-menu-content-transform-origin": "var(--tamagui-popper-transform-origin)",
+          "--tamagui-menu-content-available-width": "var(--tamagui-popper-available-width)",
+          "--tamagui-menu-content-available-height": "var(--tamagui-popper-available-height)",
+          "--tamagui-menu-trigger-width": "var(--tamagui-popper-anchor-width)",
+          "--tamagui-menu-trigger-height": "var(--tamagui-popper-anchor-height)"
+        }
+      } : props.style
     });
+  });
   MenuContent.displayName = CONTENT_NAME;
-  const GROUP_NAME = "MenuGroup",
-    MenuGroup = Menu.Group;
-  MenuGroup.displayName = GROUP_NAME;
-  const LABEL_NAME = "MenuLabel",
-    MenuLabel = Menu.Label;
-  MenuLabel.displayName = LABEL_NAME;
-  const ITEM_NAME = "MenuItem",
-    MenuItemFrame = Menu.Item,
-    MenuItem = React.forwardRef((props, forwardedRef) => {
-      const {
-        scope,
-        ...itemProps
-      } = props;
-      return /* @__PURE__ */jsx(MenuItemFrame, {
-        componentName: ITEM_NAME,
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...itemProps,
-        ref: forwardedRef
-      });
-    });
-  MenuItem.displayName = ITEM_NAME;
-  const ITEM_TITLE_NAME = "MenuItemTitle",
-    MenuItemTitle = Menu.ItemTitle;
-  MenuItemTitle.displayName = ITEM_TITLE_NAME;
-  const ITEM_SUB_TITLE_NAME = "MenuItemSubTitle",
-    MenuItemSubTitle = Menu.ItemSubtitle;
-  MenuItemSubTitle.displayName = ITEM_SUB_TITLE_NAME;
-  const ITEM_IMAGE_NAME = "MenuItemImage",
-    MenuItemImage = Menu.ItemImage;
-  MenuItemImage.displayName = ITEM_IMAGE_NAME;
-  const ITEM_ICON_NAME = "MenuItemIcon",
-    MenuItemIcon = Menu.ItemIcon;
-  MenuItemIcon.displayName = ITEM_ICON_NAME;
-  const CHECKBOX_ITEM_NAME = "MenuCheckboxItem",
-    MenuCheckboxItemFrame = Menu.CheckboxItem,
-    MenuCheckboxItem = React.forwardRef((props, forwardedRef) => {
-      const {
-        scope,
-        ...checkboxItemProps
-      } = props;
-      return /* @__PURE__ */jsx(MenuCheckboxItemFrame, {
-        componentName: CHECKBOX_ITEM_NAME,
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...checkboxItemProps,
-        ref: forwardedRef
-      });
-    });
-  MenuCheckboxItem.displayName = CHECKBOX_ITEM_NAME;
-  const RADIO_GROUP_NAME = "MenuRadioGroup",
-    MenuRadioGroup = React.forwardRef((props, forwardedRef) => {
-      const {
-        scope,
-        ...radioGroupProps
-      } = props;
-      return /* @__PURE__ */jsx(Menu.RadioGroup, {
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...radioGroupProps,
-        ref: forwardedRef
-      });
+  const DROPDOWN_MENU_SUB_NAME = "MenuSub";
+  const MenuSub = props => {
+    const {
+      scope,
+      children,
+      open: openProp,
+      onOpenChange,
+      defaultOpen,
+      ...rest
+    } = props;
+    const [open = false, setOpen] = useControllableState({
+      prop: openProp,
+      defaultProp: defaultOpen,
+      onChange: onOpenChange
     });
-  MenuRadioGroup.displayName = RADIO_GROUP_NAME;
-  const RADIO_ITEM_NAME = "MenuRadioItem",
-    MenuRadioItemFrame = Menu.RadioItem,
-    MenuRadioItem = React.forwardRef((props, forwardedRef) => {
-      const {
-        scope,
-        ...radioItemProps
-      } = props;
-      return (
-        // @ts-ignore explanation: deeply nested types typescript limitation
-        /* @__PURE__ */
-        jsx(MenuRadioItemFrame, {
-          componentName: RADIO_ITEM_NAME,
-          scope: scope || DROPDOWN_MENU_CONTEXT,
-          ...radioItemProps,
-          ref: forwardedRef
-        })
-      );
+    return /* @__PURE__ */jsx(Menu.Sub, {
+      scope: scope || DROPDOWN_MENU_CONTEXT,
+      open,
+      onOpenChange: setOpen,
+      ...rest,
+      children
     });
-  MenuRadioItem.displayName = RADIO_ITEM_NAME;
-  const INDICATOR_NAME = "MenuItemIndicator",
-    MenuItemIndicatorFrame = Menu.ItemIndicator,
-    MenuItemIndicator = MenuItemIndicatorFrame.styleable((props, forwardedRef) => {
-      const {
-        scope,
-        ...itemIndicatorProps
-      } = props;
-      return /* @__PURE__ */jsx(MenuItemIndicatorFrame, {
-        componentName: INDICATOR_NAME,
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...itemIndicatorProps,
-        ref: forwardedRef
-      });
-    });
-  MenuItemIndicator.displayName = INDICATOR_NAME;
-  const SEPARATOR_NAME = "MenuSeparator",
-    MenuSeparator = Menu.Separator;
-  MenuSeparator.displayName = SEPARATOR_NAME;
-  const ARROW_NAME = "MenuArrow",
-    MenuArrow = React.forwardRef((props, forwardedRef) => {
-      const {
-        scope,
-        ...arrowProps
-      } = props;
-      return /* @__PURE__ */jsx(Menu.Arrow, {
-        componentName: ARROW_NAME,
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...arrowProps,
-        ref: forwardedRef
-      });
-    });
-  MenuArrow.displayName = ARROW_NAME;
-  const DROPDOWN_MENU_SUB_NAME = "MenuSub",
-    MenuSub = props => {
-      const {
-          scope,
-          children,
-          open: openProp,
-          onOpenChange,
-          defaultOpen,
-          ...rest
-        } = props,
-        [open = !1, setOpen] = useControllableState({
-          prop: openProp,
-          defaultProp: defaultOpen,
-          onChange: onOpenChange
-        });
-      return /* @__PURE__ */jsx(Menu.Sub, {
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        open,
-        onOpenChange: setOpen,
-        ...rest,
-        children
-      });
-    };
+  };
   MenuSub.displayName = DROPDOWN_MENU_SUB_NAME;
-  const SUB_TRIGGER_NAME = "MenuSubTrigger",
-    MenuSubTrigger = View.styleable((props, forwardedRef) => {
-      const {
-        scope,
-        asChild,
-        ...subTriggerProps
-      } = props;
-      return /* @__PURE__ */jsx(Menu.SubTrigger, {
-        componentName: SUB_TRIGGER_NAME,
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...subTriggerProps,
-        ref: forwardedRef
-      });
-    });
-  MenuSubTrigger.displayName = SUB_TRIGGER_NAME;
-  const SUB_CONTENT_NAME = "MenuSubContent",
-    MenuSubContent = React.forwardRef((props, forwardedRef) => {
-      const {
-        scope,
-        ...subContentProps
-      } = props;
-      return /* @__PURE__ */jsx(Menu.SubContent, {
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...subContentProps,
-        ref: forwardedRef,
-        style: isWeb ? {
-          ...props.style,
+  const SUB_CONTENT_NAME = "MenuSubContent";
+  const MenuSubContent = React.forwardRef((props, forwardedRef) => {
+    const {
+      scope,
+      ...subContentProps
+    } = props;
+    return /* @__PURE__ */jsx(Menu.SubContent, {
+      scope: scope || DROPDOWN_MENU_CONTEXT,
+      ...subContentProps,
+      ref: forwardedRef,
+      style: isWeb ? {
+        ...props.style,
+        ...{
           "--tamagui-menu-content-transform-origin": "var(--tamagui-popper-transform-origin)",
           "--tamagui-menu-content-available-width": "var(--tamagui-popper-available-width)",
           "--tamagui-menu-content-available-height": "var(--tamagui-popper-available-height)",
           "--tamagui-menu-trigger-width": "var(--tamagui-popper-anchor-width)",
           "--tamagui-menu-trigger-height": "var(--tamagui-popper-anchor-height)"
-        } : null
-      });
+        }
+      } : null
     });
-  return MenuSubContent.displayName = SUB_CONTENT_NAME, withStaticProperties(MenuComp, {
+  });
+  MenuSubContent.displayName = SUB_CONTENT_NAME;
+  const MenuScrollView = styled(ScrollView, {
+    flexShrink: 1,
+    alignSelf: "stretch",
+    showsHorizontalScrollIndicator: false,
+    showsVerticalScrollIndicator: false,
+    "$platform-web": {
+      maxHeight: "var(--tamagui-menu-content-available-height)"
+    }
+  });
+  const Group = Menu.Group;
+  const Label = Menu.Label;
+  const Item = Menu.Item;
+  const CheckboxItem = Menu.CheckboxItem;
+  const RadioGroup = Menu.RadioGroup;
+  const RadioItem = Menu.RadioItem;
+  const ItemIndicator = Menu.ItemIndicator;
+  const Separator = Menu.Separator;
+  const Arrow = Menu.Arrow;
+  const SubTrigger = Menu.SubTrigger;
+  const ItemTitle = Menu.ItemTitle;
+  const ItemSubtitle = Menu.ItemSubtitle;
+  const ItemImage = Menu.ItemImage;
+  const ItemIcon = Menu.ItemIcon;
+  return withStaticProperties(MenuComp, {
     Root: MenuComp,
     Trigger: MenuTrigger,
     Portal: MenuPortal,
     Content: MenuContent,
-    Group: MenuGroup,
-    Label: MenuLabel,
-    Item: MenuItem,
-    CheckboxItem: MenuCheckboxItem,
-    RadioGroup: MenuRadioGroup,
-    RadioItem: MenuRadioItem,
-    ItemIndicator: MenuItemIndicator,
-    Separator: MenuSeparator,
-    Arrow: MenuArrow,
+    Group,
+    Label,
+    Item,
+    CheckboxItem,
+    RadioGroup,
+    RadioItem,
+    ItemIndicator,
+    Separator,
+    Arrow,
     Sub: MenuSub,
-    SubTrigger: MenuSubTrigger,
+    SubTrigger,
     SubContent: MenuSubContent,
-    ItemTitle: MenuItemTitle,
-    ItemSubtitle: MenuItemSubTitle,
-    ItemImage: MenuItemImage,
-    ItemIcon: MenuItemIcon
+    ItemTitle,
+    ItemSubtitle,
+    ItemImage,
+    ItemIcon,
+    ScrollView: MenuScrollView
   });
 }
 export { DROPDOWN_MENU_CONTEXT, createNonNativeMenu };