@launchpad-ui/menu 0.10.1 → 0.10.2

package/dist/index.js

@@ -1,9 +1,9 @@
 require('./style.css');
 "use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const jsxRuntime = require("react/jsx-runtime");
 const classix = require("classix");
 const react = require("react");
-const jsxRuntime = require("react/jsx-runtime");
 const separator = require("@react-aria/separator");
 const tooltip = require("@launchpad-ui/tooltip");
 const reactSlot = require("@radix-ui/react-slot");
@@ -11,21 +11,12 @@ const focus = require("@react-aria/focus");
 const form = require("@launchpad-ui/form");
 const reactVirtual = require("react-virtual");
 const Menu$1 = "";
-const MenuBase = react.forwardRef(({
-  children,
-  size,
-  isVirtual,
-  ...props
-}, ref) => {
-  const classes = classix.cx("Menu", isVirtual && "Menu--isVirtual", size && `MenuSize--${size}`);
-  return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ...props,
-    role: "menu",
-    className: classes,
-    ref,
-    children
-  });
-});
+const MenuBase = react.forwardRef(
+  ({ children, size, isVirtual, ...props }, ref) => {
+    const classes = classix.cx("Menu", isVirtual && "Menu--isVirtual", size && `MenuSize--${size}`);
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { ...props, role: "menu", className: classes, ref, children });
+  }
+);
 MenuBase.displayName = "MenuBase";
 const MenuDivider = ({
   elementType = "div",
@@ -33,24 +24,18 @@ const MenuDivider = ({
   innerRef,
   "data-test-id": testId = "menu-divider"
 }) => {
-  const {
-    separatorProps
-  } = separator.useSeparator({
+  const { separatorProps } = separator.useSeparator({
     orientation,
     elementType
   });
-  return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ...separatorProps,
-    "data-test-id": testId,
-    ref: innerRef,
-    className: "Menu-divider"
-  });
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { ...separatorProps, "data-test-id": testId, ref: innerRef, className: "Menu-divider" });
 };
 const defaultElement = "button";
 const MenuItem = ({
   ...props
 }) => {
   const {
+    // TODO: remove component prop once we migrate over to asChild format
     component,
     children,
     isHighlighted,
@@ -70,50 +55,44 @@ const MenuItem = ({
     ...rest
   } = props;
   const Component = component || (asChild ? reactSlot.Slot : defaultElement);
-  const renderedItem = /* @__PURE__ */ jsxRuntime.jsx(focus.FocusRing, {
-    focusRingClass: "has-focus",
-    children: /* @__PURE__ */ jsxRuntime.jsx(Component, {
+  const renderedItem = /* @__PURE__ */ jsxRuntime.jsx(focus.FocusRing, { focusRingClass: "has-focus", children: /* @__PURE__ */ jsxRuntime.jsx(
+    Component,
+    {
       ...rest,
       disabled,
       "aria-disabled": disabled ? disabled : void 0,
-      className: classix.cx("Menu-item", className, isHighlighted && "is-highlighted", nested && "Menu-item--nested", groupHeader && "Menu-item--header"),
+      className: classix.cx(
+        "Menu-item",
+        className,
+        isHighlighted && "is-highlighted",
+        nested && "Menu-item--nested",
+        groupHeader && "Menu-item--header"
+      ),
       "data-test-id": testId,
       role,
       onKeyDown,
-      children: asChild ? children : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [Icon && /* @__PURE__ */ jsxRuntime.jsx("span", {
-          className: "Menu-item-icon",
-          children: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
-            size: "small"
-          })
-        }), children]
-      })
-    })
-  });
+      children: asChild ? children : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        Icon && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "Menu-item-icon", children: /* @__PURE__ */ jsxRuntime.jsx(Icon, { size: "small" }) }),
+        children
+      ] })
+    }
+  ) });
   if (tooltip$1) {
-    return /* @__PURE__ */ jsxRuntime.jsx(tooltip.Tooltip, {
-      content: tooltip$1,
-      rootElementStyle: {
-        display: "block"
-      },
-      allowBoundaryElementOverflow: true,
-      placement: tooltipPlacement ? tooltipPlacement : "bottom",
-      ...tooltipOptions || {},
-      children: renderedItem
-    });
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      tooltip.Tooltip,
+      {
+        content: tooltip$1,
+        rootElementStyle: { display: "block" },
+        allowBoundaryElementOverflow: true,
+        placement: tooltipPlacement ? tooltipPlacement : "bottom",
+        ...tooltipOptions || {},
+        children: renderedItem
+      }
+    );
   }
   return renderedItem;
 };
