react-native-keyboard-controller 1.12.6 → 1.12.7

package/src/components/KeyboardAwareScrollView/index.tsx

@@ -24,7 +24,10 @@ import type {
   ScrollView,
   ScrollViewProps,
 } from "react-native";
-import type { FocusedInputLayoutChangedEvent } from "react-native-keyboard-controller";
+import type {
+  FocusedInputLayoutChangedEvent,
+  FocusedInputSelectionChangedEvent,
+} from "react-native-keyboard-controller";
 
 export type KeyboardAwareScrollViewProps = {
   /** The distance between keyboard and focused `TextInput` when keyboard is shown. Default is `0`. */
@@ -183,6 +186,32 @@ const KeyboardAwareScrollView = forwardRef<
       [bottomOffset, enabled, height, rest.snapToOffsets],
     );
 
+    const scrollFromCurrentPosition = useCallback(
+      (customHeight?: number) => {
+        "worklet";
+
+        const prevScrollPosition = scrollPosition.value;
+        const prevLayout = layout.value;
+
+        if (!input.value?.layout) {
+          return;
+        }
+
+        // eslint-disable-next-line react-compiler/react-compiler
+        layout.value = {
+          ...input.value,
+          layout: {
+            ...input.value.layout,
+            height: customHeight ?? input.value.layout.height,
+          },
+        };
+        scrollPosition.value = position.value;
+        maybeScroll(keyboardHeight.value, true);
+        scrollPosition.value = prevScrollPosition;
+        layout.value = prevLayout;
+      },
+      [maybeScroll],
+    );
     const onChangeText = useCallback(() => {
       "worklet";
 
@@ -192,15 +221,18 @@ const KeyboardAwareScrollView = forwardRef<
         return;
       }
 
-      const prevScrollPosition = scrollPosition.value;
-      const prevLayout = layout.value;
+      scrollFromCurrentPosition();
+    }, [scrollFromCurrentPosition]);
+    const onSelectionChange = useCallback(
+      (e: FocusedInputSelectionChangedEvent) => {
+        "worklet";
 
-      scrollPosition.value = position.value;
-      layout.value = input.value;
-      maybeScroll(keyboardHeight.value, true);
-      scrollPosition.value = prevScrollPosition;
-      layout.value = prevLayout;
-    }, [maybeScroll]);
+        if (e.selection.start.position !== e.selection.end.position) {
+          scrollFromCurrentPosition(e.selection.end.y);
+        }
+      },
+      [scrollFromCurrentPosition],
+    );
 
     const onChangeTextHandler = useMemo(
       () => debounce(onChangeText, 200),
@@ -210,8 +242,9 @@ const KeyboardAwareScrollView = forwardRef<
     useFocusedInputHandler(
       {
         onChangeText: onChangeTextHandler,
+        onSelectionChange: onSelectionChange,
       },
-      [onChangeTextHandler],
+      [onChangeTextHandler, onSelectionChange],
     );
 
     useSmoothKeyboardHandler(

package/src/components/KeyboardAwareScrollView/useSmoothKeyboardHandler.ts

@@ -65,6 +65,7 @@ export const useSmoothKeyboardHandler: typeof useKeyboardHandler = (
       // dispatch `onEnd`
       if (evt.height === height.value) {
         handler.onEnd?.(evt);
+        // eslint-disable-next-line react-compiler/react-compiler
         persistedHeight.value = height.value;
       }
     },

package/src/internal.ts

@@ -37,6 +37,7 @@ export function useSharedHandlers<
   // that it will have all of them) and then update them in worklet thread (calls are
   // happening in FIFO order, so we will always have actual value).
   const updateSharedHandlers = () => {
+    // eslint-disable-next-line react-compiler/react-compiler
     handlers.value = jsHandlers.current;
   };
   const setHandlers = useCallback((handler: Handlers<T>) => {