@legendapp/list 2.0.0-next.17 → 2.0.0-next.18

package/index.js

@@ -2453,7 +2453,7 @@ function getRenderedItem(ctx, state, key) {
     return null;
   }
   let renderedItem = null;
-  if (renderItem2) {
+  if (renderItem2 && data[index]) {
     const itemProps = {
       extraData: peek$(ctx, "extraData"),
       index,
@@ -2750,20 +2750,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       refState.current.positions.clear();
     }
   }
-  React3.useLayoutEffect(() => {
-    if (IsNewArchitecture) {
-      let measured;
-      refScroller.current.measure((x, y, width, height) => {
-        measured = { height, width, x, y };
-      });
-      if (measured) {
-        const size = Math.floor(measured[horizontal ? "width" : "height"] * 8) / 8;
-        if (size) {
-          handleLayout(ctx, state, measured, setCanRender);
-        }
-      }
-    }
-  }, [dataProp]);
   const onLayoutHeader = React3.useCallback((rect, fromLayoutEffect) => {
     const size = rect[horizontal ? "width" : "height"];
     set$(ctx, "headerSize", size);
@@ -2796,6 +2782,20 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   React3.useLayoutEffect(() => {
     set$(ctx, "extraData", extraData);
   }, [extraData]);
+  React3.useLayoutEffect(() => {
+    if (IsNewArchitecture) {
+      let measured;
+      refScroller.current.measure((x, y, width, height) => {
+        measured = { height, width, x, y };
+      });
+      if (measured) {
+        const size = Math.floor(measured[horizontal ? "width" : "height"] * 8) / 8;
+        if (size) {
+          handleLayout(ctx, state, measured, setCanRender);
+        }
+      }
+    }
+  }, []);
   React3.useLayoutEffect(initializeStateVars, [
     memoizedLastItemKeys.join(","),
     numColumnsProp,

package/index.mjs

@@ -2432,7 +2432,7 @@ function getRenderedItem(ctx, state, key) {
     return null;
   }
   let renderedItem = null;
-  if (renderItem2) {
+  if (renderItem2 && data[index]) {
     const itemProps = {
       extraData: peek$(ctx, "extraData"),
       index,
@@ -2729,20 +2729,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       refState.current.positions.clear();
     }
   }
-  useLayoutEffect(() => {
-    if (IsNewArchitecture) {
-      let measured;
-      refScroller.current.measure((x, y, width, height) => {
-        measured = { height, width, x, y };
-      });
-      if (measured) {
-        const size = Math.floor(measured[horizontal ? "width" : "height"] * 8) / 8;
-        if (size) {
-          handleLayout(ctx, state, measured, setCanRender);
-        }
-      }
-    }
-  }, [dataProp]);
   const onLayoutHeader = useCallback((rect, fromLayoutEffect) => {
     const size = rect[horizontal ? "width" : "height"];
     set$(ctx, "headerSize", size);
@@ -2775,6 +2761,20 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   useLayoutEffect(() => {
     set$(ctx, "extraData", extraData);
   }, [extraData]);
+  useLayoutEffect(() => {
+    if (IsNewArchitecture) {
+      let measured;
+      refScroller.current.measure((x, y, width, height) => {
+        measured = { height, width, x, y };
+      });
+      if (measured) {
+        const size = Math.floor(measured[horizontal ? "width" : "height"] * 8) / 8;
+        if (size) {
+          handleLayout(ctx, state, measured, setCanRender);
+        }
+      }
+    }
+  }, []);
   useLayoutEffect(initializeStateVars, [
     memoizedLastItemKeys.join(","),
     numColumnsProp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "2.0.0-next.17",
+  "version": "2.0.0-next.18",
   "description": "Legend List is a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,