@legendapp/list 1.0.0-beta.44 → 1.0.0-beta.46

package/index.d.mts

@@ -108,8 +108,8 @@ type LegendListPropsBase<ItemT, TScrollView extends ComponentProps<typeof Scroll
      */
     maintainScrollAtEnd?: boolean;
     /**
-     * Distance threshold in pixels to trigger maintainScrollAtEnd.
-     * @default 100
+     * Distance threshold in percentage of screen size to trigger maintainScrollAtEnd.
+     * @default 0.1
      */
     maintainScrollAtEndThreshold?: number;
     /**

package/index.d.ts

@@ -108,8 +108,8 @@ type LegendListPropsBase<ItemT, TScrollView extends ComponentProps<typeof Scroll
      */
     maintainScrollAtEnd?: boolean;
     /**
-     * Distance threshold in pixels to trigger maintainScrollAtEnd.
-     * @default 100
+     * Distance threshold in percentage of screen size to trigger maintainScrollAtEnd.
+     * @default 0.1
      */
     maintainScrollAtEndThreshold?: number;
     /**

package/index.js

@@ -1039,19 +1039,44 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return void 0;
   };
-  const setDidLayout = () => {
+  const scrollToIndex = ({
+    index,
+    viewOffset = 0,
+    animated = true,
+    viewPosition = 0
+  }) => {
     var _a;
+    const state = refState.current;
+    const firstIndexOffset = calculateOffsetForIndex(index);
+    let firstIndexScrollPostion = firstIndexOffset - viewOffset;
+    const diff = Math.abs(state.scroll - firstIndexScrollPostion);
+    const needsReanchoring = maintainVisibleContentPosition && diff > 100;
+    state.scrollForNextCalculateItemsInView = void 0;
+    if (needsReanchoring) {
+      const id = getId(index);
+      state.anchorElement = { id, coordinate: firstIndexOffset };
+      (_a = state.belowAnchorElementPositions) == null ? void 0 : _a.clear();
+      state.positions.clear();
+      calcTotalSizesAndPositions({ forgetPositions: true });
+      state.startBufferedId = id;
+      state.minIndexSizeChanged = index;
+      firstIndexScrollPostion = firstIndexOffset - viewOffset + state.scrollAdjustHandler.getAppliedAdjust();
+    }
+    if (viewPosition) {
+      firstIndexScrollPostion -= viewPosition * (state.scrollLength - getItemSize(getId(index), index, state.data[index]));
+    }
+    state.scrollAdjustHandler.setDisableAdjust(true);
+    state.scrollingToOffset = firstIndexScrollPostion;
+    scrollTo(firstIndexScrollPostion, animated);
+  };
+  const setDidLayout = () => {
     refState.current.queuedInitialLayout = true;
     checkAtBottom();
     if (initialScrollIndex) {
-      const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
-      (_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.setDisableAdjust(true);
       queueMicrotask(() => {
-        scrollTo(updatedOffset, false);
+        scrollToIndex({ index: initialScrollIndex, animated: false });
         requestAnimationFrame(() => {
-          var _a2;
           set$(ctx, "containersDidLayout", true);
-          (_a2 = refState.current) == null ? void 0 : _a2.scrollAdjustHandler.setDisableAdjust(false);
         });
       });
     } else {
@@ -1953,36 +1978,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   React6.useImperativeHandle(
     forwardedRef,
     () => {
-      const scrollToIndex = ({
-        index,
-        viewOffset = 0,
-        animated = true,
-        viewPosition = 0
-      }) => {
-        var _a;
-        const state = refState.current;
-        const firstIndexOffset = calculateOffsetForIndex(index);
-        let firstIndexScrollPostion = firstIndexOffset - viewOffset;
-        const diff = Math.abs(state.scroll - firstIndexScrollPostion);
-        const needsReanchoring = maintainVisibleContentPosition && diff > 100;
-        state.scrollForNextCalculateItemsInView = void 0;
-        if (needsReanchoring) {
-          const id = getId(index);
-          state.anchorElement = { id, coordinate: firstIndexOffset };
-          (_a = state.belowAnchorElementPositions) == null ? void 0 : _a.clear();
-          state.positions.clear();
-          calcTotalSizesAndPositions({ forgetPositions: true });
-          state.startBufferedId = id;
-          state.minIndexSizeChanged = index;
-          firstIndexScrollPostion = firstIndexOffset - viewOffset + state.scrollAdjustHandler.getAppliedAdjust();
-        }
-        if (viewPosition) {
-          firstIndexScrollPostion -= viewPosition * (state.scrollLength - getItemSize(getId(index), index, state.data[index]));
-        }
-        state.scrollAdjustHandler.setDisableAdjust(true);
-        state.scrollingToOffset = firstIndexScrollPostion;
-        scrollTo(firstIndexScrollPostion, animated);
-      };
       const scrollIndexIntoView = (options) => {
         if (refState.current) {
           const { index, ...rest2 } = options;

package/index.mjs

@@ -1018,19 +1018,44 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return void 0;
   };
-  const setDidLayout = () => {
+  const scrollToIndex = ({
+    index,
+    viewOffset = 0,
+    animated = true,
+    viewPosition = 0
+  }) => {
     var _a;
+    const state = refState.current;
+    const firstIndexOffset = calculateOffsetForIndex(index);
+    let firstIndexScrollPostion = firstIndexOffset - viewOffset;
+    const diff = Math.abs(state.scroll - firstIndexScrollPostion);
+    const needsReanchoring = maintainVisibleContentPosition && diff > 100;
+    state.scrollForNextCalculateItemsInView = void 0;
+    if (needsReanchoring) {
+      const id = getId(index);
+      state.anchorElement = { id, coordinate: firstIndexOffset };
+      (_a = state.belowAnchorElementPositions) == null ? void 0 : _a.clear();
+      state.positions.clear();
+      calcTotalSizesAndPositions({ forgetPositions: true });
+      state.startBufferedId = id;
+      state.minIndexSizeChanged = index;
+      firstIndexScrollPostion = firstIndexOffset - viewOffset + state.scrollAdjustHandler.getAppliedAdjust();
+    }
+    if (viewPosition) {
+      firstIndexScrollPostion -= viewPosition * (state.scrollLength - getItemSize(getId(index), index, state.data[index]));
+    }
+    state.scrollAdjustHandler.setDisableAdjust(true);
+    state.scrollingToOffset = firstIndexScrollPostion;
+    scrollTo(firstIndexScrollPostion, animated);
+  };
+  const setDidLayout = () => {
     refState.current.queuedInitialLayout = true;
     checkAtBottom();
     if (initialScrollIndex) {
-      const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
-      (_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.setDisableAdjust(true);
       queueMicrotask(() => {
-        scrollTo(updatedOffset, false);
+        scrollToIndex({ index: initialScrollIndex, animated: false });
         requestAnimationFrame(() => {
-          var _a2;
           set$(ctx, "containersDidLayout", true);
-          (_a2 = refState.current) == null ? void 0 : _a2.scrollAdjustHandler.setDisableAdjust(false);
         });
       });
     } else {
@@ -1932,36 +1957,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   useImperativeHandle(
     forwardedRef,
     () => {
-      const scrollToIndex = ({
-        index,
-        viewOffset = 0,
-        animated = true,
-        viewPosition = 0
-      }) => {
-        var _a;
-        const state = refState.current;
-        const firstIndexOffset = calculateOffsetForIndex(index);
-        let firstIndexScrollPostion = firstIndexOffset - viewOffset;
-        const diff = Math.abs(state.scroll - firstIndexScrollPostion);
-        const needsReanchoring = maintainVisibleContentPosition && diff > 100;
-        state.scrollForNextCalculateItemsInView = void 0;
-        if (needsReanchoring) {
-          const id = getId(index);
-          state.anchorElement = { id, coordinate: firstIndexOffset };
-          (_a = state.belowAnchorElementPositions) == null ? void 0 : _a.clear();
-          state.positions.clear();
-          calcTotalSizesAndPositions({ forgetPositions: true });
-          state.startBufferedId = id;
-          state.minIndexSizeChanged = index;
-          firstIndexScrollPostion = firstIndexOffset - viewOffset + state.scrollAdjustHandler.getAppliedAdjust();
-        }
-        if (viewPosition) {
-          firstIndexScrollPostion -= viewPosition * (state.scrollLength - getItemSize(getId(index), index, state.data[index]));
-        }
-        state.scrollAdjustHandler.setDisableAdjust(true);
-        state.scrollingToOffset = firstIndexScrollPostion;
-        scrollTo(firstIndexScrollPostion, animated);
-      };
       const scrollIndexIntoView = (options) => {
         if (refState.current) {
           const { index, ...rest2 } = options;

package/keyboard-controller.d.mts

@@ -4,6 +4,7 @@ import * as _legendapp_list_reanimated from '@legendapp/list/reanimated';
 import * as _legendapp_list from '@legendapp/list';
 import { LegendListRef } from '@legendapp/list';
 import * as react_native from 'react-native';
+import { Insets } from 'react-native';
 import * as React from 'react';
 
 declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.ScrollViewProps, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices"> & {
@@ -122,7 +123,7 @@ declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.Sc
     renderItem?: ((props: _legendapp_list.LegendListRenderItemProps<ItemT_1>) => React.ReactNode) | undefined;
     animatedProps?: Partial<{
         contentOffset?: react_native.PointProp | react_native_reanimated.SharedValue<react_native.PointProp | undefined> | undefined;
-        contentInset?: react_native.Insets | react_native_reanimated.SharedValue<react_native.Insets | undefined> | undefined;
+        contentInset?: Insets | react_native_reanimated.SharedValue<Insets | undefined> | undefined;
         maintainVisibleContentPosition?: {
             autoscrollToTopThreshold?: number | null | undefined;
             minIndexForVisible: number;
@@ -157,7 +158,7 @@ declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.Sc
         disableScrollViewPanResponder?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         StickyHeaderComponent?: React.ComponentType<any> | react_native_reanimated.SharedValue<React.ComponentType<any> | undefined> | undefined;
         children?: React.ReactNode | react_native_reanimated.SharedValue<React.ReactNode>;
-        hitSlop?: number | react_native.Insets | react_native_reanimated.SharedValue<number | react_native.Insets | null | undefined> | null | undefined;
+        hitSlop?: number | Insets | react_native_reanimated.SharedValue<number | Insets | null | undefined> | null | undefined;
         id?: string | react_native_reanimated.SharedValue<string | undefined> | undefined;
         needsOffscreenAlphaCompositing?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         onLayout?: ((event: react_native.LayoutChangeEvent) => void) | react_native_reanimated.SharedValue<((event: react_native.LayoutChangeEvent) => void) | undefined> | undefined;
@@ -263,7 +264,7 @@ declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.Sc
         onScrollAnimationEnd?: (() => void) | react_native_reanimated.SharedValue<(() => void) | undefined> | undefined;
         pinchGestureEnabled?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         scrollEventThrottle?: number | react_native_reanimated.SharedValue<number | undefined> | undefined;
-        scrollIndicatorInsets?: react_native.Insets | react_native_reanimated.SharedValue<react_native.Insets | undefined> | undefined;
+        scrollIndicatorInsets?: Insets | react_native_reanimated.SharedValue<Insets | undefined> | undefined;
         scrollToOverflowEnabled?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         scrollsToTop?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         snapToAlignment?: "end" | "start" | "center" | react_native_reanimated.SharedValue<"end" | "start" | "center" | undefined> | undefined;

package/keyboard-controller.d.ts

@@ -4,6 +4,7 @@ import * as _legendapp_list_reanimated from '@legendapp/list/reanimated';
 import * as _legendapp_list from '@legendapp/list';
 import { LegendListRef } from '@legendapp/list';
 import * as react_native from 'react-native';
+import { Insets } from 'react-native';
 import * as React from 'react';
 
 declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.ScrollViewProps, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices"> & {
@@ -122,7 +123,7 @@ declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.Sc
     renderItem?: ((props: _legendapp_list.LegendListRenderItemProps<ItemT_1>) => React.ReactNode) | undefined;
     animatedProps?: Partial<{
         contentOffset?: react_native.PointProp | react_native_reanimated.SharedValue<react_native.PointProp | undefined> | undefined;
-        contentInset?: react_native.Insets | react_native_reanimated.SharedValue<react_native.Insets | undefined> | undefined;
+        contentInset?: Insets | react_native_reanimated.SharedValue<Insets | undefined> | undefined;
         maintainVisibleContentPosition?: {
             autoscrollToTopThreshold?: number | null | undefined;
             minIndexForVisible: number;
@@ -157,7 +158,7 @@ declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.Sc
         disableScrollViewPanResponder?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         StickyHeaderComponent?: React.ComponentType<any> | react_native_reanimated.SharedValue<React.ComponentType<any> | undefined> | undefined;
         children?: React.ReactNode | react_native_reanimated.SharedValue<React.ReactNode>;
-        hitSlop?: number | react_native.Insets | react_native_reanimated.SharedValue<number | react_native.Insets | null | undefined> | null | undefined;
+        hitSlop?: number | Insets | react_native_reanimated.SharedValue<number | Insets | null | undefined> | null | undefined;
         id?: string | react_native_reanimated.SharedValue<string | undefined> | undefined;
         needsOffscreenAlphaCompositing?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         onLayout?: ((event: react_native.LayoutChangeEvent) => void) | react_native_reanimated.SharedValue<((event: react_native.LayoutChangeEvent) => void) | undefined> | undefined;
@@ -263,7 +264,7 @@ declare const LegendList: <ItemT, ListT extends (<T>(props: Omit<react_native.Sc
         onScrollAnimationEnd?: (() => void) | react_native_reanimated.SharedValue<(() => void) | undefined> | undefined;
         pinchGestureEnabled?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         scrollEventThrottle?: number | react_native_reanimated.SharedValue<number | undefined> | undefined;
-        scrollIndicatorInsets?: react_native.Insets | react_native_reanimated.SharedValue<react_native.Insets | undefined> | undefined;
+        scrollIndicatorInsets?: Insets | react_native_reanimated.SharedValue<Insets | undefined> | undefined;
         scrollToOverflowEnabled?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         scrollsToTop?: boolean | react_native_reanimated.SharedValue<boolean | undefined> | undefined;
         snapToAlignment?: "end" | "start" | "center" | react_native_reanimated.SharedValue<"end" | "start" | "center" | undefined> | undefined;

package/keyboard-controller.js

@@ -29,7 +29,12 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 // src/keyboard-controller.tsx
 var typedForwardRef = React.forwardRef;
 var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
-  const { LegendList: LegendListProp, style: styleProp, ...rest } = props;
+  const {
+    LegendList: LegendListProp,
+    style: styleProp,
+    scrollIndicatorInsets: scrollIndicatorInsetsProp,
+    ...rest
+  } = props;
   const [padding, setPadding] = React.useState(0);
   const updatePadding = (height) => {
     setPadding(height);
@@ -43,7 +48,14 @@ var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
   const LegendListComponent = LegendListProp != null ? LegendListProp : list.LegendList;
   const styleFlattened = reactNative.StyleSheet.flatten(styleProp) || {};
   const style = { ...styleFlattened, paddingTop: padding + (styleFlattened.paddingTop || 0) };
-  return /* @__PURE__ */ React__namespace.createElement(LegendListComponent, { ...rest, style, ref: forwardedRef });
+  const scrollIndicatorInsets = scrollIndicatorInsetsProp ? { ...scrollIndicatorInsetsProp } : {};
+  if (!props.horizontal) {
+    scrollIndicatorInsets.top = (scrollIndicatorInsets.top || 0) + padding;
+  }
+  return (
+    // @ts-expect-error TODO: Fix this type
+    /* @__PURE__ */ React__namespace.createElement(LegendListComponent, { ...rest, style, scrollIndicatorInsets, ref: forwardedRef })
+  );
 });
 
 exports.LegendList = LegendList;

