@shopify/flash-list 2.0.0-rc.4 → 2.0.0-rc.6

package/src/recyclerview/components/StickyHeaders.tsx

@@ -171,7 +171,7 @@ export const StickyHeaders = <TItem,>({
           transform: [{ translateY }],
         }}
       >
-        {currentStickyIndex !== -1 ? (
+        {currentStickyIndex !== -1 && currentStickyIndex < data.length ? (
           <ViewHolder
             index={currentStickyIndex}
             item={data[currentStickyIndex]}

package/src/recyclerview/hooks/useRecyclerViewController.tsx

@@ -167,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);
@@ -386,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
@@ -542,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;