@react-fabric/core 1.0.0-beta.4 → 1.0.0-beta.40

package/dist/cjs/components/divider/Divider.js

@@ -2,9 +2,9 @@
 
 var classNames = require('classnames');
 var react = require('react');
+var jsxRuntime = require('react/jsx-runtime');
 var getColor = require('../../utils/getColor.js');
 require('@react-fabric/utilities');
-var jsxRuntime = require('react/jsx-runtime');
 
 /*
  * React Fabric
@@ -31,10 +31,12 @@ var jsxRuntime = require('react/jsx-runtime');
 
 var Divider = function Divider(_ref) {
   var children = _ref.children,
-    color = _ref.color,
+    _ref$color = _ref.color,
+    color = _ref$color === void 0 ? "tint-300" : _ref$color,
     vertical = _ref.vertical,
-    fill = _ref.fill,
-    _ref$align = _ref.align,
+    labelClassName = _ref.labelClassName;
+    _ref.fill;
+    var _ref$align = _ref.align,
     align = _ref$align === void 0 ? "start" : _ref$align,
     className = _ref.className;
   var Rule = react.useCallback(function (_ref2) {
@@ -42,9 +44,10 @@ var Divider = function Divider(_ref) {
       className = _ref2.className;
     return /*#__PURE__*/jsxRuntime.jsx("hr", {
       style: {
-        flex: flex
+        flex: flex,
+        borderColor: getColor.getColor(color)
       },
-      className: classNames(className, vertical && "vertical", !flex && "self-stretch", vertical ? "mx-1" : "my-1", color && getColor.getBorderClass(color + "-200"))
+      className: classNames(className, vertical && "vertical", !flex && "self-stretch", vertical ? "fabric-divider--vertical" : "fabric-divider--horizontal")
     });
   }, [color, vertical]);
   return children ? /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -52,7 +55,7 @@ var Divider = function Divider(_ref) {
     children: [/*#__PURE__*/jsxRuntime.jsx(Rule, {
       flex: align === "start" ? "0 0 1rem" : "1 1 1em"
     }), /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: classNames("px-2 whitespace-nowrap", vertical ? "mx-1" : "my-1", fill && getColor.getBgClass((color !== null && color !== void 0 ? color : "tint") + "-200"), !fill && getColor.getColorClass((color !== null && color !== void 0 ? color : "tint") + "-600"), "rounded-full text-[0.75em]", vertical && "origin-center -rotate-90 z-1"),
+      className: classNames("px-2 whitespace-nowrap", vertical ? "fabric-divider--vertical" : "fabric-divider--horizontal", labelClassName, "rounded-full text-[0.75em]", vertical && "origin-center -rotate-90 z-1"),
       children: children
     }), /*#__PURE__*/jsxRuntime.jsx(Rule, {
       flex: align === "end" ? "0 0 1rem" : "1 1 1em"

package/dist/cjs/components/dropdown/Dropdown.js

@@ -6,7 +6,6 @@ var react = require('@floating-ui/react');
 var utilities = require('@react-fabric/utilities');
 var classNames = require('classnames');
 var react$1 = require('react');
-var Dropdown_module = require('./Dropdown.module.css');
 var jsxRuntime = require('react/jsx-runtime');
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -115,6 +114,7 @@ var DropdownElement = function DropdownElement(_ref) {
         e.stopPropagation();
       }
     })), {}, {
+      "data-inner-clickable": "true",
       "data-dropdown-open": isOpen ? true : undefined,
       ref: innerRef
     })), isOpen && /*#__PURE__*/jsxRuntime.jsxs(react.FloatingPortal, {
@@ -131,7 +131,8 @@ var DropdownElement = function DropdownElement(_ref) {
           style: _objectSpread({
             minWidth: minWidth,
             zIndex: "var(--z-popover)"
-          }, floatingStyles)
+          }, floatingStyles),
+          "data-ref": "dropdownBody"
         }, getFloatingProps({
           onClick: function onClick(e) {
             return e.stopPropagation();
@@ -139,14 +140,14 @@ var DropdownElement = function DropdownElement(_ref) {
         })), {}, {
           children: [/*#__PURE__*/jsxRuntime.jsx("div", {
             role: "none",
-            className: classNames(Dropdown_module.dropdownBody, dropdownClassName, !plainDropdown && "shadow-lg shadow-base bg-base ring-1 ring-tint-100", "rounded-capped overflow-auto scroll-thin grid max-h-[70vh]"),
+            className: classNames("fabric-dropdownBody", dropdownClassName, !plainDropdown && "shadow-lg bg-base ring-1 ring-tint-100", "rounded-capped overflow-auto scroll-thin grid max-h-[70vh]"),
             onMouseUpCapture: tryClosing,
             children: panel
           }), showArrow && /*#__PURE__*/jsxRuntime.jsx(react.FloatingArrow, {
             ref: arrowRef,
             context: context,
             strokeWidth: 0.5,
-            className: "fill-base stroke-muted"
+            className: "fill-base stroke-dimmed"
           })]
         }))
       })]