package/keyboard-controller.mjs

@@ -8,7 +8,12 @@ import { runOnJS } from 'react-native-reanimated';
 // src/keyboard-controller.tsx
 var typedForwardRef = forwardRef;
 var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
-  const { LegendList: LegendListProp, style: styleProp, ...rest } = props;
+  const {
+    LegendList: LegendListProp,
+    style: styleProp,
+    scrollIndicatorInsets: scrollIndicatorInsetsProp,
+    ...rest
+  } = props;
   const [padding, setPadding] = useState(0);
   const updatePadding = (height) => {
     setPadding(height);
@@ -22,7 +27,14 @@ var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
   const LegendListComponent = LegendListProp != null ? LegendListProp : LegendList$1;
   const styleFlattened = StyleSheet.flatten(styleProp) || {};
   const style = { ...styleFlattened, paddingTop: padding + (styleFlattened.paddingTop || 0) };
-  return /* @__PURE__ */ React.createElement(LegendListComponent, { ...rest, style, ref: forwardedRef });
+  const scrollIndicatorInsets = scrollIndicatorInsetsProp ? { ...scrollIndicatorInsetsProp } : {};
+  if (!props.horizontal) {
+    scrollIndicatorInsets.top = (scrollIndicatorInsets.top || 0) + padding;
+  }
+  return (
+    // @ts-expect-error TODO: Fix this type
+    /* @__PURE__ */ React.createElement(LegendListComponent, { ...rest, style, scrollIndicatorInsets, ref: forwardedRef })
+  );
 });
 
 export { LegendList };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "1.0.0-beta.44",
+  "version": "1.0.0-beta.46",
   "description": "Legend List aims to be a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,