@tamagui/menu 2.0.0-rc.3 → 2.0.0-rc.31

package/dist/cjs/Menu.cjs

@@ -37,7 +37,8 @@ module.exports = __toCommonJS(Menu_exports);
 var import_create_menu = require("@tamagui/create-menu"),
   import_web = require("@tamagui/web"),
   import_react = __toESM(require("react"), 1),
-  import_createNonNativeMenu = require("./createNonNativeMenu.cjs");
+  import_createNonNativeMenu = require("./createNonNativeMenu.cjs"),
+  import_jsx_runtime = require("react/jsx-runtime");
 function createMenu(params) {
   const {
       Menu: NativeMenuRoot
@@ -113,14 +114,18 @@ function createMenu(params) {
       Component: NonNativeMenu.RadioGroup,
       NativeComponent: ({
         children
-      }) => children
+      }) => /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+        children
+      })
     }),
     RadioItem = (0, import_create_menu.withNativeMenu)({
       ...COMMON_PARAMS,
       Component: NonNativeMenu.RadioItem,
       NativeComponent: ({
         children
-      }) => children
+      }) => /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+        children
+      })
     }),
     ItemIndicator = (0, import_create_menu.withNativeMenu)({
       ...COMMON_PARAMS,
@@ -151,7 +156,14 @@ function createMenu(params) {
       ...COMMON_PARAMS,
       Component: NonNativeMenu.SubContent,
       NativeComponent: NativeMenuRoot.SubContent
+    }),
+    NativeScrollView = ({
+      children
+    }) => /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+      children
     });
+  NativeScrollView.displayName = "MenuScrollView";
+  const ScrollView = import_web.isWeb ? NonNativeMenu.ScrollView : NativeScrollView;
   return (0, import_web.withStaticProperties)(MenuComp, {
     Trigger,
     Portal,
@@ -171,6 +183,7 @@ function createMenu(params) {
     ItemTitle,
     ItemSubtitle,
     ItemIcon,
-    ItemImage
+    ItemImage,
+    ScrollView
   });
 }

package/dist/cjs/Menu.native.js

@@ -36,7 +36,8 @@ __export(Menu_exports, {
   createMenu: () => createMenu
 });
 module.exports = __toCommonJS(Menu_exports);
-var import_create_menu = require("@tamagui/create-menu"),
+var import_jsx_runtime = require("react/jsx-runtime"),
+  import_create_menu = require("@tamagui/create-menu"),
   import_web = require("@tamagui/web"),
   import_react = __toESM(require("react"), 1),
   import_createNonNativeMenu = require("./createNonNativeMenu.native.js");
@@ -117,7 +118,9 @@ function createMenu(params) {
         var {
           children
         } = param;
-        return children;
+        return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+          children
+        });
       }
     }),
     RadioItem = (0, import_create_menu.withNativeMenu)({
@@ -127,7 +130,9 @@ function createMenu(params) {
         var {
           children
         } = param;
-        return children;
+        return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+          children
+        });
       }
     }),
     ItemIndicator = (0, import_create_menu.withNativeMenu)({
@@ -160,6 +165,16 @@ function createMenu(params) {
       Component: NonNativeMenu.SubContent,
       NativeComponent: NativeMenuRoot.SubContent
     }),
+    NativeScrollView = function (param) {
+      var {
+        children
+      } = param;
+      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+        children
+      });
+    };
+  NativeScrollView.displayName = "MenuScrollView";
+  var ScrollView = import_web.isWeb ? NonNativeMenu.ScrollView : NativeScrollView,
     Menu = (0, import_web.withStaticProperties)(MenuComp, {
       Trigger,
       Portal,
@@ -179,7 +194,8 @@ function createMenu(params) {
       ItemTitle,
       ItemSubtitle,
       ItemIcon,
-      ItemImage
+      ItemImage,
+      ScrollView
     });
   return Menu;
 }

