@shopify/flash-list 2.0.0-rc.3 → 2.0.0-rc.5

package/src/recyclerview/hooks/useRecyclerViewController.tsx

@@ -51,7 +51,7 @@ export function useRecyclerViewController<T>(
   const [_, setRenderId] = useState(0);
   const pauseOffsetCorrection = useRef(false);
   const initialScrollCompletedRef = useRef(false);
-  const lastDataLengthRef = useRef(recyclerViewManager.props.data?.length ?? 0);
+  const lastDataLengthRef = useRef(recyclerViewManager.getDataLength());
   const { setTimeout } = useUnmountAwareTimeout();
 
   // Track the first visible item for maintaining scroll position
@@ -91,7 +91,12 @@ export function useRecyclerViewController<T>(
 
   const computeFirstVisibleIndexForOffsetCorrection = useCallback(() => {
     const { data, keyExtractor } = recyclerViewManager.props;
-    if (data && keyExtractor) {
+    if (
+      recyclerViewManager.getIsFirstLayoutComplete() &&
+      keyExtractor &&
+      recyclerViewManager.getDataLength() > 0 &&
+      recyclerViewManager.shouldMaintainVisibleContentPosition()
+    ) {
       // Update the tracked first visible item
       const firstVisibleIndex = Math.max(
         0,
@@ -123,7 +128,7 @@ export function useRecyclerViewController<T>(
     pendingScrollCallbacks.current = [];
     callbacks.forEach((callback) => callback());
 
-    const currentDataLength = data?.length ?? 0;
+    const currentDataLength = recyclerViewManager.getDataLength();
 
     if (
       recyclerViewManager.getIsFirstLayoutComplete() &&
@@ -162,7 +167,11 @@ export function useRecyclerViewController<T>(
           firstVisibleItemLayout.current = {
             ...recyclerViewManager.getLayout(currentIndexOfFirstVisibleItem),
           };
-          if (diff !== 0 && !pauseOffsetCorrection.current) {
+          if (
+            diff !== 0 &&
+            !pauseOffsetCorrection.current &&
+            !recyclerViewManager.animationOptimizationsEnabled
+          ) {
             // console.log("diff", diff, firstVisibleItemKey.current);
             if (PlatformConfig.supportsOffsetCorrection) {
               // console.log("scrollBy", diff);
@@ -195,7 +204,7 @@ export function useRecyclerViewController<T>(
 
       computeFirstVisibleIndexForOffsetCorrection();
     }
-    lastDataLengthRef.current = data?.length ?? 0;
+    lastDataLengthRef.current = recyclerViewManager.getDataLength();
   }, [
     recyclerViewManager,
     scrollAnchorRef,
@@ -381,6 +390,7 @@ export function useRecyclerViewController<T>(
             const performScrollStep = (currentStep: number) => {
               // Check if component is unmounted or we've completed all steps
               if (isUnmounted.current) {
+                resolve();
                 return;
               } else if (currentStep >= steps) {
                 // All steps completed, perform final scroll
@@ -537,7 +547,7 @@ export function useRecyclerViewController<T>(
        * Disables item recycling in preparation for layout animations.
        */
       prepareForLayoutAnimationRender: () => {
-        recyclerViewManager.disableRecycling(true);
+        recyclerViewManager.animationOptimizationsEnabled = true;
       },
     };
   }, [

package/src/recyclerview/hooks/useUnmountFlag.ts

@@ -16,6 +16,7 @@ export const useUnmountFlag = () => {
   // Use layoutEffect to set up cleanup on unmount
   // This ensures the flag is set before any other cleanup effects run
   useLayoutEffect(() => {
+    isUnmounted.current = false;
     // Cleanup function that runs when the component unmounts
     return () => {
       isUnmounted.current = true;