react-native-reanimated 4.0.2 → 4.1.0-jsx-fix

package/src/platformFunctions/dispatchCommand.ts

@@ -1,16 +1,16 @@
 'use strict';
-import type { Component } from 'react';
+import { RuntimeKind } from 'react-native-worklets';
 
 import { IS_JEST, logger, SHOULD_BE_USE_WEB } from '../common';
-import type { ShadowNodeWrapper } from '../commonTypes';
+import type { ShadowNodeWrapper, WrapperRef } from '../commonTypes';
 import type {
   AnimatedRef,
   AnimatedRefOnJS,
   AnimatedRefOnUI,
 } from '../hook/commonTypes';
 
-type DispatchCommand = <T extends Component>(
-  animatedRef: AnimatedRef<T>,
+type DispatchCommand = <TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>,
   commandName: string,
   args?: unknown[]
 ) => void;
@@ -34,7 +34,7 @@ function dispatchCommandNative(
   args: Array<unknown> = []
 ) {
   'worklet';
-  if (!globalThis._WORKLET) {
+  if (globalThis.__RUNTIME_KIND === RuntimeKind.ReactNative) {
     return;
   }
 
@@ -52,7 +52,7 @@ function dispatchCommandDefault() {
 
 if (!SHOULD_BE_USE_WEB) {
   // Those assertions are actually correct since on Native platforms `AnimatedRef` is
-  // mapped as a different function in `shareableMappingCache` and
+  // mapped as a different function in `serializableMappingCache` and
   // TypeScript is not able to infer that.
   dispatchCommand = dispatchCommandNative as unknown as DispatchCommand;
 } else if (IS_JEST) {

package/src/platformFunctions/getRelativeCoords.ts

@@ -1,6 +1,5 @@
 'use strict';
-import type { Component } from 'react';
-
+import type { WrapperRef } from '../commonTypes';
 import type { AnimatedRef } from '../hook/commonTypes';
 import { measure } from './measure';
 
@@ -22,8 +21,8 @@ export interface ComponentCoords {
  *   {@link ComponentCoords}.
  * @see https://docs.swmansion.com/react-native-reanimated/docs/utilities/getRelativeCoords
  */
-export function getRelativeCoords(
-  animatedRef: AnimatedRef<Component>,
+export function getRelativeCoords<TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>,
   absoluteX: number,
   absoluteY: number
 ): ComponentCoords | null {

package/src/platformFunctions/measure.ts

@@ -1,16 +1,20 @@
 'use strict';
-import type { Component } from 'react';
+import { RuntimeKind } from 'react-native-worklets';
 
 import { IS_JEST, logger, SHOULD_BE_USE_WEB } from '../common';
-import type { MeasuredDimensions, ShadowNodeWrapper } from '../commonTypes';
+import type {
+  MeasuredDimensions,
+  ShadowNodeWrapper,
+  WrapperRef,
+} from '../commonTypes';
 import type {
   AnimatedRef,
   AnimatedRefOnJS,
   AnimatedRefOnUI,
 } from '../hook/commonTypes';
 
-type Measure = <T extends Component>(
-  animatedRef: AnimatedRef<T>
+type Measure = <TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>
 ) => MeasuredDimensions | null;
 
 /**
@@ -28,7 +32,7 @@ export let measure: Measure;
 
 function measureNative(animatedRef: AnimatedRefOnJS | AnimatedRefOnUI) {
   'worklet';
-  if (!globalThis._WORKLET) {
+  if (globalThis.__RUNTIME_KIND === RuntimeKind.ReactNative) {
     return null;
   }
 
@@ -73,7 +77,7 @@ function measureDefault() {
 
 if (!SHOULD_BE_USE_WEB) {
   // Those assertions are actually correct since on Native platforms `AnimatedRef` is
-  // mapped as a different function in `shareableMappingCache` and
+  // mapped as a different function in `serializableMappingCache` and
   // TypeScript is not able to infer that.
   measure = measureNative as unknown as Measure;
 } else if (IS_JEST) {

package/src/platformFunctions/measure.web.ts

@@ -1,12 +1,10 @@
 'use strict';
-import type { Component } from 'react';
-
 import { logger } from '../common';
-import type { MeasuredDimensions } from '../commonTypes';
+import type { MeasuredDimensions, WrapperRef } from '../commonTypes';
 import type { AnimatedRef } from '../hook/commonTypes';
 
-export function measure<T extends Component>(
-  animatedRef: AnimatedRef<T>
+export function measure<TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>
 ): MeasuredDimensions | null {
   const element = animatedRef() as HTMLElement | null;
 

package/src/platformFunctions/scrollTo.ts

@@ -1,16 +1,11 @@
 'use strict';
-import type { Component } from 'react';
-
 import { IS_JEST, logger, SHOULD_BE_USE_WEB } from '../common';
-import type {
-  AnimatedRef,
-  AnimatedRefOnJS,
-  AnimatedRefOnUI,
-} from '../hook/commonTypes';
+import type { WrapperRef } from '../commonTypes';
+import type { AnimatedRef } from '../hook/commonTypes';
 import { dispatchCommand } from './dispatchCommand';
 
-type ScrollTo = <T extends Component>(
-  animatedRef: AnimatedRef<T>,
+type ScrollTo = <TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>,
   x: number,
   y: number,
   animated: boolean
@@ -29,19 +24,14 @@ type ScrollTo = <T extends Component>(
  */
 export let scrollTo: ScrollTo;
 
-function scrollToNative(
-  animatedRef: AnimatedRefOnJS | AnimatedRefOnUI,
+function scrollToNative<TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>,
   x: number,
   y: number,
   animated: boolean
 ) {
   'worklet';
-  dispatchCommand(
-    // This assertion is needed to comply to `dispatchCommand` interface
-    animatedRef as unknown as AnimatedRef<Component>,
-    'scrollTo',
-    [x, y, animated]
-  );
+  dispatchCommand(animatedRef, 'scrollTo', [x, y, animated]);
 }
 
 function scrollToJest() {
@@ -54,7 +44,7 @@ function scrollToDefault() {
 
 if (!SHOULD_BE_USE_WEB) {
   // Those assertions are actually correct since on Native platforms `AnimatedRef` is
-  // mapped as a different function in `shareableMappingCache` and
+  // mapped as a different function in `serializableMappingCache` and
   // TypeScript is not able to infer that.
   scrollTo = scrollToNative as unknown as ScrollTo;
 } else if (IS_JEST) {

package/src/platformFunctions/scrollTo.web.ts

@@ -1,11 +1,11 @@
 'use strict';
-import type { Component } from 'react';
 import type { ScrollView } from 'react-native';
 
+import type { WrapperRef } from '../commonTypes';
 import type { AnimatedRef } from '../hook/commonTypes';
 
-export function scrollTo<T extends Component>(
-  animatedRef: AnimatedRef<T>,
+export function scrollTo<TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>,
   x: number,
   y: number,
   animated: boolean
@@ -15,7 +15,7 @@ export function scrollTo<T extends Component>(
   // This prevents crashes if ref has not been set yet
   if (element) {
     // By ScrollView we mean any scrollable component
-    const scrollView = element as HTMLElement as unknown as ScrollView;
+    const scrollView = element as unknown as ScrollView;
     scrollView?.scrollTo({ x, y, animated });
   }
 }

package/src/platformFunctions/setGestureState.ts

@@ -1,5 +1,7 @@
 'use strict';
 
+import { RuntimeKind } from 'react-native-worklets';
+
 import { IS_JEST, logger, SHOULD_BE_USE_WEB } from '../common';
 
 type SetGestureState = (handlerTag: number, newState: number) => void;
@@ -8,7 +10,7 @@ export let setGestureState: SetGestureState;
 
 function setGestureStateNative(handlerTag: number, newState: number) {
   'worklet';
-  if (!globalThis._WORKLET) {
+  if (globalThis.__RUNTIME_KIND === RuntimeKind.ReactNative) {
     logger.warn('You can not use setGestureState in non-worklet function.');
     return;
   }

package/src/platformFunctions/setNativeProps.ts

@@ -1,5 +1,5 @@
 'use strict';
-import type { Component } from 'react';
+import { RuntimeKind } from 'react-native-worklets';
 
 import {
   IS_JEST,
@@ -7,15 +7,15 @@ import {
   processColorsInProps,
   SHOULD_BE_USE_WEB,
 } from '../common';
-import type { ShadowNodeWrapper, StyleProps } from '../commonTypes';
+import type { ShadowNodeWrapper, StyleProps, WrapperRef } from '../commonTypes';
 import type {
   AnimatedRef,
   AnimatedRefOnJS,
   AnimatedRefOnUI,
 } from '../hook/commonTypes';
 
-type SetNativeProps = <T extends Component>(
-  animatedRef: AnimatedRef<T>,
+type SetNativeProps = <TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>,
   updates: StyleProps
 ) => void;
 /**
@@ -39,7 +39,7 @@ function setNativePropsNative(
   updates: StyleProps
 ) {
   'worklet';
-  if (!globalThis._WORKLET) {
+  if (globalThis.__RUNTIME_KIND === RuntimeKind.ReactNative) {
     logger.warn('setNativeProps() can only be used on the UI runtime.');
     return;
   }
@@ -58,7 +58,7 @@ function setNativePropsDefault() {
 
 if (!SHOULD_BE_USE_WEB) {
   // Those assertions are actually correct since on Native platforms `AnimatedRef` is
-  // mapped as a different function in `shareableMappingCache` and
+  // mapped as a different function in `serializableMappingCache` and
   // TypeScript is not able to infer that.
   setNativeProps = setNativePropsNative as unknown as SetNativeProps;
 } else if (IS_JEST) {

package/src/platformFunctions/setNativeProps.web.ts

@@ -1,13 +1,11 @@
 'use strict';
-import type { Component } from 'react';
-
-import type { StyleProps } from '../commonTypes';
+import type { StyleProps, WrapperRef } from '../commonTypes';
 import type { AnimatedRef } from '../hook/commonTypes';
 import type { ReanimatedHTMLElement } from '../ReanimatedModule/js-reanimated';
 import { _updatePropsJS } from '../ReanimatedModule/js-reanimated';
 
-export function setNativeProps<T extends Component>(
-  animatedRef: AnimatedRef<T>,
+export function setNativeProps<TRef extends WrapperRef>(
+  animatedRef: AnimatedRef<TRef>,
   updates: StyleProps
 ) {
   const component = animatedRef() as ReanimatedHTMLElement;

package/src/privateGlobals.d.ts

@@ -82,26 +82,5 @@ declare global {
    *   future.
    */
   var __frameTimestamp: number | undefined;
-  /**
-   * @deprecated Internals of `react-native-worklets`, abstain from using in the
-   *   future.
-   */
-  var _scheduleOnRuntime: (
-    runtime: WorkletRuntime,
-    worklet: ShareableRef<() => void>
-  ) => void;
-  /**
-   * @deprecated Internals of `react-native-worklets`, abstain from using in the
-   *   future.
-   */
-  var _scheduleHostFunctionOnJS: (fun: (...args: A) => R, args?: A) => void;
-  /**
-   * @deprecated Internals of `react-native-worklets`, abstain from using in the
-   *   future.
-   */
-  var _makeShareableClone: <T>(
-    value: T,
-    nativeStateSource?: object
-  ) => FlatShareableRef<T>;
   var ReanimatedError: IReanimatedErrorConstructor;
 }

package/src/updateProps/updateProps.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 'use strict';
-
-import type { MutableRefObject } from 'react';
+import type { RefObject } from 'react';
 import { runOnJS, runOnUI } from 'react-native-worklets';
 
 import {
@@ -65,7 +64,7 @@ if (SHOULD_BE_USE_WEB) {
 export const updatePropsJestWrapper = (
   viewDescriptors: ViewDescriptorsWrapper,
   updates: AnimatedStyle<any>,
-  animatedValues: MutableRefObject<AnimatedStyle<any>>,
+  animatedValues: RefObject<AnimatedStyle<any>>,
   adapters: ((updates: AnimatedStyle<any>) => void)[]
 ): void => {
   adapters.forEach((adapter) => {

package/src/workletFunctions.ts

@@ -5,10 +5,10 @@ import type {
   WorkletRuntime as WorkletRuntimeFromWorklets,
 } from 'react-native-worklets';
 import {
+  createSerializable,
   createWorkletRuntime as createWorkletRuntimeFromWorklets,
   executeOnUIRuntimeSync as executeOnUIRuntimeSyncFromWorklets,
   isWorkletFunction as isWorkletFunctionFromWorklets,
-  makeShareableCloneRecursive as makeShareableCloneRecursiveFromWorklets,
   runOnJS as runOnJSFromWorklets,
   runOnRuntime as runOnRuntimeFromWorklets,
   runOnUI as runOnUIFromWorklets,
@@ -19,7 +19,7 @@ import {
  *   `react-native-worklets` instead of `react-native-reanimated`.
  */
 export const makeShareableCloneRecursive: MakeShareableClone =
-  makeShareableCloneRecursiveFromWorklets;
+  createSerializable;
 
 /**
  * @deprecated Please import `createWorkletRuntime` directly from