@react-native-ohos/react-native-keyboard-controller 1.17.0-beta.2 → 1.17.0

package/src/module.ts

@@ -1,52 +1,64 @@
-import { KeyboardControllerNative, KeyboardEvents } from "./bindings";
-
-import type {
-  DismissOptions,
-  KeyboardControllerModule,
-  KeyboardEventData,
-} from "./types";
-
-let isClosed = false;
-let lastEvent: KeyboardEventData | null = null;
-
-KeyboardEvents.addListener("keyboardDidHide", (e) => {
-  isClosed = true;
-  lastEvent = e;
-});
-
-KeyboardEvents.addListener("keyboardDidShow", (e) => {
-  isClosed = false;
-  lastEvent = e;
-});
-
-const dismiss = async (
-  { keepFocus }: DismissOptions = { keepFocus: false },
-): Promise<void> => {
-  return new Promise((resolve) => {
-    if (isClosed) {
-      resolve();
-
-      return;
-    }
-
-    const subscription = KeyboardEvents.addListener("keyboardDidHide", () => {
-      resolve(undefined);
-      subscription.remove();
-    });
-
-    KeyboardControllerNative.dismiss(keepFocus);
-  });
-};
-const isVisible = () => !isClosed;
-const state = () => lastEvent;
-
-export const KeyboardController: KeyboardControllerModule = {
-  setDefaultMode: KeyboardControllerNative.setDefaultMode,
-  setInputMode: KeyboardControllerNative.setInputMode,
-  setFocusTo: KeyboardControllerNative.setFocusTo,
-  dismiss,
-  isVisible,
-  state,
-  addListener: KeyboardControllerNative.addListener,
-  removeListeners: KeyboardControllerNative.removeListeners,
-};
+import { KeyboardControllerNative, KeyboardEvents } from "./bindings";
+
+import type {
+  DismissOptions,
+  KeyboardControllerModule,
+  KeyboardEventData,
+} from "./types";
+
+let isClosed = true;
+let lastState: KeyboardEventData = {
+  height: 0,
+  tag: -1,
+  duration: 0,
+  timestamp: new Date().getTime(),
+  target: -1,
+  type: "default",
+  appearance: "light",
+};
+
+KeyboardEvents.addListener("keyboardDidHide", (e) => {
+  isClosed = true;
+  lastState = e;
+});
+
+KeyboardEvents.addListener("keyboardDidShow", (e) => {
+  isClosed = false;
+  lastState = e;
+});
+
+const dismiss = async (options?: Partial<DismissOptions>): Promise<void> => {
+  const keepFocus = options?.keepFocus ?? false;
+  const animated = options?.animated ?? true;
+
+  return new Promise((resolve) => {
+    if (isClosed) {
+      resolve();
+
+      return;
+    }
+
+    const subscription = KeyboardEvents.addListener("keyboardDidHide", () => {
+      resolve(undefined);
+      subscription.remove();
+    });
+
+    KeyboardControllerNative.dismiss(keepFocus, animated);
+  });
+};
+const isVisible = () => !isClosed;
+const state = () => lastState;
+const preload = KeyboardControllerNative.preload ?? (() => {});
+
+export const KeyboardController: KeyboardControllerModule = {
+  setDefaultMode: KeyboardControllerNative.setDefaultMode,
+  setInputMode: KeyboardControllerNative.setInputMode,
+  setFocusTo: KeyboardControllerNative.setFocusTo,
+  preload,
+  dismiss,
+  isVisible,
+  state,
+  addListener: KeyboardControllerNative.addListener,
+  removeListeners: KeyboardControllerNative.removeListeners,
+  getConstants: KeyboardControllerNative.getConstants,
+};

package/src/reanimated.native.ts

