react-native-keyboard-controller 1.1.0 → 1.3.0

package/src/native.ts

@@ -1,81 +1,57 @@
-import { useEffect } from 'react';
-import {
-  requireNativeComponent,
-  UIManager,
-  Platform,
-  NativeModules,
-  NativeEventEmitter,
-  NativeSyntheticEvent,
-  ViewProps,
-} from 'react-native';
+import { Platform, NativeEventEmitter } from 'react-native';
+
+import type {
+  KeyboardControllerEvents,
+  KeyboardControllerModule,
+  KeyboardEventData,
+} from './types';
 
 const LINKING_ERROR =
   `The package 'react-native-keyboard-controller' doesn't seem to be linked. Make sure: \n\n` +
   Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
   '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo managed workflow\n';
+  '- You are not using Expo Go\n';
 
+// copied from `android.view.WindowManager.LayoutParams`
 export enum AndroidSoftInputModes {
   SOFT_INPUT_ADJUST_NOTHING = 48,
   SOFT_INPUT_ADJUST_PAN = 32,
   SOFT_INPUT_ADJUST_RESIZE = 16,
   SOFT_INPUT_ADJUST_UNSPECIFIED = 0,
+  SOFT_INPUT_IS_FORWARD_NAVIGATION = 256,
+  SOFT_INPUT_MASK_ADJUST = 240,
+  SOFT_INPUT_MASK_STATE = 15,
+  SOFT_INPUT_MODE_CHANGED = 512,
+  SOFT_INPUT_STATE_ALWAYS_HIDDEN = 3,
+  SOFT_INPUT_STATE_ALWAYS_VISIBLE = 5,
+  SOFT_INPUT_STATE_HIDDEN = 2,
+  SOFT_INPUT_STATE_UNCHANGED = 1,
+  SOFT_INPUT_STATE_UNSPECIFIED = 0,
+  SOFT_INPUT_STATE_VISIBLE = 4,
 }
 
-export type NativeEvent = {
-  progress: number;
-  height: number;
-};
-export type EventWithName<T> = {
-  eventName: string;
-} & T;
-export type KeyboardControllerProps = {
-  onKeyboardMove: (e: NativeSyntheticEvent<EventWithName<NativeEvent>>) => void;
-  // fake prop used to activate reanimated bindings
-  onKeyboardMoveReanimated: (
-    e: NativeSyntheticEvent<EventWithName<NativeEvent>>
-  ) => void;
-  statusBarTranslucent?: boolean;
-} & ViewProps;
-type KeyboardController = {
-  // android only
-  setDefaultMode: () => void;
-  setInputMode: (mode: AndroidSoftInputModes) => void;
-};
-
-const ComponentName = 'KeyboardControllerView';
-
-const RCTKeyboardController = NativeModules.KeyboardController;
-export const KeyboardController = RCTKeyboardController as KeyboardController;
+const RCTKeyboardController =
+  require('./specs/NativeKeyboardController').default;
+export const KeyboardController = (
+  RCTKeyboardController
+    ? RCTKeyboardController
+    : new Proxy(
+        {},
+        {
+          get() {
+            throw new Error(LINKING_ERROR);
+          },
+        }
+      )
+) as KeyboardControllerModule;
+
+const eventEmitter = new NativeEventEmitter(KeyboardController);
 
-const eventEmitter = new NativeEventEmitter(RCTKeyboardController);
-type KeyboardControllerEvents =
-  | 'keyboardWillShow'
-  | 'keyboardDidShow'
-  | 'keyboardWillHide'
-  | 'keyboardDidHide';
-type KeyboardEvent = {
-  height: number;
-};
 export const KeyboardEvents = {
   addListener: (
     name: KeyboardControllerEvents,
-    cb: (e: KeyboardEvent) => void
+    cb: (e: KeyboardEventData) => void
   ) => eventEmitter.addListener('KeyboardController::' + name, cb),
 };
 export const KeyboardControllerView =
-  UIManager.getViewManagerConfig(ComponentName) != null
-    ? requireNativeComponent<KeyboardControllerProps>(ComponentName)
-    : () => {
-        throw new Error(LINKING_ERROR);
-      };
-
-export const useResizeMode = () => {
-  useEffect(() => {
-    KeyboardController.setInputMode(
-      AndroidSoftInputModes.SOFT_INPUT_ADJUST_RESIZE
-    );
-
-    return () => KeyboardController.setDefaultMode();
-  }, []);
-};
+  require('./specs/KeyboardControllerViewNativeComponent').default;

package/src/replicas.ts

@@ -8,7 +8,7 @@ import {
   useWorkletCallback,
   withSpring,
 } from 'react-native-reanimated';
-import { useReanimatedKeyboardAnimation } from './animated';
+import { useReanimatedKeyboardAnimation } from './hooks';
 
 import { AndroidSoftInputModes, KeyboardController } from './native';
 

package/src/specs/KeyboardControllerViewNativeComponent.ts

@@ -0,0 +1,23 @@
+import type { HostComponent } from 'react-native';
+// @ts-expect-error - no type definition
+import type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes';
+import type {
+  DirectEventHandler,
+  Float,
+  Int32,
+} from 'react-native/Libraries/Types/CodegenTypes';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+
+type KeyboardMoveEvent = Readonly<{
+  height: Int32;
+  progress: Float;
+}>;
+
+export interface NativeProps extends ViewProps {
+  statusBarTranslucent?: boolean;
+  onKeyboardMove?: DirectEventHandler<KeyboardMoveEvent>;
+}
+
+export default codegenNativeComponent<NativeProps>(
+  'KeyboardControllerView'
+) as HostComponent<NativeProps>;