package/dist/cjs/Menu.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Menu_exports","__export","createMenu","module","exports","import_create_menu","require","import_web","import_react","__toESM","import_createNonNativeMenu","params","Menu","NativeMenuRoot","createNativeMenu","NonNativeMenu","createNonNativeMenu","COMMON_PARAMS","isRoot","scope","DROPDOWN_MENU_CONTEXT","MenuComp","withNativeMenu","Component","Root","NativeComponent","Trigger","Portal","default","Fragment","Content","Group","Label","Item","ItemTitle","ItemSubtitle","ItemIcon","ItemImage","CheckboxItem","RadioGroup","param","children","RadioItem","ItemIndicator","Separator","Arrow","Sub","SubTrigger","SubContent","withStaticProperties"],"sources":["../../src/Menu.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Menu_exports","__export","createMenu","module","exports","import_jsx_runtime","require","import_create_menu","import_web","import_react","__toESM","import_createNonNativeMenu","params","Menu","NativeMenuRoot","createNativeMenu","NonNativeMenu","createNonNativeMenu","COMMON_PARAMS","isRoot","scope","DROPDOWN_MENU_CONTEXT","MenuComp","withNativeMenu","Component","Root","NativeComponent","Trigger","Portal","default","Fragment","Content","Group","Label","Item","ItemTitle","ItemSubtitle","ItemIcon","ItemImage","CheckboxItem","RadioGroup","param","children","jsx","RadioItem","ItemIndicator","Separator","Arrow","Sub","SubTrigger","SubContent","NativeScrollView","displayName","ScrollView","isWeb","withStaticProperties"],"sources":["../../src/Menu.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/createNonNativeMenu.cjs

@@ -36,12 +36,40 @@ __export(createNonNativeMenu_exports, {
 });
 module.exports = __toCommonJS(createNonNativeMenu_exports);
 var import_create_menu = require("@tamagui/create-menu"),
+  import_popper = require("@tamagui/popper"),
+  import_scroll_view = require("@tamagui/scroll-view"),
   import_use_controllable_state = require("@tamagui/use-controllable-state"),
   import_web = require("@tamagui/web"),
   React = __toESM(require("react"), 1),
   import_react = require("react"),
   import_jsx_runtime = require("react/jsx-runtime");
 const DROPDOWN_MENU_CONTEXT = "MenuContext";