@@ -1,132 +1,132 @@
-import { useEvent, useHandler } from "react-native-reanimated";
-
-import type {
-  EventWithName,
-  FocusedInputLayoutChangedEvent,
-  FocusedInputLayoutHandlerHook,
-  FocusedInputSelectionChangedEvent,
-  FocusedInputSelectionHandlerHook,
-  FocusedInputTextChangedEvent,
-  FocusedInputTextHandlerHook,
-  KeyboardHandlerHook,
-  NativeEvent,
-} from "./types";
-
-type EventContext = Record<string, unknown>;
-
-export const useAnimatedKeyboardHandler: KeyboardHandlerHook<
-  EventContext,
-  EventWithName<NativeEvent>
-> = (handlers, dependencies) => {
-  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
-
-  return useEvent(
-    (event) => {
-      "worklet";
-      const {
-        onKeyboardMoveStart,
-        onKeyboardMove,
-        onKeyboardMoveEnd,
-        onKeyboardMoveInteractive,
-      } = handlers;
-
-      if (
-        onKeyboardMoveStart &&
-        event.eventName.endsWith("onKeyboardMoveStart")
-      ) {
-        onKeyboardMoveStart(event, context);
-      }
-
-      if (onKeyboardMove && event.eventName.endsWith("onKeyboardMove")) {
-        onKeyboardMove(event, context);
-      }
-
-      if (onKeyboardMoveEnd && event.eventName.endsWith("onKeyboardMoveEnd")) {
-        onKeyboardMoveEnd(event, context);
-      }
-
-      if (
-        onKeyboardMoveInteractive &&
-        event.eventName.endsWith("onKeyboardMoveInteractive")
-      ) {
-        onKeyboardMoveInteractive(event, context);
-      }
-    },
-    [
-      "onKeyboardMoveStart",
-      "onKeyboardMove",
-      "onKeyboardMoveEnd",
-      "onKeyboardMoveInteractive",
-    ],
-    doDependenciesDiffer,
-  );
-};
-
-export const useFocusedInputLayoutHandler: FocusedInputLayoutHandlerHook<
-  EventContext,
-  EventWithName<FocusedInputLayoutChangedEvent>
-> = (handlers, dependencies) => {
-  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
-
-  return useEvent(
-    (event) => {
-      "worklet";
-      const { onFocusedInputLayoutChanged } = handlers;
-
-      if (
-        onFocusedInputLayoutChanged &&
-        event.eventName.endsWith("onFocusedInputLayoutChanged")
-      ) {
-        onFocusedInputLayoutChanged(event, context);
-      }
-    },
-    ["onFocusedInputLayoutChanged"],
-    doDependenciesDiffer,
-  );
-};
-
-export const useFocusedInputTextHandler: FocusedInputTextHandlerHook<
-  EventContext,
-  EventWithName<FocusedInputTextChangedEvent>
-> = (handlers, dependencies) => {
-  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
-
-  return useEvent(
-    (event) => {
-      "worklet";
-      const { onFocusedInputTextChanged } = handlers;
-
-      if (
-        onFocusedInputTextChanged &&
-        event.eventName.endsWith("onFocusedInputTextChanged")
-      ) {
-        onFocusedInputTextChanged(event, context);
-      }
-    },
-    ["onFocusedInputTextChanged"],
-    doDependenciesDiffer,
-  );
-};
-
-export const useFocusedInputSelectionHandler: FocusedInputSelectionHandlerHook<
-  EventContext,
-  EventWithName<FocusedInputSelectionChangedEvent>
-> = (handlers, dependencies) => {
-  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
-
-  return useEvent(
-    (event) => {
-      "worklet";
-      const { onFocusedInputSelectionChanged } = handlers;
-
-      if (
-        onFocusedInputSelectionChanged &&
-        event.eventName.endsWith("onFocusedInputSelectionChanged")
-      ) {
-        onFocusedInputSelectionChanged(event, context);
-      }
-    },
-    ["onFocusedInputSelectionChanged"],
-    doDependenciesDiffer,
-  );
-};
+import { useEvent, useHandler } from "react-native-reanimated";
+
+import type {
+  EventWithName,
+  FocusedInputLayoutChangedEvent,
+  FocusedInputLayoutHandlerHook,
+  FocusedInputSelectionChangedEvent,
+  FocusedInputSelectionHandlerHook,
+  FocusedInputTextChangedEvent,
+  FocusedInputTextHandlerHook,
+  KeyboardHandlerHook,
+  NativeEvent,
+} from "./types";
+
+type EventContext = Record<string, unknown>;
+
+export const useAnimatedKeyboardHandler: KeyboardHandlerHook<
+  EventContext,
+  EventWithName<NativeEvent>
+> = (handlers, dependencies) => {
+  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
+
+  return useEvent(
+    (event) => {
+      "worklet";
+      const {
+        onKeyboardMoveStart,
+        onKeyboardMove,
+        onKeyboardMoveEnd,
+        onKeyboardMoveInteractive,
+      } = handlers;
+
+      if (
+        onKeyboardMoveStart &&
+        event.eventName.endsWith("onKeyboardMoveStart")
+      ) {
+        onKeyboardMoveStart(event, context);
+      }
+
+      if (onKeyboardMove && event.eventName.endsWith("onKeyboardMove")) {
+        onKeyboardMove(event, context);
+      }
+
+      if (onKeyboardMoveEnd && event.eventName.endsWith("onKeyboardMoveEnd")) {
+        onKeyboardMoveEnd(event, context);
+      }
+
+      if (
+        onKeyboardMoveInteractive &&
+        event.eventName.endsWith("onKeyboardMoveInteractive")
+      ) {
+        onKeyboardMoveInteractive(event, context);
+      }
+    },
+    [
+      "onKeyboardMoveStart",
+      "onKeyboardMove",
+      "onKeyboardMoveEnd",
+      "onKeyboardMoveInteractive",
+    ],
+    doDependenciesDiffer,
+  );
+};
+
+export const useFocusedInputLayoutHandler: FocusedInputLayoutHandlerHook<
+  EventContext,
+  EventWithName<FocusedInputLayoutChangedEvent>
+> = (handlers, dependencies) => {
+  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
+
+  return useEvent(
+    (event) => {
+      "worklet";
+      const { onFocusedInputLayoutChanged } = handlers;
+
+      if (
+        onFocusedInputLayoutChanged &&
+        event.eventName.endsWith("onFocusedInputLayoutChanged")
+      ) {
+        onFocusedInputLayoutChanged(event, context);
+      }
+    },
+    ["onFocusedInputLayoutChanged"],
+    doDependenciesDiffer,
+  );
+};
+
+export const useFocusedInputTextHandler: FocusedInputTextHandlerHook<
+  EventContext,
+  EventWithName<FocusedInputTextChangedEvent>
+> = (handlers, dependencies) => {
+  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
+
+  return useEvent(
+    (event) => {
+      "worklet";
+      const { onFocusedInputTextChanged } = handlers;
+
+      if (
+        onFocusedInputTextChanged &&
+        event.eventName.endsWith("onFocusedInputTextChanged")
+      ) {
+        onFocusedInputTextChanged(event, context);
+      }
+    },
+    ["onFocusedInputTextChanged"],
+    doDependenciesDiffer,
+  );
+};
+
+export const useFocusedInputSelectionHandler: FocusedInputSelectionHandlerHook<
+  EventContext,
+  EventWithName<FocusedInputSelectionChangedEvent>
+> = (handlers, dependencies) => {
+  const { context, doDependenciesDiffer } = useHandler(handlers, dependencies);
+
+  return useEvent(
+    (event) => {
+      "worklet";
+      const { onFocusedInputSelectionChanged } = handlers;
+
+      if (
+        onFocusedInputSelectionChanged &&
+        event.eventName.endsWith("onFocusedInputSelectionChanged")
+      ) {
+        onFocusedInputSelectionChanged(event, context);
+      }
+    },
+    ["onFocusedInputSelectionChanged"],
+    doDependenciesDiffer,
+  );
+};

