fix: TS errors

Author: kirillzyusko

src/animated.tsx

@@ -18,10 +18,8 @@ import {
 
 import type { KeyboardAnimationContext } from "./context";
 import type {
-  FocusedInputHandler,
   FocusedInputLayoutChangedEvent,
   KeyboardControllerProps,
-  KeyboardHandler,
   NativeEvent,
 } from "./types";
 import type { ViewStyle } from "react-native";
@@ -129,10 +127,8 @@ export const KeyboardProvider = (props: KeyboardProviderProps) => {
   const progressSV = useSharedValue(0);
   const heightSV = useSharedValue(0);
   const layout = useSharedValue<FocusedInputLayoutChangedEvent | null>(null);
-  const setKeyboardHandlers =
-    useEventHandlerRegistration<KeyboardHandler>(viewTagRef);
-  const setInputHandlers =
-    useEventHandlerRegistration<FocusedInputHandler>(viewTagRef);
+  const setKeyboardHandlers = useEventHandlerRegistration(viewTagRef);
+  const setInputHandlers = useEventHandlerRegistration(viewTagRef);
   // memo
   const context = useMemo<KeyboardAnimationContext>(
     () => ({

src/context.ts

@@ -1,13 +1,12 @@
 import { createContext, useContext } from "react";
 import { Animated } from "react-native";
 
-import type {
-  FocusedInputHandler,
-  FocusedInputLayoutChangedEvent,
-  KeyboardHandler,
-} from "./types";
+import type { FocusedInputLayoutChangedEvent } from "./types";
 import type React from "react";
-import type { SharedValue } from "react-native-reanimated";
+import type {
+  EventHandlerProcessed,
+  SharedValue,
+} from "react-native-reanimated";
 
 export type AnimatedContext = {
   /**
@@ -37,9 +36,13 @@ export type KeyboardAnimationContext = {
   /** Layout of the focused `TextInput` represented as `SharedValue`. */
   layout: SharedValue<FocusedInputLayoutChangedEvent | null>;
   /** Method for setting workletized keyboard handlers. */
-  setKeyboardHandlers: (handlers: KeyboardHandler) => () => void;
+  setKeyboardHandlers: (
+    handlers: EventHandlerProcessed<never, never>,
+  ) => () => void;
   /** Method for setting workletized handlers for tracking focused input events. */
-  setInputHandlers: (handlers: FocusedInputHandler) => () => void;
+  setInputHandlers: (
+    handlers: EventHandlerProcessed<never, never>,
+  ) => () => void;
   /** Method to enable/disable KeyboardController library. */
   setEnabled: React.Dispatch<React.SetStateAction<boolean>>;
 };

src/hooks/index.ts

@@ -6,7 +6,13 @@ import { useKeyboardContext } from "../context";
 import { KeyboardController } from "../module";
 
 import type { AnimatedContext, ReanimatedContext } from "../context";
-import type { FocusedInputHandler, KeyboardHandler } from "../types";
+import type {
+  FocusedInputHandler,
+  FocusedInputSelectionChangedEvent,
+  FocusedInputTextChangedEvent,
+  KeyboardHandler,
+  NativeEvent,
+} from "../types";
 import type { DependencyList } from "react";
 
 /**
@@ -112,7 +118,7 @@ export function useGenericKeyboardHandler(
 ) {
   const context = useKeyboardContext();
 
-  const eventHandler = useEvent(
+  const eventHandler = useEvent<NativeEvent>(
     (event) => {
       "worklet";
 
@@ -257,16 +263,18 @@ export function useFocusedInputHandler(
 ) {
   const context = useKeyboardContext();
 
-  const eventHandler = useEvent(
+  const eventHandler = useEvent<
+    FocusedInputSelectionChangedEvent | FocusedInputTextChangedEvent
+  >(
     (event) => {
       "worklet";
 
       if (event.eventName.endsWith("onFocusedInputTextChanged")) {
-        handler.onChangeText?.(event);
+        handler.onChangeText?.(event as FocusedInputTextChangedEvent);
       }
 
       if (event.eventName.endsWith("onFocusedInputSelectionChanged")) {
-        handler.onSelectionChange?.(event);
+        handler.onSelectionChange?.(event as FocusedInputSelectionChangedEvent);
       }
     },
     ["onFocusedInputTextChanged", "onFocusedInputSelectionChanged"],

src/internal.ts

@@ -3,13 +3,13 @@ import { Animated } from "react-native";
 
 import { findNodeHandle } from "./utils/findNodeHandle";
 
-type EventHandler = (event: never) => void;
+import type { EventHandlerProcessed } from "react-native-reanimated";
+
 type ComponentOrHandle = Parameters<typeof findNodeHandle>[0];
 
 /**
  * An internal hook that helps to register workletized event handlers.
  *
- * @param map - Map of event handlers and their names.
  * @param viewTagRef - Ref to the view that produces events.
  * @returns A function that registers supplied event handlers.
  * @example
@@ -20,10 +20,10 @@ type ComponentOrHandle = Parameters<typeof findNodeHandle>[0];
  * );
  * ```
  */
-export function useEventHandlerRegistration<
-  H extends Partial<Record<string, EventHandler>>,
->(viewTagRef: React.MutableRefObject<ComponentOrHandle>) {
-  const onRegisterHandler = (handler: H) => {
+export function useEventHandlerRegistration(
+  viewTagRef: React.MutableRefObject<ComponentOrHandle>,
+) {
+  const onRegisterHandler = (handler: EventHandlerProcessed<never, never>) => {
     const attachWorkletHandlers = () => {
       const viewTag = findNodeHandle(viewTagRef.current);
 
@@ -34,6 +34,7 @@ export function useEventHandlerRegistration<
       }
 
       // TODO: must be a compat layer? Property `workletEventHandler` from `ref` may be missing. Should be on useEvent layer?
+      // @ts-expect-error this handler is not exposed publicly
       handler.workletEventHandler.registerForEvents(viewTag);
     };
 
@@ -47,6 +48,8 @@ export function useEventHandlerRegistration<
     return () => {
       const viewTag = findNodeHandle(viewTagRef.current);
 
+      // TODO: must be a compat layer? Property `workletEventHandler` from `ref` may be missing. Should be on useEvent layer?
+      // @ts-expect-error this handler is not exposed publicly
       handler.workletEventHandler.unregisterFromEvents(viewTag);
     };
   };