+function useMenuTriggerSetup(open) {
+  const triggerStateSettersRef = React.useRef(/* @__PURE__ */new Map()),
+    activeTriggerIdRef = React.useRef(null),
+    setActiveTrigger = (0, import_web.useEvent)(id => {
+      const prevId = activeTriggerIdRef.current;
+      prevId !== id && (prevId && triggerStateSettersRef.current.get(prevId)?.(!1), activeTriggerIdRef.current = id, id && open && triggerStateSettersRef.current.get(id)?.(!0));
+    }),
+    registerTrigger = (0, import_web.useEvent)((id, setOpenState) => {
+      triggerStateSettersRef.current.set(id, setOpenState), setOpenState(activeTriggerIdRef.current === id && open);
+    }),
+    unregisterTrigger = (0, import_web.useEvent)(id => {
+      triggerStateSettersRef.current.delete(id), activeTriggerIdRef.current === id && (activeTriggerIdRef.current = null);
+    });
+  return React.useEffect(() => {
+    if (!open) {
+      setActiveTrigger(null);
+      return;
+    }
+    const activeId = activeTriggerIdRef.current;
+    activeId && triggerStateSettersRef.current.get(activeId)?.(!0);
+  }, [open, setActiveTrigger]), {
+    setActiveTrigger,
+    registerTrigger,
+    unregisterTrigger
+  };
+}
 function createNonNativeMenu(params) {
   const {
       Menu
@@ -67,16 +95,26 @@ function createNonNativeMenu(params) {
           prop: openProp,
           defaultProp: defaultOpen,
           onChange: onOpenChange
-        });
+        }),
+        openRef = React.useRef(open);
+      openRef.current = open;
+      const {
+        setActiveTrigger,
+        registerTrigger,
+        unregisterTrigger
+      } = useMenuTriggerSetup(open);
       return /* @__PURE__ */(0, import_jsx_runtime.jsx)(MenuProvider, {
         scope,
         triggerId: (0, import_react.useId)(),
         triggerRef,
         contentId: (0, import_react.useId)(),
-        open,
-        onOpenChange: setOpen,
+        openRef,
+        onOpenChange: React.useCallback(nextOpen => setOpen(nextOpen), [setOpen]),
         onOpenToggle: React.useCallback(() => setOpen(prevOpen => !prevOpen), [setOpen]),
         modal,
+        setActiveTrigger,
+        registerTrigger,
+        unregisterTrigger,
         children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(Menu, {
           scope: scope || DROPDOWN_MENU_CONTEXT,
           open,
@@ -101,8 +139,22 @@ function createNonNativeMenu(params) {
           ...triggerProps
         } = props,
         context = useMenuContext(scope),
+        popperCtx = (0, import_popper.usePopperContextSlow)(scope || DROPDOWN_MENU_CONTEXT),
         Comp = asChild ? import_web.Slot : import_web.View,
         isTouchDevice = (0, import_web.useIsTouchDevice)(),
+        triggerElRef = React.useRef(null),
+        triggerId = React.useId(),
+        [triggerOpen, setTriggerOpen] = React.useState(!1),
+        {
+          registerTrigger,
+          unregisterTrigger
+        } = context;
+      React.useEffect(() => (registerTrigger(triggerId, setTriggerOpen), () => unregisterTrigger(triggerId)), [registerTrigger, unregisterTrigger, triggerId]);
+      const activateSelf = React.useCallback(() => {
+          context.setActiveTrigger(triggerId);
+          const el = triggerElRef.current;
+          el && (context.triggerRef.current = el, el instanceof HTMLElement && (popperCtx.refs?.setReference(el), requestAnimationFrame(() => popperCtx.update?.())));
+        }, [context, triggerId, popperCtx]),
         pressEvent = import_web.isWeb ? isTouchDevice ? "onClick" : "onPointerDown" : "onPress";
       return /* @__PURE__ */(0, import_jsx_runtime.jsx)(MenuTriggerFrame, {
         asChild: !0,
@@ -112,23 +164,23 @@ function createNonNativeMenu(params) {
           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",
+          "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: (0, import_web.composeRefs)(forwardedRef, context.triggerRef),
+          ref: (0, import_web.composeRefs)(forwardedRef, context.triggerRef, triggerElRef),
           [pressEvent]: (0, import_web.composeEventHandlers)(
           //@ts-ignore
           props[pressEvent], event => {
             if (!disabled) {
               if (import_web.isWeb && event instanceof PointerEvent && event.button !== 0 && event.ctrlKey === !0) return;
-              context.onOpenToggle(), context.open || event.preventDefault();
+              context.openRef.current ? context.setActiveTrigger(null) : activateSelf(), context.onOpenToggle(), context.openRef.current || event.preventDefault();
             }
           }),
           ...(import_web.isWeb && {
             onKeyDown: (0, import_web.composeEventHandlers)(onKeydown, event => {
-              disabled || (["Enter", " "].includes(event.key) && context.onOpenToggle(), event.key === "ArrowDown" && context.onOpenChange(!0), ["Enter", " ", "ArrowDown"].includes(event.key) && event.preventDefault());
+              disabled || (["Enter", " "].includes(event.key) && (context.openRef.current ? context.setActiveTrigger(null) : activateSelf(), context.onOpenToggle()), event.key === "ArrowDown" && (activateSelf(), context.onOpenChange(!0)), ["Enter", " ", "ArrowDown"].includes(event.key) && event.preventDefault());
             })
           }),
           ...triggerProps,
@@ -171,7 +223,10 @@ function createNonNativeMenu(params) {
         ...contentProps,
         ref: forwardedRef,
         onCloseAutoFocus: (0, import_web.composeEventHandlers)(props.onCloseAutoFocus, event => {
-          hasInteractedOutsideRef.current || context.triggerRef.current?.focus(), hasInteractedOutsideRef.current = !1, event.preventDefault();
+          hasInteractedOutsideRef.current || requestAnimationFrame(() => {
+            const activeEl = document.activeElement;
+            (!activeEl || activeEl === document.body) && context.triggerRef.current?.focus();
+          }), hasInteractedOutsideRef.current = !1, event.preventDefault();
         }),
         onInteractOutside: (0, import_web.composeEventHandlers)(props.onInteractOutside, event => {
           const originalEvent = event.detail.originalEvent,
@@ -179,122 +234,17 @@ function createNonNativeMenu(params) {
             isRightClick = originalEvent.button === 2 || ctrlLeftClick;
           (!context.modal || isRightClick) && (hasInteractedOutsideRef.current = !0);
         }),
-        ...props.style
+        style: import_web.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__ */(0, import_jsx_runtime.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__ */(0, import_jsx_runtime.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__ */(0, import_jsx_runtime.jsx)(Menu.RadioGroup, {
-        scope: scope || DROPDOWN_MENU_CONTEXT,
-        ...radioGroupProps,
-        ref: forwardedRef
-      });
-    });
-  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__ */
-        (0, import_jsx_runtime.jsx)(MenuRadioItemFrame, {
-          componentName: RADIO_ITEM_NAME,
-          scope: scope || DROPDOWN_MENU_CONTEXT,
-          ...radioItemProps,
-          ref: forwardedRef
-        })
-      );
-    });
-  MenuRadioItem.displayName = RADIO_ITEM_NAME;
-  const INDICATOR_NAME = "MenuItemIndicator",
-    MenuItemIndicatorFrame = Menu.ItemIndicator,
-    MenuItemIndicator = MenuItemIndicatorFrame.styleable((props, forwardedRef) => {
-      const {
-        scope,
-        ...itemIndicatorProps
-      } = props;
-      return /* @__PURE__ */(0, import_jsx_runtime.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__ */(0, import_jsx_runtime.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 {
@@ -319,21 +269,6 @@ function createNonNativeMenu(params) {
       });
     };
   MenuSub.displayName = DROPDOWN_MENU_SUB_NAME;
-  const SUB_TRIGGER_NAME = "MenuSubTrigger",
-    MenuSubTrigger = import_web.View.styleable((props, forwardedRef) => {
-      const {
-        scope,
-        asChild,
-        ...subTriggerProps
-      } = props;
-      return /* @__PURE__ */(0, import_jsx_runtime.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 {
@@ -354,26 +289,51 @@ function createNonNativeMenu(params) {
         } : null
       });
     });
-  return MenuSubContent.displayName = SUB_CONTENT_NAME, (0, import_web.withStaticProperties)(MenuComp, {
+  MenuSubContent.displayName = SUB_CONTENT_NAME;
+  const MenuScrollView = (0, import_web.styled)(import_scroll_view.ScrollView, {
+      flexShrink: 1,
+      alignSelf: "stretch",
+      showsHorizontalScrollIndicator: !1,
+      showsVerticalScrollIndicator: !1,
+      "$platform-web": {
+        maxHeight: "var(--tamagui-menu-content-available-height)"
+      }
+    }),
+    Group = Menu.Group,
+    Label = Menu.Label,
+    Item = Menu.Item,
+    CheckboxItem = Menu.CheckboxItem,
+    RadioGroup = Menu.RadioGroup,
+    RadioItem = Menu.RadioItem,
+    ItemIndicator = Menu.ItemIndicator,
+    Separator = Menu.Separator,
+    Arrow = Menu.Arrow,
+    SubTrigger = Menu.SubTrigger,
+    ItemTitle = Menu.ItemTitle,
+    ItemSubtitle = Menu.ItemSubtitle,
+    ItemImage = Menu.ItemImage,
+    ItemIcon = Menu.ItemIcon;
+  return (0, import_web.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
   });
 }