react-native-keyboard-controller 1.2.0 → 1.4.0

package/android/build.gradle

@@ -46,41 +46,11 @@ android {
     versionCode 1
     versionName "1.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-    if (isNewArchitectureEnabled()) {
-      var appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
-      externalNativeBuild {
-        ndkBuild {
-          arguments "APP_PLATFORM=android-21",
-                  "APP_STL=c++_shared",
-                  "NDK_TOOLCHAIN_VERSION=clang",
-                  "GENERATED_SRC_DIR=${appProject.buildDir}/generated/source",
-                  "PROJECT_BUILD_DIR=${appProject.buildDir}",
-                  "REACT_ANDROID_DIR=${appProject.rootDir}/../node_modules/react-native/ReactAndroid",
-                  "REACT_ANDROID_BUILD_DIR=${appProject.rootDir}/../node_modules/react-native/ReactAndroid/build"
-          cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-          cppFlags "-std=c++17"
-          targets "reactnativekeyboardcontroller_modules"
-        }
-      }
-    }
     ndk {
       abiFilters (*reactNativeArchitectures())
     }
   }
 
-  if (isNewArchitectureEnabled()) {
-    externalNativeBuild {
-      ndkBuild {
-        path "src/main/jni/Android.mk"
-      }
-    }
-
-    packagingOptions {
-      exclude "**/libreact_render_*.so"
-      exclude "**/librrc_root.so"
-    }
-  }
-
   sourceSets {
     main {
       if (isNewArchitectureEnabled()) {
@@ -186,13 +156,3 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'androidx.core:core-ktx:1.5.0-beta03'
 }
-
-if (isNewArchitectureEnabled()) {
-  react {
-    reactNativeDir = rootProject.file("../node_modules/react-native/")
-    jsRootDir = file("../src/")
-    codegenDir = rootProject.file("../node_modules/react-native-codegen/")
-    libraryName = "reactnativekeyboardcontroller"
-    codegenJavaPackageName = "com.reactnativekeyboardcontroller"
-  }
-}

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

@@ -74,14 +74,16 @@ class KeyboardAnimationCallback(
       val keyboardHeight = getCurrentKeyboardHeight()
 
       this.emitEvent("KeyboardController::keyboardWillShow", getEventParams(keyboardHeight))
+      this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMoveStart", keyboardHeight, 1.0))
 
-      val animation = ValueAnimator.ofInt(-this.persistentKeyboardHeight, -keyboardHeight)
+      val animation = ValueAnimator.ofInt(this.persistentKeyboardHeight, keyboardHeight)
       animation.addUpdateListener { animator ->
         val toValue = animator.animatedValue as Int
-        this.sendEventToJS(KeyboardTransitionEvent(view.id, toValue, -toValue.toDouble() / keyboardHeight))
+        this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMove", toValue, toValue.toDouble() / keyboardHeight))
       }
       animation.doOnEnd {
         this.emitEvent("KeyboardController::keyboardDidShow", getEventParams(keyboardHeight))
+        this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMoveEnd", keyboardHeight, 1.0))
       }
       animation.setDuration(250).startDelay = 0
       animation.start()
@@ -108,6 +110,7 @@ class KeyboardAnimationCallback(
     this.emitEvent("KeyboardController::" + if (!isKeyboardVisible) "keyboardWillHide" else "keyboardWillShow", getEventParams(keyboardHeight))
 
     Log.i(TAG, "HEIGHT:: $keyboardHeight")
+    this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMoveStart", keyboardHeight, if (!isKeyboardVisible) 0.0 else 1.0))
 
     return super.onStart(animation, bounds)
   }
@@ -128,7 +131,7 @@ class KeyboardAnimationCallback(
     val diff = Insets.subtract(typesInset, otherInset).let {
       Insets.max(it, Insets.NONE)
     }
-    val diffY = (diff.top - diff.bottom).toFloat()
+    val diffY = (diff.bottom - diff.top).toFloat()
     val height = toDp(diffY, context)
 
     var progress = 0.0
@@ -139,7 +142,7 @@ class KeyboardAnimationCallback(
     }
     Log.i(TAG, "DiffY: $diffY $height $progress")
 
-    this.sendEventToJS(KeyboardTransitionEvent(view.id, height, progress))
+    this.sendEventToJS(KeyboardTransitionEvent(view.id, "topKeyboardMove", height, progress))
 
     return insets
   }
@@ -150,6 +153,7 @@ class KeyboardAnimationCallback(
     isTransitioning = false
     this.persistentKeyboardHeight = getCurrentKeyboardHeight()
     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))
   }
 
   private fun isKeyboardVisible(): Boolean {

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

@@ -1,21 +1,57 @@
 package com.reactnativekeyboardcontroller
 
-import com.facebook.react.ReactPackage
+import androidx.annotation.Nullable
+import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
-import com.facebook.soloader.SoLoader
 
-class KeyboardControllerPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(KeyboardControllerModule(reactContext), StatusBarManagerCompatModule(reactContext))
+class KeyboardControllerPackage : TurboReactPackage() {
+  @Nullable
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return when (name) {
+      KeyboardControllerModuleImpl.NAME -> {
+        KeyboardControllerModule(reactContext)
+      }
+      StatusBarManagerCompatImpl.NAME -> {
+        StatusBarManagerCompatModule(reactContext)
+      }
+      else -> {
+        null
+      }
+    }
   }
 
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      SoLoader.loadLibrary("reactnativekeyboardcontroller_modules")
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+
+      moduleInfos[KeyboardControllerModuleImpl.NAME] = ReactModuleInfo(
+        KeyboardControllerModuleImpl.NAME,
+        KeyboardControllerModuleImpl.NAME,
+        false, // canOverrideExistingModule
+        false, // needsEagerInit
+        true, // hasConstants
+        false, // isCxxModule
+        isTurboModule // isTurboModule
+      )
+      moduleInfos[StatusBarManagerCompatImpl.NAME] = ReactModuleInfo(
+        StatusBarManagerCompatImpl.NAME,
+        StatusBarManagerCompatImpl.NAME,
+        false, // canOverrideExistingModule
+        false, // needsEagerInit
+        true, // hasConstants
+        false, // isCxxModule
+        isTurboModule // isTurboModule
+      )
+      moduleInfos
     }
+  }
 
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
     return listOf(KeyboardControllerViewManager(reactContext))
   }
 }

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

