@rific/scroll-view 0.2.0 → 0.3.0

package/dist/index.mjs

@@ -3,9 +3,10 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/CustomList.tsx
-import { memo, useCallback as useCallback2, useMemo as useMemo2, useRef as useRef2 } from "react";
+import { memo, useCallback as useCallback2, useContext as useContext4, useLayoutEffect as useLayoutEffect2, useMemo as useMemo2, useRef as useRef2 } from "react";
 import { Dimensions, View } from "react-native";
 import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import { runOnUI, useSharedValue as useSharedValue4 } from "react-native-reanimated";
 
 // src/internal/RefreshControl.tsx
 import { RefreshControl as RNRefreshControl } from "react-native";
@@ -31,8 +32,8 @@ var styles = StyleSheet.create({
 });
 
 // src/internal/useScrollHandler.ts
-import { useContext } from "react";
-import { runOnJS, useAnimatedScrollHandler, useSharedValue, withTiming } from "react-native-reanimated";
+import { useContext as useContext2 } from "react";
+import { runOnJS, useAnimatedScrollHandler, useSharedValue as useSharedValue2, withTiming } from "react-native-reanimated";
 
 // src/ScrollViewContext.ts
 import { createContext } from "react";
@@ -42,10 +43,16 @@ var ScrollViewContext = createContext({
   footerHeightShared: null,
   footerFixed: false,
   footerOffset: null,
-  headerHeight: 0,
+  headerHeight: null,
   headerHeightShared: null,
   headerFixed: false,
   headerOffset: null,
+  jsListGeneration: { current: 0 },
+  listGeneration: null,
+  onJsListUnmount: () => {
+  },
+  onListUnmount: () => {
+  },
   progress: null,
   progressing: false,
   pullSearchHeightShared: null,
@@ -64,17 +71,207 @@ var ScrollViewContext = createContext({
   tabBarHeight: 60
 });
 
+// src/useScrollInit.ts
+import { createElement, useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
+import { useSharedValue } from "react-native-reanimated";
+var REMOUNT_SYNC_MAX_ATTEMPTS = 8;
+var REMOUNT_SYNC_TOLERANCE = 1;
+var REMOUNT_SYNC_FALLBACK_MS = 500;
+var REMOUNT_PRIME_FRAMES = 40;
+var SNAP_VERIFY_TOLERANCE = 1;
+var SNAP_VERIFY_MAX_ATTEMPTS = 5;
+var SNAP_VERIFY_INITIAL_DELAY_MS = 400;
+var SNAP_VERIFY_RETRY_DELAY_MS = 150;
+function useScrollInit({ listHeaderComponent, onMomentumScrollEnd: externalMomentumScrollEnd, onRefresh, onScrollBeginDrag: externalScrollBeginDrag, onScrollEndDrag: externalScrollEndDrag, pullSearchHeight, scrollTo }) {
+  const { headerHeight, scrollPosition, setProgressing } = useContext(ScrollViewContext);
+  const hasPullSearch = pullSearchHeight !== void 0;
+  const [phase, setPhase] = useState(hasPullSearch && !headerHeight ? "measuring" : "ready");
+  const [refreshing, setRefreshing] = useState(false);
+  const refreshingRef = useRef(refreshing);
+  useEffect(() => {
+    refreshingRef.current = refreshing;
+  }, [refreshing]);
+  const dragStartY = useRef(null);
+  const pendingSnapTarget = useRef(null);
+  const snapVerifyTimeout = useRef(null);
+  const snapVerifyAttempts = useRef(0);
+  const scheduleSnapVerification = useCallback(
+    (target, delay) => {
+      if (snapVerifyTimeout.current !== null) clearTimeout(snapVerifyTimeout.current);
+      pendingSnapTarget.current = target;
+      snapVerifyAttempts.current = 0;
+      const check = () => {
+        snapVerifyTimeout.current = null;
+        if (pendingSnapTarget.current !== target) return;
+        if (Math.abs(scrollPosition.value - target) <= SNAP_VERIFY_TOLERANCE) {
+          pendingSnapTarget.current = null;
+          return;
+        }
+        snapVerifyAttempts.current += 1;
+        if (snapVerifyAttempts.current > SNAP_VERIFY_MAX_ATTEMPTS || refreshingRef.current) {
+          pendingSnapTarget.current = null;
+          return;
+        }
+        scrollTo(target, false);
+        snapVerifyTimeout.current = setTimeout(check, SNAP_VERIFY_RETRY_DELAY_MS);
+      };
+      snapVerifyTimeout.current = setTimeout(check, delay);
+    },
+    [scrollPosition, scrollTo]
+  );
+  useEffect(
+    () => () => {
+      if (snapVerifyTimeout.current !== null) clearTimeout(snapVerifyTimeout.current);
+    },
+    []
+  );
+  const [remountTarget] = useState(() => headerHeight !== null ? -headerHeight + (pullSearchHeight ?? 0) : null);
+  const remountSyncTarget = useSharedValue(remountTarget);
+  const [scrollReady, setScrollReady] = useState(remountTarget === null);
+  const remountAttempts = useRef(0);
+  const onRemountSynced = useCallback(
+    (y) => {
+      scrollPosition.value = y;
+      setScrollReady(true);
+    },
+    [scrollPosition]
+  );
+  const onRemountSyncRetry = useCallback(
+    (currentY) => {
+      if (remountTarget === null) return;
+      remountAttempts.current += 1;
+      if (remountAttempts.current > REMOUNT_SYNC_MAX_ATTEMPTS) {
+        remountSyncTarget.value = null;
+        onRemountSynced(currentY);
+        return;
+      }
+      scrollTo(remountTarget, false);
+    },
+    [onRemountSynced, remountSyncTarget, remountTarget, scrollTo]
+  );
+  useEffect(() => {
+    if (remountTarget === null) return;
+    scrollTo(remountTarget, false);
+    const fallback = setTimeout(() => {
+      if (remountSyncTarget.value === null) return;
+      remountSyncTarget.value = null;
+      onRemountSynced(remountTarget);
+    }, REMOUNT_SYNC_FALLBACK_MS);
+    return () => clearTimeout(fallback);
+  }, []);
+  useEffect(() => {
+    if (phase === "ready" || !headerHeight || !pullSearchHeight) return;
+    scrollPosition.value = -headerHeight + pullSearchHeight;
+    setPhase("ready");
+  }, [phase, headerHeight, pullSearchHeight, scrollPosition]);
+  const headerInitialized = useRef(false);
+  useLayoutEffect(() => {
+    if (!headerHeight || headerInitialized.current) return;
+    headerInitialized.current = true;
+    const target = remountTarget ?? -headerHeight;
+    scrollPosition.value = target;
+    scrollTo(target, false);
+    if (remountTarget === null) return;
+    let framesLeft = REMOUNT_PRIME_FRAMES;
+    let handle = null;
+    const tick = () => {
+      const offset = framesLeft === 1 ? target : framesLeft % 2 === 0 ? target + 30 : target - 30;
+      scrollTo(offset, false);
+      framesLeft -= 1;
+      if (framesLeft > 0) handle = requestAnimationFrame(tick);
+    };
+    handle = requestAnimationFrame(tick);
+    return () => {
+      if (handle !== null) cancelAnimationFrame(handle);
+    };
+  }, [remountTarget, headerHeight, scrollPosition, scrollTo]);
+  const pullSearchInitialized = useRef(false);
+  useLayoutEffect(() => {
+    if (remountTarget !== null || !hasPullSearch || phase !== "ready" || pullSearchInitialized.current || !headerHeight || !pullSearchHeight || !scrollReady) return;
+    pullSearchInitialized.current = true;
+    scrollPosition.value = -headerHeight + pullSearchHeight;
+    scrollTo(-headerHeight + pullSearchHeight, false);
+  }, [remountTarget, hasPullSearch, phase, headerHeight, pullSearchHeight, scrollPosition, scrollReady, scrollTo]);
+  useEffect(() => {
+    if (pullSearchHeight) setProgressing(refreshing);
+  }, [pullSearchHeight, refreshing, setProgressing]);
+  const handleScrollBeginDrag = useCallback(
+    (e) => {
+      if (snapVerifyTimeout.current !== null) {
+        clearTimeout(snapVerifyTimeout.current);
+        snapVerifyTimeout.current = null;
+      }
+      pendingSnapTarget.current = null;
+      if (pullSearchHeight) dragStartY.current = e.nativeEvent.contentOffset.y;
+      externalScrollBeginDrag?.(e);
+    },
+    [externalScrollBeginDrag, pullSearchHeight]
+  );
+  const handleScrollEndDrag = useCallback(
+    (e) => {
+      if (pullSearchHeight && headerHeight) {
+        const y = e.nativeEvent.contentOffset.y;
+        const showY = -headerHeight;
+        const hideY = -headerHeight + pullSearchHeight;
+        const startY = dragStartY.current;
+        dragStartY.current = null;
+        const pulledDown = (startY ?? hideY) <= hideY;
+        const dragDistance = startY !== null ? startY - y : 0;
+        if (pulledDown && dragDistance >= pullSearchHeight * 0.5) {
+          if (y <= showY && !refreshing && onRefresh) {
+            setRefreshing(true);
+            Promise.resolve(onRefresh()).finally(() => setRefreshing(false));
+          }
+          scrollTo(showY, true);
+          scheduleSnapVerification(showY, SNAP_VERIFY_INITIAL_DELAY_MS);
+        } else if (y < hideY) {
+          scrollTo(hideY, true);
+          scheduleSnapVerification(hideY, SNAP_VERIFY_INITIAL_DELAY_MS);
+        }
+      }
+      externalScrollEndDrag?.(e);
+    },
+    [externalScrollEndDrag, headerHeight, onRefresh, pullSearchHeight, refreshing, scheduleSnapVerification, scrollTo]
+  );
+  const handleMomentumScrollEnd = useCallback(
+    (e) => {
+      if (pullSearchHeight && headerHeight && !refreshing && pendingSnapTarget.current === null) {
+        const y = e.nativeEvent.contentOffset.y;
+        const hideY = -headerHeight + pullSearchHeight;
+        if (y < hideY - 1) {
+          scrollTo(hideY, true);
+          scheduleSnapVerification(hideY, SNAP_VERIFY_INITIAL_DELAY_MS);
+        }
+      }
+      externalMomentumScrollEnd?.(e);
+    },
+    [externalMomentumScrollEnd, headerHeight, pullSearchHeight, refreshing, scheduleSnapVerification, scrollTo]
+  );
+  const activeListHeader = hasPullSearch && phase === "measuring" ? null : listHeaderComponent;
+  const hiddenHeader = phase === "measuring" && listHeaderComponent != null ? typeof listHeaderComponent === "function" ? createElement(listHeaderComponent) : listHeaderComponent : null;
+  return { activeListHeader, handleMomentumScrollEnd, handleScrollBeginDrag, handleScrollEndDrag, hiddenHeader, onRemountSyncRetry, onRemountSynced, pullSearchMinHeight: pullSearchHeight ?? 0, remountSyncTarget, remountTarget, scrollReady };
+}
+
 // src/internal/useScrollHandler.ts
-function useScrollHandler({ chipHidden, chipThreshold = 100, footerFixed, headerFixed, isHorizontal, onPullSearchZoneEnter }) {
-  const { footerHeightShared, footerOffset, headerHeightShared, headerOffset, pullSearchHeightShared, scrollPosition, snapBackFooterShared, snapBackHeaderShared } = useContext(ScrollViewContext);
-  const snapUpAccum = useSharedValue(0);
-  const fromBottomBounce = useSharedValue(false);
-  const isMomentum = useSharedValue(false);
-  const momentumPullSearchFired = useSharedValue(false);
+function useScrollHandler({ capturedGeneration, chipHidden, chipThreshold = 100, footerFixed, headerFixed, isHorizontal, listGeneration, onRemountSyncRetry, onRemountSynced, remountSyncTarget }) {
+  const { footerHeightShared, footerOffset, headerHeightShared, headerOffset, pullSearchHeightShared, scrollPosition, snapBackFooterShared, snapBackHeaderShared } = useContext2(ScrollViewContext);
+  const snapUpAccum = useSharedValue2(0);
+  const fromBottomBounce = useSharedValue2(false);
   return useAnimatedScrollHandler(
     {
       onScroll: ({ contentOffset: { x, y }, contentSize: { height: contentHeight }, layoutMeasurement: { height: layoutHeight } }) => {
         "worklet";
+        if (remountSyncTarget && remountSyncTarget.value !== null) {
+          const target = remountSyncTarget.value;
+          if (Math.abs(y - target) < REMOUNT_SYNC_TOLERANCE) {
+            remountSyncTarget.value = null;
+            if (onRemountSynced) runOnJS(onRemountSynced)(y);
+          } else if (onRemountSyncRetry) {
+            runOnJS(onRemountSyncRetry)(y);
+          }
+          return;
+        }
+        if (listGeneration.value !== capturedGeneration.value) return;
         if (isHorizontal) {
           scrollPosition.value = x;
           chipHidden.value = x < chipThreshold ? 1 : 0;
@@ -90,13 +287,6 @@ function useScrollHandler({ chipHidden, chipThreshold = 100, footerFixed, header
         } else if (fromBottomBounce.value) {
           fromBottomBounce.value = false;
         }
-        if (isMomentum.value && pullSearchHeightShared.value > 0 && !momentumPullSearchFired.value) {
-          const hideY = -headerHeightShared.value + pullSearchHeightShared.value;
-          if (y < hideY) {
-            momentumPullSearchFired.value = true;
-            if (onPullSearchZoneEnter) runOnJS(onPullSearchZoneEnter)();
-          }
-        }
         const snapHeader = snapBackHeaderShared.value && !headerFixed;
         const snapFooter = snapBackFooterShared.value && !footerFixed;
         if (snapHeader || snapFooter) {
@@ -122,16 +312,9 @@ function useScrollHandler({ chipHidden, chipThreshold = 100, footerFixed, header
       },
       onBeginDrag: () => {
         "worklet";
-        isMomentum.value = false;
-        momentumPullSearchFired.value = false;
         fromBottomBounce.value = false;
         snapUpAccum.value = 0;
       },
-      onMomentumBegin: () => {
-        "worklet";
-        isMomentum.value = true;
-        momentumPullSearchFired.value = false;
-      },
       onEndDrag: ({ contentOffset: { y }, contentSize: { height: contentHeight }, layoutMeasurement: { height: layoutHeight } }) => {
         "worklet";
         if (isHorizontal) return;
@@ -142,28 +325,26 @@ function useScrollHandler({ chipHidden, chipThreshold = 100, footerFixed, header
       },
       onMomentumEnd: () => {
         "worklet";
-        isMomentum.value = false;
-        momentumPullSearchFired.value = false;
         fromBottomBounce.value = false;
         snapUpAccum.value = 0;
       }
     },
-    [headerFixed, footerFixed, isHorizontal, chipThreshold, onPullSearchZoneEnter]
+    [capturedGeneration, headerFixed, footerFixed, isHorizontal, chipThreshold, listGeneration, onRemountSyncRetry, onRemountSynced, remountSyncTarget]
   );
 }
 
 // src/internal/useScrollList.ts
-import { useContext as useContext2, useEffect, useMemo } from "react";
+import { useContext as useContext3, useEffect as useEffect2, useMemo, useState as useState3 } from "react";
 import { StyleSheet as StyleSheet2 } from "react-native";
-import { useAnimatedStyle, useSharedValue as useSharedValue2, withTiming as withTiming2 } from "react-native-reanimated";
+import { useAnimatedStyle, useSharedValue as useSharedValue3, withTiming as withTiming2 } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 // src/useKeyboardInset.ts
-import { useState } from "react";
+import { useState as useState2 } from "react";
 import { useKeyboardHandler } from "react-native-keyboard-controller";
 import { runOnJS as runOnJS2 } from "react-native-reanimated";
 var useKeyboardInset = () => {
-  const [keyboardHeight, setKeyboardHeight] = useState(0);
+  const [keyboardHeight, setKeyboardHeight] = useState2(0);
   useKeyboardHandler(
     {
       onMove: (e) => {
@@ -185,28 +366,30 @@ var CHIP_SLIDE = 48;
 function useScrollList({ footerFixed: footerFixedProp, headerFixed: headerFixedProp, isHorizontal, keyboardAware, pullSearchHeight, style } = {}) {
   const insets = useSafeAreaInsets();
   const keyboardHeight = useKeyboardInset();
-  const { footerHeight, footerFixed: contextFooterFixed, headerHeight, headerFixed: contextHeaderFixed, headerOffset, pullSearchHeightShared, scrollPosition, snapBackHeaderShared } = useContext2(ScrollViewContext);
+  const { footerHeight, footerFixed: contextFooterFixed, headerHeight, headerFixed: contextHeaderFixed, headerOffset, pullSearchHeightShared, scrollPosition, snapBackHeaderShared } = useContext3(ScrollViewContext);
   const headerFixed = isHorizontal ? true : headerFixedProp ?? contextHeaderFixed;
   const footerFixed = isHorizontal ? true : footerFixedProp ?? contextFooterFixed;
-  useEffect(() => {
+  useEffect2(() => {
     pullSearchHeightShared.value = pullSearchHeight ?? 0;
   }, [pullSearchHeight, pullSearchHeightShared]);
-  const containerStyle = useMemo(() => headerHeight === 0 ? [{ flex: 1 }, style] : [StyleSheet2.absoluteFill, style], [headerHeight, style]);
-  const contentInset = useMemo(() => ({ bottom: (footerFixed ? footerHeight || insets.bottom : insets.bottom) + (keyboardAware ? keyboardHeight : 0), top: headerHeight }), [footerFixed, footerHeight, insets.bottom, headerHeight, keyboardAware, keyboardHeight]);
-  const contentOffset = useMemo(() => ({ x: 0, y: -contentInset.top }), [contentInset.top]);
-  const chipHidden = useSharedValue2(1);
+  const containerStyle = useMemo(() => headerHeight === null ? [{ flex: 1, opacity: 0 }, style] : [StyleSheet2.absoluteFill, style], [headerHeight, style]);
+  const contentInset = useMemo(() => ({ bottom: (footerFixed ? footerHeight || insets.bottom : insets.bottom) + (keyboardAware ? keyboardHeight : 0), top: headerHeight ?? 0 }), [footerFixed, footerHeight, insets.bottom, headerHeight, keyboardAware, keyboardHeight]);
+  const [startedWithHeader] = useState3(headerHeight !== null);
+  const contentOffset = useMemo(() => ({ x: 0, y: headerHeight !== null ? -headerHeight + (startedWithHeader && !isHorizontal && pullSearchHeight ? pullSearchHeight : 0) : 0 }), [headerHeight, isHorizontal, pullSearchHeight, startedWithHeader]);
+  const chipHidden = useSharedValue3(1);
   const chipStyle = useAnimatedStyle(() => {
     const pointerEvents = chipHidden.value ? "none" : "box-none";
     if (isHorizontal) {
       return {
         opacity: chipHidden.value ? withTiming2(0) : withTiming2(1),
         pointerEvents,
-        top: Math.max(headerHeight, insets.top) + 4,
+        top: Math.max(headerHeight ?? 0, insets.top) + 4,
         transform: [{ translateX: chipHidden.value ? withTiming2(-CHIP_SLIDE) : withTiming2(0) }]
       };
     }
-    const slide = headerFixed ? 0 : snapBackHeaderShared.value ? -headerOffset.value : Math.max(0, scrollPosition.value + headerHeight - pullSearchHeightShared.value);
-    const top = Math.max(headerHeight - slide, insets.top) + 4;
+    const h = headerHeight ?? 0;
+    const slide = headerFixed ? 0 : snapBackHeaderShared.value ? -headerOffset.value : Math.max(0, scrollPosition.value + h - pullSearchHeightShared.value);
+    const top = Math.max(h - slide, insets.top) + 4;
     return {
       opacity: chipHidden.value ? withTiming2(0) : withTiming2(1),
       pointerEvents,
@@ -217,90 +400,21 @@ function useScrollList({ footerFixed: footerFixedProp, headerFixed: headerFixedP
   return { chipHidden, chipStyle, containerStyle, contentInset, contentOffset, footerFixed, headerFixed, headerHeight, insets, isHorizontal: isHorizontal ?? false };
 }
 
-// src/useScrollInit.ts
-import { createElement, useCallback, useContext as useContext3, useEffect as useEffect2, useLayoutEffect, useRef, useState as useState2 } from "react";
-function useScrollInit({ listHeaderComponent, onMomentumScrollEnd: externalMomentumScrollEnd, onRefresh, onScrollBeginDrag: externalScrollBeginDrag, onScrollEndDrag: externalScrollEndDrag, pullSearchHeight, scrollTo }) {
-  const { headerHeight, scrollPosition, setProgressing } = useContext3(ScrollViewContext);
-  const hasPullSearch = pullSearchHeight !== void 0;
-  const [phase, setPhase] = useState2(hasPullSearch ? "measuring" : "ready");
-  const [refreshing, setRefreshing] = useState2(false);
-  const dragStartY = useRef(null);
-  const deliberatelyOpened = useRef(false);
-  useEffect2(() => {
-    if (phase === "ready" || !headerHeight || !pullSearchHeight) return;
-    scrollPosition.value = -headerHeight + pullSearchHeight;
-    setPhase("ready");
-  }, [phase, headerHeight, pullSearchHeight, scrollPosition]);
-  const headerInitialized = useRef(false);
-  useLayoutEffect(() => {
-    if (!headerHeight || headerInitialized.current) return;
-    headerInitialized.current = true;
-    scrollPosition.value = -headerHeight;
-    scrollTo(-headerHeight, false);
-  }, [headerHeight, scrollPosition, scrollTo]);
-  const pullSearchInitialized = useRef(false);
-  useLayoutEffect(() => {
-    if (!hasPullSearch || phase !== "ready" || pullSearchInitialized.current || !headerHeight || !pullSearchHeight) return;
-    pullSearchInitialized.current = true;
-    scrollPosition.value = -headerHeight + pullSearchHeight;
-    scrollTo(-headerHeight + pullSearchHeight, false);
-  }, [hasPullSearch, phase, headerHeight, pullSearchHeight, scrollPosition, scrollTo]);
-  useEffect2(() => {
-    if (pullSearchHeight) setProgressing(refreshing);
-  }, [pullSearchHeight, refreshing, setProgressing]);
-  const handleScrollBeginDrag = useCallback(
-    (e) => {
-      deliberatelyOpened.current = false;
-      if (pullSearchHeight) dragStartY.current = e.nativeEvent.contentOffset.y;
-      externalScrollBeginDrag?.(e);
-    },
-    [externalScrollBeginDrag, pullSearchHeight]
-  );
-  const handleScrollEndDrag = useCallback(
-    (e) => {
-      if (pullSearchHeight && headerHeight) {
-        const y = e.nativeEvent.contentOffset.y;
-        const showY = -headerHeight;
-        const hideY = -headerHeight + pullSearchHeight;
-        const pulledDown = (dragStartY.current ?? hideY) <= hideY;
-        dragStartY.current = null;
-        if (pulledDown && y <= showY + pullSearchHeight * 0.5) {
-          deliberatelyOpened.current = true;
-          if (y <= showY && !refreshing && onRefresh) {
-            setRefreshing(true);
-            Promise.resolve(onRefresh()).finally(() => setRefreshing(false));
-          }
-          scrollTo(showY, true);
-        } else if (y < hideY) {
-          scrollTo(hideY, true);
-        }
-      }
-      externalScrollEndDrag?.(e);
-    },
-    [externalScrollEndDrag, headerHeight, onRefresh, pullSearchHeight, refreshing, scrollTo]
-  );
-  const handleMomentumScrollEnd = useCallback(
-    (e) => {
-      if (pullSearchHeight && headerHeight && !deliberatelyOpened.current && !refreshing) {
-        const y = e.nativeEvent.contentOffset.y;
-        const hideY = -headerHeight + pullSearchHeight;
-        if (y < hideY - 1) scrollTo(hideY, true);
-      }
-      deliberatelyOpened.current = false;
-      externalMomentumScrollEnd?.(e);
-    },
-    [externalMomentumScrollEnd, headerHeight, pullSearchHeight, refreshing, scrollTo]
-  );
-  const activeListHeader = hasPullSearch && phase === "measuring" ? null : listHeaderComponent;
-  const hiddenHeader = phase === "measuring" && listHeaderComponent != null ? typeof listHeaderComponent === "function" ? createElement(listHeaderComponent) : listHeaderComponent : null;
-  return { activeListHeader, handleMomentumScrollEnd, handleScrollBeginDrag, handleScrollEndDrag, hiddenHeader, pullSearchMinHeight: pullSearchHeight ?? 0 };
-}
-
 // src/CustomList.tsx
 import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
 var CustomListInner = ({ chipProps, chipThreshold, component: List, renderFilters, footerFixed: footerFixedProp, gesture, headerFixed: headerFixedProp, keyboardAware, onChipPress, onMomentumScrollEnd: externalMomentumScrollEnd, onRefresh, onScrollBeginDrag: externalScrollBeginDrag, onScrollEndDrag: externalScrollEndDrag, pullSearchHeight, scrollRef, style, ...props }) => {
   const { ListHeaderComponent: listHeaderComponent, contentContainerStyle: externalContentContainerStyle, ...restProps } = props;
   const { chipHidden, chipStyle, containerStyle, contentInset, contentOffset, footerFixed, headerFixed } = useScrollList({ footerFixed: footerFixedProp, headerFixed: headerFixedProp, keyboardAware, pullSearchHeight, style });
+  const { listGeneration, onListUnmount } = useContext4(ScrollViewContext);
+  const capturedGeneration = useSharedValue4(-1);
+  useLayoutEffect2(() => {
+    const generation = listGeneration.value;
+    runOnUI((gen) => {
+      "worklet";
+      capturedGeneration.value = gen;
+    })(generation);
+  }, [capturedGeneration, listGeneration]);
+  useLayoutEffect2(() => () => onListUnmount(), [onListUnmount]);
   const scrollViewInternal = useRef2(null);
   const handleRef = useCallback2(
     (el) => {
@@ -318,7 +432,10 @@ var CustomListInner = ({ chipProps, chipThreshold, component: List, renderFilter
     handleScrollBeginDrag,
     handleScrollEndDrag,
     hiddenHeader,
-    pullSearchMinHeight
+    onRemountSyncRetry,
+    onRemountSynced,
+    pullSearchMinHeight,
+    remountSyncTarget
   } = useScrollInit({
     listHeaderComponent,
     onMomentumScrollEnd: externalMomentumScrollEnd,
@@ -337,11 +454,7 @@ var CustomListInner = ({ chipProps, chipThreshold, component: List, renderFilter
     ] });
   }, [pullSearchHeader, renderFilters]);
   const contentContainerStyle = useMemo2(() => [{ minHeight: Dimensions.get("window").height - contentInset.top - contentInset.bottom + pullSearchMinHeight }, externalContentContainerStyle], [contentInset.bottom, contentInset.top, externalContentContainerStyle, pullSearchMinHeight]);
-  const onPullSearchZoneEnter = useCallback2(() => {
-    if (!pullSearchHeight) return;
-    scrollViewInternal.current?.scrollToOffset({ offset: -contentInset.top + pullSearchHeight, animated: true });
-  }, [contentInset.top, pullSearchHeight]);
-  const onScroll = useScrollHandler({ chipHidden, chipThreshold, footerFixed, headerFixed, onPullSearchZoneEnter: pullSearchHeight ? onPullSearchZoneEnter : void 0 });
+  const onScroll = useScrollHandler({ capturedGeneration, chipHidden, chipThreshold, footerFixed, headerFixed, listGeneration, onRemountSyncRetry, onRemountSynced, remountSyncTarget });
   const handleScrollToTop = useCallback2(() => {
     const offset = pullSearchHeight ? -contentInset.top + pullSearchHeight : -contentInset.top;
     scrollViewInternal.current?.scrollToOffset({ offset, animated: true });
@@ -362,14 +475,13 @@ var styles2 = { measureContainer: { left: 0, opacity: 0, position: "absolute", r
 var CustomList = memo(CustomListInner);
 
 // src/FlatList.tsx
-import { memo as memo2, useCallback as useCallback3, useMemo as useMemo3, useRef as useRef3 } from "react";
-import { Dimensions as Dimensions2, View as View3 } from "react-native";
+import { Fragment as Fragment2, memo as memo2, useCallback as useCallback4, useContext as useContext7, useLayoutEffect as useLayoutEffect3, useMemo as useMemo3, useRef as useRef4 } from "react";
+import { Dimensions as Dimensions2, FlatList as RNFlatList, View as View3 } from "react-native";
 import { Gesture as Gesture2, GestureDetector as GestureDetector2 } from "react-native-gesture-handler";
-import Animated3 from "react-native-reanimated";
 
 // src/internal/HorizontalDots.tsx
 import { BlurView } from "@rific/auto-paper";
-import { useContext as useContext4 } from "react";
+import { useContext as useContext5 } from "react";
 import { StyleSheet as StyleSheet3, useWindowDimensions, View as View2 } from "react-native";
 import { useTheme } from "react-native-paper";
 import Animated2, { interpolateColor, useAnimatedStyle as useAnimatedStyle2 } from "react-native-reanimated";
@@ -398,7 +510,7 @@ var Dot = ({ activeColor, index, inactiveColor, pageWidth, scrollPosition }) =>
   return /* @__PURE__ */ jsx4(View2, { style: styles3.dotContainer, children: /* @__PURE__ */ jsx4(Animated2.View, { style: circleStyle }) });
 };
 var HorizontalDots = ({ total }) => {
-  const { blur, footerHeightShared, scrollPosition } = useContext4(ScrollViewContext);
+  const { blur, footerHeightShared, scrollPosition } = useContext5(ScrollViewContext);
   const { width } = useWindowDimensions();
   const insets = useSafeAreaInsets2();
   const theme = useTheme();
@@ -434,14 +546,144 @@ var styles3 = StyleSheet3.create({
   pillContainer: { alignItems: "center", left: 0, position: "absolute", right: 0, zIndex: 3 }
 });
 
+// src/internal/useScrollHandlerJS.ts
+import { useCallback as useCallback3, useContext as useContext6, useRef as useRef3 } from "react";
+import { withTiming as withTiming3 } from "react-native-reanimated";
+var REMOUNT_RETRY_TOLERANCE = 1;
+var REMOUNT_RETRY_MAX_ATTEMPTS = 8;
+function useScrollHandlerJS({ capturedGeneration, chipHidden, chipThreshold = 100, footerFixed, headerFixed, isHorizontal, jsListGeneration, remountTarget = null, scrollTo }) {
+  const { footerHeightShared, footerOffset, headerHeightShared, headerOffset, pullSearchHeightShared, scrollPosition, snapBackFooterShared, snapBackHeaderShared } = useContext6(ScrollViewContext);
+  const snapUpAccum = useRef3(0);
+  const fromBottomBounce = useRef3(false);
+  const pendingRemountTarget = useRef3(remountTarget);
+  const remountAttempts = useRef3(0);
+  const onScroll = useCallback3(
+    (event) => {
+      if (jsListGeneration.current !== capturedGeneration.current) return;
+      const {
+        contentOffset: { x, y },
+        contentSize: { height: contentHeight },
+        layoutMeasurement: { height: layoutHeight }
+      } = event.nativeEvent;
+      if (pendingRemountTarget.current !== null) {
+        const target = pendingRemountTarget.current;
+        if (Math.abs(y - target) < REMOUNT_RETRY_TOLERANCE) {
+          pendingRemountTarget.current = null;
+        } else {
+          remountAttempts.current += 1;
+          if (remountAttempts.current > REMOUNT_RETRY_MAX_ATTEMPTS) {
+            pendingRemountTarget.current = null;
+          } else {
+            scrollTo?.(target, false);
+            return;
+          }
+        }
+      }
+      if (isHorizontal) {
+        scrollPosition.value = x;
+        chipHidden.value = x < chipThreshold ? 1 : 0;
+        return;
+      }
+      const delta = y - scrollPosition.value;
+      scrollPosition.value = y;
+      chipHidden.value = y < chipThreshold ? 1 : 0;
+      const maxScroll = contentHeight - layoutHeight;
+      if (maxScroll > 0 && y >= maxScroll) {
+        fromBottomBounce.current = true;
+        snapUpAccum.current = 0;
+      } else if (fromBottomBounce.current) {
+        fromBottomBounce.current = false;
+      }
+      const snapHeader = snapBackHeaderShared.value && !headerFixed;
+      const snapFooter = snapBackFooterShared.value && !footerFixed;
+      if (snapHeader || snapFooter) {
+        if (y <= -headerHeightShared.value) {
+          snapUpAccum.current = 0;
+          if (snapHeader) headerOffset.value = 0;
+          if (snapFooter) footerOffset.value = 0;
+        } else if (delta > 0) {
+          snapUpAccum.current = 0;
+          if (y >= -headerHeightShared.value + pullSearchHeightShared.value) {
+            if (snapHeader) headerOffset.value = Math.max(-headerHeightShared.value, Math.min(0, headerOffset.value - delta));
+            if (snapFooter) footerOffset.value = Math.max(0, Math.min(footerHeightShared.value, footerOffset.value + delta));
+          }
+        } else if (delta < 0 && !fromBottomBounce.current) {
+          if (y >= -headerHeightShared.value + pullSearchHeightShared.value) snapUpAccum.current -= delta;
+          if (snapUpAccum.current >= 10) {
+            snapUpAccum.current = 999;
+            if (snapHeader) headerOffset.value = withTiming3(0, { duration: 200 });
+            if (snapFooter) footerOffset.value = withTiming3(0, { duration: 200 });
+          }
+        }
+      }
+    },
+    [capturedGeneration, chipHidden, chipThreshold, footerFixed, footerHeightShared, footerOffset, headerFixed, headerHeightShared, headerOffset, isHorizontal, jsListGeneration, pullSearchHeightShared, scrollPosition, scrollTo, snapBackFooterShared, snapBackHeaderShared]
+  );
+  const onScrollBeginDrag = useCallback3(() => {
+    fromBottomBounce.current = false;
+    snapUpAccum.current = 0;
+  }, []);
+  const onMomentumScrollBegin = useCallback3(() => {
+  }, []);
+  const onScrollEndDrag = useCallback3(
+    (event) => {
+      if (isHorizontal) return;
+      const {
+        contentOffset: { y },
+        contentSize: { height: contentHeight },
+        layoutMeasurement: { height: layoutHeight }
+      } = event.nativeEvent;
+      if (y >= contentHeight - layoutHeight - 10) {
+        fromBottomBounce.current = true;
+        snapUpAccum.current = 0;
+      }
+    },
+    [isHorizontal]
+  );
+  const onMomentumScrollEnd = useCallback3(() => {
+    fromBottomBounce.current = false;
+    snapUpAccum.current = 0;
+  }, []);
+  return { onMomentumScrollBegin, onMomentumScrollEnd, onScroll, onScrollBeginDrag, onScrollEndDrag };
+}
+
 // src/FlatList.tsx
-import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
-var FlatListInner = ({ chipProps, chipThreshold, contentContainerStyle: externalContentContainerStyle, data, initialNumToRender = 20, maxToRenderPerBatch = 50, renderFilters, footerFixed: footerFixedProp, gesture, headerFixed: headerFixedProp, horizontal, keyboardAware, ListHeaderComponent: externalListHeaderComponent, onChipPress, onMomentumScrollEnd: externalMomentumScrollEnd, onRefresh, onScrollBeginDrag: externalScrollBeginDrag, onScrollEndDrag: externalScrollEndDrag, pagingEnabled, pullSearchHeight, removeClippedSubviews = false, showsHorizontalScrollIndicator, showsVerticalScrollIndicator, style, onContentSizeChange, ref: externalRef, windowSize = 100, ...props }) => {
-  const scrollView = useRef3(null);
+import { Fragment as Fragment3, jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
+var FlatListInner = ({ chipProps, chipThreshold, columnWrapperStyle, contentContainerStyle: externalContentContainerStyle, data, initialNumToRender = 20, keyExtractor, maxToRenderPerBatch = 50, numColumns, renderFilters, renderItem, footerFixed: footerFixedProp, gesture, headerFixed: headerFixedProp, horizontal, keyboardAware, ListHeaderComponent: externalListHeaderComponent, onChipPress, onMomentumScrollEnd: externalMomentumScrollEnd, onRefresh, onScrollBeginDrag: externalScrollBeginDrag, onScrollEndDrag: externalScrollEndDrag, pagingEnabled, pullSearchHeight, removeClippedSubviews = false, showsHorizontalScrollIndicator, showsVerticalScrollIndicator, style, onContentSizeChange, ref: externalRef, windowSize = 100, ...props }) => {
+  const scrollView = useRef4(null);
   const isHorizontal = horizontal === true;
   const showDots = isHorizontal && pagingEnabled === true && (data?.length ?? 0) > 1;
+  const cols = numColumns && numColumns > 1 ? numColumns : 1;
+  const rowData = useMemo3(() => {
+    if (cols <= 1 || !data) return data;
+    const items = Array.from(data);
+    const rows = [];
+    for (let i = 0; i < items.length; i += cols) rows.push(items.slice(i, i + cols));
+    return rows;
+  }, [cols, data]);
+  const rowKeyExtractor = useCallback4(
+    (row, rowIndex) => {
+      if (cols <= 1) return keyExtractor ? keyExtractor(row, rowIndex) : defaultKeyExtractor(row, rowIndex);
+      return row.map((item, kk) => keyExtractor ? keyExtractor(item, rowIndex * cols + kk) : defaultKeyExtractor(item, rowIndex * cols + kk)).join(":");
+    },
+    [cols, keyExtractor]
+  );
+  const rowRenderItem = useCallback4(
+    (info) => {
+      if (cols <= 1) return renderItem ? renderItem(info) : null;
+      const row = info.item;
+      return /* @__PURE__ */ jsx5(View3, { style: [styles4.row, columnWrapperStyle], children: row.map((item, kk) => /* @__PURE__ */ jsx5(Fragment2, { children: renderItem ? renderItem({ index: info.index * cols + kk, item, separators: info.separators }) : null }, kk)) });
+    },
+    [cols, columnWrapperStyle, renderItem]
+  );
   const { chipHidden, chipStyle, containerStyle, contentInset, contentOffset, footerFixed, headerFixed } = useScrollList({ footerFixed: footerFixedProp, headerFixed: headerFixedProp, isHorizontal, keyboardAware, pullSearchHeight, style });
-  const scrollTo = useCallback3((offset, animated) => {
+  const { jsListGeneration, onJsListUnmount } = useContext7(ScrollViewContext);
+  const capturedGeneration = useRef4(jsListGeneration.current);
+  useLayoutEffect3(() => {
+    capturedGeneration.current = jsListGeneration.current;
+  }, [jsListGeneration]);
+  useLayoutEffect3(() => () => onJsListUnmount(), [onJsListUnmount]);
+  const scrollTo = useCallback4((offset, animated) => {
     scrollView.current?.scrollToOffset({ offset, animated });
   }, []);
   const {
@@ -450,7 +692,8 @@ var FlatListInner = ({ chipProps, chipThreshold, contentContainerStyle: external
     handleScrollBeginDrag,
     handleScrollEndDrag,
     hiddenHeader,
-    pullSearchMinHeight
+    pullSearchMinHeight,
+    remountTarget
   } = useScrollInit({
     listHeaderComponent: externalListHeaderComponent,
     onMomentumScrollEnd: externalMomentumScrollEnd,
@@ -463,18 +706,35 @@ var FlatListInner = ({ chipProps, chipThreshold, contentContainerStyle: external
   const activeListHeader = useMemo3(() => {
     if (!renderFilters) return pullSearchHeader;
     const Inner = pullSearchHeader;
-    return () => /* @__PURE__ */ jsxs3(Fragment2, { children: [
+    return () => /* @__PURE__ */ jsxs3(Fragment3, { children: [
       Inner ? typeof Inner === "function" ? /* @__PURE__ */ jsx5(Inner, {}) : Inner : null,
       renderFilters
     ] });
   }, [pullSearchHeader, renderFilters]);
   const contentContainerStyle = useMemo3(() => isHorizontal ? externalContentContainerStyle : [{ minHeight: Dimensions2.get("window").height - contentInset.top - contentInset.bottom + pullSearchMinHeight }, externalContentContainerStyle], [isHorizontal, contentInset.bottom, contentInset.top, externalContentContainerStyle, pullSearchMinHeight]);
-  const onPullSearchZoneEnter = useCallback3(() => {
-    if (!pullSearchHeight) return;
-    scrollView.current?.scrollToOffset({ offset: -contentInset.top + pullSearchHeight, animated: true });
-  }, [contentInset.top, pullSearchHeight]);
-  const handleScroll = useScrollHandler({ chipHidden, chipThreshold, footerFixed, headerFixed, isHorizontal, onPullSearchZoneEnter: pullSearchHeight ? onPullSearchZoneEnter : void 0 });
-  const handleScrollToTop = useCallback3(() => {
+  const scrollHandler = useScrollHandlerJS({ capturedGeneration, chipHidden, chipThreshold, footerFixed, headerFixed, isHorizontal, jsListGeneration, remountTarget, scrollTo });
+  const onScrollBeginDrag = useCallback4(
+    (e) => {
+      scrollHandler.onScrollBeginDrag(e);
+      handleScrollBeginDrag(e);
+    },
+    [scrollHandler, handleScrollBeginDrag]
+  );
+  const onScrollEndDrag = useCallback4(
+    (e) => {
+      scrollHandler.onScrollEndDrag(e);
+      handleScrollEndDrag(e);
+    },
+    [scrollHandler, handleScrollEndDrag]
+  );
+  const onMomentumScrollEnd = useCallback4(
+    (e) => {
+      scrollHandler.onMomentumScrollEnd(e);
+      handleMomentumScrollEnd(e);
+    },
+    [scrollHandler, handleMomentumScrollEnd]
+  );
+  const handleScrollToTop = useCallback4(() => {
     if (isHorizontal) {
       scrollView.current?.scrollToOffset({ offset: 0, animated: true });
       return;
@@ -482,7 +742,7 @@ var FlatListInner = ({ chipProps, chipThreshold, contentContainerStyle: external
     const offset = pullSearchHeight ? -contentInset.top + pullSearchHeight : -contentInset.top;
     scrollView.current?.scrollToOffset({ offset, animated: true });
   }, [isHorizontal, contentInset.top, pullSearchHeight]);
-  const handleContentSizeChange = useCallback3(
+  const handleContentSizeChange = useCallback4(
     (w, h) => {
       if (onContentSizeChange) onContentSizeChange(w, h);
     },
@@ -494,23 +754,27 @@ var FlatListInner = ({ chipProps, chipThreshold, contentContainerStyle: external
   const detectorGesture = gesture !== void 0 ? combinedGesture : void 0;
   const content = /* @__PURE__ */ jsxs3(View3, { style: containerStyle, children: [
     /* @__PURE__ */ jsx5(
-      Animated3.FlatList,
+      RNFlatList,
       {
         ...props,
         contentContainerStyle,
         contentInset,
+        contentInsetAdjustmentBehavior: "never",
         contentOffset,
-        data,
+        data: cols > 1 ? rowData : data,
         horizontal: isHorizontal,
         initialNumToRender,
+        keyExtractor: cols > 1 ? rowKeyExtractor : keyExtractor,
         ListHeaderComponent: activeListHeader,
         maxToRenderPerBatch,
         onContentSizeChange: handleContentSizeChange,
-        onMomentumScrollEnd: handleMomentumScrollEnd,
-        onScroll: handleScroll,
-        onScrollBeginDrag: handleScrollBeginDrag,
-        onScrollEndDrag: handleScrollEndDrag,
+        onMomentumScrollBegin: scrollHandler.onMomentumScrollBegin,
+        onMomentumScrollEnd,
+        onScroll: scrollHandler.onScroll,
+        onScrollBeginDrag,
+        onScrollEndDrag,
         pagingEnabled,
+        renderItem: cols > 1 ? rowRenderItem : renderItem,
         ref: (el) => {
           if (externalRef) externalRef.current = el;
           scrollView.current = el;
@@ -529,22 +793,26 @@ var FlatListInner = ({ chipProps, chipThreshold, contentContainerStyle: external
   ] });
   return detectorGesture ? /* @__PURE__ */ jsx5(GestureDetector2, { gesture: detectorGesture, children: content }) : content;
 };
-var styles4 = { measureContainer: { left: 0, opacity: 0, position: "absolute", right: 0, top: -9999 } };
+var defaultKeyExtractor = (item, index) => {
+  const key = item?.key ?? item?.id;
+  return key != null ? String(key) : String(index);
+};
+var styles4 = { measureContainer: { left: 0, opacity: 0, position: "absolute", right: 0, top: -9999 }, row: { flexDirection: "row" } };
 var FlatList = memo2(FlatListInner);
 
 // src/PullSearch.tsx
-import { forwardRef, useCallback as useCallback4, useContext as useContext5, useEffect as useEffect3, useImperativeHandle, useRef as useRef4, useState as useState3 } from "react";
+import { forwardRef, useCallback as useCallback5, useContext as useContext8, useEffect as useEffect3, useImperativeHandle, useRef as useRef5, useState as useState4 } from "react";
 import { StyleSheet as StyleSheet4 } from "react-native";
 import { Searchbar, useTheme as useTheme2 } from "react-native-paper";
-import Animated4, { Extrapolation, interpolate, runOnJS as runOnJS3, useAnimatedReaction, useAnimatedStyle as useAnimatedStyle3 } from "react-native-reanimated";
+import Animated3, { Extrapolation, interpolate, runOnJS as runOnJS3, useAnimatedReaction, useAnimatedStyle as useAnimatedStyle3 } from "react-native-reanimated";
 import { jsx as jsx6 } from "react/jsx-runtime";
 var PullSearch = forwardRef(function PullSearch2({ debounce, onChangeText, onHeightChange, placeholder, value: propValue }, ref) {
-  const { headerHeight, scrollPosition } = useContext5(ScrollViewContext);
+  const { headerHeight, scrollPosition } = useContext8(ScrollViewContext);
   const theme = useTheme2();
-  const inputRef = useRef4(null);
-  const [barHeight, setBarHeight] = useState3(0);
-  const [value, setValue] = useState3(propValue ?? "");
-  const prevPropValueRef = useRef4(propValue);
+  const inputRef = useRef5(null);
+  const [barHeight, setBarHeight] = useState4(0);
+  const [value, setValue] = useState4(propValue ?? "");
+  const prevPropValueRef = useRef5(propValue);
   useEffect3(() => {
     if (prevPropValueRef.current === propValue) return;
     prevPropValueRef.current = propValue;
@@ -554,22 +822,22 @@ var PullSearch = forwardRef(function PullSearch2({ debounce, onChangeText, onHei
     blur: () => inputRef.current?.blur(),
     focus: () => inputRef.current?.focus()
   }));
-  const blurInput = useCallback4(() => inputRef.current?.blur(), []);
+  const blurInput = useCallback5(() => inputRef.current?.blur(), []);
   useAnimatedReaction(
     () => {
       if (barHeight === 0) return false;
-      return scrollPosition.value >= -headerHeight + barHeight;
+      return scrollPosition.value >= -(headerHeight ?? 0) + barHeight;
     },
     (isHidden, wasHidden) => {
       if (isHidden && !wasHidden) runOnJS3(blurInput)();
     },
     [barHeight, headerHeight, blurInput]
   );
-  const handleClear = useCallback4(() => {
+  const handleClear = useCallback5(() => {
     setValue("");
     onChangeText("");
   }, [onChangeText]);
-  const handleLayout = useCallback4(
+  const handleLayout = useCallback5(
     ({
       nativeEvent: {
         layout: { height }
@@ -590,11 +858,12 @@ var PullSearch = forwardRef(function PullSearch2({ debounce, onChangeText, onHei
   }, [debounce, onChangeText, value]);
   const animatedStyle = useAnimatedStyle3(() => {
     if (barHeight === 0) return { opacity: 0 };
-    const showY = -headerHeight;
-    const hideY = -headerHeight + barHeight;
+    const h = headerHeight ?? 0;
+    const showY = -h;
+    const hideY = -h + barHeight;
     return { opacity: interpolate(scrollPosition.value, [showY, hideY], [1, 0], Extrapolation.CLAMP) };
   }, [barHeight, headerHeight]);
-  return /* @__PURE__ */ jsx6(Animated4.View, { onLayout: handleLayout, style: [styles5.container, animatedStyle], children: /* @__PURE__ */ jsx6(Searchbar, { autoCorrect: false, onChangeText: (text) => setValue((text || "").trimStart()), onClearIconPress: handleClear, placeholder, placeholderTextColor: theme.colors.onSurfaceVariant, ref: inputRef, spellCheck: false, style: styles5.input, value }) });
+  return /* @__PURE__ */ jsx6(Animated3.View, { onLayout: handleLayout, style: [styles5.container, animatedStyle], children: /* @__PURE__ */ jsx6(Searchbar, { autoCorrect: false, onChangeText: (text) => setValue((text || "").trimStart()), onClearIconPress: handleClear, placeholder, placeholderTextColor: theme.colors.onSurfaceVariant, ref: inputRef, spellCheck: false, style: styles5.input, value }) });
 });
 var styles5 = StyleSheet4.create({
   container: { paddingVertical: 8 },
@@ -1095,6 +1364,24 @@ var objectTraps = {
   get(state, prop) {
     if (prop === DRAFT_STATE)
       return state;
+    if (prop === "constructor" || prop === "__proto__") {
+      const source2 = latest(state);
+      const value2 = source2[prop];
+      return new Proxy(value2 || {}, {
+        get: (target, key) => {
+          if (key === "__proto__" || key === "prototype") {
+            return Object.freeze(/* @__PURE__ */ Object.create(null));
+          }
+          return Reflect.get(target, key);
+        },
+        set: () => {
+          return true;
+        },
+        apply: (target, thisArg, args) => {
+          return Reflect.apply(target, thisArg, args);
+        }
+      });
+    }
     let arrayPlugin = state.scope_.arrayMethodsPlugin_;
     const isArrayWithStringProp = state.type_ === 1 && typeof prop === "string";
     if (isArrayWithStringProp) {
@@ -1124,12 +1411,18 @@ var objectTraps = {
     return value;
   },
   has(state, prop) {
+    if (prop === "constructor" || prop === "__proto__" || prop === "prototype") {
+      return false;
+    }
     return prop in latest(state);
   },
   ownKeys(state) {
     return Reflect.ownKeys(latest(state));
   },
   set(state, prop, value) {
+    if (prop === "constructor" || prop === "__proto__" || prop === "prototype") {
+      return true;
+    }
     const desc = getDescriptorFromProto(latest(state), prop);
     if (desc?.set) {
       desc.set.call(state.draft_, value);
@@ -1149,7 +1442,7 @@ var objectTraps = {
       markChanged(state);
     }
     if (state.copy_[prop] === value && // special case: handle new props with value 'undefined'
-    (value !== void 0 || prop in state.copy_) || // special case: NaN
+    (value !== void 0 || has(state.copy_, prop, state.type_)) || // special case: NaN
     Number.isNaN(value) && Number.isNaN(state.copy_[prop]))
       return true;
     state.copy_[prop] = value;
@@ -2165,16 +2458,26 @@ var scrollViewActions = slice.actions;
 var scrollViewReducer = slice.reducer;
 
 // src/ScrollView.tsx
-import { memo as memo3, useCallback as useCallback5, useMemo as useMemo4, useRef as useRef5 } from "react";
+import { memo as memo3, useCallback as useCallback6, useContext as useContext9, useLayoutEffect as useLayoutEffect4, useMemo as useMemo4, useRef as useRef6 } from "react";
 import { View as View4 } from "react-native";
 import { Gesture as Gesture3, GestureDetector as GestureDetector3 } from "react-native-gesture-handler";
-import Animated5 from "react-native-reanimated";
+import Animated4, { runOnUI as runOnUI2, useSharedValue as useSharedValue5 } from "react-native-reanimated";
 import { jsx as jsx7, jsxs as jsxs4 } from "react/jsx-runtime";
 var ScrollViewInner = ({ chipProps, chipThreshold, children, footerFixed: footerFixedProp, gesture, headerFixed: headerFixedProp, horizontal, keyboardAware, onChipPress, onMomentumScrollEnd: externalMomentumScrollEnd, onRefresh, onScrollBeginDrag: externalScrollBeginDrag, onScrollEndDrag: externalScrollEndDrag, pullSearchHeight, refreshing, style, ...props }) => {
-  const scrollView = useRef5(null);
+  const scrollView = useRef6(null);
   const isHorizontal = horizontal === true;
   const { chipHidden, chipStyle, containerStyle, contentInset, contentOffset, footerFixed, headerFixed } = useScrollList({ footerFixed: footerFixedProp, headerFixed: headerFixedProp, isHorizontal, keyboardAware, pullSearchHeight, style });
-  const scrollTo = useCallback5((offset, animated) => {
+  const { listGeneration, onListUnmount } = useContext9(ScrollViewContext);
+  const capturedGeneration = useSharedValue5(-1);
+  useLayoutEffect4(() => {
+    const generation = listGeneration.value;
+    runOnUI2((gen) => {
+      "worklet";
+      capturedGeneration.value = gen;
+    })(generation);
+  }, [capturedGeneration, listGeneration]);
+  useLayoutEffect4(() => () => onListUnmount(), [onListUnmount]);
+  const scrollTo = useCallback6((offset, animated) => {
     scrollView.current?.scrollTo({ y: offset, animated });
   }, []);
   const { handleMomentumScrollEnd, handleScrollBeginDrag, handleScrollEndDrag } = useScrollInit({
@@ -2184,12 +2487,8 @@ var ScrollViewInner = ({ chipProps, chipThreshold, children, footerFixed: footer
     pullSearchHeight,
     scrollTo
   });
-  const onPullSearchZoneEnter = useCallback5(() => {
-    if (!pullSearchHeight) return;
-    scrollTo(-contentInset.top + pullSearchHeight, true);
-  }, [contentInset.top, pullSearchHeight, scrollTo]);
-  const handleScroll = useScrollHandler({ chipHidden, chipThreshold, footerFixed, headerFixed, isHorizontal, onPullSearchZoneEnter: pullSearchHeight ? onPullSearchZoneEnter : void 0 });
-  const handleScrollToTop = useCallback5(() => {
+  const handleScroll = useScrollHandler({ capturedGeneration, chipHidden, chipThreshold, footerFixed, headerFixed, isHorizontal, listGeneration });
+  const handleScrollToTop = useCallback6(() => {
     if (isHorizontal) {
       scrollView.current?.scrollTo({ x: 0, animated: true });
       return;
@@ -2203,7 +2502,7 @@ var ScrollViewInner = ({ chipProps, chipThreshold, children, footerFixed: footer
   const detectorGesture = gesture !== void 0 ? combinedGesture : void 0;
   const content = /* @__PURE__ */ jsxs4(View4, { style: containerStyle, children: [
     /* @__PURE__ */ jsx7(
-      Animated5.ScrollView,
+      Animated4.ScrollView,
       {
         ...props,
         contentInset,
@@ -2229,13 +2528,13 @@ var ScrollView = memo3(ScrollViewInner);
 
 // src/ScrollViewFooter.tsx
 import { BlurView as BlurView2 } from "@rific/auto-paper";
-import { useContext as useContext6, useEffect as useEffect4 } from "react";
+import { useContext as useContext10, useEffect as useEffect4 } from "react";
 import { StyleSheet as StyleSheet5, View as View5 } from "react-native";
-import Animated6, { useAnimatedStyle as useAnimatedStyle4 } from "react-native-reanimated";
+import Animated5, { useAnimatedStyle as useAnimatedStyle4 } from "react-native-reanimated";
 import { useSafeAreaInsets as useSafeAreaInsets3 } from "react-native-safe-area-context";
 import { jsx as jsx8, jsxs as jsxs5 } from "react/jsx-runtime";
 var ScrollViewFooter = ({ children, style }) => {
-  const { blur, footerHeight, footerFixed, footerOffset, headerHeightShared, pullSearchHeightShared, scrollPosition, setFooterHeight, snapBackFooterShared } = useContext6(ScrollViewContext);
+  const { blur, footerHeight, footerFixed, footerOffset, headerHeightShared, pullSearchHeightShared, scrollPosition, setFooterHeight, snapBackFooterShared } = useContext10(ScrollViewContext);
   const insets = useSafeAreaInsets3();
   useEffect4(
     () => () => {
@@ -2257,7 +2556,7 @@ var ScrollViewFooter = ({ children, style }) => {
     if (effective <= 0) return { transform: [{ translateY: 0 }] };
     return { transform: [{ translateY: Math.min(effective, footerHeight) }] };
   }, [footerHeight, footerFixed]);
-  return /* @__PURE__ */ jsxs5(Animated6.View, { onLayout: handleLayout, pointerEvents: "box-none", style: [styles6.footer, footerStyle], children: [
+  return /* @__PURE__ */ jsxs5(Animated5.View, { onLayout: handleLayout, pointerEvents: "box-none", style: [styles6.footer, footerStyle], children: [
     footerHeight > 0 && /* @__PURE__ */ jsx8(BlurView2, { blur, style: StyleSheet5.absoluteFill }),
     /* @__PURE__ */ jsx8(View5, { style: [styles6.row, { paddingBottom: insets.bottom }, style], children })
   ] });
@@ -2269,16 +2568,16 @@ var styles6 = StyleSheet5.create({
 
 // src/ScrollViewHeader.tsx
 import { BlurView as BlurView3 } from "@rific/auto-paper";
-import { useContext as useContext7 } from "react";
+import { useContext as useContext11 } from "react";
 import { StyleSheet as StyleSheet6, Text, View as View6 } from "react-native";
 import { Appbar, ProgressBar, Surface, useTheme as useTheme3 } from "react-native-paper";
-import Animated7, { useAnimatedStyle as useAnimatedStyle5 } from "react-native-reanimated";
+import Animated6, { useAnimatedStyle as useAnimatedStyle5 } from "react-native-reanimated";
 import { useSafeAreaInsets as useSafeAreaInsets4 } from "react-native-safe-area-context";
-import { Fragment as Fragment3, jsx as jsx9, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx9, jsxs as jsxs6 } from "react/jsx-runtime";
 var ActionBg = ({ blur, style }) => blur ? /* @__PURE__ */ jsx9(View6, { style: [StyleSheet6.absoluteFill, styles7.actionBg, style], children: /* @__PURE__ */ jsx9(BlurView3, { blur: true, style: StyleSheet6.absoluteFill }) }) : /* @__PURE__ */ jsx9(View6, { style: [StyleSheet6.absoluteFill, styles7.actionBg, style], pointerEvents: "none", children: /* @__PURE__ */ jsx9(Surface, { style: StyleSheet6.absoluteFill, elevation: 1, children: null }) });
 var ScrollViewHeader = ({ actionSize = 48, actionStyle, backAction, backActionFixed, caption, centerContent, children, iconSize, style, title, topInset = true, trailingAction, trailingActionFixed = true }) => {
-  const { blur, headerHeight, headerFixed, headerOffset, progress, progressing, pullSearchHeightShared, scrollPosition, setHeaderHeight, snapBackHeaderShared } = useContext7(ScrollViewContext);
-  const { settings } = useContext7(ScrollViewSettingsContext);
+  const { blur, headerHeight, headerFixed, headerOffset, progress, progressing, pullSearchHeightShared, scrollPosition, setHeaderHeight, snapBackHeaderShared } = useContext11(ScrollViewContext);
+  const { settings } = useContext11(ScrollViewSettingsContext);
   const effectiveBackActionFixed = backActionFixed ?? settings.backActionFixed;
   const insets = useSafeAreaInsets4();
   const theme = useTheme3();
@@ -2293,20 +2592,22 @@ var ScrollViewHeader = ({ actionSize = 48, actionStyle, backAction, backActionFi
   const translateStyle = useAnimatedStyle5(() => {
     if (headerFixed) return { transform: [{ translateY: 0 }] };
     if (snapBackHeaderShared.value) return { transform: [{ translateY: headerOffset.value }] };
-    const effective = scrollPosition.value + headerHeight - pullSearchHeightShared.value;
+    const effective = scrollPosition.value + (headerHeight ?? 0) - pullSearchHeightShared.value;
     if (effective <= 0) return { transform: [{ translateY: 0 }] };
     return { transform: [{ translateY: -effective }] };
   }, [headerFixed, headerHeight]);
   const blurStyle = useAnimatedStyle5(() => {
     if (!headerHeight) return { height: 0 };
     if (headerFixed) return { height: headerHeight };
-    const translateY = snapBackHeaderShared.value ? headerOffset.value : -Math.max(0, scrollPosition.value + headerHeight - pullSearchHeightShared.value);
-    return { height: Math.max(headerHeight + translateY, top) };
+    const h = headerHeight ?? 0;
+    const translateY = snapBackHeaderShared.value ? headerOffset.value : -Math.max(0, scrollPosition.value + h - pullSearchHeightShared.value);
+    return { height: Math.max(h + translateY, top) };
   }, [headerFixed, headerHeight, top]);
   const progressStyle = useAnimatedStyle5(() => {
-    if (headerFixed) return { top: headerHeight };
-    const slide = snapBackHeaderShared.value ? -headerOffset.value : Math.max(0, scrollPosition.value + headerHeight - pullSearchHeightShared.value);
-    return { top: Math.max(headerHeight - slide, top) };
+    const h = headerHeight ?? 0;
+    if (headerFixed) return { top: h };
+    const slide = snapBackHeaderShared.value ? -headerOffset.value : Math.max(0, scrollPosition.value + h - pullSearchHeightShared.value);
+    return { top: Math.max(h - slide, top) };
   }, [headerFixed, headerHeight, top]);
   const actionMargin = 4;
   const contentMinHeight = actionSize + 2 * actionMargin;
@@ -2315,32 +2616,31 @@ var ScrollViewHeader = ({ actionSize = 48, actionStyle, backAction, backActionFi
   const actionShadow = { borderRadius: actionSize / 2, elevation: 2, shadowColor: "#000", shadowOffset: { width: 0, height: 1 }, shadowOpacity: 0.15, shadowRadius: 2 };
   const leadingStyle = { alignItems: "center", height: actionSize, justifyContent: "center", left: actionMargin, position: "absolute", top: actionTop, width: actionSize, zIndex: 3, ...actionShadow };
   const trailingStyle = { alignItems: "center", height: actionSize, justifyContent: "center", position: "absolute", right: actionMargin, top: actionTop, width: actionSize, zIndex: 3, ...actionShadow };
-  return /* @__PURE__ */ jsxs6(Fragment3, { children: [
-    /* @__PURE__ */ jsx9(Animated7.View, { pointerEvents: "none", style: [styles7.blur, blurStyle], children: headerHeight > 0 && /* @__PURE__ */ jsx9(BlurView3, { blur, style: [styles7.blurInner, { height: headerHeight }] }) }),
-    /* @__PURE__ */ jsxs6(Animated7.View, { onLayout: handleLayout, pointerEvents: "box-none", style: [headerHeight === 0 ? styles7.headerInit : styles7.header, translateStyle], children: [
-      /* @__PURE__ */ jsx9(View6, { style: [{ paddingTop: top }, style], children: /* @__PURE__ */ jsxs6(View6, { style: [styles7.content, { minHeight: contentMinHeight }], children: [
+  return /* @__PURE__ */ jsxs6(Fragment4, { children: [
+    /* @__PURE__ */ jsx9(Animated6.View, { pointerEvents: "none", style: [styles7.blur, blurStyle], children: headerHeight !== null && headerHeight > 0 && /* @__PURE__ */ jsx9(BlurView3, { blur, style: [styles7.blurInner, { height: headerHeight }] }) }),
+    /* @__PURE__ */ jsxs6(Animated6.View, { onLayout: handleLayout, pointerEvents: "box-none", style: [headerHeight === null ? styles7.headerInit : styles7.header, translateStyle], children: [
+      /* @__PURE__ */ jsx9(View6, { style: [{ paddingTop: top }, style], children: children ?? /* @__PURE__ */ jsxs6(View6, { style: [styles7.content, { minHeight: contentMinHeight }], children: [
         /* @__PURE__ */ jsx9(View6, { style: styles7.side }),
         /* @__PURE__ */ jsx9(View6, { style: styles7.spacer }),
-        /* @__PURE__ */ jsx9(View6, { style: styles7.side, children }),
-        (centerContent || title || caption) && /* @__PURE__ */ jsx9(View6, { style: [StyleSheet6.absoluteFill, styles7.titleContainer], pointerEvents: centerContent ? "box-none" : "none", children: centerContent ?? /* @__PURE__ */ jsxs6(Fragment3, { children: [
+        (centerContent || title || caption) && /* @__PURE__ */ jsx9(View6, { style: [StyleSheet6.absoluteFill, styles7.titleContainer], pointerEvents: centerContent ? "box-none" : "none", children: centerContent ?? /* @__PURE__ */ jsxs6(Fragment4, { children: [
           title && /* @__PURE__ */ jsx9(Text, { numberOfLines: 1, style: [styles7.title, { color: theme.colors.onSurface }], children: title }),
           caption && /* @__PURE__ */ jsx9(Text, { numberOfLines: 1, style: [styles7.caption, { color: theme.colors.onSurfaceVariant }], children: caption })
         ] }) })
       ] }) }),
       !blur && /* @__PURE__ */ jsx9(View6, { style: [styles7.divider, { backgroundColor: theme.colors.outlineVariant }] })
     ] }),
-    /* @__PURE__ */ jsx9(Animated7.View, { pointerEvents: "none", style: [styles7.progress, progressStyle], children: /* @__PURE__ */ jsx9(ProgressBar, { indeterminate: progress === null, visible: progressing, progress: progress ?? void 0 }) }),
-    backAction && (effectiveBackActionFixed ? /* @__PURE__ */ jsxs6(Animated7.View, { style: leadingStyle, children: [
+    /* @__PURE__ */ jsx9(Animated6.View, { pointerEvents: "none", style: [styles7.progress, progressStyle], children: /* @__PURE__ */ jsx9(ProgressBar, { indeterminate: progress === null, visible: progressing, progress: progress ?? void 0 }) }),
+    backAction && (effectiveBackActionFixed ? /* @__PURE__ */ jsxs6(Animated6.View, { style: leadingStyle, children: [
       /* @__PURE__ */ jsx9(ActionBg, { blur, style: actionStyle }),
       /* @__PURE__ */ jsx9(Appbar.BackAction, { onPress: backAction, size: iconSize ?? actionSize / 2, style: buttonStyle })
-    ] }) : /* @__PURE__ */ jsxs6(Animated7.View, { style: [leadingStyle, translateStyle], children: [
+    ] }) : /* @__PURE__ */ jsxs6(Animated6.View, { style: [leadingStyle, translateStyle], children: [
       /* @__PURE__ */ jsx9(ActionBg, { blur, style: actionStyle }),
       /* @__PURE__ */ jsx9(Appbar.BackAction, { onPress: backAction, size: iconSize ?? actionSize / 2, style: buttonStyle })
     ] })),
     trailingAction && (trailingActionFixed ? /* @__PURE__ */ jsxs6(View6, { style: trailingStyle, children: [
       /* @__PURE__ */ jsx9(ActionBg, { blur, style: actionStyle }),
       trailingAction
-    ] }) : /* @__PURE__ */ jsxs6(Animated7.View, { style: [trailingStyle, translateStyle], children: [
+    ] }) : /* @__PURE__ */ jsxs6(Animated6.View, { style: [trailingStyle, translateStyle], children: [
       /* @__PURE__ */ jsx9(ActionBg, { blur, style: actionStyle }),
       trailingAction
     ] }))
@@ -2364,62 +2664,77 @@ var styles7 = StyleSheet6.create({
 
 // src/ScrollViewProvider.tsx
 import { useBlur } from "@rific/auto-paper";
-import { useCallback as useCallback6, useContext as useContext8, useEffect as useEffect5, useMemo as useMemo5, useState as useState4 } from "react";
+import { useCallback as useCallback7, useContext as useContext12, useEffect as useEffect5, useMemo as useMemo5, useRef as useRef7, useState as useState5 } from "react";
 import { Dimensions as Dimensions3 } from "react-native";
-import { useSharedValue as useSharedValue3 } from "react-native-reanimated";
+import { useSharedValue as useSharedValue6 } from "react-native-reanimated";
 import { jsx as jsx10 } from "react/jsx-runtime";
 var ScrollViewProvider = ({ blur, children, fixed = false, footerFixed, headerFixed, snapBack, snapBackFooter, snapBackHeader, tabBarHeight = 60 }) => {
-  const { settings } = useContext8(ScrollViewSettingsContext);
+  const { settings } = useContext12(ScrollViewSettingsContext);
   const effectiveBlur = useBlur(blur);
   const effectiveSnapBack = snapBack ?? settings.snapBack;
   const effectiveSnapBackHeader = snapBackHeader ?? settings.snapBackHeader;
   const effectiveSnapBackFooter = snapBackFooter ?? settings.snapBackFooter;
-  const [headerHeight, setHeaderHeightState] = useState4(0);
-  const [footerHeight, setFooterHeightState] = useState4(0);
-  const [progress, setProgress] = useState4(null);
-  const [progressing, setProgressing] = useState4(false);
-  const scrollPosition = useSharedValue3(0);
-  const headerHeightShared = useSharedValue3(0);
-  const footerHeightShared = useSharedValue3(0);
-  const headerOffset = useSharedValue3(0);
-  const footerOffset = useSharedValue3(0);
-  const pullSearchHeightShared = useSharedValue3(0);
-  const snapBackHeaderShared = useSharedValue3(false);
-  const snapBackFooterShared = useSharedValue3(false);
+  const [headerHeight, setHeaderHeightState] = useState5(null);
+  const [footerHeight, setFooterHeightState] = useState5(0);
+  const [progress, setProgress] = useState5(null);
+  const [progressing, setProgressing] = useState5(false);
+  const scrollPosition = useSharedValue6(0);
+  const listGeneration = useSharedValue6(0);
+  const jsListGeneration = useRef7(0);
+  const headerHeightShared = useSharedValue6(0);
+  const footerHeightShared = useSharedValue6(0);
+  const headerOffset = useSharedValue6(0);
+  const footerOffset = useSharedValue6(0);
+  const pullSearchHeightShared = useSharedValue6(0);
+  const snapBackHeaderShared = useSharedValue6(false);
+  const snapBackFooterShared = useSharedValue6(false);
   useEffect5(() => {
     snapBackHeaderShared.value = effectiveSnapBackHeader ?? effectiveSnapBack;
     snapBackFooterShared.value = effectiveSnapBackFooter ?? effectiveSnapBack;
   }, [effectiveSnapBack, effectiveSnapBackFooter, effectiveSnapBackHeader, snapBackFooterShared, snapBackHeaderShared]);
-  const setHeaderHeight = useCallback6(
+  const setHeaderHeight = useCallback7(
     (h) => {
       setHeaderHeightState(h);
-      headerHeightShared.value = h;
+      headerHeightShared.value = h ?? 0;
     },
     [headerHeightShared]
   );
-  const setFooterHeight = useCallback6(
+  const onListUnmount = useCallback7(() => {
+    listGeneration.value += 1;
+  }, [listGeneration]);
+  const onJsListUnmount = useCallback7(() => {
+    jsListGeneration.current += 1;
+  }, []);
+  useEffect5(() => {
+    if (!__DEV__ || headerHeight !== null) return;
+    const timeout = setTimeout(() => {
+      console.warn("[scroll-view] No ScrollViewHeader ever measured inside this ScrollViewProvider \u2014 scroll content stays hidden (opacity: 0) until one does. Render a <ScrollViewHeader> (it can be empty / zero height) inside this provider.");
+    }, 3e3);
+    return () => clearTimeout(timeout);
+  }, [headerHeight]);
+  const setFooterHeight = useCallback7(
     (h) => {
       setFooterHeightState(h);
       footerHeightShared.value = h;
     },
     [footerHeightShared]
   );
-  const scrollHeight = useMemo5(() => Dimensions3.get("window").height - headerHeight - footerHeight, [headerHeight, footerHeight]);
+  const scrollHeight = useMemo5(() => Dimensions3.get("window").height - (headerHeight ?? 0) - footerHeight, [headerHeight, footerHeight]);
   const effectiveHeaderFixed = fixed || (headerFixed ?? settings.headerFixed);
   const effectiveFooterFixed = fixed || (footerFixed ?? settings.footerFixed);
-  const value = useMemo5(() => ({ blur: effectiveBlur, footerHeight, footerHeightShared, footerFixed: effectiveFooterFixed, footerOffset, headerHeight, headerHeightShared, headerFixed: effectiveHeaderFixed, headerOffset, progress, pullSearchHeightShared, progressing, scrollHeight, scrollPosition, setFooterHeight, setHeaderHeight, setProgress, setProgressing, snapBackFooterShared, snapBackHeaderShared, tabBarHeight }), [effectiveBlur, effectiveFooterFixed, effectiveHeaderFixed, footerHeight, footerHeightShared, footerOffset, headerHeight, headerHeightShared, headerOffset, progress, pullSearchHeightShared, progressing, scrollHeight, scrollPosition, setFooterHeight, setHeaderHeight, snapBackFooterShared, snapBackHeaderShared, tabBarHeight]);
+  const value = useMemo5(() => ({ blur: effectiveBlur, footerHeight, footerHeightShared, footerFixed: effectiveFooterFixed, footerOffset, headerHeight, headerHeightShared, headerFixed: effectiveHeaderFixed, headerOffset, jsListGeneration, listGeneration, onJsListUnmount, onListUnmount, progress, pullSearchHeightShared, progressing, scrollHeight, scrollPosition, setFooterHeight, setHeaderHeight, setProgress, setProgressing, snapBackFooterShared, snapBackHeaderShared, tabBarHeight }), [effectiveBlur, effectiveFooterFixed, effectiveHeaderFixed, footerHeight, footerHeightShared, footerOffset, headerHeight, headerHeightShared, headerOffset, jsListGeneration, listGeneration, onJsListUnmount, onListUnmount, progress, pullSearchHeightShared, progressing, scrollHeight, scrollPosition, setFooterHeight, setHeaderHeight, snapBackFooterShared, snapBackHeaderShared, tabBarHeight]);
   return /* @__PURE__ */ jsx10(ScrollViewContext.Provider, { value, children });
 };
 
 // src/ScrollViewSettingsProvider.tsx
-import { useCallback as useCallback7, useMemo as useMemo6, useState as useState5 } from "react";
+import { useCallback as useCallback8, useMemo as useMemo6, useState as useState6 } from "react";
 import { jsx as jsx11 } from "react/jsx-runtime";
 var ScrollViewSettingsProvider = ({ children, onChange, initialValue }) => {
-  const [settings, setSettings] = useState5(() => ({
+  const [settings, setSettings] = useState6(() => ({
     ...defaultScrollViewSettings,
     ...initialValue
   }));
-  const set2 = useCallback7(
+  const set2 = useCallback8(
     (patch) => {
       setSettings((prev) => {
         const next = { ...prev, ...patch };
@@ -2434,27 +2749,27 @@ var ScrollViewSettingsProvider = ({ children, onChange, initialValue }) => {
 };
 
 // src/SectionList.tsx
-import { memo as memo4, useCallback as useCallback9, useEffect as useEffect6, useLayoutEffect as useLayoutEffect3, useMemo as useMemo7, useRef as useRef7 } from "react";
+import { memo as memo4, useCallback as useCallback10, useContext as useContext14, useEffect as useEffect6, useLayoutEffect as useLayoutEffect6, useMemo as useMemo7, useRef as useRef9 } from "react";
 import { Dimensions as Dimensions4, SectionList as RNSectionList, View as View7 } from "react-native";
 import { Gesture as Gesture4, GestureDetector as GestureDetector4 } from "react-native-gesture-handler";
-import Animated8, { createAnimatedComponent } from "react-native-reanimated";
+import Animated7, { runOnUI as runOnUI3, useSharedValue as useSharedValue8 } from "react-native-reanimated";
 
 // src/internal/useStickyHeaders.ts
-import { useCallback as useCallback8, useContext as useContext9, useLayoutEffect as useLayoutEffect2, useRef as useRef6, useState as useState6 } from "react";
-import { runOnJS as runOnJS4, useAnimatedReaction as useAnimatedReaction2, useAnimatedStyle as useAnimatedStyle6, useSharedValue as useSharedValue4 } from "react-native-reanimated";
+import { useCallback as useCallback9, useContext as useContext13, useLayoutEffect as useLayoutEffect5, useRef as useRef8, useState as useState7 } from "react";
+import { runOnJS as runOnJS4, useAnimatedReaction as useAnimatedReaction2, useAnimatedStyle as useAnimatedStyle6, useSharedValue as useSharedValue7 } from "react-native-reanimated";
 import { useSafeAreaInsets as useSafeAreaInsets5 } from "react-native-safe-area-context";
 function useStickyHeaders(headerFixed, enabled) {
-  const { headerHeightShared, headerOffset, pullSearchHeightShared, scrollPosition, snapBackHeaderShared } = useContext9(ScrollViewContext);
+  const { headerHeightShared, headerOffset, pullSearchHeightShared, scrollPosition, snapBackHeaderShared } = useContext13(ScrollViewContext);
   const insetsTop = useSafeAreaInsets5().top;
-  const sectionYPositions = useSharedValue4([]);
-  const sectionHeights = useSharedValue4([]);
-  const [activeIndex, setActiveIndex] = useState6(-1);
-  const contentIndexShared = useSharedValue4(-1);
-  useLayoutEffect2(() => {
+  const sectionYPositions = useSharedValue7([]);
+  const sectionHeights = useSharedValue7([]);
+  const [activeIndex, setActiveIndex] = useState7(-1);
+  const contentIndexShared = useSharedValue7(-1);
+  useLayoutEffect5(() => {
     contentIndexShared.value = activeIndex;
   }, [activeIndex, contentIndexShared]);
-  const positionsCache = useRef6([]);
-  const heightsCache = useRef6([]);
+  const positionsCache = useRef8([]);
+  const heightsCache = useRef8([]);
   useAnimatedReaction2(
     () => {
       if (!enabled) return -1;
@@ -2526,7 +2841,7 @@ function useStickyHeaders(headerFixed, enabled) {
     }
     return { opacity: 1, top: 0, transform: [{ translateY }] };
   }, [enabled, headerFixed, insetsTop]);
-  const measureHeader = useCallback8(
+  const measureHeader = useCallback9(
     (index, pageY, height) => {
       const contentY = pageY + scrollPosition.value;
       positionsCache.current[index] = contentY;
@@ -2536,7 +2851,7 @@ function useStickyHeaders(headerFixed, enabled) {
     },
     [scrollPosition, sectionHeights, sectionYPositions]
   );
-  const resetPositions = useCallback8(
+  const resetPositions = useCallback9(
     (count) => {
       positionsCache.current = Array.from({ length: count }, () => -1);
       sectionYPositions.value = positionsCache.current.slice();
@@ -2549,18 +2864,27 @@ function useStickyHeaders(headerFixed, enabled) {
 }
 
 // src/SectionList.tsx
-import { Fragment as Fragment4, jsx as jsx12, jsxs as jsxs7 } from "react/jsx-runtime";
-var AnimatedSectionList = createAnimatedComponent(RNSectionList);
+import { Fragment as Fragment5, jsx as jsx12, jsxs as jsxs7 } from "react/jsx-runtime";
+var AnimatedSectionList = Animated7.createAnimatedComponent(RNSectionList);
 var SectionListInner = ({ chipProps, chipThreshold, contentContainerStyle: externalContentContainerStyle, initialNumToRender = 20, maxToRenderPerBatch = 50, renderFilters, footerFixed: footerFixedProp, gesture, headerFixed: headerFixedProp, keyboardAware, ListHeaderComponent: externalListHeaderComponent, onChipPress, onMomentumScrollEnd: externalMomentumScrollEnd, onRefresh, onContentSizeChange, onScrollBeginDrag: externalScrollBeginDrag, onScrollEndDrag: externalScrollEndDrag, pullSearchHeight, refreshing, removeClippedSubviews = false, sections, showsVerticalScrollIndicator, style, ref: externalRef, windowSize = 100, ...props }) => {
-  const scrollView = useRef7(null);
+  const scrollView = useRef9(null);
   const { stickySectionHeadersEnabled = true, renderSectionHeader, ...passThroughProps } = props;
   const { chipHidden, chipStyle, containerStyle, contentInset, contentOffset, footerFixed, headerFixed, headerHeight } = useScrollList({ footerFixed: footerFixedProp, headerFixed: headerFixedProp, keyboardAware, pullSearchHeight, style });
+  const { listGeneration, onListUnmount } = useContext14(ScrollViewContext);
+  const capturedGeneration = useSharedValue8(-1);
+  useLayoutEffect6(() => {
+    const generation = listGeneration.value;
+    runOnUI3((gen) => {
+      "worklet";
+      capturedGeneration.value = gen;
+    })(generation);
+  }, [capturedGeneration, listGeneration]);
   const usesCustomSticky = stickySectionHeadersEnabled && renderSectionHeader != null;
   const { activeIndex, clipStyle, measureHeader, overlayStyle, resetPositions } = useStickyHeaders(headerFixed, usesCustomSticky);
-  useLayoutEffect3(() => {
+  useLayoutEffect6(() => {
     if (usesCustomSticky) resetPositions(sections.length);
   }, [sections, usesCustomSticky, resetPositions, headerHeight]);
-  const sectionViewRefs = useRef7(/* @__PURE__ */ new Map());
+  const sectionViewRefs = useRef9(/* @__PURE__ */ new Map());
   const wrappedRenderSectionHeader = useMemo7(() => {
     if (!usesCustomSticky) return renderSectionHeader ?? void 0;
     return (info) => {
@@ -2582,7 +2906,8 @@ var SectionListInner = ({ chipProps, chipThreshold, contentContainerStyle: exter
       );
     };
   }, [usesCustomSticky, renderSectionHeader, sections, measureHeader]);
-  const scrollTo = useCallback9((offset, animated) => {
+  useLayoutEffect6(() => () => onListUnmount(), [onListUnmount]);
+  const scrollTo = useCallback10((offset, animated) => {
     scrollView.current?.getScrollResponder()?.scrollTo({ y: offset, animated });
   }, []);
   const {
@@ -2603,12 +2928,12 @@ var SectionListInner = ({ chipProps, chipThreshold, contentContainerStyle: exter
   const activeListHeader = useMemo7(() => {
     if (!renderFilters) return pullSearchHeader;
     const Inner = pullSearchHeader;
-    return () => /* @__PURE__ */ jsxs7(Fragment4, { children: [
+    return () => /* @__PURE__ */ jsxs7(Fragment5, { children: [
       Inner ? typeof Inner === "function" ? /* @__PURE__ */ jsx12(Inner, {}) : Inner : null,
       renderFilters
     ] });
   }, [pullSearchHeader, renderFilters]);
-  const pullSearchSettled = useRef7(false);
+  const pullSearchSettled = useRef9(false);
   useEffect6(() => {
     if (!usesCustomSticky || activeListHeader == null || pullSearchSettled.current) return;
     pullSearchSettled.current = true;
@@ -2622,16 +2947,12 @@ var SectionListInner = ({ chipProps, chipThreshold, contentContainerStyle: exter
     return () => cancelAnimationFrame(handle);
   }, [activeListHeader, usesCustomSticky, measureHeader]);
   const contentContainerStyle = useMemo7(() => [{ minHeight: Dimensions4.get("window").height - contentInset.top - contentInset.bottom + pullSearchMinHeight }, externalContentContainerStyle], [contentInset.bottom, contentInset.top, externalContentContainerStyle, pullSearchMinHeight]);
-  const onPullSearchZoneEnter = useCallback9(() => {
-    if (!pullSearchHeight) return;
-    scrollTo(-contentInset.top + pullSearchHeight, true);
-  }, [contentInset.top, pullSearchHeight, scrollTo]);
-  const handleScroll = useScrollHandler({ chipHidden, chipThreshold, footerFixed, headerFixed, onPullSearchZoneEnter: pullSearchHeight ? onPullSearchZoneEnter : void 0 });
-  const handleScrollToTop = useCallback9(() => {
+  const handleScroll = useScrollHandler({ capturedGeneration, chipHidden, chipThreshold, footerFixed, headerFixed, listGeneration });
+  const handleScrollToTop = useCallback10(() => {
     const offset = pullSearchHeight ? -contentInset.top + pullSearchHeight : -contentInset.top;
     scrollView.current?.getScrollResponder()?.scrollTo({ y: offset, animated: true });
   }, [contentInset.top, pullSearchHeight]);
-  const handleContentSizeChange = useCallback9(
+  const handleContentSizeChange = useCallback10(
     (w, h) => {
       if (onContentSizeChange) onContentSizeChange(w, h);
     },
@@ -2670,11 +2991,11 @@ var SectionListInner = ({ chipProps, chipThreshold, contentContainerStyle: exter
         stickySectionHeadersEnabled: false,
         windowSize
       },
-      headerHeight > 0 ? 1 : 0
+      headerHeight !== null && headerHeight > 0 ? 1 : 0
     ),
     hiddenHeader && /* @__PURE__ */ jsx12(View7, { pointerEvents: "none", style: styles8.measureContainer, children: hiddenHeader }),
     /* @__PURE__ */ jsx12(ScrollViewChip, { chipProps, onChipPress, onPress: handleScrollToTop, style: chipStyle }),
-    usesCustomSticky && /* @__PURE__ */ jsx12(Animated8.View, { pointerEvents: "none", style: [styles8.stickyClip, clipStyle], children: activeIndex >= 0 && activeIndex < sections.length && /* @__PURE__ */ jsx12(Animated8.View, { style: [styles8.stickyOverlay, overlayStyle], children: renderSectionHeader({ section: sections[activeIndex] }) }) })
+    usesCustomSticky && /* @__PURE__ */ jsx12(Animated7.View, { pointerEvents: "none", style: [styles8.stickyClip, clipStyle], children: activeIndex >= 0 && activeIndex < sections.length && /* @__PURE__ */ jsx12(Animated7.View, { style: [styles8.stickyOverlay, overlayStyle], children: renderSectionHeader({ section: sections[activeIndex] }) }) })
   ] });
   return detectorGesture ? /* @__PURE__ */ jsx12(GestureDetector4, { gesture: detectorGesture, children: content }) : content;
 };
@@ -2686,15 +3007,15 @@ var styles8 = {
 var SectionList = memo4(SectionListInner);
 
 // src/useScrollView.ts
-import { useContext as useContext10 } from "react";
+import { useContext as useContext15 } from "react";
 var useScrollView = () => {
-  const { progress, progressing, scrollHeight, scrollPosition, setProgress, setProgressing } = useContext10(ScrollViewContext);
+  const { progress, progressing, scrollHeight, scrollPosition, setProgress, setProgressing } = useContext15(ScrollViewContext);
   return { progress, progressing, scrollHeight, scrollPosition, setProgress, setProgressing };
 };
 
 // src/useScrollViewSettings.ts
-import { useContext as useContext11 } from "react";
-var useScrollViewSettings = () => useContext11(ScrollViewSettingsContext);
+import { useContext as useContext16 } from "react";
+var useScrollViewSettings = () => useContext16(ScrollViewSettingsContext);
 export {
   CustomList,
   FlatList,