@sanity/ui 2.7.1-canary.1 → 2.8.0

package/dist/index.js

@@ -128,8 +128,13 @@ function useArrayProp(val, defaultVal) {
 }
 function useClickOutside(listener, elementsArg = EMPTY_ARRAY, boundaryElement) {
   const [legacyElement, setLegacyElement] = react.useState(null), onEvent = useEffectEvent.useEffectEvent((evt) => {
+    if (!listener)
+      return;
     const target = evt.target;
-    if (!(target instanceof Node) || boundaryElement && !boundaryElement.contains(target))
+    if (!(target instanceof Node))
+      return;
+    const resolvedBoundaryElement = typeof boundaryElement == "function" ? boundaryElement() : boundaryElement;
+    if (resolvedBoundaryElement && !resolvedBoundaryElement.contains(target))
       return;
     const elements = (Array.isArray(elementsArg) ? [legacyElement, ...elementsArg] : elementsArg()).flat();
     for (const el of elements)
@@ -140,8 +145,8 @@ function useClickOutside(listener, elementsArg = EMPTY_ARRAY, boundaryElement) {
   if (react.useEffect(() => {
     if (!hasListener) return;
     const handleEvent = (evt) => onEvent(evt);
-    return document.addEventListener("mousedown", handleEvent), document.addEventListener("touchstart", handleEvent), () => {
-      document.removeEventListener("mousedown", handleEvent), document.removeEventListener("touchstart", handleEvent);
+    return document.addEventListener("mousedown", handleEvent), () => {
+      document.removeEventListener("mousedown", handleEvent);
     };
   }, [hasListener, onEvent]), Array.isArray(elementsArg))
     return setLegacyElement;
@@ -5099,14 +5104,11 @@ const Root$7 = styledComponents.styled(Layer)(responsivePaddingStyle, dialogStyl
       [boundaryElement, isTopLayer, onClose, portalElement]
     )
   ), useClickOutside(
-    react.useCallback(
-      (event) => {
-        if (!isTopLayer || !onClickOutside) return;
-        const target = event.target;
-        target && !isTargetWithinScope(boundaryElement, portalElement, target) || onClickOutside();
-      },
-      [boundaryElement, isTopLayer, onClickOutside, portalElement]
-    ),
+    (event) => {
+      if (!isTopLayer || !onClickOutside) return;
+      const target = event.target;
+      target && !isTargetWithinScope(boundaryElement, portalElement, target) || onClickOutside();
+    },
     [rootElement]
   );
   const setRef = react.useCallback((el) => {
@@ -5443,13 +5445,7 @@ const Root$5 = styledComponents.styled(Box)`
   );
   react.useEffect(() => {
     onItemSelect && onItemSelect(activeIndex);
-  }, [activeIndex, onItemSelect]), useClickOutside(
-    react.useCallback(
-      (event) => isTopLayer && onClickOutside && onClickOutside(event),
-      [isTopLayer, onClickOutside]
-    ),
-    [rootElement]
-  ), useGlobalKeyDown(
+  }, [activeIndex, onItemSelect]), useClickOutside((event) => isTopLayer && onClickOutside && onClickOutside(event), [rootElement]), useGlobalKeyDown(
     react.useCallback(
       (event) => {
         isTopLayer && event.key === "Escape" && (event.stopPropagation(), onEscape && onEscape());