Merge pull request #46513 from margelo/fix/44514-kav-from-keyboard-co…

…ntroller fix: use `KeyboardAvoidingView` from keyboard controller
Expensify · Aug 1, 2024 · 73f97c9 · 73f97c9
2 parents c46990b + 473f8b4
commit 73f97c9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...t-native-keyboard-controller+1.12.2.patch → ...board-controller+1.12.2+001+initial.patch b/...t-native-keyboard-controller+1.12.2.patch → ...board-controller+1.12.2+001+initial.patch
diff --git a/patches/react-native-keyboard-controller+1.12.2+002+keyboard-avoiding-view.patch b/patches/react-native-keyboard-controller+1.12.2+002+keyboard-avoiding-view.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/react-native-keyboard-controller/src/components/KeyboardAvoidingView/hooks.ts b/node_modules/react-native-keyboard-controller/src/components/KeyboardAvoidingView/hooks.ts
+index 676eafc..6d84beb 100644
+--- a/node_modules/react-native-keyboard-controller/src/components/KeyboardAvoidingView/hooks.ts
++++ b/node_modules/react-native-keyboard-controller/src/components/KeyboardAvoidingView/hooks.ts
+@@ -33,6 +33,10 @@ export const useKeyboardAnimation = () => {
+
+         isClosed.value = e.height === 0;
+
++        if (e.height > 0) {
++          heightWhenOpened.value = e.height;
++        }
++
+         // `height` update happens in `onMove` handler
+         // in `onEnd` we need to update only if `onMove`
+         // wasn't called (i. e. duration === 0)
diff --git a/src/components/KeyboardAvoidingView/index.ios.tsx b/src/components/KeyboardAvoidingView/index.ios.tsx
@@ -2,7 +2,7 @@
  * The KeyboardAvoidingView is only used on ios
  */
 import React from 'react';
-import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native';
+import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native-keyboard-controller';
 import type {KeyboardAvoidingViewProps} from './types';
 
 function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {