react-native-keyboard-controller 1.5.0 → 1.5.2

package/android/src/fabric/java/com/reactnativekeyboardcontroller/KeyboardGestureAreaViewManager.kt

@@ -32,16 +32,13 @@ class KeyboardGestureAreaViewManager(mReactContext: ReactApplicationContext) :
     manager.setInterpolator(view as KeyboardGestureAreaReactViewGroup, value ?: "linear")
   }
 
-  @ReactProp(name = "allowToShowKeyboardFromHiddenStateBySwipeUp")
-  override fun setAllowToShowKeyboardFromHiddenStateBySwipeUp(
-    view: ReactViewGroup,
-    value: Boolean,
-  ) {
+  @ReactProp(name = "showOnSwipeUp")
+  override fun setShowOnSwipeUp(view: ReactViewGroup, value: Boolean) {
     manager.setScrollKeyboardOnScreenWhenNotVisible(view as KeyboardGestureAreaReactViewGroup, value)
   }
 
-  @ReactProp(name = "allowToDragKeyboardFromShownStateBySwipes")
-  override fun setAllowToDragKeyboardFromShownStateBySwipes(view: ReactViewGroup?, value: Boolean) {
+  @ReactProp(name = "enableSwipeToDismiss")
+  override fun setEnableSwipeToDismiss(view: ReactViewGroup?, value: Boolean) {
     manager.setScrollKeyboardOffScreenWhenVisible(view as KeyboardGestureAreaReactViewGroup, value)
   }
 }

package/android/src/main/java/com/reactnativekeyboardcontroller/KeyboardAnimationCallback.kt

@@ -156,7 +156,7 @@ class KeyboardAnimationCallback(
       // then we need to reset the state
       InteractiveKeyboardProvider.shown = false
     }
-    val isKeyboardVisible = isKeyboardVisible || isKeyboardShown
+    isKeyboardVisible = isKeyboardVisible || isKeyboardShown
 
     this.emitEvent("KeyboardController::" + if (!isKeyboardVisible) "keyboardDidHide" else "keyboardDidShow", getEventParams(this.persistentKeyboardHeight))
     this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMoveEnd", this.persistentKeyboardHeight, if (!isKeyboardVisible) 0.0 else 1.0))

package/android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardGestureAreaViewManager.kt

@@ -21,12 +21,12 @@ class KeyboardGestureAreaViewManager(mReactContext: ReactApplicationContext) : R
     manager.setInterpolator(view, interpolator)
   }
 
-  @ReactProp(name = "allowToShowKeyboardFromHiddenStateBySwipeUp")
+  @ReactProp(name = "showOnSwipeUp")
   fun setScrollKeyboardOnScreenWhenNotVisible(view: KeyboardGestureAreaReactViewGroup, value: Boolean) {
     manager.setScrollKeyboardOnScreenWhenNotVisible(view, value)
   }
 
-  @ReactProp(name = "allowToDragKeyboardFromShownStateBySwipes")
+  @ReactProp(name = "enableSwipeToDismiss")
   fun setScrollKeyboardOffScreenWhenVisible(view: KeyboardGestureAreaReactViewGroup, value: Boolean) {
     manager.setScrollKeyboardOffScreenWhenVisible(view, value)
   }

package/ios/KeyboardMovementObserver.swift

