@sanity/ui 2.7.0 → 2.7.1-canary.1

package/dist/index.d.mts

@@ -628,7 +628,7 @@ export declare interface CheckboxProps {
 /**
  * @public
  */
-export declare type ClickOutsideListener = (event: MouseEvent) => void
+export declare type ClickOutsideListener = (event: MouseEvent | TouchEvent) => void
 
 /**
  * @public
@@ -1432,7 +1432,7 @@ export declare interface MenuProps extends ResponsivePaddingProps {
    * @deprecated Use `shouldFocus="last"` instead.
    */
   focusLast?: boolean
-  onClickOutside?: (event: MouseEvent) => void
+  onClickOutside?: (event: MouseEvent | TouchEvent) => void
   onEscape?: () => void
   onItemClick?: () => void
   onItemSelect?: (index: number) => void
@@ -2653,9 +2653,48 @@ export declare function useBoundaryElement(): BoundaryElementContextValue
  */
 export declare function useClickOutside(
   listener: ClickOutsideListener,
-  elementsArg?: Array<HTMLElement | HTMLElement[] | null>,
+  elementsArg: () => (HTMLElement | HTMLElement[] | null)[],
   boundaryElement?: HTMLElement | null,
-): (el: HTMLElement | null) => void
+): void
+
+/**
+ * @public
+ * @deprecated
+ * Instead of:
+ * ```tsx
+ * const buttonRef = useRef(null)
+ * const setElement = useClickOutside(() => {}, [buttonRef.current])
+ * return (
+ *   <>
+ *     <button ref={buttonRef} />
+ *     {open && <div ref={setElement} />}
+ *   </>
+ * )
+ * ```
+ * Use:
+ * ```tsx
+ * const buttonRef = useRef()
+ * const [element, setElement] = useState(null)
+ * useClickOutside(() => {}, () => [buttonRef.current, element])
+ * return (
+ *   <>
+ *     <button ref={buttonRef} />
+ *     {open && <div ref={setElement} />}
+ *   </>
+ * )
+ * ```
+ */
+export declare function useClickOutside(
+  listener: ClickOutsideListener,
+  elementsArg: (HTMLElement | HTMLElement[] | null)[],
+  boundaryElement?: HTMLElement | null,
+): UseClickOutsideSetElement
+
+/**
+ * @public
+ * @deprecated -- do not use
+ */
+export declare type UseClickOutsideSetElement = (el: HTMLElement | null) => void
 
 /**
  * @beta

package/dist/index.d.ts

@@ -628,7 +628,7 @@ export declare interface CheckboxProps {
 /**
  * @public
  */
-export declare type ClickOutsideListener = (event: MouseEvent) => void
+export declare type ClickOutsideListener = (event: MouseEvent | TouchEvent) => void
 
 /**
  * @public
@@ -1432,7 +1432,7 @@ export declare interface MenuProps extends ResponsivePaddingProps {
    * @deprecated Use `shouldFocus="last"` instead.
    */
   focusLast?: boolean
-  onClickOutside?: (event: MouseEvent) => void
+  onClickOutside?: (event: MouseEvent | TouchEvent) => void
   onEscape?: () => void
   onItemClick?: () => void
   onItemSelect?: (index: number) => void
