fix: remove keyboard controller remnants

.gitignore

@@ -24,3 +24,5 @@ index.android.bundle
 *.DSYM.zip
 **/metrics/
 package/shared-native/.sync-state/
+
+.claude/worktrees

examples/ExpoMessaging/package.json

@@ -47,13 +47,14 @@
     "react-dom": "19.2.0",
     "react-native": "0.83.2",
     "react-native-gesture-handler": "~2.30.0",
+    "react-native-keyboard-controller": "1.20.7",
     "react-native-maps": "1.26.20",
     "react-native-reanimated": "4.2.1",
     "react-native-safe-area-context": "~5.6.2",
     "react-native-screens": "~4.23.0",
     "react-native-svg": "15.15.3",
-    "react-native-web": "^0.21.0",
     "react-native-teleport": "^1.0.2",
+    "react-native-web": "^0.21.0",
     "react-native-worklets": "0.7.2",
     "stream-chat-expo": "link:../../package/expo-package",
     "stream-chat-react-native-core": "link:../../package"

examples/ExpoMessaging/yarn.lock

@@ -5526,6 +5526,13 @@ react-native-is-edge-to-edge@1.2.1, react-native-is-edge-to-edge@^1.2.1:
   resolved "https://registry.yarnpkg.com/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.2.1.tgz#64e10851abd9d176cbf2b40562f751622bde3358"
   integrity sha512-FLbPWl/MyYQWz+KwqOZsSyj2JmLKglHatd3xLZWskXOpRaio4LfEDEz8E/A6uD8QoTHW6Aobw1jbEwK7KMgR7Q==
 
+react-native-keyboard-controller@1.20.7:
+  version "1.20.7"
+  resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.20.7.tgz#e1be1c15a5eb10b96a40a0812d8472e6e4bd8f29"
+  integrity sha512-G8S5jz1FufPrcL1vPtReATx+jJhT/j+sTqxMIb30b1z7cYEfMlkIzOCyaHgf6IMB2KA9uBmnA5M6ve2A9Ou4kw==
+  dependencies:
+    react-native-is-edge-to-edge "^1.2.1"
+
 react-native-lightbox@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/react-native-lightbox/-/react-native-lightbox-0.7.0.tgz#e52b4d7fcc141f59d7b23f0180de535e35b20ec9"

package/package.json

@@ -94,7 +94,6 @@
     "emoji-mart": ">=5.4.0",
     "react-native": ">=0.73.0",
     "react-native-gesture-handler": ">=2.18.0",
-    "react-native-keyboard-controller": ">=1.20.2",
     "react-native-reanimated": ">=3.16.0",
     "react-native-safe-area-context": ">=5.4.1",
     "react-native-svg": ">=15.8.0",
@@ -112,9 +111,6 @@
     },
     "@emoji-mart/data": {
       "optional": true
-    },
-    "react-native-keyboard-controller": {
-      "optional": true
     }
   },
   "devDependencies": {
@@ -163,7 +159,6 @@
     "react-native": "0.80.2",
     "react-native-builder-bob": "0.40.11",
     "react-native-gesture-handler": "^2.26.0",
-    "react-native-keyboard-controller": "^1.20.2",
     "react-native-reanimated": "3.18.0",
     "react-native-safe-area-context": "^5.6.1",
     "react-native-svg": "15.12.0",

package/src/components/AttachmentPicker/AttachmentPicker.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import {
   BackHandler,
-  EmitterSubscription,
   Keyboard,
   Platform,
   View,
@@ -21,7 +20,6 @@ import { useComponentsContext } from '../../contexts/componentsContext/Component
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useStableCallback } from '../../hooks';
 import { BottomSheet } from '../BottomSheetCompatibility/BottomSheet';
-import { KeyboardControllerPackage } from '../KeyboardCompatibleView/KeyboardControllerAvoidingView';
 
 dayjs.extend(duration);
 
@@ -78,18 +76,10 @@ export const AttachmentPicker = () => {
       }
       closePicker();
     };
-    let keyboardSubscription: EmitterSubscription | null = null;
-    if (KeyboardControllerPackage?.KeyboardEvents) {
-      keyboardSubscription = KeyboardControllerPackage.KeyboardEvents.addListener(
-        'keyboardWillShow',
-        onKeyboardOpenHandler,
-      );
-    } else {
-      const keyboardShowEvent = Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow';
-      keyboardSubscription = Keyboard.addListener(keyboardShowEvent, onKeyboardOpenHandler);
-    }
+    const keyboardShowEvent = Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow';
+    const keyboardSubscription = Keyboard.addListener(keyboardShowEvent, onKeyboardOpenHandler);
     return () => {
-      keyboardSubscription?.remove();
+      keyboardSubscription.remove();
     };
   }, [attachmentPickerStore, closePicker]);
 