@@ -42,6 +42,7 @@ public class KeyboardMovementObserver: NSObject {
   private var prevKeyboardPosition = 0.0
   private var displayLink: CADisplayLink?
   private var keyboardHeight: CGFloat = 0.0
+  private var hasKVObserver = false
 
   @objc public init(
     handler: @escaping (NSString, NSNumber, NSNumber) -> Void,
@@ -82,18 +83,40 @@ public class KeyboardMovementObserver: NSObject {
       name: UIWindow.didBecomeVisibleNotification,
       object: nil
     )
+    NotificationCenter.default.addObserver(
+      self,
+      selector: #selector(windowDidBecomeHidden),
+      name: UIWindow.didBecomeHiddenNotification,
+      object: nil
+    )
+  }
+
+  @objc func windowDidBecomeHidden(_: Notification) {
+    removeKVObserver()
   }
 
   @objc func windowDidBecomeVisible(_: Notification) {
-    let keyboardView = findKeyboardView()
+    setupKVObserver()
+  }
 
-    if keyboardView == _keyboardView {
+  private func setupKVObserver() {
+    if hasKVObserver {
       return
     }
 
-    _keyboardView = keyboardView
+    if keyboardView != nil {
+      hasKVObserver = true
+      keyboardView?.addObserver(self, forKeyPath: "center", options: .new, context: nil)
+    }
+  }
+
+  private func removeKVObserver() {
+    if !hasKVObserver {
+      return
+    }
 
-    keyboardView?.addObserver(self, forKeyPath: "center", options: .new, context: nil)
+    hasKVObserver = false
+    keyboardView?.removeObserver(self, forKeyPath: "center", context: nil)
   }
 
   // swiftlint:disable:next block_based_kvo

package/lib/commonjs/specs/KeyboardGestureAreaNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["codegenNativeComponent","excludedPlatforms"],"sources":["KeyboardGestureAreaNativeComponent.ts"],"sourcesContent":["import type { HostComponent } from 'react-native';\nimport type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes';\nimport type { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';\nimport codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\n\nexport interface NativeProps extends ViewProps {\n  interpolator?: WithDefault<'linear' | 'ios', 'linear'>;\n  allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;\n  allowToDragKeyboardFromShownStateBySwipes?: boolean;\n}\n\nexport default codegenNativeComponent<NativeProps>('KeyboardGestureArea', {\n  excludedPlatforms: ['iOS'],\n}) as HostComponent<NativeProps>;\n"],"mappings":";;;;;;AAGA;AAA6F;AAAA,eAQ9E,IAAAA,+BAAsB,EAAc,qBAAqB,EAAE;EACxEC,iBAAiB,EAAE,CAAC,KAAK;AAC3B,CAAC,CAAC;AAAA"}
+{"version":3,"names":["codegenNativeComponent","excludedPlatforms"],"sources":["KeyboardGestureAreaNativeComponent.ts"],"sourcesContent":["import type { HostComponent } from 'react-native';\nimport type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes';\nimport type { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';\nimport codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\n\nexport interface NativeProps extends ViewProps {\n  interpolator?: WithDefault<'linear' | 'ios', 'linear'>;\n  showOnSwipeUp?: boolean;\n  enableSwipeToDismiss?: boolean;\n}\n\nexport default codegenNativeComponent<NativeProps>('KeyboardGestureArea', {\n  excludedPlatforms: ['iOS'],\n}) as HostComponent<NativeProps>;\n"],"mappings":";;;;;;AAGA;AAA6F;AAAA,eAQ9E,IAAAA,+BAAsB,EAAc,qBAAqB,EAAE;EACxEC,iBAAiB,EAAE,CAAC,KAAK;AAC3B,CAAC,CAAC;AAAA"}

package/lib/commonjs/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { NativeSyntheticEvent, ViewProps } from 'react-native';\n\n// DirectEventHandler events declaration\n\nexport type NativeEvent = {\n  progress: number;\n  height: number;\n};\nexport type EventWithName<T> = {\n  eventName: string;\n} & T;\n\n// native View/Module declarations\n\nexport type KeyboardControllerProps = {\n  onKeyboardMoveStart?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMove?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveEnd?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveInteractive?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  // fake prop used to activate reanimated bindings\n  onKeyboardMoveReanimated?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  statusBarTranslucent?: boolean;\n  navigationBarTranslucent?: boolean;\n} & ViewProps;\n\nexport type KeyboardGestureAreaProps = {\n  interpolator: 'ios' | 'linear';\n  /**\n   * Whether to allow to show a keyboard from dismissed state by swipe up.\n   * Default to `false`.\n   */\n  allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;\n  /**\n   * Whether to allow to control a keyboard by gestures. The strategy how\n   * it should be controlled is determined by `interpolator` property.\n   * Defaults to `true`.\n   */\n  allowToDragKeyboardFromShownStateBySwipes?: boolean;\n} & ViewProps;\n\nexport type KeyboardControllerModule = {\n  // android only\n  setDefaultMode: () => void;\n  setInputMode: (mode: number) => void;\n  // native event module stuff\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n};\n\n// Event module declarations\n\nexport type KeyboardControllerEvents =\n  | 'keyboardWillShow'\n  | 'keyboardDidShow'\n  | 'keyboardWillHide'\n  | 'keyboardDidHide';\nexport type KeyboardEventData = {\n  height: number;\n};\n\n// package types\n\nexport type Handlers<T> = Record<string, T | undefined>;\nexport type KeyboardHandler = Partial<{\n  onStart: (e: NativeEvent) => void;\n  onMove: (e: NativeEvent) => void;\n  onEnd: (e: NativeEvent) => void;\n  onInteractive: (e: NativeEvent) => void;\n}>;\nexport type KeyboardHandlers = Handlers<KeyboardHandler>;\n"],"mappings":""}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { NativeSyntheticEvent, ViewProps } from 'react-native';\n\n// DirectEventHandler events declaration\n\nexport type NativeEvent = {\n  progress: number;\n  height: number;\n};\nexport type EventWithName<T> = {\n  eventName: string;\n} & T;\n\n// native View/Module declarations\n\nexport type KeyboardControllerProps = {\n  onKeyboardMoveStart?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMove?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveEnd?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveInteractive?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  // fake prop used to activate reanimated bindings\n  onKeyboardMoveReanimated?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  statusBarTranslucent?: boolean;\n  navigationBarTranslucent?: boolean;\n} & ViewProps;\n\nexport type KeyboardGestureAreaProps = {\n  interpolator: 'ios' | 'linear';\n  /**\n   * Whether to allow to show a keyboard from dismissed state by swipe up.\n   * Default to `false`.\n   */\n  showOnSwipeUp?: boolean;\n  /**\n   * Whether to allow to control a keyboard by gestures. The strategy how\n   * it should be controlled is determined by `interpolator` property.\n   * Defaults to `true`.\n   */\n  enableSwipeToDismiss?: boolean;\n} & ViewProps;\n\nexport type KeyboardControllerModule = {\n  // android only\n  setDefaultMode: () => void;\n  setInputMode: (mode: number) => void;\n  // native event module stuff\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n};\n\n// Event module declarations\n\nexport type KeyboardControllerEvents =\n  | 'keyboardWillShow'\n  | 'keyboardDidShow'\n  | 'keyboardWillHide'\n  | 'keyboardDidHide';\nexport type KeyboardEventData = {\n  height: number;\n};\n\n// package types\n\nexport type Handlers<T> = Record<string, T | undefined>;\nexport type KeyboardHandler = Partial<{\n  onStart: (e: NativeEvent) => void;\n  onMove: (e: NativeEvent) => void;\n  onEnd: (e: NativeEvent) => void;\n  onInteractive: (e: NativeEvent) => void;\n}>;\nexport type KeyboardHandlers = Handlers<KeyboardHandler>;\n"],"mappings":""}

package/lib/module/specs/KeyboardGestureAreaNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["codegenNativeComponent","excludedPlatforms"],"sources":["KeyboardGestureAreaNativeComponent.ts"],"sourcesContent":["import type { HostComponent } from 'react-native';\nimport type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes';\nimport type { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';\nimport codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\n\nexport interface NativeProps extends ViewProps {\n  interpolator?: WithDefault<'linear' | 'ios', 'linear'>;\n  allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;\n  allowToDragKeyboardFromShownStateBySwipes?: boolean;\n}\n\nexport default codegenNativeComponent<NativeProps>('KeyboardGestureArea', {\n  excludedPlatforms: ['iOS'],\n}) as HostComponent<NativeProps>;\n"],"mappings":"AAGA,OAAOA,sBAAsB,MAAM,yDAAyD;AAQ5F,eAAeA,sBAAsB,CAAc,qBAAqB,EAAE;EACxEC,iBAAiB,EAAE,CAAC,KAAK;AAC3B,CAAC,CAAC"}
+{"version":3,"names":["codegenNativeComponent","excludedPlatforms"],"sources":["KeyboardGestureAreaNativeComponent.ts"],"sourcesContent":["import type { HostComponent } from 'react-native';\nimport type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes';\nimport type { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';\nimport codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';\n\nexport interface NativeProps extends ViewProps {\n  interpolator?: WithDefault<'linear' | 'ios', 'linear'>;\n  showOnSwipeUp?: boolean;\n  enableSwipeToDismiss?: boolean;\n}\n\nexport default codegenNativeComponent<NativeProps>('KeyboardGestureArea', {\n  excludedPlatforms: ['iOS'],\n}) as HostComponent<NativeProps>;\n"],"mappings":"AAGA,OAAOA,sBAAsB,MAAM,yDAAyD;AAQ5F,eAAeA,sBAAsB,CAAc,qBAAqB,EAAE;EACxEC,iBAAiB,EAAE,CAAC,KAAK;AAC3B,CAAC,CAAC"}