-const MenuItemList = react.forwardRef(({
-  children,
-  ...rest
-}, ref) => /* @__PURE__ */ jsxRuntime.jsx("div", {
-  ...rest,
-  ref,
-  "data-test-id": "menu-item-list",
-  className: "Menu-item-list",
-  children
-}));
+const MenuItemList = react.forwardRef(({ children, ...rest }, ref) => /* @__PURE__ */ jsxRuntime.jsx("div", { ...rest, ref, "data-test-id": "menu-item-list", className: "Menu-item-list", children }));
 MenuItemList.displayName = "MenuItemList";
 const MenuSearch = react.forwardRef((props, ref) => {
   const {
@@ -123,9 +102,9 @@ const MenuSearch = react.forwardRef((props, ref) => {
     "data-test-id": testId = "menu-search",
     ...finalProps
   } = props;
-  return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    className: "Menu-search",
-    children: /* @__PURE__ */ jsxRuntime.jsx(form.TextField, {
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "Menu-search", children: /* @__PURE__ */ jsxRuntime.jsx(
+    form.TextField,
+    {
       ...finalProps,
       ref,
       className: "Menu-search-input",
@@ -136,8 +115,8 @@ const MenuSearch = react.forwardRef((props, ref) => {
       autoComplete: "off",
       placeholder,
       "aria-label": ariaLabel || "Search"
-    })
-  });
+    }
+  ) });
 });
 MenuSearch.displayName = "MenuSearch";
 const createItemId = (index, id) => `${id}-item-${index}`;
@@ -170,14 +149,10 @@ const Menu = (props) => {
   } = props;
   const focusManager = focus.useFocusManager();
   const handleArrowDown = react.useCallback(() => {
-    focusManager.focusNext({
-      wrap: true
-    });
+    focusManager.focusNext({ wrap: true });
   }, [focusManager]);
   const handleArrowUp = react.useCallback(() => {
-    focusManager.focusPrevious({
-      wrap: true
-    });
+    focusManager.focusPrevious({ wrap: true });
   }, [focusManager]);
   const reduceItems = react.useMemo(() => {
     const childrenProps = react.Children.toArray(children);
@@ -195,70 +170,57 @@ const Menu = (props) => {
             break;
         }
       });
-      return {
-        items: elements,
-        searchElement: searchElem
-      };
+      return { items: elements, searchElement: searchElem };
     }
