diff --git a/src/components/KeyboardAvoidingView/index.ios.js b/src/components/KeyboardAvoidingView/index.ios.tsx
similarity index 77%
rename from src/components/KeyboardAvoidingView/index.ios.js
rename to src/components/KeyboardAvoidingView/index.ios.tsx
index c1ea8687f793..fde4df6fc05b 100644
--- a/src/components/KeyboardAvoidingView/index.ios.js
+++ b/src/components/KeyboardAvoidingView/index.ios.tsx
@@ -3,8 +3,9 @@
  */
 import React from 'react';
 import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native';
+import KeyboardAvoidingViewProps from './types';
 
-function KeyboardAvoidingView(props) {
+function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
     return <KeyboardAvoidingViewComponent {...props} />;
 }
diff --git a/src/components/KeyboardAvoidingView/index.js b/src/components/KeyboardAvoidingView/index.tsx
similarity index 56%
rename from src/components/KeyboardAvoidingView/index.js
rename to src/components/KeyboardAvoidingView/index.tsx
index 3483b2d007ac..cf3a5c5ebef7 100644
--- a/src/components/KeyboardAvoidingView/index.js
+++ b/src/components/KeyboardAvoidingView/index.tsx
@@ -3,13 +3,13 @@
  */
 import React from 'react';
 import {View} from 'react-native';
-import _ from 'underscore';
+import KeyboardAvoidingViewProps from './types';
 
-function KeyboardAvoidingView(props) {
-    const viewProps = _.omit(props, ['behavior', 'contentContainerStyle', 'enabled', 'keyboardVerticalOffset']);
+function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
+    const {behavior, contentContainerStyle, enabled, keyboardVerticalOffset, ...rest} = props;
     return (
         // eslint-disable-next-line react/jsx-props-no-spreading
-        <View {...viewProps} />
+        <View {...rest} />
     );
 }
 
diff --git a/src/components/KeyboardAvoidingView/types.ts b/src/components/KeyboardAvoidingView/types.ts
new file mode 100644
index 000000000000..48d354e8b53f
--- /dev/null
+++ b/src/components/KeyboardAvoidingView/types.ts
@@ -0,0 +1,3 @@
+import {KeyboardAvoidingViewProps} from 'react-native';
+
+export default KeyboardAvoidingViewProps;