package/lib/module/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { NativeSyntheticEvent, ViewProps } from 'react-native';\n\n// DirectEventHandler events declaration\n\nexport type NativeEvent = {\n  progress: number;\n  height: number;\n};\nexport type EventWithName<T> = {\n  eventName: string;\n} & T;\n\n// native View/Module declarations\n\nexport type KeyboardControllerProps = {\n  onKeyboardMoveStart?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMove?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveEnd?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveInteractive?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  // fake prop used to activate reanimated bindings\n  onKeyboardMoveReanimated?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  statusBarTranslucent?: boolean;\n  navigationBarTranslucent?: boolean;\n} & ViewProps;\n\nexport type KeyboardGestureAreaProps = {\n  interpolator: 'ios' | 'linear';\n  /**\n   * Whether to allow to show a keyboard from dismissed state by swipe up.\n   * Default to `false`.\n   */\n  allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;\n  /**\n   * Whether to allow to control a keyboard by gestures. The strategy how\n   * it should be controlled is determined by `interpolator` property.\n   * Defaults to `true`.\n   */\n  allowToDragKeyboardFromShownStateBySwipes?: boolean;\n} & ViewProps;\n\nexport type KeyboardControllerModule = {\n  // android only\n  setDefaultMode: () => void;\n  setInputMode: (mode: number) => void;\n  // native event module stuff\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n};\n\n// Event module declarations\n\nexport type KeyboardControllerEvents =\n  | 'keyboardWillShow'\n  | 'keyboardDidShow'\n  | 'keyboardWillHide'\n  | 'keyboardDidHide';\nexport type KeyboardEventData = {\n  height: number;\n};\n\n// package types\n\nexport type Handlers<T> = Record<string, T | undefined>;\nexport type KeyboardHandler = Partial<{\n  onStart: (e: NativeEvent) => void;\n  onMove: (e: NativeEvent) => void;\n  onEnd: (e: NativeEvent) => void;\n  onInteractive: (e: NativeEvent) => void;\n}>;\nexport type KeyboardHandlers = Handlers<KeyboardHandler>;\n"],"mappings":""}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { NativeSyntheticEvent, ViewProps } from 'react-native';\n\n// DirectEventHandler events declaration\n\nexport type NativeEvent = {\n  progress: number;\n  height: number;\n};\nexport type EventWithName<T> = {\n  eventName: string;\n} & T;\n\n// native View/Module declarations\n\nexport type KeyboardControllerProps = {\n  onKeyboardMoveStart?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMove?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveEnd?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  onKeyboardMoveInteractive?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  // fake prop used to activate reanimated bindings\n  onKeyboardMoveReanimated?: (\n    e: NativeSyntheticEvent<EventWithName<NativeEvent>>\n  ) => void;\n  statusBarTranslucent?: boolean;\n  navigationBarTranslucent?: boolean;\n} & ViewProps;\n\nexport type KeyboardGestureAreaProps = {\n  interpolator: 'ios' | 'linear';\n  /**\n   * Whether to allow to show a keyboard from dismissed state by swipe up.\n   * Default to `false`.\n   */\n  showOnSwipeUp?: boolean;\n  /**\n   * Whether to allow to control a keyboard by gestures. The strategy how\n   * it should be controlled is determined by `interpolator` property.\n   * Defaults to `true`.\n   */\n  enableSwipeToDismiss?: boolean;\n} & ViewProps;\n\nexport type KeyboardControllerModule = {\n  // android only\n  setDefaultMode: () => void;\n  setInputMode: (mode: number) => void;\n  // native event module stuff\n  addListener: (eventName: string) => void;\n  removeListeners: (count: number) => void;\n};\n\n// Event module declarations\n\nexport type KeyboardControllerEvents =\n  | 'keyboardWillShow'\n  | 'keyboardDidShow'\n  | 'keyboardWillHide'\n  | 'keyboardDidHide';\nexport type KeyboardEventData = {\n  height: number;\n};\n\n// package types\n\nexport type Handlers<T> = Record<string, T | undefined>;\nexport type KeyboardHandler = Partial<{\n  onStart: (e: NativeEvent) => void;\n  onMove: (e: NativeEvent) => void;\n  onEnd: (e: NativeEvent) => void;\n  onInteractive: (e: NativeEvent) => void;\n}>;\nexport type KeyboardHandlers = Handlers<KeyboardHandler>;\n"],"mappings":""}

