@legendapp/list 2.0.18 → 2.0.19

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.19
+- Fix: Add safety checks for getItemType, getEstimatedItemSize, getFixedItemSize, and keyExtractor to prevent calling when index is out of range
+- Fix: Error with animatedProps in reanimated integration
+
 ## 2.0.18
 - Improvement: KeyboardAvoidingLegendList now supports KeyboardGestureArea with improved interactive behavior
 

package/index.js

@@ -2091,7 +2091,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       if (needNewContainers.length > 0) {
         const requiredItemTypes = getItemType ? needNewContainers.map((i) => {
           const itemType = getItemType(data[i], i);
-          return itemType ? String(itemType) : "";
+          return itemType !== void 0 ? String(itemType) : "";
         }) : void 0;
         const availableContainers = findAvailableContainers(
           ctx,
@@ -2355,8 +2355,10 @@ function doInitialAllocateContainers(ctx, state) {
       const num = Math.min(20, data.length);
       for (let i = 0; i < num; i++) {
         const item = data[i];
-        const itemType = getItemType ? (_a = getItemType(item, i)) != null ? _a : "" : "";
-        totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        if (item !== void 0) {
+          const itemType = (_a = getItemType == null ? void 0 : getItemType(item, i)) != null ? _a : "";
+          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        }
       }
       averageItemSize = totalSize / num;
     } else {
@@ -2644,6 +2646,12 @@ function updateOneItemSize(state, itemKey, sizeObj) {
   }
   return 0;
 }
+function useWrapIfItem(fn) {
+  return React2.useMemo(
+    () => fn ? (arg1, arg2, arg3) => arg1 !== void 0 && arg2 !== void 0 ? fn(arg1, arg2, arg3) : void 0 : void 0,
+    [fn]
+  );
+}
 var useCombinedRef = (...refs) => {
   const callback = React2.useCallback((element) => {
     for (const ref of refs) {
@@ -2913,14 +2921,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     dataVersion,
     enableAverages,
     estimatedItemSize,
-    getEstimatedItemSize,
-    getFixedItemSize,
-    getItemType,
+    getEstimatedItemSize: useWrapIfItem(getEstimatedItemSize),
+    getFixedItemSize: useWrapIfItem(getFixedItemSize),
+    getItemType: useWrapIfItem(getItemType),
     horizontal: !!horizontal,
     initialContainerPoolRatio,
     initialScroll,
     itemsAreEqual,
-    keyExtractor,
+    keyExtractor: useWrapIfItem(keyExtractor),
     maintainScrollAtEnd,
     maintainScrollAtEndThreshold,
     maintainVisibleContentPosition,

package/index.mjs

@@ -2070,7 +2070,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       if (needNewContainers.length > 0) {
         const requiredItemTypes = getItemType ? needNewContainers.map((i) => {
           const itemType = getItemType(data[i], i);
-          return itemType ? String(itemType) : "";
+          return itemType !== void 0 ? String(itemType) : "";
         }) : void 0;
         const availableContainers = findAvailableContainers(
           ctx,
@@ -2334,8 +2334,10 @@ function doInitialAllocateContainers(ctx, state) {
       const num = Math.min(20, data.length);
       for (let i = 0; i < num; i++) {
         const item = data[i];
-        const itemType = getItemType ? (_a = getItemType(item, i)) != null ? _a : "" : "";
-        totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        if (item !== void 0) {
+          const itemType = (_a = getItemType == null ? void 0 : getItemType(item, i)) != null ? _a : "";
+          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        }
       }
       averageItemSize = totalSize / num;
     } else {
@@ -2623,6 +2625,12 @@ function updateOneItemSize(state, itemKey, sizeObj) {
   }
   return 0;
 }
+function useWrapIfItem(fn) {
+  return useMemo(
+    () => fn ? (arg1, arg2, arg3) => arg1 !== void 0 && arg2 !== void 0 ? fn(arg1, arg2, arg3) : void 0 : void 0,
+    [fn]
+  );
+}
 var useCombinedRef = (...refs) => {
   const callback = useCallback((element) => {
     for (const ref of refs) {
@@ -2892,14 +2900,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     dataVersion,
     enableAverages,
     estimatedItemSize,
-    getEstimatedItemSize,
-    getFixedItemSize,
-    getItemType,
+    getEstimatedItemSize: useWrapIfItem(getEstimatedItemSize),
+    getFixedItemSize: useWrapIfItem(getFixedItemSize),
+    getItemType: useWrapIfItem(getItemType),
     horizontal: !!horizontal,
     initialContainerPoolRatio,
     initialScroll,
     itemsAreEqual,
-    keyExtractor,
+    keyExtractor: useWrapIfItem(keyExtractor),
     maintainScrollAtEnd,
     maintainScrollAtEndThreshold,
     maintainVisibleContentPosition,

package/keyboard.d.mts

@@ -4,7 +4,7 @@ import { ReanimatedScrollEvent } from 'react-native-reanimated/lib/typescript/ho
 import { LegendListRef } from '@legendapp/list';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
-declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "contentInset" | "onScroll"> & {
+declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "contentInset"> & {
     onScroll?: (event: ReanimatedScrollEvent) => void;
     contentInset?: Insets | undefined;
     safeAreaInsetBottom?: number;

package/keyboard.d.ts

@@ -4,7 +4,7 @@ import { ReanimatedScrollEvent } from 'react-native-reanimated/lib/typescript/ho
 import { LegendListRef } from '@legendapp/list';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
-declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "contentInset" | "onScroll"> & {
+declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "contentInset"> & {
     onScroll?: (event: ReanimatedScrollEvent) => void;
     contentInset?: Insets | undefined;
     safeAreaInsetBottom?: number;

package/package.json

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

package/reanimated.js

@@ -69,9 +69,18 @@ var AnimatedLegendListComponent = Reanimated__default.default.createAnimatedComp
 var AnimatedLegendList = typedMemo(
   React__namespace.forwardRef(function AnimatedLegendList2(props, ref) {
     const { refScrollView, ...rest } = props;
+    const { animatedProps } = props;
     const refLegendList = React__namespace.useRef(null);
     const combinedRef = useCombinedRef(refLegendList, ref);
-    return /* @__PURE__ */ React__namespace.createElement(AnimatedLegendListComponent, { ref: refScrollView, refLegendList: combinedRef, ...rest });
+    return /* @__PURE__ */ React__namespace.createElement(
+      AnimatedLegendListComponent,
+      {
+        animatedPropsInternal: animatedProps,
+        ref: refScrollView,
+        refLegendList: combinedRef,
+        ...rest
+      }
+    );
   })
 );
 

package/reanimated.mjs

@@ -45,9 +45,18 @@ var AnimatedLegendListComponent = Reanimated.createAnimatedComponent(LegendListF
 var AnimatedLegendList = typedMemo(
   React.forwardRef(function AnimatedLegendList2(props, ref) {
     const { refScrollView, ...rest } = props;
+    const { animatedProps } = props;
     const refLegendList = React.useRef(null);
     const combinedRef = useCombinedRef(refLegendList, ref);
-    return /* @__PURE__ */ React.createElement(AnimatedLegendListComponent, { ref: refScrollView, refLegendList: combinedRef, ...rest });
+    return /* @__PURE__ */ React.createElement(
+      AnimatedLegendListComponent,
+      {
+        animatedPropsInternal: animatedProps,
+        ref: refScrollView,
+        refLegendList: combinedRef,
+        ...rest
+      }
+    );
   })
 );