package/src/components/Channel/Channel.tsx

@@ -114,7 +114,7 @@ import {
 } from '../../utils/utils';
 import { NotificationAnnouncer } from '../Accessibility/NotificationAnnouncer';
 import { AttachmentPicker } from '../AttachmentPicker/AttachmentPicker';
-import type { KeyboardCompatibleViewProps } from '../KeyboardCompatibleView/KeyboardControllerAvoidingView';
+import type { KeyboardCompatibleViewProps } from '../KeyboardCompatibleView/KeyboardCompatibleView';
 import { Emoji } from '../MessageMenu/EmojiPickerList';
 import { emojis } from '../MessageMenu/emojis';
 import { toUnicodeScalarString } from '../MessageMenu/utils/toUnicodeScalarString';

package/src/components/ImageGallery/ImageGallery.tsx

@@ -36,7 +36,7 @@ import { useViewport } from '../../hooks/useViewport';
 import { IconProps } from '../../icons/utils/base';
 import { ImageGalleryState } from '../../state-store/image-gallery-state-store';
 import { FileTypes } from '../../types/types';
-import { dismissKeyboard } from '../KeyboardCompatibleView/KeyboardControllerAvoidingView';
+import { dismissKeyboard } from '../KeyboardCompatibleView/KeyboardCompatibleView';
 import { BottomSheetModal } from '../UIComponents';
 
 export type ImageGalleryActionHandler = () => Promise<void> | void;

package/src/components/KeyboardCompatibleView/KeyboardCompatibleView.tsx

