sanity 5.18.0-next.13 → 5.18.0-next.14

package/lib/_chunks-es/version.js

@@ -1,4 +1,4 @@
-var version = "5.18.0-next.13+4cfc7ac9be";
+var version = "5.18.0-next.14+b5c0733a01";
 let buildVersion;
 try {
   buildVersion = process.env.PKG_BUILD_VERSION;
@@ -7,7 +7,7 @@ try {
 try {
   buildVersion = buildVersion || // This is replaced by `@sanity/pkg-utils` at build time
   // and must always be references by its full static name, e.g. no optional chaining, no `if (process && process.env)` etc.
-  "5.18.0-next.13+4cfc7ac9be";
+  "5.18.0-next.14+b5c0733a01";
 } catch {
 }
 const SANITY_VERSION = buildVersion || `${version}-dev`;

package/lib/index.js

@@ -27312,7 +27312,19 @@ function VirtualizedArrayList(props2) {
   } = useTheme().sanity, {
     scrollElement,
     containerElement
-  } = useVirtualizerScrollInstance(), parentRef = useRef(null), rangeExtractor = useCallback((range2) => {
+  } = useVirtualizerScrollInstance(), parentRef = useRef(null), [resolvedScrollElement, setResolvedScrollElement] = useState(scrollElement);
+  useLayoutEffect(() => {
+    const el = parentRef.current;
+    if (!scrollElement || !el || scrollElement.contains(el)) {
+      setResolvedScrollElement(scrollElement);
+      return;
+    }
+    let ancestor = el.parentElement;
+    for (; ancestor && !(ancestor.scrollHeight > ancestor.clientHeight); )
+      ancestor = ancestor.parentElement;
+    setResolvedScrollElement(ancestor || scrollElement);
+  }, [scrollElement, members.length]);
+  const rangeExtractor = useCallback((range2) => {
     const newRange = {
       ...range2
     };
@@ -27324,20 +27336,33 @@ function VirtualizedArrayList(props2) {
   }, [activeDragItemIndex, focusPathKey, memberKeys]), observeElementOffset = useCallback((instance, callback) => {
     if (!instance.scrollElement)
       return;
-    const scroll = instance.scrollElement, handleScroll = (evt) => {
+    const scroll = instance.scrollElement;
+    if (containerElement.current && !scroll.contains(containerElement.current)) {
+      const handleScroll = (evt) => {
+        const scrollTop = scroll.getBoundingClientRect().top, parentTop = parentRef.current?.getBoundingClientRect().top ?? 0;
+        callback(Math.floor(scrollTop - parentTop), !!evt);
+      };
+      return handleScroll(), scroll.addEventListener("scroll", handleScroll, {
+        capture: !1,
+        passive: !0
+      }), () => {
+        scroll.removeEventListener("scroll", handleScroll);
+      };
+    }
+    const handleScroll_0 = (evt_0) => {
       const containerElementTop = containerElement.current?.getBoundingClientRect().top ?? 0, parentElementTop = parentRef.current?.getBoundingClientRect().top ?? 0, itemOffset = Math.floor(parentElementTop - containerElementTop);
-      callback(scroll.scrollTop - itemOffset, !!evt);
+      callback(scroll.scrollTop - itemOffset, !!evt_0);
     };
-    return handleScroll(), instance.scrollElement.addEventListener("scroll", handleScroll, {
+    return handleScroll_0(), instance.scrollElement.addEventListener("scroll", handleScroll_0, {
       capture: !1,
       passive: !0
     }), () => {
-      scroll.removeEventListener("scroll", handleScroll);
+      scroll.removeEventListener("scroll", handleScroll_0);
     };
   }, [containerElement]), estimateSize2 = useCallback(() => 53, []), virtualizer = useVirtualizer({
     count: members.length,
     estimateSize: estimateSize2,
-    getScrollElement: useCallback(() => scrollElement, [scrollElement]),
+    getScrollElement: useCallback(() => resolvedScrollElement, [resolvedScrollElement]),
     observeElementOffset,
     rangeExtractor,
     getItemKey: useCallback((index_0) => memberKeys[index_0], [memberKeys]),