package/lib/typescript/specs/KeyboardGestureAreaNativeComponent.d.ts

@@ -3,8 +3,8 @@ import type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropT
 import type { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';
 export interface NativeProps extends ViewProps {
     interpolator?: WithDefault<'linear' | 'ios', 'linear'>;
-    allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;
-    allowToDragKeyboardFromShownStateBySwipes?: boolean;
+    showOnSwipeUp?: boolean;
+    enableSwipeToDismiss?: boolean;
 }
 declare const _default: HostComponent<NativeProps>;
 export default _default;

package/lib/typescript/types.d.ts

@@ -21,13 +21,13 @@ export type KeyboardGestureAreaProps = {
      * Whether to allow to show a keyboard from dismissed state by swipe up.
      * Default to `false`.
      */
-    allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;
+    showOnSwipeUp?: boolean;
     /**
      * Whether to allow to control a keyboard by gestures. The strategy how
      * it should be controlled is determined by `interpolator` property.
      * Defaults to `true`.
      */
-    allowToDragKeyboardFromShownStateBySwipes?: boolean;
+    enableSwipeToDismiss?: boolean;
 } & ViewProps;
 export type KeyboardControllerModule = {
     setDefaultMode: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/specs/KeyboardGestureAreaNativeComponent.ts

@@ -5,8 +5,8 @@ import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNati
 
 export interface NativeProps extends ViewProps {
   interpolator?: WithDefault<'linear' | 'ios', 'linear'>;
-  allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;
-  allowToDragKeyboardFromShownStateBySwipes?: boolean;
+  showOnSwipeUp?: boolean;
+  enableSwipeToDismiss?: boolean;
 }
 
 export default codegenNativeComponent<NativeProps>('KeyboardGestureArea', {

package/src/types.ts

@@ -39,13 +39,13 @@ export type KeyboardGestureAreaProps = {
    * Whether to allow to show a keyboard from dismissed state by swipe up.
    * Default to `false`.
    */
-  allowToShowKeyboardFromHiddenStateBySwipeUp?: boolean;
+  showOnSwipeUp?: boolean;
   /**
    * Whether to allow to control a keyboard by gestures. The strategy how
    * it should be controlled is determined by `interpolator` property.
    * Defaults to `true`.
    */
-  allowToDragKeyboardFromShownStateBySwipes?: boolean;
+  enableSwipeToDismiss?: boolean;
 } & ViewProps;
 
 export type KeyboardControllerModule = {