package/src/reanimated.ts

@@ -1,29 +1,29 @@
-import type {
-  EventWithName,
-  FocusedInputLayoutChangedEvent,
-  FocusedInputLayoutHandlerHook,
-  FocusedInputSelectionChangedEvent,
-  FocusedInputSelectionHandlerHook,
-  FocusedInputTextChangedEvent,
-  FocusedInputTextHandlerHook,
-  KeyboardHandlerHook,
-  NativeEvent,
-} from "./types";
-
-const NOOP = () => () => {};
-export const useAnimatedKeyboardHandler: KeyboardHandlerHook<
-  Record<string, unknown>,
-  EventWithName<NativeEvent>
-> = NOOP;
-export const useFocusedInputLayoutHandler: FocusedInputLayoutHandlerHook<
-  Record<string, unknown>,
-  EventWithName<FocusedInputLayoutChangedEvent>
-> = NOOP;
-export const useFocusedInputTextHandler: FocusedInputTextHandlerHook<
-  Record<string, unknown>,
-  EventWithName<FocusedInputTextChangedEvent>
-> = NOOP;
-export const useFocusedInputSelectionHandler: FocusedInputSelectionHandlerHook<
-  Record<string, unknown>,
-  EventWithName<FocusedInputSelectionChangedEvent>
-> = NOOP;
+import type {
+  EventWithName,
+  FocusedInputLayoutChangedEvent,
+  FocusedInputLayoutHandlerHook,
+  FocusedInputSelectionChangedEvent,
+  FocusedInputSelectionHandlerHook,
+  FocusedInputTextChangedEvent,
+  FocusedInputTextHandlerHook,
+  KeyboardHandlerHook,
+  NativeEvent,
+} from "./types";
+
+const NOOP = () => () => {};
+export const useAnimatedKeyboardHandler: KeyboardHandlerHook<
+  Record<string, unknown>,
+  EventWithName<NativeEvent>
+> = NOOP;
+export const useFocusedInputLayoutHandler: FocusedInputLayoutHandlerHook<
+  Record<string, unknown>,
+  EventWithName<FocusedInputLayoutChangedEvent>
+> = NOOP;
+export const useFocusedInputTextHandler: FocusedInputTextHandlerHook<
+  Record<string, unknown>,
+  EventWithName<FocusedInputTextChangedEvent>
+> = NOOP;
+export const useFocusedInputSelectionHandler: FocusedInputSelectionHandlerHook<
+  Record<string, unknown>,
+  EventWithName<FocusedInputSelectionChangedEvent>
+> = NOOP;

