@legendapp/list 3.5.0 → 3.7.0

package/keyboard.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var React = require('react');
+var reactNative$1 = require('react-native');
 var reactNativeKeyboardController = require('react-native-keyboard-controller');
 var reactNativeReanimated = require('react-native-reanimated');
 var reactNative = require('@legendapp/list/react-native');
@@ -59,19 +60,61 @@ function useKeyboardChatComposerInset(_listRef, composerRef, initialHeight = 0)
   );
   return { contentInsetEndAdjustment, onComposerLayout };
 }
+var DISMISS_TIMEOUT_MS = 2e3;
+function dismissKeyboard() {
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(resolve, DISMISS_TIMEOUT_MS);
+  });
+  return Promise.race([reactNativeKeyboardController.KeyboardController.dismiss(), timeout]).catch(() => {
+  }).finally(() => clearTimeout(timer));
+}
+var endScrollFreezes = /* @__PURE__ */ new WeakMap();
+var keyboardCloses = /* @__PURE__ */ new WeakMap();
+function getEndScrollFreeze(freeze) {
+  let owned = endScrollFreezes.get(freeze);
+  if (!owned) {
+    owned = reactNativeReanimated.makeMutable(false);
+    endScrollFreezes.set(freeze, owned);
+  }
+  return owned;
+}
+function setFreeze(freeze, value, onSet, animated = false) {
+  const owned = getEndScrollFreeze(freeze);
+  reactNativeReanimated.runOnUI(() => {
+    "worklet";
+    owned.value = value ? animated ? "animated" : "immediate" : false;
+    freeze.value = value;
+    if (onSet) reactNativeReanimated.runOnJS(onSet)();
+  })();
+}
 function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
   const internalFreeze = reactNativeReanimated.useSharedValue(false);
   const freeze = freezeProp != null ? freezeProp : internalFreeze;