@@ -9,7 +9,6 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
-import com.reactnativekeyboardcontroller.events.KeyboardTransitionEvent
 
 class KeyboardControllerViewManagerImpl(reactContext: ReactApplicationContext) {
   private val TAG = KeyboardControllerViewManagerImpl::class.qualifiedName
@@ -58,8 +57,12 @@ class KeyboardControllerViewManagerImpl(reactContext: ReactApplicationContext) {
 
   fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
     val map: MutableMap<String, Any> = MapBuilder.of(
-      KeyboardTransitionEvent.EVENT_NAME,
-      MapBuilder.of("registrationName", "onKeyboardMove")
+      "topKeyboardMove",
+      MapBuilder.of("registrationName", "onKeyboardMove"),
+      "topKeyboardMoveStart",
+      MapBuilder.of("registrationName", "onKeyboardMoveStart"),
+      "topKeyboardMoveEnd",
+      MapBuilder.of("registrationName", "onKeyboardMoveEnd"),
     )
 
     return map

package/android/src/main/java/com/reactnativekeyboardcontroller/events/KeyboardTransitionEvent.kt

@@ -4,8 +4,8 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.RCTEventEmitter
 
-class KeyboardTransitionEvent(private val viewId: Int, private val height: Int, private val progress: Double) : Event<KeyboardTransitionEvent>(viewId) {
-  override fun getEventName() = EVENT_NAME
+class KeyboardTransitionEvent(viewId: Int, private val event: String, private val height: Int, private val progress: Double) : Event<KeyboardTransitionEvent>(viewId) {
+  override fun getEventName() = event
 
   // TODO: All events for a given view can be coalesced?
   override fun getCoalescingKey(): Short = 0
@@ -16,8 +16,4 @@ class KeyboardTransitionEvent(private val viewId: Int, private val height: Int,
     map.putInt("height", height)
     rctEventEmitter.receiveEvent(viewTag, eventName, map)
   }
-
-  companion object {
-    const val EVENT_NAME = "topKeyboardMove"
-  }
 }

package/ios/.swiftlint.yml

@@ -1,5 +1,9 @@
 disabled_rules:
   - trailing_comma
 
+line_length:
+  warning: 120
+  ignores_urls: true
+
 excluded:
   - Pods

package/ios/KeyboardController.xcodeproj/project.pbxproj

@@ -187,7 +187,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -230,7 +230,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

package/ios/KeyboardControllerModule.mm

@@ -12,7 +12,7 @@
 // Thanks to this guard, we won't import this header when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
-#import "RNKeyboardControllerSpec.h"
+#import <reactnativekeyboardcontroller/reactnativekeyboardcontroller.h>
 #endif
 
 #import "KeyboardControllerModule-Header.h"

package/ios/KeyboardControllerView.mm

@@ -12,10 +12,10 @@
 #import "KeyboardMoveEvent.h"
 #import "react_native_keyboard_controller-Swift.h"
 
-#import <react/renderer/components/RNKeyboardControllerViewSpec/ComponentDescriptors.h>
-#import <react/renderer/components/RNKeyboardControllerViewSpec/EventEmitters.h>
-#import <react/renderer/components/RNKeyboardControllerViewSpec/Props.h>
-#import <react/renderer/components/RNKeyboardControllerViewSpec/RCTComponentViewHelpers.h>
+#import <react/renderer/components/reactnativekeyboardcontroller/ComponentDescriptors.h>
+#import <react/renderer/components/reactnativekeyboardcontroller/EventEmitters.h>
+#import <react/renderer/components/reactnativekeyboardcontroller/Props.h>
+#import <react/renderer/components/reactnativekeyboardcontroller/RCTComponentViewHelpers.h>
 
 #import <React/RCTBridge+Private.h>
 
@@ -44,13 +44,30 @@ using namespace facebook::react;
     _props = defaultProps;
 
     observer = [[KeyboardMovementObserver alloc]
-        initWithHandler:^(NSNumber *height, NSNumber *progress) {
+        initWithHandler:^(NSString *event, NSNumber *height, NSNumber *progress) {
           if (self->_eventEmitter) {
-            std::dynamic_pointer_cast<const facebook::react::KeyboardControllerViewEventEmitter>(
-                self->_eventEmitter)
-                ->onKeyboardMove(
-                    facebook::react::KeyboardControllerViewEventEmitter::OnKeyboardMove{
-                        .height = [height intValue], .progress = static_cast<Float>(self.tag)});
+            // TODO: use reflection to reduce code duplication?
+            if ([event isEqualToString:@"onKeyboardMoveStart"]) {
+              std::dynamic_pointer_cast<const facebook::react::KeyboardControllerViewEventEmitter>(
+                  self->_eventEmitter)
+                  ->onKeyboardMoveStart(
+                      facebook::react::KeyboardControllerViewEventEmitter::OnKeyboardMoveStart{
+                          .height = [height intValue], .progress = [progress floatValue]});
+            }
+            if ([event isEqualToString:@"onKeyboardMove"]) {
+              std::dynamic_pointer_cast<const facebook::react::KeyboardControllerViewEventEmitter>(
+                  self->_eventEmitter)
+                  ->onKeyboardMove(
+                      facebook::react::KeyboardControllerViewEventEmitter::OnKeyboardMove{
+                          .height = [height intValue], .progress = [progress floatValue]});
+            }
+            if ([event isEqualToString:@"onKeyboardMoveEnd"]) {
+              std::dynamic_pointer_cast<const facebook::react::KeyboardControllerViewEventEmitter>(
+                  self->_eventEmitter)
+                  ->onKeyboardMoveEnd(
+                      facebook::react::KeyboardControllerViewEventEmitter::OnKeyboardMoveEnd{
+                          .height = [height intValue], .progress = [progress floatValue]});
+            }
           }
 
           // TODO: use built-in _eventEmitter once NativeAnimated module will use ModernEventemitter
@@ -58,6 +75,7 @@ using namespace facebook::react;
           if (bridge) {
             KeyboardMoveEvent *keyboardMoveEvent =
                 [[KeyboardMoveEvent alloc] initWithReactTag:@(self.tag)
+                                                      event:event
                                                      height:height
                                                    progress:progress];
             [bridge.eventDispatcher sendEvent:keyboardMoveEvent];

package/ios/KeyboardControllerViewManager.mm

@@ -2,6 +2,8 @@
 
 @interface RCT_EXTERN_MODULE (KeyboardControllerViewManager, RCTViewManager)
 
+RCT_EXPORT_VIEW_PROPERTY(onKeyboardMoveStart, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onKeyboardMove, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onKeyboardMoveEnd, RCTDirectEventBlock);
 
 @end

package/ios/KeyboardControllerViewManager.swift

@@ -12,7 +12,9 @@ class KeyboardControllerViewManager: RCTViewManager {
 class KeyboardControllerView: UIView {
   private var keyboardObserver: KeyboardMovementObserver?
   private var eventDispatcher: RCTEventDispatcherProtocol
+  @objc var onKeyboardMoveStart: RCTDirectEventBlock?
   @objc var onKeyboardMove: RCTDirectEventBlock?
+  @objc var onKeyboardMoveEnd: RCTDirectEventBlock?
 
   init(frame: CGRect, eventDispatcher: RCTEventDispatcherProtocol) {
     self.eventDispatcher = eventDispatcher
@@ -39,10 +41,11 @@ class KeyboardControllerView: UIView {
     }
   }
 
-  func onEvent(height: NSNumber, progress: NSNumber) {
+  func onEvent(event: NSString, height: NSNumber, progress: NSNumber) {
     eventDispatcher.send(
       KeyboardMoveEvent(
         reactTag: reactTag,
+        event: event as String,
         height: height,
         progress: progress
       )

package/ios/KeyboardMoveEvent.h

@@ -12,6 +12,7 @@
 @interface KeyboardMoveEvent : NSObject <RCTEvent>
 
 - (instancetype)initWithReactTag:(NSNumber *)reactTag
+                           event:(NSString *)event
                           height:(NSNumber *)height
                         progress:(NSNumber *)progress;
 

package/ios/KeyboardMoveEvent.m

@@ -19,13 +19,14 @@
 @synthesize eventName = _eventName;
 
 - (instancetype)initWithReactTag:(NSNumber *)reactTag
+                           event:(NSString *)event
                           height:(NSNumber *)height
                         progress:(NSNumber *)progress
 {
   RCTAssertParam(reactTag);
 
   if ((self = [super init])) {
-    _eventName = @"onKeyboardMove";
+    _eventName = [event copy];
     _viewTag = reactTag;
     _progress = progress;
     _height = height;

package/ios/KeyboardMovementObserver.swift

@@ -10,10 +10,31 @@ import Foundation
 
 @objc(KeyboardMovementObserver)
 public class KeyboardMovementObserver: NSObject {
-  var onEvent: (NSNumber, NSNumber) -> Void
+  // class members
+  var onEvent: (NSString, NSNumber, NSNumber) -> Void
   var onNotify: (String, Any) -> Void
+  // progress tracker
+  private var _keyboardView: UIView?
+  private var keyboardView: UIView? {
+    let windowsCount = UIApplication.shared.windows.count
 
-  @objc public init(handler: @escaping (NSNumber, NSNumber) -> Void, onNotify: @escaping (String, Any) -> Void) {
+    if _keyboardView == nil || windowsCount != _windowsCount {
+      _keyboardView = findKeyboardView()
+      _windowsCount = windowsCount
+    }
+
+    return _keyboardView
+  }
+
+  private var _windowsCount: Int = 0
+  private var prevKeyboardPosition = 0.0
+  private var displayLink: CADisplayLink?
+  private var keyboardHeight: CGFloat = 0.0
+
+  @objc public init(
+    handler: @escaping (NSString, NSNumber, NSNumber) -> Void,
+    onNotify: @escaping (String, Any) -> Void
+  ) {
     onEvent = handler
     self.onNotify = onNotify
   }
@@ -53,12 +74,15 @@ public class KeyboardMovementObserver: NSObject {
   @objc func keyboardWillAppear(_ notification: Notification) {
     if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
+      self.keyboardHeight = keyboardHeight
 
       var data = [AnyHashable: Any]()
       data["height"] = keyboardHeight
 
-      onEvent(Float(-keyboardHeight) as NSNumber, 1)
+      onEvent("onKeyboardMoveStart", Float(keyboardHeight) as NSNumber, 1)
       onNotify("KeyboardController::keyboardWillShow", data)
+
+      setupKeyboardWatcher()
     }
   }
 
@@ -66,18 +90,24 @@ public class KeyboardMovementObserver: NSObject {
     var data = [AnyHashable: Any]()
     data["height"] = 0
 
-    onEvent(0, 0)
+    onEvent("onKeyboardMoveStart", 0, 0)
     onNotify("KeyboardController::keyboardWillHide", data)
+
+    setupKeyboardWatcher()
   }
 
   @objc func keyboardDidAppear(_ notification: Notification) {
     if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
       let keyboardHeight = keyboardFrame.cgRectValue.size.height
+      self.keyboardHeight = keyboardHeight
 
       var data = [AnyHashable: Any]()
       data["height"] = keyboardHeight
 
+      onEvent("onKeyboardMoveEnd", keyboardHeight as NSNumber, 1)
       onNotify("KeyboardController::keyboardDidShow", data)
+
+      removeKeyboardWatcher()
     }
   }
 
@@ -85,6 +115,61 @@ public class KeyboardMovementObserver: NSObject {
     var data = [AnyHashable: Any]()
     data["height"] = 0
 
+    onEvent("onKeyboardMoveEnd", 0 as NSNumber, 0)
     onNotify("KeyboardController::keyboardDidHide", data)
+
+    removeKeyboardWatcher()
+  }
+
+  @objc func setupKeyboardWatcher() {
+    displayLink = CADisplayLink(target: self, selector: #selector(updateKeyboardFrame))
+    displayLink?.preferredFramesPerSecond = 120 // will fallback to 60 fps for devices without Pro Motion display
+    displayLink?.add(to: .main, forMode: .common)
+  }
+
+  @objc func removeKeyboardWatcher() {
+    displayLink?.invalidate()
+    displayLink = nil
+  }
+
+  // https://stackoverflow.com/questions/32598490/show-uiview-with-buttons-over-keyboard-like-in-skype-viber-messengers-swift-i
+  func findKeyboardView() -> UIView? {
+    var result: UIView?
+
+    let windows = UIApplication.shared.windows
+    for window in windows {
+      if window.description.hasPrefix("<UITextEffectsWindow") {
+        for subview in window.subviews {
+          if subview.description.hasPrefix("<UIInputSetContainerView") {
+            for hostView in subview.subviews {
+              if hostView.description.hasPrefix("<UIInputSetHostView") {
+                result = hostView as? UIView
+                break
+              }
+            }
+            break
+          }
+        }
+        break
+      }
+    }
+    return result
+  }
+
+  @objc func updateKeyboardFrame() {
+    if keyboardView == nil {
+      return
+    }
+
+    var keyboardFrameY = keyboardView!.layer.presentation()!.frame.origin.y
+    var keyboardWindowH = keyboardView!.window!.bounds.size.height
+    var keyboardPosition = keyboardWindowH - keyboardFrameY
+
+    if keyboardPosition == prevKeyboardPosition || keyboardFrameY == 0 {
+      return
+    }
+
+    prevKeyboardPosition = keyboardPosition
+    onEvent("onKeyboardMove", keyboardPosition as NSNumber, keyboardPosition / CGFloat(keyboardHeight) as NSNumber)
   }
 }

package/lib/commonjs/animated.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useReanimatedKeyboardAnimation = exports.useKeyboardAnimation = exports.styles = exports.KeyboardProvider = exports.KeyboardContext = void 0;
+exports.styles = exports.KeyboardProvider = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -11,6 +11,10 @@ var _reactNative = require("react-native");
 
 var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
 
+var _context = require("./context");
+
+var _internal = require("./internal");
+
 var _native = require("./native");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -19,59 +23,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 const KeyboardControllerViewAnimated = _reactNativeReanimated.default.createAnimatedComponent(_reactNative.Animated.createAnimatedComponent(_native.KeyboardControllerView));
 
-const defaultContext = {
-  animated: {
-    progress: new _reactNative.Animated.Value(0),
-    height: new _reactNative.Animated.Value(0)
-  },
-  reanimated: {
-    progress: {
-      value: 0
-    },
-    height: {
-      value: 0
-    }
-  }
-};
-
-const KeyboardContext = /*#__PURE__*/_react.default.createContext(defaultContext);
-
-exports.KeyboardContext = KeyboardContext;
-
-const useKeyboardAnimation = () => {
-  (0, _native.useResizeMode)();
-  const context = (0, _react.useContext)(KeyboardContext);
-  return context.animated;
-};
-
-exports.useKeyboardAnimation = useKeyboardAnimation;
-
-const useReanimatedKeyboardAnimation = () => {
-  (0, _native.useResizeMode)();
-  const context = (0, _react.useContext)(KeyboardContext);
-  return context.reanimated;
-};
-
-exports.useReanimatedKeyboardAnimation = useReanimatedKeyboardAnimation;
-
-function useAnimatedKeyboardHandler(handlers, dependencies) {
-  const {
-    context,
-    doDependenciesDiffer
-  } = (0, _reactNativeReanimated.useHandler)(handlers, dependencies);
-  return (0, _reactNativeReanimated.useEvent)(event => {
-    'worklet';
-
-    const {
-      onKeyboardMove
-    } = handlers;
-
-    if (onKeyboardMove && event.eventName.endsWith('onKeyboardMove')) {
-      onKeyboardMove(event, context);
-    }
-  }, ['onKeyboardMove'], doDependenciesDiffer);
-}
-
 const styles = _reactNative.StyleSheet.create({
   container: {
     flex: 1
@@ -89,19 +40,27 @@ const KeyboardProvider = _ref => {
     children,
     statusBarTranslucent
   } = _ref;
+  // animated values
   const progress = (0, _react.useRef)(new _reactNative.Animated.Value(0)).current;
-  const height = (0, _react.useRef)(new _reactNative.Animated.Value(0)).current;
+  const height = (0, _react.useRef)(new _reactNative.Animated.Value(0)).current; // shared values
+
   const progressSV = (0, _reactNativeReanimated.useSharedValue)(0);
   const heightSV = (0, _reactNativeReanimated.useSharedValue)(0);
+  const {
+    setHandlers,
+    broadcast
+  } = (0, _internal.useSharedHandlers)(); // memo
+
   const context = (0, _react.useMemo)(() => ({
     animated: {
       progress: progress,
-      height: height
+      height: _reactNative.Animated.multiply(height, -1)
     },
     reanimated: {
       progress: progressSV,
       height: heightSV
-    }
+    },
+    setHandlers
   }), []);
   const style = (0, _react.useMemo)(() => [styles.hidden, {
     transform: [{
@@ -117,20 +76,42 @@ const KeyboardProvider = _ref => {
     }
   }], {
     useNativeDriver: true
-  }), []);
-  const handler = useAnimatedKeyboardHandler({
+  }), []); // handlers
+
+  const updateSharedValues = (event, platforms) => {
+    'worklet';
+
+    if (platforms.includes(_reactNative.Platform.OS)) {
+      progressSV.value = event.progress;
+      heightSV.value = -event.height;
+    }
+  };
+
+  const handler = (0, _internal.useAnimatedKeyboardHandler)({
+    onKeyboardMoveStart: event => {
+      'worklet';
+
+      broadcast('onStart', event);
+      updateSharedValues(event, ['ios']);
+    },
     onKeyboardMove: event => {
       'worklet';
 
-      progressSV.value = event.progress;
-      heightSV.value = event.height;
+      broadcast('onMove', event);
+      updateSharedValues(event, ['android']);
+    },
+    onKeyboardMoveEnd: event => {
+      'worklet';
+
+      broadcast('onEnd', event);
     }
   }, []);
-  return /*#__PURE__*/_react.default.createElement(KeyboardContext.Provider, {
+  return /*#__PURE__*/_react.default.createElement(_context.KeyboardContext.Provider, {
     value: context
   }, /*#__PURE__*/_react.default.createElement(KeyboardControllerViewAnimated, {
     onKeyboardMoveReanimated: handler,
-    onKeyboardMove: onKeyboardMove,
+    onKeyboardMoveStart: _reactNative.Platform.OS === 'ios' ? onKeyboardMove : undefined,
+    onKeyboardMove: _reactNative.Platform.OS === 'android' ? onKeyboardMove : undefined,
     statusBarTranslucent: statusBarTranslucent,
     style: styles.container
   }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactNative.Animated.View, {