package/src/specs/ClippingScrollViewDecoratorViewNativeComponent.ts

@@ -0,0 +1,19 @@
+import { codegenNativeComponent } from "react-native";
+
+import type { HostComponent } from "react-native";
+import type { ViewProps } from "react-native";
+import type { Double } from "react-native/Libraries/Types/CodegenTypes";
+
+export interface NativeProps extends ViewProps {
+  contentInsetBottom: Double;
+  contentInsetTop: Double;
+  applyWorkaroundForContentInsetHitTestBug?: boolean;
+}
+
+export default codegenNativeComponent<NativeProps>(
+  "ClippingScrollViewDecoratorView",
+  {
+    interfaceOnly: true,
+    excludedPlatforms: ["iOS"],
+  },
+) as HostComponent<NativeProps>;

package/src/specs/KeyboardControllerViewNativeComponent.ts

@@ -1,71 +1,82 @@
-import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
-
-import type { HostComponent } from "react-native";
-import type { ViewProps } from "react-native/Libraries/Components/View/ViewPropTypes";
-import type {
-  DirectEventHandler,
-  Double,
-  Int32,
-} from "react-native/Libraries/Types/CodegenTypes";
-
-type KeyboardMoveEvent = Readonly<{
-  height: Double;
-  progress: Double;
-  duration: Int32;
-  target: Int32;
-}>;
-
-type FocusedInputLayoutChangedEvent = Readonly<{
-  target: Int32;
-  parentScrollViewTarget: Int32;
-  layout: {
-    x: Double;
-    y: Double;
-    width: Double;
-    height: Double;
-    absoluteX: Double;
-    absoluteY: Double;
-  };
-}>;
-
-type FocusedInputTextChangedEvent = Readonly<{
-  text: string;
-}>;
-
-type FocusedInputSelectionChangedEvent = Readonly<{
-  target: Int32;
-  selection: {
-    start: {
-      x: Double;
-      y: Double;
-      position: Int32;
-    };
-    end: {
-      x: Double;
-      y: Double;
-      position: Int32;
-    };
-  };
-}>;
-
-export interface NativeProps extends ViewProps {
-  // props
-  enabled?: boolean;
-  statusBarTranslucent?: boolean;
-  navigationBarTranslucent?: boolean;
-  preserveEdgeToEdge?: boolean;
-  // callbacks
-  /// keyboard
-  onKeyboardMoveStart?: DirectEventHandler<KeyboardMoveEvent>;
-  onKeyboardMove?: DirectEventHandler<KeyboardMoveEvent>;
-  onKeyboardMoveEnd?: DirectEventHandler<KeyboardMoveEvent>;
-  onKeyboardMoveInteractive?: DirectEventHandler<KeyboardMoveEvent>;
-  /// focused input
-  onFocusedInputLayoutChanged?: DirectEventHandler<FocusedInputLayoutChangedEvent>;
-  onFocusedInputTextChanged?: DirectEventHandler<FocusedInputTextChangedEvent>;
-  onFocusedInputSelectionChanged?: DirectEventHandler<FocusedInputSelectionChangedEvent>;
-}
-
-export default codegenNativeComponent<NativeProps>(
-  "RNKeyboardControllerView",
-) as HostComponent<NativeProps>;
+import codegenNativeCommands from "react-native/Libraries/Utilities/codegenNativeCommands";
+import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
+
+import type { HostComponent } from "react-native";
+import type { ViewProps } from "react-native/Libraries/Components/View/ViewPropTypes";
+import type {
+  DirectEventHandler,
+  Double,
+  Int32,
+} from "react-native/Libraries/Types/CodegenTypes";
+
+type KeyboardMoveEvent = Readonly<{
+  height: Double;
+  progress: Double;
+  duration: Int32;
+  target: Int32;
+}>;
+
+type FocusedInputLayoutChangedEvent = Readonly<{
+  target: Int32;
+  parentScrollViewTarget: Int32;
+  layout: {
+    x: Double;
+    y: Double;
+    width: Double;
+    height: Double;
+    absoluteX: Double;
+    absoluteY: Double;
+  };
+}>;
+
+type FocusedInputTextChangedEvent = Readonly<{
+  text: string;
+}>;
+
+type FocusedInputSelectionChangedEvent = Readonly<{
+  target: Int32;
+  selection: {
+    start: {
+      x: Double;
+      y: Double;
+      position: Int32;
+    };
+    end: {
+      x: Double;
+      y: Double;
+      position: Int32;
+    };
+  };
+}>;
+
+export interface NativeProps extends ViewProps {
+  // props
+  enabled?: boolean;
+  statusBarTranslucent?: boolean;
+  navigationBarTranslucent?: boolean;
+  preserveEdgeToEdge?: boolean;
+  // callbacks
+  /// keyboard
+  onKeyboardMoveStart?: DirectEventHandler<KeyboardMoveEvent>;
+  onKeyboardMove?: DirectEventHandler<KeyboardMoveEvent>;
+  onKeyboardMoveEnd?: DirectEventHandler<KeyboardMoveEvent>;
+  onKeyboardMoveInteractive?: DirectEventHandler<KeyboardMoveEvent>;
+  /// focused input
+  onFocusedInputLayoutChanged?: DirectEventHandler<FocusedInputLayoutChangedEvent>;
+  onFocusedInputTextChanged?: DirectEventHandler<FocusedInputTextChangedEvent>;
+  onFocusedInputSelectionChanged?: DirectEventHandler<FocusedInputSelectionChangedEvent>;
+}
+
+interface NativeCommands {
+  synchronizeFocusedInputLayout: (
+    viewRef: React.ElementRef<HostComponent<NativeProps>>,
+  ) => void;
+}
+
+export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
+  supportedCommands: ["synchronizeFocusedInputLayout"],
+});
+
+export default codegenNativeComponent<NativeProps>("RNKeyboardControllerView", {
+  interfaceOnly: true,
+}) as HostComponent<NativeProps>;