@@ -22,6 +22,12 @@ import {
 
 import { KeyboardProvider } from '../../contexts/keyboardContext/KeyboardContext';
 
+export type KeyboardCompatibleViewProps = KeyboardAvoidingViewProps;
+
+export const dismissKeyboard = () => {
+  Keyboard.dismiss();
+};
+
 type State = {
   bottom: number;
 };

package/src/components/Message/Message.tsx

@@ -77,7 +77,7 @@ import {
   MessageStatusTypes,
 } from '../../utils/utils';
 import type { Thumbnail } from '../Attachment/utils/buildGallery/types';
-import { dismissKeyboard } from '../KeyboardCompatibleView/KeyboardControllerAvoidingView';
+import { dismissKeyboard } from '../KeyboardCompatibleView/KeyboardCompatibleView';
 import { BottomSheetModal } from '../UIComponents';
 
 const createMessageOverlayId = (messageId?: string) =>

package/src/components/UIComponents/BottomSheetModal.tsx

@@ -19,7 +19,6 @@ import {
   View,
 } from 'react-native';
 import { Gesture, GestureDetector, GestureHandlerRootView } from 'react-native-gesture-handler';
-import type { KeyboardEventData } from 'react-native-keyboard-controller';
 import Animated, {
   Easing,
   FadeIn,
@@ -43,7 +42,6 @@ import { BottomSheetProvider } from '../../contexts/bottomSheetContext/BottomShe
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useStableCallback } from '../../hooks';
 import { primitives } from '../../theme';
-import { KeyboardControllerPackage } from '../KeyboardCompatibleView/KeyboardControllerAvoidingView';
 
 export type BottomSheetModalProps = {
   /**
@@ -377,18 +375,11 @@ const BottomSheetModalInner = (props: PropsWithChildren<BottomSheetModalProps>)
 
     const listeners: EventSubscription[] = [];
 
-    if (KeyboardControllerPackage?.KeyboardEvents) {
-      const keyboardDidShowKC = (event: KeyboardEventData) => {
-        animateKeyboardOffset(event.height);
-      };
-
+    if (Platform.OS === 'ios') {
       listeners.push(
-        KeyboardControllerPackage.KeyboardEvents.addListener('keyboardDidShow', keyboardDidShowKC),
-        KeyboardControllerPackage.KeyboardEvents.addListener('keyboardDidHide', keyboardDidHide),
+        Keyboard.addListener('keyboardWillShow', keyboardDidShowRN),
+        Keyboard.addListener('keyboardWillHide', keyboardDidHide),
       );
-    } else if (Platform.OS === 'ios') {
-      listeners.push(Keyboard.addListener('keyboardWillShow', keyboardDidShowRN));
-      listeners.push(Keyboard.addListener('keyboardWillHide', keyboardDidHide));
     }
 
     return () => listeners.forEach((l) => l.remove());

package/src/contexts/componentsContext/defaultComponents.ts

@@ -50,7 +50,7 @@ import { ImageGalleryGrid } from '../../components/ImageGallery/components/Image
 import { EmptyStateIndicator } from '../../components/Indicators/EmptyStateIndicator';
 import { LoadingErrorIndicator } from '../../components/Indicators/LoadingErrorIndicator';
 import { LoadingIndicator } from '../../components/Indicators/LoadingIndicator';
-import { KeyboardCompatibleView } from '../../components/KeyboardCompatibleView/KeyboardControllerAvoidingView';
+import { KeyboardCompatibleView } from '../../components/KeyboardCompatibleView/KeyboardCompatibleView';
 import { Message } from '../../components/Message/Message';
 import { MessagePinnedHeader } from '../../components/Message/MessageItemView/Headers/MessagePinnedHeader';
 import { MessageReminderHeader } from '../../components/Message/MessageItemView/Headers/MessageReminderHeader';

package/src/contexts/messageInputContext/MessageInputContext.tsx

@@ -23,7 +23,7 @@ import {
 import { useCreateMessageInputContext } from './hooks/useCreateMessageInputContext';
 import { useMessageComposer } from './hooks/useMessageComposer';
 
-import { dismissKeyboard } from '../../components/KeyboardCompatibleView/KeyboardControllerAvoidingView';
+import { dismissKeyboard } from '../../components/KeyboardCompatibleView/KeyboardCompatibleView';
 import { parseLinksFromText } from '../../components/Message/MessageItemView/utils/parseLinks';
 import { useAudioRecorder } from '../../components/MessageInput/hooks/useAudioRecorder';
 import { useNotificationApi } from '../../components/Notifications';

package/src/hooks/useAfterKeyboardOpenCallback.ts

@@ -3,7 +3,6 @@ import { EventSubscription, Keyboard, Platform } from 'react-native';
 
 import { useStableCallback } from './useStableCallback';
 
-import { KeyboardControllerPackage } from '../components/KeyboardCompatibleView/KeyboardControllerAvoidingView';
 import { useMessageInputContext } from '../contexts/messageInputContext/MessageInputContext';
 
 /**
@@ -50,9 +49,7 @@ export const useAfterKeyboardOpenCallback = <T extends unknown[]>(
 
     const keyboardEvent = Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow';
 
-    keyboardSubscriptionRef.current = KeyboardControllerPackage?.KeyboardEvents
-      ? KeyboardControllerPackage.KeyboardEvents.addListener(keyboardEvent, runCallback)
-      : Keyboard.addListener(keyboardEvent, runCallback);
+    keyboardSubscriptionRef.current = Keyboard.addListener(keyboardEvent, runCallback);
 
     inputBoxRef.current.focus();
   });

package/src/hooks/useKeyboardVisibility.ts

@@ -1,7 +1,5 @@
 import { useEffect, useState } from 'react';
-import { EventSubscription, Keyboard, Platform } from 'react-native';
-
-import { KeyboardControllerPackage } from '../components/KeyboardCompatibleView/KeyboardControllerAvoidingView';
+import { Keyboard, Platform } from 'react-native';
 
 /**
  * A custom hook that provides a boolean value indicating whether the keyboard is visible.
@@ -11,30 +9,14 @@ export const useKeyboardVisibility = () => {
   const [isKeyboardVisible, setIsKeyboardVisible] = useState(false);
 
   useEffect(() => {
-    const listeners: EventSubscription[] = [];
-    if (KeyboardControllerPackage?.KeyboardEvents) {
-      listeners.push(
-        KeyboardControllerPackage.KeyboardEvents.addListener('keyboardWillShow', () =>
-          setIsKeyboardVisible(true),
-        ),
-      );
-      listeners.push(
-        KeyboardControllerPackage.KeyboardEvents.addListener('keyboardWillHide', () =>
-          setIsKeyboardVisible(false),
-        ),
-      );
-    } else {
-      listeners.push(
-        Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', () =>
-          setIsKeyboardVisible(true),
-        ),
-      );
-      listeners.push(
-        Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', () =>
-          setIsKeyboardVisible(false),
-        ),
-      );
-    }
+    const listeners = [
+      Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow', () =>
+        setIsKeyboardVisible(true),
+      ),
+      Keyboard.addListener(Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide', () =>
+        setIsKeyboardVisible(false),
+      ),
+    ];
 
     return () => listeners.forEach((listener) => listener.remove());
   }, []);