+  const latestRequest = React.useRef(0);
+  const closing = React.useRef(void 0);
+  const preparedClose = React.useRef(false);
   const scrollMessageToEnd = React.useCallback(
     async ({ animated, closeKeyboard }) => {
-      const listRefCurrent = listRef.current;
-      if (listRefCurrent) {
-        freeze.set(true);
-        const dismissPromise = closeKeyboard && reactNativeKeyboardController.KeyboardController.dismiss();
-        const scrollPromise = listRefCurrent.scrollToEnd({ animated });
-        await Promise.all([scrollPromise, dismissPromise]);
-        freeze.set(false);
+      var _a;
+      const list = listRef.current;
+      if (!list) return;
+      if (closeKeyboard && ((_a = keyboardCloses.get(freeze)) == null ? void 0 : _a.prepare())) preparedClose.current = true;
+      const scrollPromise = list.scrollToEnd({ animated });
+      const request = ++latestRequest.current;
+      const frozen = new Promise((resolve) => setFreeze(freeze, true, resolve, preparedClose.current));
+      if (closeKeyboard && !closing.current) {
+        closing.current = frozen.then(dismissKeyboard).finally(() => {
+          closing.current = void 0;
+        });
       }
+      await Promise.all([scrollPromise, closing.current]).finally(() => {
+        var _a2;
+        if (request === latestRequest.current) {
+          preparedClose.current = false;
+          setFreeze(freeze, false, (_a2 = keyboardCloses.get(freeze)) == null ? void 0 : _a2.restore);
+        }
+      });
     },
     [freeze, listRef]
   );
@@ -81,6 +124,7 @@ function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
   };
 }
 var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(props, forwardedRef) {
+  var _a, _b;
   const {
     anchoredEndSpace,
     applyWorkaroundForContentInsetHitTestBug,
@@ -88,11 +132,61 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
     freeze,
     keyboardLiftBehavior,
     keyboardOffset,
+    refScrollView,
     ...rest
   } = props;
   const refLegendList = React.useRef(null);
   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
+  const staticContentInsetRef = React.useRef(rest.contentInset);
+  staticContentInsetRef.current = rest.contentInset;
   const blankSpace = reactNativeReanimated.useSharedValue(0);
+  const scrollRef = reactNativeReanimated.useAnimatedRef();
+  const combinedScrollRef = useCombinedRef(scrollRef, refScrollView);
+  const scrollOffset = reactNativeReanimated.useScrollViewOffset(scrollRef);
+  const dimensions = reactNativeReanimated.useSharedValue({ content: 0, viewport: 0 });
+  const frozenClose = reactNativeReanimated.useSharedValue(false);
+  const closeOffset = reactNativeReanimated.useSharedValue(0);
+  const endScrollFreeze = typeof freeze === "object" ? getEndScrollFreeze(freeze) : void 0;
+  const reportedInsets = React.useRef(void 0);
+  const initialKeyboardHeight = reactNativeKeyboardController.KeyboardController.state().height;
+  const keyboard = reactNativeReanimated.useSharedValue({ height: initialKeyboardHeight, progress: initialKeyboardHeight > 0 ? 1 : 0 });
+  const keyboardTarget = reactNativeReanimated.useSharedValue(initialKeyboardHeight);
+  const isHorizontal = !!rest.horizontal;
+  const reportViewabilityInset = React.useCallback((inset) => {
+    var _a2, _b2;
+    (_b2 = (_a2 = refLegendList.current) == null ? void 0 : _a2.reportViewabilityInsetEndInternal) == null ? void 0 : _b2.call(_a2, inset);
+  }, []);
+  const onKeyboardMove = (event) => {
+    "worklet";
+    keyboard.value = { height: event.height, progress: event.progress };
+  };
+  reactNativeKeyboardController.useKeyboardHandler(
+    {
+      onEnd: onKeyboardMove,
+      onInteractive: onKeyboardMove,
+      onMove: onKeyboardMove,
+      onStart: (event) => {
+        "worklet";
+        keyboardTarget.value = event.height;
+        if (event.height === 0 && !frozenClose.value) closeOffset.value = scrollOffset.value;
+        frozenClose.value = event.height === 0 && !!(endScrollFreeze == null ? void 0 : endScrollFreeze.value);
+      }
+    },
+    [endScrollFreeze]
+  );
+  reactNativeReanimated.useAnimatedReaction(
+    // Blank space extends the scroll range but does not obscure content.
+    () => {
+      var _a2;
+      return isHorizontal ? 0 : Math.max(0, keyboard.value.height - (keyboardOffset != null ? keyboardOffset : 0) * keyboard.value.progress) + Math.max(0, (_a2 = contentInsetEndAdjustment == null ? void 0 : contentInsetEndAdjustment.value) != null ? _a2 : 0);
+    },
+    (current, previous) => {
+      if (current !== previous) {
+        reactNativeReanimated.runOnJS(reportViewabilityInset)(current);
+      }
+    },
+    [contentInsetEndAdjustment, isHorizontal, keyboard, keyboardOffset, reportViewabilityInset]
+  );
   React.useEffect(() => {
     if (!anchoredEndSpace) {
       blankSpace.value = 0;
@@ -105,16 +199,90 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
     return {
       ...anchoredEndSpace,
       onSizeChanged: (size) => {
-        var _a;
+        var _a2;
         blankSpace.value = size;
-        (_a = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a.call(anchoredEndSpace, size);
+        (_a2 = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a2.call(anchoredEndSpace, size);
       }
     };
   }, [anchoredEndSpace, blankSpace]);
-  const onContentInsetChange = React.useCallback((insets) => {
-    var _a;
-    (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
+  const staticBottomInset = reactNative$1.Platform.OS === "ios" ? (_b = (_a = rest.contentInset) == null ? void 0 : _a.bottom) != null ? _b : 0 : 0;
+  const getEndInset = React.useCallback(
+    (keyboardInset = 0) => {
+      "worklet";
+      var _a2;
+      const padding = keyboardInset + ((_a2 = contentInsetEndAdjustment == null ? void 0 : contentInsetEndAdjustment.value) != null ? _a2 : 0);
+      return staticBottomInset + Math.min(dimensions.value.viewport, Math.max(blankSpace.value, padding));
+    },
+    [blankSpace, contentInsetEndAdjustment, dimensions, staticBottomInset]
+  );
+  const onContentInsetChange = React.useCallback(
+    (insets) => {
+      var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
+      const staticInset = staticContentInsetRef.current;
+      if (reactNative$1.Platform.OS !== "ios" && staticInset) {
+        insets = {
+          bottom: Math.max(0, ((_a2 = insets.bottom) != null ? _a2 : 0) - ((_b2 = staticInset.bottom) != null ? _b2 : 0)),
+          left: Math.max(0, ((_c = insets.left) != null ? _c : 0) - ((_d = staticInset.left) != null ? _d : 0)),
+          right: Math.max(0, ((_e = insets.right) != null ? _e : 0) - ((_f = staticInset.right) != null ? _f : 0)),
+          top: Math.max(0, ((_g = insets.top) != null ? _g : 0) - ((_h = staticInset.top) != null ? _h : 0))
+        };
+      }
+      reportedInsets.current = insets;
+      const list = refLegendList.current;
+      if ((endScrollFreeze == null ? void 0 : endScrollFreeze.value) === "animated") {
+        (_i = list == null ? void 0 : list.reportContentInsetForScrollInternal) == null ? void 0 : _i.call(list, { ...insets, bottom: getEndInset() });
+      } else if (keyboardTarget.value > 0 && (list == null ? void 0 : list.reportContentInsetForScrollInternal)) {
+        list.reportContentInsetForScrollInternal(insets);
+      } else {
+        list == null ? void 0 : list.reportContentInset(insets);
+      }
+    },
+    [endScrollFreeze, getEndInset, keyboardTarget]
+  );
+  const reportClosingInset = React.useCallback((bottom) => {
+    var _a2;
+    (_a2 = refLegendList.current) == null ? void 0 : _a2.reportContentInset({ ...reportedInsets.current, bottom });
   }, []);
+  React.useLayoutEffect(() => {
+    if (typeof freeze !== "object") return;
+    keyboardCloses.set(freeze, {
+      prepare: () => {
+        var _a2;
+        const report = (_a2 = refLegendList.current) == null ? void 0 : _a2.reportContentInsetForScrollInternal;
+        if (isHorizontal || !dimensions.value.viewport || keyboard.value.height === 0 || !report) return false;
+        report({ ...reportedInsets.current, bottom: getEndInset() });
+        return true;
+      },
+      restore: () => {
+        var _a2;
+        if (keyboard.value.height > 0 && reportedInsets.current) {
+          (_a2 = refLegendList.current) == null ? void 0 : _a2.reportContentInset(reportedInsets.current);
+        }
+      }
+    });
+    return () => {
+      keyboardCloses.delete(freeze);
+    };
+  }, [dimensions, freeze, getEndInset, isHorizontal, keyboard]);
+  reactNativeReanimated.useAnimatedReaction(
+    () => frozenClose.value && (endScrollFreeze == null ? void 0 : endScrollFreeze.value) === "immediate" && typeof freeze === "object" && freeze.value ? { height: keyboard.value.height, scroll: scrollOffset.value } : null,
+    (current, previous) => {
+      if (!current) {
+        frozenClose.value = false;
+        return;
+      }
+      if (isHorizontal || !dimensions.value.viewport) return;
+      closeOffset.value = Math.min(closeOffset.value, current.scroll);
+      const keyboardInset = Math.max(0, current.height - (keyboardOffset != null ? keyboardOffset : 0) * keyboard.value.progress);
+      const contentEnd = dimensions.value.content - dimensions.value.viewport;
+      const keyboardEndInset = getEndInset(keyboardInset);
+      const inset = Math.max(getEndInset(), Math.min(keyboardEndInset, closeOffset.value - contentEnd));
+      if (current.height === 0 && (previous == null ? void 0 : previous.height) !== 0) reactNativeReanimated.runOnJS(reportClosingInset)(getEndInset());
+      const end = Math.max(0, contentEnd + inset);
+      if (current.scroll > end) reactNativeReanimated.scrollTo(scrollRef, 0, end, false);
+    },
+    [freeze, getEndInset, isHorizontal, keyboardOffset, reportClosingInset]
+  );
   const memoList = React.useCallback(
     (scrollProps) => {
       return /* @__PURE__ */ React__namespace.createElement(
@@ -127,7 +295,17 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
           freeze,
           keyboardLiftBehavior,
           offset: keyboardOffset,
-          onContentInsetChange
+          onContentInsetChange,
+          onContentSizeChange: (width, height) => {
+            var _a2;
+            dimensions.value = { ...dimensions.value, content: height };
+            (_a2 = scrollProps.onContentSizeChange) == null ? void 0 : _a2.call(scrollProps, width, height);
+          },
+          onLayout: (event) => {
+            var _a2;
+            dimensions.value = { ...dimensions.value, viewport: event.nativeEvent.layout.height };
+            (_a2 = scrollProps.onLayout) == null ? void 0 : _a2.call(scrollProps, event);
+          }
         }
       );
     },
@@ -135,6 +313,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
       applyWorkaroundForContentInsetHitTestBug,
       blankSpace,
       contentInsetEndAdjustment,
+      dimensions,
       freeze,
       keyboardLiftBehavior,
       keyboardOffset,
@@ -148,6 +327,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
       anchoredEndSpace: anchoredEndSpaceWithBlankSpace,
       anchoredEndSpaceOwnerInternal: "scroll",
       ref: combinedRef,
+      refScrollView: combinedScrollRef,
       renderScrollComponent: memoList,
       ...rest
     }

package/keyboard.mjs

@@ -1,7 +1,8 @@
 import * as React from 'react';
-import { useRef, useEffect, useMemo, useCallback, useLayoutEffect } from 'react';
-import { KeyboardChatScrollView, KeyboardController } from 'react-native-keyboard-controller';
-import { useSharedValue } from 'react-native-reanimated';
+import { useRef, useCallback, useEffect, useMemo, useLayoutEffect } from 'react';
+import { Platform } from 'react-native';
+import { KeyboardChatScrollView, KeyboardController, useKeyboardHandler } from 'react-native-keyboard-controller';
+import { useSharedValue, useAnimatedRef, useScrollViewOffset, useAnimatedReaction, runOnJS, scrollTo, makeMutable, runOnUI } from 'react-native-reanimated';
 import { internal } from '@legendapp/list/react-native';
 import { AnimatedLegendList } from '@legendapp/list/reanimated';
 
@@ -38,19 +39,61 @@ function useKeyboardChatComposerInset(_listRef, composerRef, initialHeight = 0)
   );
   return { contentInsetEndAdjustment, onComposerLayout };
 }
+var DISMISS_TIMEOUT_MS = 2e3;
+function dismissKeyboard() {
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(resolve, DISMISS_TIMEOUT_MS);
+  });
+  return Promise.race([KeyboardController.dismiss(), timeout]).catch(() => {
+  }).finally(() => clearTimeout(timer));
+}
+var endScrollFreezes = /* @__PURE__ */ new WeakMap();
+var keyboardCloses = /* @__PURE__ */ new WeakMap();
+function getEndScrollFreeze(freeze) {
+  let owned = endScrollFreezes.get(freeze);
+  if (!owned) {
+    owned = makeMutable(false);
+    endScrollFreezes.set(freeze, owned);
+  }
+  return owned;
+}
+function setFreeze(freeze, value, onSet, animated = false) {
+  const owned = getEndScrollFreeze(freeze);
+  runOnUI(() => {
+    "worklet";
+    owned.value = value ? animated ? "animated" : "immediate" : false;
+    freeze.value = value;
+    if (onSet) runOnJS(onSet)();
+  })();
+}
 function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
   const internalFreeze = useSharedValue(false);
   const freeze = freezeProp != null ? freezeProp : internalFreeze;
+  const latestRequest = useRef(0);
+  const closing = useRef(void 0);
+  const preparedClose = useRef(false);
   const scrollMessageToEnd = useCallback(
     async ({ animated, closeKeyboard }) => {
-      const listRefCurrent = listRef.current;
-      if (listRefCurrent) {
-        freeze.set(true);
-        const dismissPromise = closeKeyboard && KeyboardController.dismiss();
-        const scrollPromise = listRefCurrent.scrollToEnd({ animated });
-        await Promise.all([scrollPromise, dismissPromise]);
-        freeze.set(false);
+      var _a;
+      const list = listRef.current;
+      if (!list) return;
+      if (closeKeyboard && ((_a = keyboardCloses.get(freeze)) == null ? void 0 : _a.prepare())) preparedClose.current = true;
+      const scrollPromise = list.scrollToEnd({ animated });
+      const request = ++latestRequest.current;
+      const frozen = new Promise((resolve) => setFreeze(freeze, true, resolve, preparedClose.current));
+      if (closeKeyboard && !closing.current) {
+        closing.current = frozen.then(dismissKeyboard).finally(() => {
+          closing.current = void 0;
+        });
       }
+      await Promise.all([scrollPromise, closing.current]).finally(() => {
+        var _a2;
+        if (request === latestRequest.current) {
+          preparedClose.current = false;
+          setFreeze(freeze, false, (_a2 = keyboardCloses.get(freeze)) == null ? void 0 : _a2.restore);
+        }
+      });
     },
     [freeze, listRef]
   );
@@ -60,6 +103,7 @@ function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
   };
 }
 var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(props, forwardedRef) {
+  var _a, _b;
   const {
     anchoredEndSpace,
     applyWorkaroundForContentInsetHitTestBug,
@@ -67,11 +111,61 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
     freeze,
     keyboardLiftBehavior,
     keyboardOffset,
+    refScrollView,
     ...rest
   } = props;
   const refLegendList = useRef(null);
   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
+  const staticContentInsetRef = useRef(rest.contentInset);
+  staticContentInsetRef.current = rest.contentInset;
   const blankSpace = useSharedValue(0);
+  const scrollRef = useAnimatedRef();
+  const combinedScrollRef = useCombinedRef(scrollRef, refScrollView);
+  const scrollOffset = useScrollViewOffset(scrollRef);
+  const dimensions = useSharedValue({ content: 0, viewport: 0 });
+  const frozenClose = useSharedValue(false);
+  const closeOffset = useSharedValue(0);
+  const endScrollFreeze = typeof freeze === "object" ? getEndScrollFreeze(freeze) : void 0;
+  const reportedInsets = useRef(void 0);
+  const initialKeyboardHeight = KeyboardController.state().height;
+  const keyboard = useSharedValue({ height: initialKeyboardHeight, progress: initialKeyboardHeight > 0 ? 1 : 0 });
+  const keyboardTarget = useSharedValue(initialKeyboardHeight);
+  const isHorizontal = !!rest.horizontal;
+  const reportViewabilityInset = useCallback((inset) => {
+    var _a2, _b2;
+    (_b2 = (_a2 = refLegendList.current) == null ? void 0 : _a2.reportViewabilityInsetEndInternal) == null ? void 0 : _b2.call(_a2, inset);
+  }, []);
+  const onKeyboardMove = (event) => {
+    "worklet";
+    keyboard.value = { height: event.height, progress: event.progress };
+  };
+  useKeyboardHandler(
+    {
+      onEnd: onKeyboardMove,
+      onInteractive: onKeyboardMove,
+      onMove: onKeyboardMove,
+      onStart: (event) => {
+        "worklet";
+        keyboardTarget.value = event.height;
+        if (event.height === 0 && !frozenClose.value) closeOffset.value = scrollOffset.value;
+        frozenClose.value = event.height === 0 && !!(endScrollFreeze == null ? void 0 : endScrollFreeze.value);
+      }
+    },
+    [endScrollFreeze]
+  );
+  useAnimatedReaction(
+    // Blank space extends the scroll range but does not obscure content.
+    () => {
+      var _a2;
+      return isHorizontal ? 0 : Math.max(0, keyboard.value.height - (keyboardOffset != null ? keyboardOffset : 0) * keyboard.value.progress) + Math.max(0, (_a2 = contentInsetEndAdjustment == null ? void 0 : contentInsetEndAdjustment.value) != null ? _a2 : 0);
+    },
+    (current, previous) => {
+      if (current !== previous) {
+        runOnJS(reportViewabilityInset)(current);
+      }
+    },
+    [contentInsetEndAdjustment, isHorizontal, keyboard, keyboardOffset, reportViewabilityInset]
+  );
   useEffect(() => {
     if (!anchoredEndSpace) {
       blankSpace.value = 0;
@@ -84,16 +178,90 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
     return {
       ...anchoredEndSpace,
       onSizeChanged: (size) => {
-        var _a;
+        var _a2;
         blankSpace.value = size;
-        (_a = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a.call(anchoredEndSpace, size);
+        (_a2 = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a2.call(anchoredEndSpace, size);
       }
     };
   }, [anchoredEndSpace, blankSpace]);
-  const onContentInsetChange = useCallback((insets) => {
-    var _a;
-    (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
+  const staticBottomInset = Platform.OS === "ios" ? (_b = (_a = rest.contentInset) == null ? void 0 : _a.bottom) != null ? _b : 0 : 0;
+  const getEndInset = useCallback(
+    (keyboardInset = 0) => {
+      "worklet";
+      var _a2;
+      const padding = keyboardInset + ((_a2 = contentInsetEndAdjustment == null ? void 0 : contentInsetEndAdjustment.value) != null ? _a2 : 0);
+      return staticBottomInset + Math.min(dimensions.value.viewport, Math.max(blankSpace.value, padding));
+    },
+    [blankSpace, contentInsetEndAdjustment, dimensions, staticBottomInset]
+  );
+  const onContentInsetChange = useCallback(
+    (insets) => {
+      var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
+      const staticInset = staticContentInsetRef.current;
+      if (Platform.OS !== "ios" && staticInset) {
+        insets = {
+          bottom: Math.max(0, ((_a2 = insets.bottom) != null ? _a2 : 0) - ((_b2 = staticInset.bottom) != null ? _b2 : 0)),
+          left: Math.max(0, ((_c = insets.left) != null ? _c : 0) - ((_d = staticInset.left) != null ? _d : 0)),
+          right: Math.max(0, ((_e = insets.right) != null ? _e : 0) - ((_f = staticInset.right) != null ? _f : 0)),
+          top: Math.max(0, ((_g = insets.top) != null ? _g : 0) - ((_h = staticInset.top) != null ? _h : 0))
+        };
+      }
+      reportedInsets.current = insets;
+      const list = refLegendList.current;
+      if ((endScrollFreeze == null ? void 0 : endScrollFreeze.value) === "animated") {
+        (_i = list == null ? void 0 : list.reportContentInsetForScrollInternal) == null ? void 0 : _i.call(list, { ...insets, bottom: getEndInset() });
+      } else if (keyboardTarget.value > 0 && (list == null ? void 0 : list.reportContentInsetForScrollInternal)) {
+        list.reportContentInsetForScrollInternal(insets);
+      } else {
+        list == null ? void 0 : list.reportContentInset(insets);
+      }
+    },
+    [endScrollFreeze, getEndInset, keyboardTarget]
+  );
+  const reportClosingInset = useCallback((bottom) => {
+    var _a2;
+    (_a2 = refLegendList.current) == null ? void 0 : _a2.reportContentInset({ ...reportedInsets.current, bottom });
   }, []);
+  useLayoutEffect(() => {
+    if (typeof freeze !== "object") return;
+    keyboardCloses.set(freeze, {
+      prepare: () => {
+        var _a2;
+        const report = (_a2 = refLegendList.current) == null ? void 0 : _a2.reportContentInsetForScrollInternal;
+        if (isHorizontal || !dimensions.value.viewport || keyboard.value.height === 0 || !report) return false;
+        report({ ...reportedInsets.current, bottom: getEndInset() });
+        return true;
+      },
+      restore: () => {
+        var _a2;
+        if (keyboard.value.height > 0 && reportedInsets.current) {
+          (_a2 = refLegendList.current) == null ? void 0 : _a2.reportContentInset(reportedInsets.current);
+        }
+      }
+    });
+    return () => {
+      keyboardCloses.delete(freeze);
+    };
+  }, [dimensions, freeze, getEndInset, isHorizontal, keyboard]);
+  useAnimatedReaction(
+    () => frozenClose.value && (endScrollFreeze == null ? void 0 : endScrollFreeze.value) === "immediate" && typeof freeze === "object" && freeze.value ? { height: keyboard.value.height, scroll: scrollOffset.value } : null,
+    (current, previous) => {
+      if (!current) {
+        frozenClose.value = false;
+        return;
+      }
+      if (isHorizontal || !dimensions.value.viewport) return;
+      closeOffset.value = Math.min(closeOffset.value, current.scroll);
+      const keyboardInset = Math.max(0, current.height - (keyboardOffset != null ? keyboardOffset : 0) * keyboard.value.progress);
+      const contentEnd = dimensions.value.content - dimensions.value.viewport;
+      const keyboardEndInset = getEndInset(keyboardInset);
+      const inset = Math.max(getEndInset(), Math.min(keyboardEndInset, closeOffset.value - contentEnd));
+      if (current.height === 0 && (previous == null ? void 0 : previous.height) !== 0) runOnJS(reportClosingInset)(getEndInset());
+      const end = Math.max(0, contentEnd + inset);
+      if (current.scroll > end) scrollTo(scrollRef, 0, end, false);
+    },
+    [freeze, getEndInset, isHorizontal, keyboardOffset, reportClosingInset]
+  );
   const memoList = useCallback(
     (scrollProps) => {
       return /* @__PURE__ */ React.createElement(
@@ -106,7 +274,17 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
           freeze,
           keyboardLiftBehavior,
           offset: keyboardOffset,
-          onContentInsetChange
+          onContentInsetChange,
+          onContentSizeChange: (width, height) => {
+            var _a2;
+            dimensions.value = { ...dimensions.value, content: height };
+            (_a2 = scrollProps.onContentSizeChange) == null ? void 0 : _a2.call(scrollProps, width, height);
+          },
+          onLayout: (event) => {
+            var _a2;
+            dimensions.value = { ...dimensions.value, viewport: event.nativeEvent.layout.height };
+            (_a2 = scrollProps.onLayout) == null ? void 0 : _a2.call(scrollProps, event);
+          }
         }
       );
     },
@@ -114,6 +292,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
       applyWorkaroundForContentInsetHitTestBug,
       blankSpace,
       contentInsetEndAdjustment,
+      dimensions,
       freeze,
       keyboardLiftBehavior,
       keyboardOffset,
@@ -127,6 +306,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
       anchoredEndSpace: anchoredEndSpaceWithBlankSpace,
       anchoredEndSpaceOwnerInternal: "scroll",
       ref: combinedRef,
+      refScrollView: combinedScrollRef,
       renderScrollComponent: memoList,
       ...rest
     }

package/package.json

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