-    return childrenProps.reduce(({
-      items,
-      searchElement
-    }, child) => {
-      var _a;
-      switch (child.type) {
-        case MenuSearch:
-          return {
-            items,
-            searchElement: react.cloneElement(child, {
-              onKeyDown: (e) => handleKeyboardInteractions(e, {
-                handleDown: handleArrowDown,
-                handleUp: handleArrowUp
-              })
-            })
-          };
-        case MenuItem:
-          return {
-            items: items.concat(child.props.disabled ? react.cloneElement(child, {
-              onClick: () => void 0,
-              onKeyDown: () => void 0,
-              tabIndex: -1,
-              disabled: true
-            }) : react.cloneElement(child, {
-              className: classix.cx(child.props.className, menuItemClassName),
-              item: (_a = child.props.item) != null ? _a : items.length,
-              onClick: chainEventHandlers(child.props.onClick, () => {
-                var _a2;
-                onSelect == null ? void 0 : onSelect((_a2 = child.props.item) != null ? _a2 : items.length);
-              }),
-              onKeyDown: (e) => handleKeyboardInteractions(e, {
-                handleDown: handleArrowDown,
-                handleUp: handleArrowUp
+    return childrenProps.reduce(
+      ({ items, searchElement }, child) => {
+        switch (child.type) {
+          case MenuSearch:
+            return {
+              items,
+              searchElement: react.cloneElement(child, {
+                onKeyDown: (e) => handleKeyboardInteractions(e, {
+                  handleDown: handleArrowDown,
+                  handleUp: handleArrowUp
+                })
               })
-            })),
-            searchElement
-          };
-        case MenuDivider:
-          return {
-            items: items.concat(child),
-            searchElement
-          };
-        default:
-          return {
-            items,
-            searchElement
-          };
-      }
-    }, {
-      items: [],
-      searchElement: null
-    });
+            };
+          case MenuItem:
+            return {
+              items: items.concat(
+                child.props.disabled ? react.cloneElement(child, {
+                  onClick: () => void 0,
+                  onKeyDown: () => void 0,
+                  tabIndex: -1,
+                  disabled: true
+                }) : react.cloneElement(child, {
+                  className: classix.cx(child.props.className, menuItemClassName),
+                  item: child.props.item ?? items.length,
+                  // set focus on the first menu item if there is no search input, and set in the tab order
+                  onClick: chainEventHandlers(child.props.onClick, () => {
+                    onSelect == null ? void 0 : onSelect(child.props.item ?? items.length);
+                  }),
+                  onKeyDown: (e) => handleKeyboardInteractions(e, {
+                    handleDown: handleArrowDown,
+                    handleUp: handleArrowUp
+                  })
+                })
+              ),
+              searchElement
+            };
+          case MenuDivider:
+            return { items: items.concat(child), searchElement };
+          default:
+            return { items, searchElement };
+        }
+      },
+      { items: [], searchElement: null }
+    );
   }, [children, enableVirtualization, menuItemClassName, handleArrowDown, handleArrowUp, onSelect]);
   if (enableVirtualization) {
-    return /* @__PURE__ */ jsxRuntime.jsx(MenuBase, {
-      "data-test-id": testId,
-      isVirtual: true,
-      size,
-      children: /* @__PURE__ */ jsxRuntime.jsx(ItemVirtualizer, {
+    return /* @__PURE__ */ jsxRuntime.jsx(MenuBase, { "data-test-id": testId, isVirtual: true, size, children: /* @__PURE__ */ jsxRuntime.jsx(
+      ItemVirtualizer,
+      {
         items: react.Children.toArray(reduceItems.items),
         searchElement: reduceItems.searchElement,
         overscan,
@@ -266,17 +228,13 @@ const Menu = (props) => {
         onSelect,
         itemHeight,
         focusManager
-      })
-    });
+      }
+    ) });
   }
-  return /* @__PURE__ */ jsxRuntime.jsxs(MenuBase, {
-    "data-test-id": testId,
-    size,
-    children: [reduceItems.searchElement, /* @__PURE__ */ jsxRuntime.jsx(MenuItemList, {
-      role: "presentation",
-      children: reduceItems.items
-    })]
-  });
+  return /* @__PURE__ */ jsxRuntime.jsxs(MenuBase, { "data-test-id": testId, size, children: [
+    reduceItems.searchElement,
+    /* @__PURE__ */ jsxRuntime.jsx(MenuItemList, { role: "presentation", children: reduceItems.items })
+  ] });
 };
 const ItemVirtualizer = (props) => {
   const {
@@ -306,60 +264,70 @@ const ItemVirtualizer = (props) => {
     rowVirtualizer.scrollToIndex(0);
     (_b = (_a = searchRef.current) == null ? void 0 : _a.focus) == null ? void 0 : _b.call(_a);
   }, [rowVirtualizer]);
-  const focusMenuItem = react.useCallback((index) => {
-    rowVirtualizer.scrollToIndex(index);
-    setNextFocusValue(index);
-  }, [rowVirtualizer]);
-  const handleKeyboardFocusInteraction = react.useCallback((direction) => {
-    if (focusedItemIndex.current === null || focusedItemIndex.current === void 0) {
-      return;
-    }
-    const nextIndex = direction === "next" ? focusedItemIndex.current + 1 : focusedItemIndex.current - 1;
-    const shouldWrap = direction === "next" && focusedItemIndex.current === lastVirtualItemIndex || direction === "previous" && focusedItemIndex.current === 0;
-    if (shouldWrap) {
-      if (hasSearch) {
-        focusSearchBar();
-      } else {
-        focusMenuItem(direction === "next" ? 0 : lastVirtualItemIndex);
+  const focusMenuItem = react.useCallback(
+    (index) => {
+      rowVirtualizer.scrollToIndex(index);
+      setNextFocusValue(index);
+    },
+    [rowVirtualizer]
+  );
+  const handleKeyboardFocusInteraction = react.useCallback(
+    (direction) => {
+      if (focusedItemIndex.current === null || focusedItemIndex.current === void 0) {
+        return;
       }
-      return;
-    }
-    switch (direction) {
-      case "next":
-        rowVirtualizer.scrollToIndex(nextIndex);
-        focusManager.focusNext();
-        break;
-      case "previous":
-        rowVirtualizer.scrollToIndex(nextIndex);
-        focusManager.focusPrevious();
-        break;
-    }
-  }, [focusManager, focusMenuItem, focusSearchBar, hasSearch, lastVirtualItemIndex, rowVirtualizer]);
-  const getItemProps = react.useCallback((itemElem, index) => {
-    const childProps = itemElem.props;
-    switch (itemElem.type) {
-      case MenuItem:
-        return {
-          className: classix.cx(childProps.className, menuItemClassName),
-          onKeyDown: childProps.disabled ? () => void 0 : (e) => handleKeyboardFocusKeydown(e, {
-            handleFocusBackward: handleKeyboardFocusInteraction,
-            handleFocusForward: handleKeyboardFocusInteraction
-          }),
-          onFocus: chainEventHandlers(childProps.onFocus, () => {
-            focusedItemIndex.current = index;
-          }),
-          id: createItemId(index, menuId.current),
-          onBlur: chainEventHandlers(childProps.onBlur, () => {
-            focusedItemIndex.current = null;
-          }),
-          onClick: childProps.disabled ? () => void 0 : chainEventHandlers(childProps.onClick, () => {
-            onSelect == null ? void 0 : onSelect(childProps.item);
-          })
-        };
-      default:
-        return {};
-    }
-  }, [handleKeyboardFocusInteraction, menuItemClassName, onSelect]);
+      const nextIndex = direction === "next" ? focusedItemIndex.current + 1 : focusedItemIndex.current - 1;
+      const shouldWrap = direction === "next" && focusedItemIndex.current === lastVirtualItemIndex || direction === "previous" && focusedItemIndex.current === 0;
+      if (shouldWrap) {
+        if (hasSearch) {
+          focusSearchBar();
+        } else {
+          focusMenuItem(direction === "next" ? 0 : lastVirtualItemIndex);
+        }
+        return;
+      }
+      switch (direction) {
+        case "next":
+          rowVirtualizer.scrollToIndex(nextIndex);
+          focusManager.focusNext();
+          break;
+        case "previous":
+          rowVirtualizer.scrollToIndex(nextIndex);
+          focusManager.focusPrevious();
+          break;
+      }
+    },
+    [focusManager, focusMenuItem, focusSearchBar, hasSearch, lastVirtualItemIndex, rowVirtualizer]
+  );
+  const getItemProps = react.useCallback(
+    (itemElem, index) => {
+      const childProps = itemElem.props;
+      switch (itemElem.type) {
+        case MenuItem:
+          return {
+            className: classix.cx(childProps.className, menuItemClassName),
+            // set focus on the first menu item if there is no search input, and set in the tab order
+            onKeyDown: childProps.disabled ? () => void 0 : (e) => handleKeyboardFocusKeydown(e, {
+              handleFocusBackward: handleKeyboardFocusInteraction,
+              handleFocusForward: handleKeyboardFocusInteraction
+            }),
+            onFocus: chainEventHandlers(childProps.onFocus, () => {
+              focusedItemIndex.current = index;
+            }),
+            id: createItemId(index, menuId.current),
+            onBlur: chainEventHandlers(childProps.onBlur, () => {
+              focusedItemIndex.current = null;
+            }),
+            onClick: childProps.disabled ? () => void 0 : chainEventHandlers(childProps.onClick, () => {
+              onSelect == null ? void 0 : onSelect(childProps.item);
+            })
+          };
+        default:
+          return {};
+      }
+    },
+    [handleKeyboardFocusInteraction, menuItemClassName, onSelect]
+  );
   react.useEffect(() => {
     if (nextFocusValue !== null) {
       requestAnimationFrame(() => {
@@ -382,42 +350,52 @@ const ItemVirtualizer = (props) => {
       }
     }
   };
-  const renderSearch = react.useMemo(() => searchElement ? react.cloneElement(searchElement, {
-    onKeyDown: (e) => handleKeyboardFocusKeydown(e, {
-      handleFocusBackward: () => focusMenuItem(lastVirtualItemIndex),
-      handleFocusForward: () => focusMenuItem(0)
+  const renderSearch = react.useMemo(
+    () => searchElement ? react.cloneElement(searchElement, {
+      onKeyDown: (e) => handleKeyboardFocusKeydown(e, {
+        handleFocusBackward: () => focusMenuItem(lastVirtualItemIndex),
+        handleFocusForward: () => focusMenuItem(0)
+      }),
+      ref: searchRef
+    }) : null,
+    [searchElement, lastVirtualItemIndex, focusMenuItem]
+  );
+  const renderItems = react.useMemo(
+    () => rowVirtualizer.virtualItems.map((virtualRow) => {
+      if (!items) {
+        return null;
+      }
+      const elem = items[virtualRow.index];
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        "div",
+        {
+          ref: virtualRow.measureRef,
+          role: "presentation",
+          className: classix.cx("VirtualMenu-item"),
+          style: {
+            transform: `translateY(${virtualRow.start}px)`
+          },
+          children: react.cloneElement(elem, getItemProps(elem, virtualRow.index))
+        },
+        virtualRow.index
+      );
     }),
-    ref: searchRef
-  }) : null, [searchElement, lastVirtualItemIndex, focusMenuItem]);
-  const renderItems = react.useMemo(() => rowVirtualizer.virtualItems.map((virtualRow) => {
-    if (!items) {
-      return null;
-    }
-    const elem = items[virtualRow.index];
-    return /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ref: virtualRow.measureRef,
-      role: "presentation",
-      className: classix.cx("VirtualMenu-item"),
-      style: {
-        transform: `translateY(${virtualRow.start}px)`
-      },
-      children: react.cloneElement(elem, getItemProps(elem, virtualRow.index))
-    }, virtualRow.index);
-  }), [rowVirtualizer.virtualItems, items, getItemProps]);
-  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [renderSearch, /* @__PURE__ */ jsxRuntime.jsx(MenuItemList, {
-      ref: parentRef,
-      role: "presentation",
-      children: /* @__PURE__ */ jsxRuntime.jsx("div", {
+    [rowVirtualizer.virtualItems, items, getItemProps]
+  );
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    renderSearch,
+    /* @__PURE__ */ jsxRuntime.jsx(MenuItemList, { ref: parentRef, role: "presentation", children: /* @__PURE__ */ jsxRuntime.jsx(
+      "div",
+      {
         role: "presentation",
         className: "VirtualMenu-item-list",
         style: {
           height: `${rowVirtualizer.totalSize}px`
         },
         children: renderItems
-      })
-    })]
-  });
+      }
+    ) })
+  ] });
 };
 exports.Menu = Menu;
 exports.MenuBase = MenuBase;