@doist/reactist 24.1.0-beta → 24.1.1-beta

package/dist/reactist.cjs.development.js

@@ -473,54 +473,9 @@ function Tooltip({
   if (typeof child.ref === 'string') {
     throw new Error('Tooltip: String refs cannot be used as they cannot be forwarded');
   }
-  /**
-   * Prevents the tooltip from automatically firing on focus all the time. This is to prevent
-   * tooltips from showing when the trigger element is focused back after a popover or dialog that
-   * it opened was closed. See link below for more details.
-   * @see https://github.com/ariakit/ariakit/discussions/749
-   */
-
-
-  function handleFocus(event) {
-    var _child$props;
-
-    // If focus is not followed by a key up event, does it mean that it's not an intentional
-    // keyboard focus? Not sure but it seems to work.
-    // This may be resolved soon in an upcoming version of ariakit:
-    // https://github.com/ariakit/ariakit/issues/750
-    function handleKeyUp(event) {
-      const eventKey = event.key;
-
-      if (eventKey !== 'Escape' && eventKey !== 'Enter' && eventKey !== 'Space') {
-        tooltip.show();
-      }
-    }
-
-    event.currentTarget.addEventListener('keyup', handleKeyUp, {
-      once: true
-    });
-    event.preventDefault(); // Prevent tooltip.show from being called by TooltipReference
-
-    child == null ? void 0 : (_child$props = child.props) == null ? void 0 : _child$props.onFocus == null ? void 0 : _child$props.onFocus(event);
-  }
-
-  function handleBlur(event) {
-    var _child$props2;
-
-    tooltip.hide();
-    child == null ? void 0 : (_child$props2 = child.props) == null ? void 0 : _child$props2.onBlur == null ? void 0 : _child$props2.onBlur(event);
-  }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(react.TooltipAnchor, {
-    render: anchorProps => {
-      // Let child props override anchor props so user can specify attributes like tabIndex
-      // Also, do not apply the child's props to TooltipAnchor as props like `as` can create problems
-      // by applying the replacement component/element twice
-      return /*#__PURE__*/React.cloneElement(child, _objectSpread2(_objectSpread2(_objectSpread2({}, child.props), anchorProps), {}, {
-        onFocus: handleFocus,
-        onBlur: handleBlur
-      }));
-    },
+    render: child,
     store: tooltip,
     ref: child.ref
   }), isOpen && content ? /*#__PURE__*/React.createElement(Box, {
@@ -2647,15 +2602,12 @@ function Menu(_ref) {
   const menuStore = react.useMenuStore(_objectSpread2({
     focusLoop: true
   }, props));
-  const handleItemSelect = React.useCallback(function handleItemSelect(value) {
-    onItemSelect == null ? void 0 : onItemSelect(value);
-  }, [onItemSelect]);
   const value = React.useMemo(() => ({
     menuStore,
-    handleItemSelect,
+    handleItemSelect: onItemSelect,
     getAnchorRect,
     setAnchorRect
-  }), [menuStore, handleItemSelect, getAnchorRect, setAnchorRect]);
+  }), [menuStore, onItemSelect, getAnchorRect, setAnchorRect]);
   return /*#__PURE__*/React.createElement(MenuContext.Provider, {
     value: value
   }, children);
@@ -2731,7 +2683,15 @@ const MenuList = /*#__PURE__*/polymorphicComponent(function MenuList(_ref4, ref)
     ref: ref,
     className: classNames('reactist_menulist', exceptionallySetClassName),
     getAnchorRect: getAnchorRect != null ? getAnchorRect : undefined,
-    modal: modal
+    modal: modal,
+    onBlur: event => {
+      var _event$relatedTarget;
+
+      if (!event.relatedTarget) return;
+      if (event.currentTarget.contains(event.relatedTarget)) return;
+      if ((_event$relatedTarget = event.relatedTarget) != null && _event$relatedTarget.closest('[role^="menu"]')) return;
+      menuStore.hide();
+    }
   }))) : null;
 });
 /**
@@ -2762,7 +2722,7 @@ const MenuItem = /*#__PURE__*/polymorphicComponent(function MenuItem(_ref5, ref)
     onClick == null ? void 0 : onClick(event);
     const onSelectResult = onSelect && !event.defaultPrevented ? onSelect() : undefined;
     const shouldClose = onSelectResult !== false && hideOnSelect;
-    handleItemSelect(value);
+    handleItemSelect == null ? void 0 : handleItemSelect(value);
     if (shouldClose) hide();
   }, [onSelect, onClick, handleItemSelect, hideOnSelect, hide, value]);
   return /*#__PURE__*/React.createElement(react.MenuItem, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -2809,7 +2769,7 @@ const SubMenu = /*#__PURE__*/React.forwardRef(function SubMenu({
   } = menuStore;
   const handleSubItemSelect = React.useCallback(function handleSubItemSelect(value) {
     if (onItemSelect) onItemSelect(value);
-    parentMenuItemSelect(value);
+    parentMenuItemSelect == null ? void 0 : parentMenuItemSelect(value);
     parentMenuHide();
   }, [parentMenuHide, parentMenuItemSelect, onItemSelect]);
   const [button, list] = React.Children.toArray(children); // Ariakit needs to be able to pass props to the MenuButton