package/src/specs/NativeKeyboardController.ts

@@ -0,0 +1,16 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  readonly getConstants: () => {};
+
+  // methods
+  setInputMode(mode: number): void;
+  setDefaultMode(): void;
+
+  // event emitter
+  addListener: (eventName: string) => void;
+  removeListeners: (count: number) => void;
+}
+
+export default TurboModuleRegistry.get<Spec>('KeyboardController');

package/src/specs/NativeStatusBarManagerCompat.ts

@@ -0,0 +1,13 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  readonly getConstants: () => {};
+
+  setHidden(hidden: boolean): void;
+  setColor(color: number, animated: boolean): void;
+  setTranslucent(translucent: boolean): void;
+  setStyle(style: string): void;
+}
+
+export default TurboModuleRegistry.get<Spec>('StatusBarManagerCompat');

package/src/types.ts

@@ -0,0 +1,42 @@
+import type { NativeSyntheticEvent, ViewProps } from 'react-native';
+
+// DirectEventHandler events declaration
+
+export type NativeEvent = {
+  progress: number;
+  height: number;
+};
+export type EventWithName<T> = {
+  eventName: string;
+} & T;
+
+// native View/Module declarations
+
+export type KeyboardControllerProps = {
+  onKeyboardMove: (e: NativeSyntheticEvent<EventWithName<NativeEvent>>) => void;
+  // fake prop used to activate reanimated bindings
+  onKeyboardMoveReanimated: (
+    e: NativeSyntheticEvent<EventWithName<NativeEvent>>
+  ) => void;
+  statusBarTranslucent?: boolean;
+} & ViewProps;
+
+export type KeyboardControllerModule = {
+  // android only
+  setDefaultMode: () => void;
+  setInputMode: (mode: number) => void;
+  // native event module stuff
+  addListener: (eventName: string) => void;
+  removeListeners: (count: number) => void;
+};
+
+// Event module declarations
+
+export type KeyboardControllerEvents =
+  | 'keyboardWillShow'
+  | 'keyboardDidShow'
+  | 'keyboardWillHide'
+  | 'keyboardDidHide';
+export type KeyboardEventData = {
+  height: number;
+};

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/android/gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"

package/android/gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

package/ios/KeyboardControllerModule.m

@@ -1,21 +0,0 @@
-//
-//  RCTBridge.m
-//  KeyboardController
-//
-//  Created by Kiryl Ziusko on 22.04.22.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
-
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-
-@interface RCT_EXTERN_MODULE (KeyboardController, RCTEventEmitter)
-
-// Android stubs
-RCT_EXTERN_METHOD(setInputMode : (nonnull NSNumber *)mode)
-RCT_EXTERN_METHOD(setDefaultMode)
-
-// event emitter
-RCT_EXTERN_METHOD(supportedEvents)
-
-@end

package/ios/KeyboardControllerModule.swift

@@ -1,53 +0,0 @@
-//
-//  KeyboardController.swift
-//  KeyboardController
-//
-//  Created by Kiryl Ziusko on 22.04.22.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
-
-import AVFoundation
-import Foundation
-import UIKit
-
-@objc(KeyboardController)
-class KeyboardController: RCTEventEmitter {
-  public static var shared: KeyboardController?
-  private var hasListeners = false
-
-  override class func requiresMainQueueSetup() -> Bool {
-    return false
-  }
-
-  override init() {
-    super.init()
-    KeyboardController.shared = self
-  }
-
-  // Android stubs
-  @objc func setInputMode(_: NSNumber!) {}
-  @objc func setDefaultMode() {}
-
-  @objc override open func supportedEvents() -> [String] {
-    return [
-      "KeyboardController::keyboardWillShow",
-      "KeyboardController::keyboardDidShow",
-      "KeyboardController::keyboardWillHide",
-      "KeyboardController::keyboardDidHide",
-    ]
-  }
-
-  @objc override open func startObserving() {
-    hasListeners = true
-  }
-
-  @objc override open func stopObserving() {
-    hasListeners = false
-  }
-
-  @objc override open func sendEvent(withName name: String!, body: Any!) {
-    if hasListeners {
-      super.sendEvent(withName: name, body: body)
-    }
-  }
-}

package/ios/KeyboardMoveEvent.swift

@@ -1,41 +0,0 @@
-//
-//  KeyboardMoveEvent.swift
-//  KeyboardController
-//
-//  Created by Kiryl Ziusko on 26.04.22.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
-
-class KeyboardMoveEvent: NSObject, RCTEvent {
-  var viewTag: NSNumber!
-  var eventName: String = "onKeyboardMove"
-  var coalescingKey: UInt16 = 0
-  var height: NSNumber!
-  var progress: NSNumber!
-
-  func canCoalesce() -> Bool {
-    return false
-  }
-
-  func coalesce(with newEvent: RCTEvent!) -> RCTEvent! {
-    return newEvent
-  }
-
-  static func moduleDotMethod() -> String! {
-    return "RCTEventEmitter.receiveEvent"
-  }
-
-  func arguments() -> [Any]! {
-    return [
-      viewTag,
-      RCTNormalizeInputEventName(eventName),
-      ["height": height, "progress": progress],
-    ]
-  }
-
-  init(viewTag: NSNumber, height: NSNumber, progress: NSNumber) {
-    self.viewTag = viewTag
-    self.height = height
-    self.progress = progress
-  }
-}