package/src/specs/KeyboardGestureAreaNativeComponent.ts

@@ -1,20 +1,21 @@
-import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
-
-import type { HostComponent } from "react-native";
-import type { ViewProps } from "react-native/Libraries/Components/View/ViewPropTypes";
-import type {
-  Double,
-  WithDefault,
-} from "react-native/Libraries/Types/CodegenTypes";
-
-export interface NativeProps extends ViewProps {
-  interpolator?: WithDefault<"linear" | "ios", "linear">;
-  showOnSwipeUp?: boolean;
-  enableSwipeToDismiss?: boolean;
-  offset?: Double;
-  textInputNativeID?: string;
-}
-
-export default codegenNativeComponent<NativeProps>("RNKeyboardGestureArea", {
-  excludedPlatforms: ["iOS"],
-}) as HostComponent<NativeProps>;
+import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
+
+import type { HostComponent } from "react-native";
+import type { ViewProps } from "react-native/Libraries/Components/View/ViewPropTypes";
+import type {
+  Double,
+  WithDefault,
+} from "react-native/Libraries/Types/CodegenTypes";
+
+export interface NativeProps extends ViewProps {
+  interpolator?: WithDefault<"linear" | "ios", "linear">;
+  showOnSwipeUp?: boolean;
+  enableSwipeToDismiss?: boolean;
+  offset?: Double;
+  textInputNativeID?: string;
+}
+
+export default codegenNativeComponent<NativeProps>("RNKeyboardGestureArea", {
+  excludedPlatforms: ["iOS"],
+  interfaceOnly: true,
+}) as HostComponent<NativeProps>;

package/src/specs/KeyboardToolbarGroupViewNativeComponent.ts

@@ -0,0 +1,10 @@
+import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
+
+import type { HostComponent } from "react-native";
+import type { ViewProps } from "react-native/Libraries/Components/View/ViewPropTypes";
+
+export interface NativeProps extends ViewProps {}
+
+export default codegenNativeComponent<NativeProps>("KeyboardToolbarGroupView", {
+  interfaceOnly: true,
+}) as HostComponent<NativeProps>;