@@ -2653,9 +2653,48 @@ export declare function useBoundaryElement(): BoundaryElementContextValue
  */
 export declare function useClickOutside(
   listener: ClickOutsideListener,
-  elementsArg?: Array<HTMLElement | HTMLElement[] | null>,
+  elementsArg: () => (HTMLElement | HTMLElement[] | null)[],
   boundaryElement?: HTMLElement | null,
-): (el: HTMLElement | null) => void
+): void
+
+/**
+ * @public
+ * @deprecated
+ * Instead of:
+ * ```tsx
+ * const buttonRef = useRef(null)
+ * const setElement = useClickOutside(() => {}, [buttonRef.current])
+ * return (
+ *   <>
+ *     <button ref={buttonRef} />
+ *     {open && <div ref={setElement} />}
+ *   </>
+ * )
+ * ```
+ * Use:
+ * ```tsx
+ * const buttonRef = useRef()
+ * const [element, setElement] = useState(null)
+ * useClickOutside(() => {}, () => [buttonRef.current, element])
+ * return (
+ *   <>
+ *     <button ref={buttonRef} />
+ *     {open && <div ref={setElement} />}
+ *   </>
+ * )
+ * ```
+ */
+export declare function useClickOutside(
+  listener: ClickOutsideListener,
+  elementsArg: (HTMLElement | HTMLElement[] | null)[],
+  boundaryElement?: HTMLElement | null,
+): UseClickOutsideSetElement
+
+/**
+ * @public
+ * @deprecated -- do not use
+ */
+export declare type UseClickOutsideSetElement = (el: HTMLElement | null) => void
 
 /**
  * @beta

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import { buildTheme, createColorTheme as createColorTheme$1, hexToRgb as hexToRgb$1, hslToRgb as hslToRgb$1, multiply as multiply$1, parseColor as parseColor$1, rgbToHex as rgbToHex$1, rgbToHsl as rgbToHsl$1, rgba as rgba$1, screen as screen$1, getTheme_v2, getScopedTheme } from "@sanity/ui/theme";
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import { useMemo, useState, useRef, useEffect, useImperativeHandle, useDebugValue, useSyncExternalStore, createContext, useContext, forwardRef, useId, useCallback, Children, isValidElement, cloneElement, Component, memo, useLayoutEffect, useReducer, Fragment as Fragment$1, startTransition } from "react";
+import { useMemo, useState, useEffect, useRef, useImperativeHandle, useDebugValue, useSyncExternalStore, createContext, useContext, forwardRef, useId, useCallback, Children, isValidElement, cloneElement, Component, memo, useLayoutEffect, useReducer, Fragment as Fragment$1, startTransition } from "react";
 import ReactIs, { isValidElementType } from "react-is";
 import { ThemeProvider as ThemeProvider$1, useTheme as useTheme$1, css, styled, keyframes } from "styled-components";
 import { SpinnerIcon, CheckmarkIcon, RemoveIcon, ChevronDownIcon, CloseIcon, ChevronRightIcon, ToggleArrowRightIcon } from "@sanity/icons";
@@ -131,45 +131,25 @@ function useArrayProp(val, defaultVal) {
     [__perf_hash__]
   );
 }
-function _getElements(element, elementsArg) {
-  const ret = [element];
-  for (const el of elementsArg)
-    Array.isArray(el) ? ret.push(...el) : ret.push(el);
-  return ret.filter(Boolean);
-}
 function useClickOutside(listener, elementsArg = EMPTY_ARRAY, boundaryElement) {
-  const [element, setElement] = useState(null), [elements, setElements] = useState(() => _getElements(element, elementsArg)), elementsRef = useRef(elements);
-  return useEffect(() => {
-    const prevElements = elementsRef.current, nextElements = _getElements(element, elementsArg);
-    if (prevElements.length !== nextElements.length) {
-      setElements(nextElements), elementsRef.current = nextElements;
+  const [legacyElement, setLegacyElement] = useState(null), onEvent = useEffectEvent((evt) => {
+    const target = evt.target;
+    if (!(target instanceof Node) || boundaryElement && !boundaryElement.contains(target))
       return;
-    }
-    for (const el of prevElements)
-      if (!nextElements.includes(el)) {
-        setElements(nextElements), elementsRef.current = nextElements;
+    const elements = (Array.isArray(elementsArg) ? [legacyElement, ...elementsArg] : elementsArg()).flat();
+    for (const el of elements)
+      if (el && (target === el || el.contains(target)))
         return;
-      }
-    for (const el of nextElements)
-      if (!prevElements.includes(el)) {
-        setElements(nextElements), elementsRef.current = nextElements;
-        return;
-      }
-  }, [element, elementsArg]), useEffect(() => {
-    if (!listener) return;
-    const handleWindowMouseDown = (evt) => {
-      const target = evt.target;
-      if (target instanceof Node && !(boundaryElement && !boundaryElement.contains(target))) {
-        for (const el of elements)
-          if (target === el || el.contains(target))
-            return;
-        listener(evt);
-      }
-    };
-    return window.addEventListener("mousedown", handleWindowMouseDown), () => {
-      window.removeEventListener("mousedown", handleWindowMouseDown);
+    listener(evt);
+  }), hasListener = !!listener;
+  if (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);
     };
-  }, [boundaryElement, listener, elements]), setElement;
+  }, [hasListener, onEvent]), Array.isArray(elementsArg))
+    return setLegacyElement;
 }
 function useCustomValidity(ref, customValidity) {
   useEffect(() => {