@sanity/ui 2.3.6-canary.4 → 2.3.6-canary.6

package/dist/index.d.mts

@@ -1423,6 +1423,7 @@ export declare interface MenuItemProps extends ResponsivePaddingProps, Responsiv
  * @public
  */
 export declare interface MenuProps extends ResponsivePaddingProps {
+  'aria-labelledby'?: string
   /**
    * @deprecated Use `shouldFocus="first"` instead.
    */
@@ -1432,6 +1433,7 @@ export declare interface MenuProps extends ResponsivePaddingProps {
    */
   focusLast?: boolean
   onClickOutside?: (event: MouseEvent) => void
+  onBlurCapture?: (event: React.FocusEvent<HTMLButtonElement>) => void
   onEscape?: () => void
   onItemClick?: () => void
   onItemSelect?: (index: number) => void

package/dist/index.d.ts

@@ -1423,6 +1423,7 @@ export declare interface MenuItemProps extends ResponsivePaddingProps, Responsiv
  * @public
  */
 export declare interface MenuProps extends ResponsivePaddingProps {
+  'aria-labelledby'?: string
   /**
    * @deprecated Use `shouldFocus="first"` instead.
    */
@@ -1432,6 +1433,7 @@ export declare interface MenuProps extends ResponsivePaddingProps {
    */
   focusLast?: boolean
   onClickOutside?: (event: MouseEvent) => void
+  onBlurCapture?: (event: React.FocusEvent<HTMLButtonElement>) => void
   onEscape?: () => void
   onItemClick?: () => void
   onItemSelect?: (index: number) => void

package/dist/index.esm.js

@@ -3264,7 +3264,7 @@ const Popover = memo(
       animate: _animate = !1,
       arrow: arrowProp = !1,
       boundaryElement: _boundaryElement,
-      children,
+      children: _children,
       constrainSize = !1,
       content,
       disabled,
@@ -3378,10 +3378,16 @@ const Popover = memo(
       },
       [refs]
     );
-    if (useImperativeHandle(updateRef, () => update, [update]), useEffect(() => {
-      children || refs.setReference(referenceElement || null);
-    }, [children, referenceElement, refs]), disabled)
-      return children || /* @__PURE__ */ jsx(Fragment, {});
+    useImperativeHandle(updateRef, () => update, [update]), useEffect(() => {
+      _children || refs.setReference(referenceElement || null);
+    }, [_children, referenceElement, refs]);
+    const children = useMemo(() => !_children || referenceElement ? null : cloneElement(_children, {
+      ref: (node) => {
+        logDeprecatedWarning(), refs.setReference(node);
+      }
+    }), [_children, referenceElement, refs]);
+    if (disabled)
+      return _children || /* @__PURE__ */ jsx(Fragment, {});
     const popover = /* @__PURE__ */ jsx(LayerProvider, { zOffset, children: /* @__PURE__ */ jsx(
       PopoverCard,
       {
@@ -3426,16 +3432,7 @@ const Popover = memo(
           )
         }
       ),
-      children && !referenceElement && /* @__PURE__ */ jsx(
-        "div",
-        {
-          ref: (node) => {
-            logDeprecatedWarning(), refs.setReference(node);
-          },
-          style: { display: "contents" },
-          children
-        }
-      )
+      children
     ] });
   })
 );
@@ -5560,28 +5557,16 @@ const Root$5 = styled(Box)`
     setOpen(!1), !disableRestoreFocusOnClose && buttonElement && buttonElement.focus();
   }, [buttonElement, disableRestoreFocusOnClose]), registerElement = useCallback((el) => (setChildMenuElements((els) => els.concat([el])), () => {
     setChildMenuElements((els) => els.filter((_el) => _el !== el));
-  }), []), menuProps = useMemo(
-    () => ({
-      "aria-labelledby": id,
-      onBlurCapture: handleBlur,
-      onClickOutside: handleMenuClickOutside,
-      onEscape: handleMenuEscape,
-      onItemClick: handleItemClick,
-      originElement: buttonElement,
-      registerElement,
-      shouldFocus
-    }),
-    [
-      buttonElement,
-      handleMenuClickOutside,
-      handleMenuEscape,
-      handleItemClick,
-      id,
-      handleBlur,
-      registerElement,
-      shouldFocus
-    ]
-  ), menu = menuProp && cloneElement(menuProp, menuProps), ref = useRef(null), button = useMemo(
+  }), []), menu = menuProp && cloneElement(menuProp, {
+    "aria-labelledby": id,
+    onBlurCapture: handleBlur,
+    onClickOutside: handleMenuClickOutside,
+    onEscape: handleMenuEscape,
+    onItemClick: handleItemClick,
+    originElement: buttonElement,
+    registerElement,
+    shouldFocus
+  }), button = useMemo(
     () => {
       var _a;
       return buttonProp && cloneElement(buttonProp, {
@@ -5592,7 +5577,7 @@ const Root$5 = styled(Box)`
         onMouseDown: handleMouseDown,
         "aria-haspopup": !0,
         "aria-expanded": open,
-        ref,
+        ref: setButtonElement,
         selected: (_a = buttonProp.props.selected) != null ? _a : open
       });
     },
@@ -5600,11 +5585,9 @@ const Root$5 = styled(Box)`
   );
   useImperativeHandle(
     forwardedRef,
-    () => ref.current
-  ), useEffect(() => {
-    if (button)
-      return setButtonElement(ref.current), () => setButtonElement(null);
-  }, [button]);
+    () => buttonElement,
+    [buttonElement]
+  );
   const popoverProps = useMemo(
     () => ({
       boundaryElement: deprecated_boundaryElement,
@@ -5626,7 +5609,19 @@ const Root$5 = styled(Box)`
       popover
     ]
   );
-  return /* @__PURE__ */ jsx(Popover, { "data-ui": "MenuButton__popover", ...popoverProps, content: menu, open, children: button || /* @__PURE__ */ jsx(Fragment, {}) });
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(
+      Popover,
+      {
+        "data-ui": "MenuButton__popover",
+        referenceElement: buttonElement,
+        ...popoverProps,
+        content: menu,
+        open
+      }
+    ),
+    button
+  ] });
 }), MenuDivider = styled.hr`
   height: 1px;
   border: 0;