package/dist/cjs/components/dropdown/DropdownTool.js

@@ -8,18 +8,19 @@ var Icon = require('../icon/Icon.js');
 var Dropdown = require('./Dropdown.js');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["children", "className", "groupHover"];
+var _excluded = ["children", "className", "groupHover", "icon"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var DropdownTool = function DropdownTool(_ref) {
   var children = _ref.children,
     className = _ref.className,
     groupHover = _ref.groupHover,
+    icon = _ref.icon,
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/jsxRuntime.jsxs(Dropdown.Dropdown, _objectSpread(_objectSpread({}, props), {}, {
     children: [/*#__PURE__*/jsxRuntime.jsx(Icon.Icon, {
-      icon: icons.CoreIcons.caretDown,
-      className: classNames(className, "outline bg-base flex-content pointer-events-auto cursor-pointer", groupHover && "hidden group-hover:inline-block data-[dropdown-open]:inline-block")
+      icon: icon !== null && icon !== void 0 ? icon : icons.CoreIcons.caretDown,
+      className: classNames("outline bg-tint-50/50 flex-content pointer-events-auto cursor-pointer", className, groupHover && "hidden group-hover/tool:inline-block data-[dropdown-open]:inline-block")
     }), children]
   }));
 };

package/dist/cjs/components/icon/Icon.js

@@ -4,10 +4,9 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var utilities = require('@react-fabric/utilities');
 var classNames = require('classnames');
-var useEffectDebugger = require('../../hooks/useEffectDebugger.js');
-var getColor = require('../../utils/getColor.js');
-var Icon_module = require('./Icon.module.css');
+var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
+var getColor = require('../../utils/getColor.js');
 
 var _excluded = ["ref", "icon", "bg", "color", "size", "rtlFlip", "animate", "rounded", "viewBox", "className", "onClick"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -40,7 +39,7 @@ var Icon = function Icon(_ref) {
     onClick = _ref.onClick,
     rest = _objectWithoutProperties(_ref, _excluded);
   /** ***************** style map *******************/
-  var styles = useEffectDebugger.useMemoDebugger(function () {
+  var styles = react.useMemo(function () {
     var s = {};
     if (bg) {
       s.backgroundColor = getColor.getColor(bg);
@@ -55,16 +54,15 @@ var Icon = function Icon(_ref) {
       s.fontSize = SizeMap[size];
     }
     return s;
-  }, [bg, color, size], "Icon styles");
+  }, [bg, color, size]);
 
   /** ***************** check if icon is svg path *******************/
-  var isSvg = useEffectDebugger.useMemoDebugger(function () {
+  var isSvg = react.useMemo(function () {
     return utilities.isSvgPath(icon);
-  }, [icon], "Icon isSvg");
+  }, [icon]);
 
   /** ***************** render icon *******************/
-  var iconEl = useEffectDebugger.useMemoDebugger(function () {
-    var _SvgTextSize$icon$len;
+  var iconEl = react.useMemo(function () {
     if (!utilities.isString(icon)) {
       throw Error("Invalid icon expected string");
     }
@@ -83,22 +81,25 @@ var Icon = function Icon(_ref) {
         dominantBaseline: "middle",
         textAnchor: "middle",
         style: {
-          fontSize: (_SvgTextSize$icon$len = SvgTextSize[icon.length]) !== null && _SvgTextSize$icon$len !== void 0 ? _SvgTextSize$icon$len : "1em"
+          fontSize: SvgTextSize[icon.length]
         },
         children: icon
       })
     }) : /*#__PURE__*/jsxRuntime.jsx("i", {
       className: "".concat(icon)
     });
-  }, [icon, isSvg, viewBox], "Icon el");
-  return /*#__PURE__*/jsxRuntime.jsx("dfn", _objectSpread(_objectSpread({}, rest), {}, {
-    ref: ref,
+  }, [icon, isSvg, viewBox]);
+  return /*#__PURE__*/jsxRuntime.jsx("dfn", _objectSpread(_objectSpread({
+    "data-ref": "icon",
+    ref: ref
+  }, rest), {}, {
     role: "presentation",
-    className: classNames(Icon_module.icon, className, "select-none overflow-hidden inline-block box-content leading-none not-italic text-center", bg && getColor.getBgClass(bg), color && getColor.getColorClass(color), !rounded && "rounded", rounded && "rounded-full", animate && "animate-".concat(animate)),
+    className: classNames("fabric-icon", "select-none overflow-hidden box-content leading-none not-italic text-center", !rounded && "rounded", rounded && "rounded-full", animate && "animate-".concat(animate), className),
     onClick: onClick,
     "data-flip": rtlFlip,
     style: styles,
     "data-clickable": !!onClick,
+    "data-inner-clickable": !!onClick,
     children: iconEl
   }));
 };

package/dist/cjs/components/media/Media.js

@@ -8,13 +8,22 @@ var classNames = require('classnames');
 var react = require('react');
 var icons = require('../../types/icons.js');
 var Button = require('../button/Button.js');
-var Media_module = require('./Media.module.css');
+var Icon = require('../icon/Icon.js');
 var jsxRuntime = require('react/jsx-runtime');
 
 var _excluded = ["src", "alt", "reel", "fit", "className"],
   _excluded2 = ["src", "poster", "reel", "autoPlay", "playOnHover", "fit", "className"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var cover = {
+  fill: "object-fill",
+  cover: "object-cover",
+  contain: "object-contain"
+};
+var loadIndicator = /*#__PURE__*/jsxRuntime.jsx("div", {
+  className: classNames("fabric-mediaPlaceholder", "absolute z-1 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-4xl text-gray animate-pulse"),
+  children: "\u25CF\u25CF\u25CF"
+});
 var Image = function Image(_ref) {
   var src = _ref.src,
     alt = _ref.alt,
@@ -27,28 +36,40 @@ var Image = function Image(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     colorSet = _useState2[0],
     setColorSet = _useState2[1];
-  var loadIndicator = react.useMemo(function () {
-    return /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: classNames(Media_module.mediaPlaceholder, "absolute z-1 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-4xl text-gray animate-pulse"),
-      children: "\u25CF\u25CF\u25CF"
-    });
+  var _useState3 = react.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loaded = _useState4[0],
+    setLoaded = _useState4[1];
+  var _useState5 = react.useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    errored = _useState6[0],
+    setErrored = _useState6[1];
+  react.useEffect(function () {
+    setLoaded(false);
+    setErrored(false);
   }, [src]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({
     "data-ref": "image",
-    className: classNames(Media_module.mediaContainer, "relative overflow-hidden bg-gray inline-block", reel && Media_module.mediaReel, className),
+    className: classNames("fabric-mediaContainer", "relative overflow-hidden inline-block", reel && "fabric-mediaReel", className),
     "data-colorset": colorSet
   }, aria), {}, {
-    children: [loadIndicator, /*#__PURE__*/jsxRuntime.jsx("img", {
+    children: [!loaded && !errored && loadIndicator, !errored && /*#__PURE__*/jsxRuntime.jsx("img", {
       alt: alt !== null && alt !== void 0 ? alt : src,
       src: src,
       loading: "lazy",
       crossOrigin: "anonymous",
-      className: classNames(Media_module.media, "pointer-events-none w-full h-full", fit && "object-".concat(fit)),
+      className: classNames("fabric-media", "pointer-events-none w-full h-full", cover[fit]),
       onLoad: function onLoad(e) {
-        var _e$currentTarget$prev;
-        (_e$currentTarget$prev = e.currentTarget.previousElementSibling) === null || _e$currentTarget$prev === void 0 || _e$currentTarget$prev.remove();
+        setLoaded(true);
         setColorSet(utilities.getImageColorset(e.currentTarget));
+      },
+      onError: function onError() {
+        return setErrored(true);
       }
+    }), errored && /*#__PURE__*/jsxRuntime.jsx(Icon.Icon, {
+      size: "2rem",
+      className: "absolute text-tint-300 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2",
+      icon: icons.CoreIcons.mediaImageBroken
     })]
   }));
 };
@@ -63,17 +84,32 @@ var Video = function Video(_ref2) {
     className = _ref2.className,
     aria = _objectWithoutProperties(_ref2, _excluded2);
   var videoRef = react.useRef(null);
-  var _useState3 = react.useState(true),
-    _useState4 = _slicedToArray(_useState3, 2),
-    state = _useState4[0],
-    setState = _useState4[1];
-  var _useState5 = react.useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    volume = _useState6[0],
-    setVolume = _useState6[1];
+  var _useState7 = react.useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    loaded = _useState8[0],
+    setLoaded = _useState8[1];
+  var _useState9 = react.useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    errored = _useState10[0],
+    setErrored = _useState10[1];
+  react.useEffect(function () {
+    setLoaded(false);
+    setErrored(false);
+  }, [src]);
+  var _useState11 = react.useState(true),
+    _useState12 = _slicedToArray(_useState11, 2),
+    state = _useState12[0],
+    setState = _useState12[1];
+  var _useState13 = react.useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    volume = _useState14[0],
+    setVolume = _useState14[1];
+  react.useEffect(function () {
+    setErrored(false);
+  }, [src]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({
     "data-ref": "video",
-    className: classNames(Media_module.mediaContainer, "relative overflow-hidden bg-gray inline-block", reel && Media_module.mediaReel, className),
+    className: classNames("fabric-mediaContainer", "relative overflow-hidden inline-block", reel && "fabric-mediaReel", className),
     onMouseEnter: function onMouseEnter() {
       var _videoRef$current;
       playOnHover && ((_videoRef$current = videoRef.current) === null || _videoRef$current === void 0 ? void 0 : _videoRef$current.play());
@@ -83,64 +119,69 @@ var Video = function Video(_ref2) {
       playOnHover && ((_videoRef$current2 = videoRef.current) === null || _videoRef$current2 === void 0 ? void 0 : _videoRef$current2.pause());
     }
   }, aria), {}, {
-    children: [/*#__PURE__*/jsxRuntime.jsx("div", {
-      className: classNames(Media_module.mediaPlaceholder, "absolute z-1 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-5xl animate-pulse"),
-      children: "\u25CF\u25CF\u25CF"
-    }), /*#__PURE__*/jsxRuntime.jsxs("video", {
-      loop: true,
-      ref: videoRef,
-      controls: false,
-      poster: poster,
-      autoPlay: autoPlay,
-      className: classNames(Media_module.media, "pointer-events-none w-full h-full", fit && "object-".concat(fit)),
-      onPlay: function onPlay() {
-        return setState(true);
-      },
-      onPause: function onPause() {
-        return setState(false);
-      },
-      onVolumeChange: function onVolumeChange(e) {
-        return setVolume(!!e.currentTarget.volume);
-      },
-      onLoadedData: function onLoadedData(e) {
-        var _e$currentTarget$prev2;
-        e.currentTarget.volume = 0;
-        (_e$currentTarget$prev2 = e.currentTarget.previousElementSibling) === null || _e$currentTarget$prev2 === void 0 || _e$currentTarget$prev2.remove();
-      },
-      children: [/*#__PURE__*/jsxRuntime.jsx("source", {
-        src: src
-      }), /*#__PURE__*/jsxRuntime.jsx("track", {
-        kind: "captions"
-      })]
-    }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-      "data-inner-clickable": true,
-      className: classNames(Media_module.mediaControls, "absolute bottom-6 end-6 rounded-full flex flex-col"),
-      children: [/*#__PURE__*/jsxRuntime.jsx(Button.Button, {
-        rounded: true,
-        variant: "link",
-        className: Media_module.mediaControlPlaceholder,
-        icon: icons.CoreIcons.ellipsis,
-        "aria-label": "controls"
-      }), /*#__PURE__*/jsxRuntime.jsx(Button.Button, {
-        rounded: true,
-        variant: "link",
-        "aria-label": "controls",
-        className: Media_module.mediaControlAction,
-        onClick: function onClick() {
-          videoRef.current && (videoRef.current.volume = videoRef.current.volume ? 0 : 1);
+    children: [!loaded && !errored && loadIndicator, !errored && /*#__PURE__*/jsxRuntime.jsxs(react.Fragment, {
+      children: [/*#__PURE__*/jsxRuntime.jsxs("video", {
+        loop: true,
+        ref: videoRef,
+        controls: false,
+        poster: poster,
+        autoPlay: autoPlay,
+        className: classNames("fabric-media", "pointer-events-none w-full h-full", fit && "object-".concat(fit)),
+        onPlay: function onPlay() {
+          return setState(true);
+        },
+        onPause: function onPause() {
+          return setState(false);
+        },
+        onVolumeChange: function onVolumeChange(e) {
+          return setVolume(!!e.currentTarget.volume);
+        },
+        onLoadedData: function onLoadedData(e) {
+          e.currentTarget.volume = 0;
+          setLoaded(true);
         },
-        icon: volume ? icons.CoreIcons.volumeOn : icons.CoreIcons.volumeOff
-      }), /*#__PURE__*/jsxRuntime.jsx(Button.Button, {
-        rounded: true,
-        variant: "link",
-        "aria-label": "controls",
-        className: Media_module.mediaControlAction,
-        onClick: function onClick() {
-          var _videoRef$current3, _videoRef$current4, _videoRef$current5;
-          (_videoRef$current3 = videoRef.current) !== null && _videoRef$current3 !== void 0 && _videoRef$current3.paused ? (_videoRef$current4 = videoRef.current) === null || _videoRef$current4 === void 0 ? void 0 : _videoRef$current4.play() : (_videoRef$current5 = videoRef.current) === null || _videoRef$current5 === void 0 ? void 0 : _videoRef$current5.pause();
+        onError: function onError() {
+          return setErrored(true);
         },
-        icon: state ? icons.CoreIcons.pause : icons.CoreIcons.play
+        children: [/*#__PURE__*/jsxRuntime.jsx("source", {
+          src: src
+        }), /*#__PURE__*/jsxRuntime.jsx("track", {
+          kind: "captions"
+        })]
+      }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+        "data-inner-clickable": true,
+        className: classNames("fabric-mediaControls", "absolute bottom-6 end-6 rounded-full flex flex-col"),
+        children: [/*#__PURE__*/jsxRuntime.jsx(Button.Button, {
+          rounded: true,
+          variant: "link",
+          className: "fabric-mediaControlPlaceholder",
+          icon: icons.CoreIcons.ellipsis,
+          "aria-label": "controls"
+        }), /*#__PURE__*/jsxRuntime.jsx(Button.Button, {
+          rounded: true,
+          variant: "link",
+          "aria-label": "controls",
+          className: "fabric-mediaControlAction",
+          onClick: function onClick() {
+            videoRef.current && (videoRef.current.volume = videoRef.current.volume ? 0 : 1);
+          },
+          icon: volume ? icons.CoreIcons.volumeOn : icons.CoreIcons.volumeOff
+        }), /*#__PURE__*/jsxRuntime.jsx(Button.Button, {
+          rounded: true,
+          variant: "link",
+          "aria-label": "controls",
+          className: "fabric-mediaControlAction",
+          onClick: function onClick() {
+            var _videoRef$current3, _videoRef$current4, _videoRef$current5;
+            (_videoRef$current3 = videoRef.current) !== null && _videoRef$current3 !== void 0 && _videoRef$current3.paused ? (_videoRef$current4 = videoRef.current) === null || _videoRef$current4 === void 0 ? void 0 : _videoRef$current4.play() : (_videoRef$current5 = videoRef.current) === null || _videoRef$current5 === void 0 ? void 0 : _videoRef$current5.pause();
+          },
+          icon: state ? icons.CoreIcons.pause : icons.CoreIcons.play
+        })]
       })]
+    }), errored && /*#__PURE__*/jsxRuntime.jsx(Icon.Icon, {
+      size: "2rem",
+      className: "absolute text-tint-300 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2",
+      icon: icons.CoreIcons.mediaVideoBroken
     })]
   }));
 };

package/dist/cjs/components/menu/ContextMenu.js

@@ -9,15 +9,22 @@ var jsxRuntime = require('react/jsx-runtime');
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ContextMenu = function ContextMenu(_ref) {
+  var _refs$domReference$cu, _refs$domReference$cu2;
   var children = _ref.children,
-    menu = _ref.menu;
+    menu = _ref.menu,
+    disabled = _ref.disabled;
   var _useState = react.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isOpen = _useState2[0],
     setIsOpen = _useState2[1];
+  var nodeId = react$1.useFloatingNodeId();
   var _useFloating = react$1.useFloating({
       open: isOpen,
-      onOpenChange: setIsOpen,
+      nodeId: nodeId,
+      onOpenChange: function onOpenChange(open, evt, reason) {
+        var target = evt === null || evt === void 0 ? void 0 : evt.target;
+        if (!(target !== null && target !== void 0 && target.closest(".menu-list"))) setIsOpen(open);
+      },
       strategy: "fixed",
       placement: "bottom-start",
       whileElementsMounted: react$1.autoUpdate,
@@ -26,8 +33,13 @@ var ContextMenu = function ContextMenu(_ref) {
     refs = _useFloating.refs,
     floatingStyles = _useFloating.floatingStyles,
     context = _useFloating.context;
-  var click = react$1.useClick(context, {});
-  var dismiss = react$1.useDismiss(context, {});
+  var click = react$1.useClick(context, {
+    toggle: true,
+    ignoreMouse: true
+  });
+  var dismiss = react$1.useDismiss(context, {
+    bubbles: true
+  });
   var _useInteractions = react$1.useInteractions([dismiss, click]),
     getFloatingProps = _useInteractions.getFloatingProps;
   var handleClick = react.useRef(function (e) {
@@ -51,11 +63,18 @@ var ContextMenu = function ContextMenu(_ref) {
     e.preventDefault();
     return false;
   });
-  var wrapperRef = react.useRef(function (el) {
-    var _el$parentElement, _el$parentElement2;
-    el === null || el === void 0 || (_el$parentElement = el.parentElement) === null || _el$parentElement === void 0 || _el$parentElement.removeEventListener("contextmenu", handleClick.current);
-    el === null || el === void 0 || (_el$parentElement2 = el.parentElement) === null || _el$parentElement2 === void 0 || _el$parentElement2.addEventListener("contextmenu", handleClick.current);
-  });
+  var wrapperRef = react.useRef(null);
+  react.useEffect(function () {
+    var el = wrapperRef.current;
+    if (el && !disabled) {
+      var _el$parentElement;
+      el === null || el === void 0 || (_el$parentElement = el.parentElement) === null || _el$parentElement === void 0 || _el$parentElement.addEventListener("contextmenu", handleClick.current);
+      return function () {
+        var _el$parentElement2;
+        el === null || el === void 0 || (_el$parentElement2 = el.parentElement) === null || _el$parentElement2 === void 0 || _el$parentElement2.removeEventListener("contextmenu", handleClick.current);
+      };
+    }
+  }, [disabled]);
   var tryClosing = react.useRef(function (e) {
     var _e$target;
     if ((_e$target = e.target) !== null && _e$target !== void 0 && _e$target.closest("[data-dropdown-dismiss='true']")) setTimeout(function () {
@@ -64,9 +83,10 @@ var ContextMenu = function ContextMenu(_ref) {
   });
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "contents",
-    ref: wrapperRef.current,
+    ref: wrapperRef,
     onMouseUpCapture: tryClosing.current,
     children: [children, isOpen && /*#__PURE__*/jsxRuntime.jsx(react$1.FloatingPortal, {
+      root: (_refs$domReference$cu = (_refs$domReference$cu2 = refs.domReference.current) === null || _refs$domReference$cu2 === void 0 ? void 0 : _refs$domReference$cu2.closest(".theme-base")) !== null && _refs$domReference$cu !== void 0 ? _refs$domReference$cu : undefined,
       children: /*#__PURE__*/react.cloneElement(menu, _objectSpread(_objectSpread({}, getFloatingProps()), {}, {
         style: _objectSpread(_objectSpread({}, floatingStyles), {}, {
           borderRadius: "var(--rounding)",

package/dist/cjs/components/menu/Menu.js

@@ -7,7 +7,9 @@ var react = require('@floating-ui/react');
 var utilities = require('@react-fabric/utilities');
 var classNames = require('classnames');
 var react$1 = require('react');
+var HotKeyWrapper = require('../../hotkeys/HotKeyWrapper.js');
 var icons = require('../../types/icons.js');
+var cloneElement = require('../../utils/cloneElement.js');
 var nodeCheck = require('../../utils/nodeCheck.js');
 var MenuItem = require('./MenuItem.js');
 var jsxRuntime = require('react/jsx-runtime');
@@ -64,8 +66,9 @@ var MenuComponent = function MenuComponent(_ref) {
     })
   });
   var click = react.useClick(context, {
-    toggle: true,
-    ignoreMouse: true
+    event: "mousedown",
+    toggle: !isNested,
+    ignoreMouse: isNested
   });
   var role = react.useRole(context, {
     role: "menu"
@@ -137,6 +140,16 @@ var MenuComponent = function MenuComponent(_ref) {
       });
     }, 100);
   }, [isOpen]);
+  react$1.useEffect(function () {
+    if ((!isNested || isOpen) && activeIndex) {
+      setTimeout(function () {
+        var _elementsRef$current$;
+        (_elementsRef$current$ = elementsRef.current[activeIndex]) === null || _elementsRef$current$ === void 0 || _elementsRef$current$.scrollIntoView({
+          block: "nearest"
+        });
+      }, 100);
+    }
+  }, [isOpen, activeIndex]);
   return /*#__PURE__*/jsxRuntime.jsxs(react.FloatingNode, {
     id: nodeId,
     children: [isNested && /*#__PURE__*/jsxRuntime.jsx(MenuItem.MenuItem, _objectSpread(_objectSpread({}, getReferenceProps(_objectSpread(_objectSpread({}, rest), {}, {
@@ -155,21 +168,21 @@ var MenuComponent = function MenuComponent(_ref) {
       elementsRef: elementsRef,
       labelsRef: labelsRef,
       children: (!isNested || isOpen) && /*#__PURE__*/jsxRuntime.jsxs(Wrapper, _objectSpread(_objectSpread({}, wrapperProps), {}, {
-        children: [isNested && /*#__PURE__*/jsxRuntime.jsx(react.FloatingOverlay, {}), /*#__PURE__*/jsxRuntime.jsx(react.FloatingFocusManager, {
-          context: context,
-          modal: !isNested,
-          initialFocus: isNested ? -1 : 0,
-          returnFocus: !isNested,
-          children: /*#__PURE__*/jsxRuntime.jsx("div", _objectSpread(_objectSpread({
-            className: classNames(menuClassName, "flex flex-col bg-base p-1 menu-list", isNested && "outline shadow-lg rounded-capped max-h-96 overflow-auto scroll-thin z-[var(--z-popover)]"),
-            autoFocus: true,
-            ref: utilities.mergeRefs(refs.setFloating, isNested ? undefined : ref)
-          }, getFloatingProps({
-            onClick: isNested ? undefined : handleClick
-          })), {}, {
-            style: !isNested ? rest.style : floatingStyles,
-            children: react$1.Children.map(children, function (child, index) {
-              if (child) {
+        children: [isNested && /*#__PURE__*/jsxRuntime.jsx(react.FloatingOverlay, {}), /*#__PURE__*/jsxRuntime.jsx(HotKeyWrapper.HotKeyWrapper, {
+          children: /*#__PURE__*/jsxRuntime.jsx(react.FloatingFocusManager, {
+            context: context,
+            modal: !isNested,
+            initialFocus: isNested ? -1 : 0,
+            returnFocus: !isNested,
+            children: /*#__PURE__*/jsxRuntime.jsx("div", _objectSpread(_objectSpread({
+              className: classNames(menuClassName, "flex flex-col bg-base p-1 menu-list", isNested && "outline shadow-lg rounded-capped max-h-96 overflow-auto scroll-thin z-(--z-popover)"),
+              autoFocus: true,
+              ref: utilities.mergeRefs(isNested ? refs.setFloating : ref)
+            }, getFloatingProps({
+              onClick: isNested ? undefined : handleClick
+            })), {}, {
+              style: !isNested ? rest.style : floatingStyles,
+              children: cloneElement.cloneChildren(children, function (child, index) {
                 labelsRef.current[index] = child.props.label;
                 return /*#__PURE__*/react$1.cloneElement(child, nodeCheck.nodeCheck(child, MenuItem.MenuItem, Menu, MenuComponent) ? _objectSpread({
                   minimal: !isNested && minimal,
@@ -181,9 +194,9 @@ var MenuComponent = function MenuComponent(_ref) {
                   onClick: child.props.onClick,
                   tabIndex: activeIndex === index ? 0 : -1
                 })) : {});
-              }
-            })
-          }))
+              })
+            }))
+          })
         })]
       }))
     })]
@@ -191,6 +204,12 @@ var MenuComponent = function MenuComponent(_ref) {
 };
 var Menu = function Menu(props) {
   var parentId = react.useFloatingParentNodeId();
+  var tree = react.useFloatingTree();
+  if (tree) {
+    return /*#__PURE__*/jsxRuntime.jsx(MenuComponent, _objectSpread(_objectSpread({}, props), {}, {
+      menuClassName: props.className
+    }));
+  }
   if (parentId === null) {
     return /*#__PURE__*/jsxRuntime.jsx(react.FloatingTree, {
       children: /*#__PURE__*/jsxRuntime.jsx(MenuComponent, _objectSpread(_objectSpread({}, props), {}, {