diff --git a/apps/fabric-example/package.json b/apps/fabric-example/package.json index e69adb5f34f6..80003b03f9cf 100644 --- a/apps/fabric-example/package.json +++ b/apps/fabric-example/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "private": true, "scripts": { - "build": "yarn patch-package", + "build": "", "android": "react-native run-android", "ios": "react-native run-ios", "lint": "eslint --max-warnings=0 .", diff --git a/apps/paper-example/ios/Podfile.lock b/apps/paper-example/ios/Podfile.lock index 515201a3010b..2ae59d78d3ad 100644 --- a/apps/paper-example/ios/Podfile.lock +++ b/apps/paper-example/ios/Podfile.lock @@ -935,7 +935,7 @@ PODS: - React-Mapbuffer (0.74.0): - glog - React-debug - - react-native-pager-view (6.3.1): + - react-native-pager-view (6.3.0): - DoubleConversion - glog - hermes-engine @@ -1515,7 +1515,7 @@ SPEC CHECKSUMS: React-jsitracing: 36a2bbc272300313653d980de5ab700ec86c534a React-logger: 03f2f7b955cfe24593a2b8c9705c23e142d1ad24 React-Mapbuffer: 5e05d78fe6505f4a054b86f415733d4ad02dd314 - react-native-pager-view: e2b7c31147cdc1750cb3867d37a145e487653c34 + react-native-pager-view: c1e29e1a6105a02807392ba822ad322447a72f55 react-native-safe-area-context: 71e343069c879133ea9c194097261830f6d23478 react-native-slider: ce295d2bf830a7990af05b0bd70ab28c133e230c React-nativeconfig: 951ec32f632e81cbd7d40aebb3211313251c092e diff --git a/apps/tvos-example/package.json b/apps/tvos-example/package.json index 0c8885b021d4..af9ee3b28672 100644 --- a/apps/tvos-example/package.json +++ b/apps/tvos-example/package.json @@ -28,11 +28,11 @@ "@types/react": "^18.2.6", "@types/react-test-renderer": "^18.0.0", "babel-jest": "^29.6.3", - "eslint": "^8.0.0-0", + "eslint": "^8.57.0", "jest": "^29.6.3", "prettier": "2.8.8", "react-test-renderer": "18.2.0", - "typescript": "5.0.4" + "typescript": "~5.3.0" }, "engines": { "node": ">=18" diff --git a/packages/eslint-plugin-reanimated/types/index.d.ts b/packages/eslint-plugin-reanimated/types/index.d.ts index 39887d3d1110..1f58dd81a751 100644 --- a/packages/eslint-plugin-reanimated/types/index.d.ts +++ b/packages/eslint-plugin-reanimated/types/index.d.ts @@ -1,8 +1,4 @@ import type { TSESLint } from '@typescript-eslint/utils'; export declare const rules: { - 'animated-style-non-animated-component': TSESLint.RuleModule< - 'animatedStyle' | 'sharedValue', - [], - TSESLint.RuleListener - >; + 'animated-style-non-animated-component': TSESLint.RuleModule<"animatedStyle" | "sharedValue", [], TSESLint.RuleListener>; }; diff --git a/packages/react-native-reanimated/scripts/set-reanimated-version.js b/packages/react-native-reanimated/scripts/set-reanimated-version.js index 221db11bee30..ff02577fa18f 100644 --- a/packages/react-native-reanimated/scripts/set-reanimated-version.js +++ b/packages/react-native-reanimated/scripts/set-reanimated-version.js @@ -75,7 +75,7 @@ fs.writeFileSync( 'utf-8' ); -const jsVersionPath = 'src/reanimated2/platform-specific/jsVersion.ts'; +const jsVersionPath = 'src/platform-specific/jsVersion.ts'; const before = cat(jsVersionPath); const after = before.replace( /jsVersion = '(.*)';/g, diff --git a/packages/react-native-reanimated/src/Animated.ts b/packages/react-native-reanimated/src/Animated.ts index de00efd6e82c..42cb63cac75e 100644 --- a/packages/react-native-reanimated/src/Animated.ts +++ b/packages/react-native-reanimated/src/Animated.ts @@ -1,7 +1,7 @@ 'use strict'; -import type { Extrapolate as _Extrapolate } from './reanimated2/interpolateColor'; -import type { SharedValue as _SharedValue } from './reanimated2/commonTypes'; -import type { DerivedValue as _DerivedValue } from './reanimated2/hook/useDerivedValue'; +import type { Extrapolate as _Extrapolate } from './interpolateColor'; +import type { SharedValue as _SharedValue } from './commonTypes'; +import type { DerivedValue as _DerivedValue } from './hook/useDerivedValue'; import type { TransformStyleTypes as _TransformStyleTypes, Adaptable as _Adaptable, @@ -10,18 +10,18 @@ import type { AnimateStyle as _AnimateStyle, StylesOrDefault as _StylesOrDefault, AnimateProps as _AnimateProps, -} from './reanimated2/helperTypes'; -import type { EasingFunction as _EasingFunction } from './reanimated2/Easing'; +} from './helperTypes'; +import type { EasingFunction as _EasingFunction } from './Easing'; -import type { AnimatedScrollViewProps as _AnimatedScrollViewProps } from './reanimated2/component/ScrollView'; -import type { FlatListPropsWithLayout as _FlatListPropsWithLayout } from './reanimated2/component/FlatList'; +import type { AnimatedScrollViewProps as _AnimatedScrollViewProps } from './component/ScrollView'; +import type { FlatListPropsWithLayout as _FlatListPropsWithLayout } from './component/FlatList'; export { createAnimatedComponent } from './createAnimatedComponent'; -export { AnimatedText as Text } from './reanimated2/component/Text'; -export { AnimatedView as View } from './reanimated2/component/View'; -export { AnimatedScrollView as ScrollView } from './reanimated2/component/ScrollView'; -export { AnimatedImage as Image } from './reanimated2/component/Image'; -export { ReanimatedFlatList as FlatList } from './reanimated2/component/FlatList'; +export { AnimatedText as Text } from './component/Text'; +export { AnimatedView as View } from './component/View'; +export { AnimatedScrollView as ScrollView } from './component/ScrollView'; +export { AnimatedImage as Image } from './component/Image'; +export { ReanimatedFlatList as FlatList } from './component/FlatList'; export { addWhitelistedNativeProps, addWhitelistedUIProps, diff --git a/packages/react-native-reanimated/src/reanimated2/Bezier.ts b/packages/react-native-reanimated/src/Bezier.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/Bezier.ts rename to packages/react-native-reanimated/src/Bezier.ts diff --git a/packages/react-native-reanimated/src/reanimated2/Colors.ts b/packages/react-native-reanimated/src/Colors.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/Colors.ts rename to packages/react-native-reanimated/src/Colors.ts diff --git a/packages/react-native-reanimated/src/ConfigHelper.ts b/packages/react-native-reanimated/src/ConfigHelper.ts index 811bc9b699ae..9026cc8b9602 100644 --- a/packages/react-native-reanimated/src/ConfigHelper.ts +++ b/packages/react-native-reanimated/src/ConfigHelper.ts @@ -1,6 +1,6 @@ 'use strict'; import { PropsAllowlists } from './propsAllowlists'; -import { jsiConfigureProps } from './reanimated2/core'; +import { jsiConfigureProps } from './core'; function assertNoOverlapInLists() { for (const key in PropsAllowlists.NATIVE_THREAD_PROPS_WHITELIST) { if (key in PropsAllowlists.UI_THREAD_PROPS_WHITELIST) { diff --git a/packages/react-native-reanimated/src/reanimated2/Easing.ts b/packages/react-native-reanimated/src/Easing.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/Easing.ts rename to packages/react-native-reanimated/src/Easing.ts diff --git a/packages/react-native-reanimated/src/reanimated2/NativeReanimated/NativeReanimated.ts b/packages/react-native-reanimated/src/NativeReanimated/NativeReanimated.ts similarity index 99% rename from packages/react-native-reanimated/src/reanimated2/NativeReanimated/NativeReanimated.ts rename to packages/react-native-reanimated/src/NativeReanimated/NativeReanimated.ts index 3541a712548e..4119474c5afc 100644 --- a/packages/react-native-reanimated/src/reanimated2/NativeReanimated/NativeReanimated.ts +++ b/packages/react-native-reanimated/src/NativeReanimated/NativeReanimated.ts @@ -13,7 +13,7 @@ import { isFabric } from '../PlatformChecker'; import type React from 'react'; import { getShadowNodeWrapperFromRef } from '../fabricUtils'; import type { LayoutAnimationBatchItem } from '../layoutReanimation/animationBuilder/commonTypes'; -import ReanimatedModule from '../../specs/NativeReanimatedModule'; +import ReanimatedModule from '../specs/NativeReanimatedModule'; // this is the type of `__reanimatedModuleProxy` which is injected using JSI export interface NativeReanimatedModule { diff --git a/packages/react-native-reanimated/src/reanimated2/NativeReanimated/index.ts b/packages/react-native-reanimated/src/NativeReanimated/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/NativeReanimated/index.ts rename to packages/react-native-reanimated/src/NativeReanimated/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/NativeReanimated/index.web.ts b/packages/react-native-reanimated/src/NativeReanimated/index.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/NativeReanimated/index.web.ts rename to packages/react-native-reanimated/src/NativeReanimated/index.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/PlatformChecker.ts b/packages/react-native-reanimated/src/PlatformChecker.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/PlatformChecker.ts rename to packages/react-native-reanimated/src/PlatformChecker.ts diff --git a/packages/react-native-reanimated/src/reanimated2/PropAdapters.ts b/packages/react-native-reanimated/src/PropAdapters.ts similarity index 91% rename from packages/react-native-reanimated/src/reanimated2/PropAdapters.ts rename to packages/react-native-reanimated/src/PropAdapters.ts index 9d3226d0d246..12f4a08a11ef 100644 --- a/packages/react-native-reanimated/src/reanimated2/PropAdapters.ts +++ b/packages/react-native-reanimated/src/PropAdapters.ts @@ -1,5 +1,5 @@ 'use strict'; -import { addWhitelistedNativeProps } from '../ConfigHelper'; +import { addWhitelistedNativeProps } from './ConfigHelper'; import type { AnimatedPropsAdapterFunction, AnimatedPropsAdapterWorklet, diff --git a/packages/react-native-reanimated/src/reanimated2/PropsRegistry.ts b/packages/react-native-reanimated/src/PropsRegistry.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/PropsRegistry.ts rename to packages/react-native-reanimated/src/PropsRegistry.ts diff --git a/packages/react-native-reanimated/src/reanimated2/Sensor.ts b/packages/react-native-reanimated/src/Sensor.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/Sensor.ts rename to packages/react-native-reanimated/src/Sensor.ts diff --git a/packages/react-native-reanimated/src/reanimated2/SensorContainer.ts b/packages/react-native-reanimated/src/SensorContainer.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/SensorContainer.ts rename to packages/react-native-reanimated/src/SensorContainer.ts diff --git a/packages/react-native-reanimated/src/reanimated2/UpdateLayoutAnimations.ts b/packages/react-native-reanimated/src/UpdateLayoutAnimations.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/UpdateLayoutAnimations.ts rename to packages/react-native-reanimated/src/UpdateLayoutAnimations.ts diff --git a/packages/react-native-reanimated/src/reanimated2/UpdateProps.ts b/packages/react-native-reanimated/src/UpdateProps.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/UpdateProps.ts rename to packages/react-native-reanimated/src/UpdateProps.ts diff --git a/packages/react-native-reanimated/src/reanimated2/ViewDescriptorsSet.ts b/packages/react-native-reanimated/src/ViewDescriptorsSet.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/ViewDescriptorsSet.ts rename to packages/react-native-reanimated/src/ViewDescriptorsSet.ts diff --git a/packages/react-native-reanimated/src/reanimated2/WorkletEventHandler.ts b/packages/react-native-reanimated/src/WorkletEventHandler.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/WorkletEventHandler.ts rename to packages/react-native-reanimated/src/WorkletEventHandler.ts diff --git a/packages/react-native-reanimated/src/reanimated2/__tests__/Colors.test.ts b/packages/react-native-reanimated/src/__tests__/Colors.test.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/__tests__/Colors.test.ts rename to packages/react-native-reanimated/src/__tests__/Colors.test.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/clamp.ts b/packages/react-native-reanimated/src/animation/clamp.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/clamp.ts rename to packages/react-native-reanimated/src/animation/clamp.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/commonTypes.ts b/packages/react-native-reanimated/src/animation/commonTypes.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/commonTypes.ts rename to packages/react-native-reanimated/src/animation/commonTypes.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/decay/decay.ts b/packages/react-native-reanimated/src/animation/decay/decay.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/decay/decay.ts rename to packages/react-native-reanimated/src/animation/decay/decay.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/decay/index.ts b/packages/react-native-reanimated/src/animation/decay/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/decay/index.ts rename to packages/react-native-reanimated/src/animation/decay/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/decay/rigidDecay.ts b/packages/react-native-reanimated/src/animation/decay/rigidDecay.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/decay/rigidDecay.ts rename to packages/react-native-reanimated/src/animation/decay/rigidDecay.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/decay/rubberBandDecay.ts b/packages/react-native-reanimated/src/animation/decay/rubberBandDecay.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/decay/rubberBandDecay.ts rename to packages/react-native-reanimated/src/animation/decay/rubberBandDecay.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/decay/utils.ts b/packages/react-native-reanimated/src/animation/decay/utils.ts similarity index 98% rename from packages/react-native-reanimated/src/reanimated2/animation/decay/utils.ts rename to packages/react-native-reanimated/src/animation/decay/utils.ts index 31aa656508ee..deb18ccd8865 100644 --- a/packages/react-native-reanimated/src/reanimated2/animation/decay/utils.ts +++ b/packages/react-native-reanimated/src/animation/decay/utils.ts @@ -6,7 +6,7 @@ import type { ReduceMotion, Timestamp, RequiredKeys, -} from '../../../reanimated2/commonTypes'; +} from '../../commonTypes'; import { isWeb } from '../../PlatformChecker'; const IS_WEB = isWeb(); diff --git a/packages/react-native-reanimated/src/reanimated2/animation/delay.ts b/packages/react-native-reanimated/src/animation/delay.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/delay.ts rename to packages/react-native-reanimated/src/animation/delay.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/index.ts b/packages/react-native-reanimated/src/animation/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/index.ts rename to packages/react-native-reanimated/src/animation/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/repeat.ts b/packages/react-native-reanimated/src/animation/repeat.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/repeat.ts rename to packages/react-native-reanimated/src/animation/repeat.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/sequence.ts b/packages/react-native-reanimated/src/animation/sequence.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/sequence.ts rename to packages/react-native-reanimated/src/animation/sequence.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/spring.ts b/packages/react-native-reanimated/src/animation/spring.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/spring.ts rename to packages/react-native-reanimated/src/animation/spring.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/springUtils.ts b/packages/react-native-reanimated/src/animation/springUtils.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/springUtils.ts rename to packages/react-native-reanimated/src/animation/springUtils.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/styleAnimation.ts b/packages/react-native-reanimated/src/animation/styleAnimation.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/styleAnimation.ts rename to packages/react-native-reanimated/src/animation/styleAnimation.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/timing.ts b/packages/react-native-reanimated/src/animation/timing.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/timing.ts rename to packages/react-native-reanimated/src/animation/timing.ts diff --git a/packages/react-native-reanimated/src/reanimated2/animation/transformationMatrix/matrixUtils.tsx b/packages/react-native-reanimated/src/animation/transformationMatrix/matrixUtils.tsx similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/transformationMatrix/matrixUtils.tsx rename to packages/react-native-reanimated/src/animation/transformationMatrix/matrixUtils.tsx diff --git a/packages/react-native-reanimated/src/reanimated2/animation/util.ts b/packages/react-native-reanimated/src/animation/util.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/animation/util.ts rename to packages/react-native-reanimated/src/animation/util.ts diff --git a/packages/react-native-reanimated/src/animationBuilder.tsx b/packages/react-native-reanimated/src/animationBuilder.tsx index 489d4deffa0d..a5067d88576c 100644 --- a/packages/react-native-reanimated/src/animationBuilder.tsx +++ b/packages/react-native-reanimated/src/animationBuilder.tsx @@ -3,8 +3,8 @@ import type { ILayoutAnimationBuilder, LayoutAnimationFunction, LayoutAnimationsValues, -} from './reanimated2/layoutReanimation'; -import type { StyleProps } from './reanimated2/commonTypes'; +} from './layoutReanimation'; +import type { StyleProps } from './commonTypes'; import type { NestedArray } from './createAnimatedComponent/commonTypes'; const mockTargetValues: LayoutAnimationsValues = { diff --git a/packages/react-native-reanimated/src/reanimated2/commonTypes.ts b/packages/react-native-reanimated/src/commonTypes.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/commonTypes.ts rename to packages/react-native-reanimated/src/commonTypes.ts diff --git a/packages/react-native-reanimated/src/reanimated2/component/FlatList.tsx b/packages/react-native-reanimated/src/component/FlatList.tsx similarity index 98% rename from packages/react-native-reanimated/src/reanimated2/component/FlatList.tsx rename to packages/react-native-reanimated/src/component/FlatList.tsx index 053598ed2831..bea52d63a8db 100644 --- a/packages/react-native-reanimated/src/reanimated2/component/FlatList.tsx +++ b/packages/react-native-reanimated/src/component/FlatList.tsx @@ -8,7 +8,7 @@ import type { } from 'react-native'; import { FlatList } from 'react-native'; import { AnimatedView } from './View'; -import { createAnimatedComponent } from '../../createAnimatedComponent'; +import { createAnimatedComponent } from '../createAnimatedComponent'; import type { ILayoutAnimationBuilder } from '../layoutReanimation/animationBuilder/commonTypes'; import { LayoutAnimationConfig } from './LayoutAnimationConfig'; import type { AnimatedProps, AnimatedStyle } from '../helperTypes'; diff --git a/packages/react-native-reanimated/src/reanimated2/component/Image.ts b/packages/react-native-reanimated/src/component/Image.ts similarity index 86% rename from packages/react-native-reanimated/src/reanimated2/component/Image.ts rename to packages/react-native-reanimated/src/component/Image.ts index d238cae7672a..5fc3b1698b13 100644 --- a/packages/react-native-reanimated/src/reanimated2/component/Image.ts +++ b/packages/react-native-reanimated/src/component/Image.ts @@ -1,6 +1,6 @@ 'use strict'; import { Image } from 'react-native'; -import { createAnimatedComponent } from '../../createAnimatedComponent'; +import { createAnimatedComponent } from '../createAnimatedComponent'; // Since createAnimatedComponent return type is ComponentClass that has the props of the argument, // but not things like NativeMethods, etc. we need to add them manually by extending the type. diff --git a/packages/react-native-reanimated/src/reanimated2/component/LayoutAnimationConfig.tsx b/packages/react-native-reanimated/src/component/LayoutAnimationConfig.tsx similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/component/LayoutAnimationConfig.tsx rename to packages/react-native-reanimated/src/component/LayoutAnimationConfig.tsx diff --git a/packages/react-native-reanimated/src/reanimated2/component/PerformanceMonitor.tsx b/packages/react-native-reanimated/src/component/PerformanceMonitor.tsx similarity index 97% rename from packages/react-native-reanimated/src/reanimated2/component/PerformanceMonitor.tsx rename to packages/react-native-reanimated/src/component/PerformanceMonitor.tsx index 7a74de184fd0..9e6680395430 100644 --- a/packages/react-native-reanimated/src/reanimated2/component/PerformanceMonitor.tsx +++ b/packages/react-native-reanimated/src/component/PerformanceMonitor.tsx @@ -6,8 +6,8 @@ import { TextInput, StyleSheet, View } from 'react-native'; import type { FrameInfo } from '../frameCallback'; import type { SharedValue } from '../commonTypes'; import { useSharedValue, useAnimatedProps, useFrameCallback } from '../hook'; -import { createAnimatedComponent } from '../../createAnimatedComponent'; -import { addWhitelistedNativeProps } from '../../ConfigHelper'; +import { createAnimatedComponent } from '../createAnimatedComponent'; +import { addWhitelistedNativeProps } from '../ConfigHelper'; type CircularBuffer = ReturnType; function createCircularDoublesBuffer(size: number) { diff --git a/packages/react-native-reanimated/src/reanimated2/component/ScrollView.tsx b/packages/react-native-reanimated/src/component/ScrollView.tsx similarity index 96% rename from packages/react-native-reanimated/src/reanimated2/component/ScrollView.tsx rename to packages/react-native-reanimated/src/component/ScrollView.tsx index 1612bd7c840c..977db4d0dd04 100644 --- a/packages/react-native-reanimated/src/reanimated2/component/ScrollView.tsx +++ b/packages/react-native-reanimated/src/component/ScrollView.tsx @@ -3,7 +3,7 @@ import type { ForwardedRef } from 'react'; import React, { forwardRef } from 'react'; import type { ScrollViewProps } from 'react-native'; import { ScrollView } from 'react-native'; -import { createAnimatedComponent } from '../../createAnimatedComponent'; +import { createAnimatedComponent } from '../createAnimatedComponent'; import type { SharedValue } from '../commonTypes'; import type { AnimatedRef } from '../hook'; import { useAnimatedRef, useScrollViewOffset } from '../hook'; diff --git a/packages/react-native-reanimated/src/reanimated2/component/Text.ts b/packages/react-native-reanimated/src/component/Text.ts similarity index 86% rename from packages/react-native-reanimated/src/reanimated2/component/Text.ts rename to packages/react-native-reanimated/src/component/Text.ts index 0c8582956a98..c9fd06fca20b 100644 --- a/packages/react-native-reanimated/src/reanimated2/component/Text.ts +++ b/packages/react-native-reanimated/src/component/Text.ts @@ -1,6 +1,6 @@ 'use strict'; import { Text } from 'react-native'; -import { createAnimatedComponent } from '../../createAnimatedComponent'; +import { createAnimatedComponent } from '../createAnimatedComponent'; // Since createAnimatedComponent return type is ComponentClass that has the props of the argument, // but not things like NativeMethods, etc. we need to add them manually by extending the type. diff --git a/packages/react-native-reanimated/src/reanimated2/component/View.ts b/packages/react-native-reanimated/src/component/View.ts similarity index 86% rename from packages/react-native-reanimated/src/reanimated2/component/View.ts rename to packages/react-native-reanimated/src/component/View.ts index f8565ffdc90d..9d8aa93299c2 100644 --- a/packages/react-native-reanimated/src/reanimated2/component/View.ts +++ b/packages/react-native-reanimated/src/component/View.ts @@ -1,6 +1,6 @@ 'use strict'; import { View } from 'react-native'; -import { createAnimatedComponent } from '../../createAnimatedComponent'; +import { createAnimatedComponent } from '../createAnimatedComponent'; // Since createAnimatedComponent return type is ComponentClass that has the props of the argument, // but not things like NativeMethods, etc. we need to add them manually by extending the type. diff --git a/packages/react-native-reanimated/src/reanimated2/core.ts b/packages/react-native-reanimated/src/core.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/core.ts rename to packages/react-native-reanimated/src/core.ts diff --git a/packages/react-native-reanimated/src/createAnimatedComponent/InlinePropManager.ts b/packages/react-native-reanimated/src/createAnimatedComponent/InlinePropManager.ts index 6c1a4ceebdb1..f6b382aafd57 100644 --- a/packages/react-native-reanimated/src/createAnimatedComponent/InlinePropManager.ts +++ b/packages/react-native-reanimated/src/createAnimatedComponent/InlinePropManager.ts @@ -1,5 +1,5 @@ 'use strict'; -import type { StyleProps } from '../reanimated2'; +import type { StyleProps } from '../commonTypes'; import type { IAnimatedComponentInternal, AnimatedComponentProps, @@ -7,16 +7,13 @@ import type { ViewInfo, } from './commonTypes'; import { flattenArray } from './utils'; -import { makeViewDescriptorsSet } from '../reanimated2/ViewDescriptorsSet'; -import type { - ViewDescriptorsSet, - ViewRefSet, -} from '../reanimated2/ViewDescriptorsSet'; +import { makeViewDescriptorsSet } from '../ViewDescriptorsSet'; +import type { ViewDescriptorsSet, ViewRefSet } from '../ViewDescriptorsSet'; import { adaptViewConfig } from '../ConfigHelper'; -import updateProps from '../reanimated2/UpdateProps'; -import { stopMapper, startMapper } from '../reanimated2/mappers'; -import { isSharedValue } from '../reanimated2/isSharedValue'; -import { shouldBeUseWeb } from '../reanimated2/PlatformChecker'; +import updateProps from '../UpdateProps'; +import { stopMapper, startMapper } from '../mappers'; +import { isSharedValue } from '../isSharedValue'; +import { shouldBeUseWeb } from '../PlatformChecker'; const SHOULD_BE_USE_WEB = shouldBeUseWeb(); diff --git a/packages/react-native-reanimated/src/createAnimatedComponent/JSPropsUpdater.ts b/packages/react-native-reanimated/src/createAnimatedComponent/JSPropsUpdater.ts index 206db88a8e27..fab7c1dd4781 100644 --- a/packages/react-native-reanimated/src/createAnimatedComponent/JSPropsUpdater.ts +++ b/packages/react-native-reanimated/src/createAnimatedComponent/JSPropsUpdater.ts @@ -1,9 +1,9 @@ 'use strict'; import { NativeEventEmitter, Platform, findNodeHandle } from 'react-native'; import type { NativeModule } from 'react-native'; -import { shouldBeUseWeb } from '../reanimated2/PlatformChecker'; -import type { StyleProps } from '../reanimated2'; -import { runOnJS, runOnUIImmediately } from '../reanimated2/threads'; +import { shouldBeUseWeb } from '../PlatformChecker'; +import type { StyleProps } from '../commonTypes'; +import { runOnJS, runOnUIImmediately } from '../threads'; import type { AnimatedComponentProps, IAnimatedComponentInternal, diff --git a/packages/react-native-reanimated/src/createAnimatedComponent/PropsFilter.tsx b/packages/react-native-reanimated/src/createAnimatedComponent/PropsFilter.tsx index d7f5a3790ad9..3378bc212354 100644 --- a/packages/react-native-reanimated/src/createAnimatedComponent/PropsFilter.tsx +++ b/packages/react-native-reanimated/src/createAnimatedComponent/PropsFilter.tsx @@ -1,11 +1,11 @@ 'use strict'; -import { shallowEqual } from '../reanimated2/hook/utils'; -import type { StyleProps } from '../reanimated2/commonTypes'; -import { isSharedValue } from '../reanimated2/isSharedValue'; -import { isChromeDebugger } from '../reanimated2/PlatformChecker'; -import { WorkletEventHandler } from '../reanimated2/WorkletEventHandler'; -import { initialUpdaterRun } from '../reanimated2/animation'; +import { shallowEqual } from '../hook/utils'; +import type { StyleProps } from '../commonTypes'; +import { isSharedValue } from '../isSharedValue'; +import { isChromeDebugger } from '../PlatformChecker'; +import { WorkletEventHandler } from '../WorkletEventHandler'; +import { initialUpdaterRun } from '../animation'; import { hasInlineStyles, getInlineStyle } from './InlinePropManager'; import type { AnimatedComponentProps, diff --git a/packages/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts b/packages/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts index 5f8207e52c00..8d65e6a2ae7d 100644 --- a/packages/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts +++ b/packages/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts @@ -1,20 +1,19 @@ 'use strict'; import type { Ref, Component } from 'react'; import type { + ShadowNodeWrapper, + SharedValue, StyleProps, +} from '../commonTypes'; +import type { ViewConfig } from '../ConfigHelper'; +import type { ViewDescriptorsSet, ViewRefSet } from '../ViewDescriptorsSet'; +import type { BaseAnimationBuilder, - ILayoutAnimationBuilder, EntryExitAnimationFunction, + ILayoutAnimationBuilder, SharedTransition, - SharedValue, -} from '../reanimated2'; -import type { - ViewDescriptorsSet, - ViewRefSet, -} from '../reanimated2/ViewDescriptorsSet'; -import type { SkipEnteringContext } from '../reanimated2/component/LayoutAnimationConfig'; -import type { ShadowNodeWrapper } from '../reanimated2/commonTypes'; -import type { ViewConfig } from '../ConfigHelper'; +} from '../layoutReanimation'; +import type { SkipEnteringContext } from '../component/LayoutAnimationConfig'; export interface AnimatedProps extends Record { viewDescriptors?: ViewDescriptorsSet; diff --git a/packages/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx b/packages/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx index 2488ebca7bfa..1985bc57180a 100644 --- a/packages/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx +++ b/packages/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx @@ -8,23 +8,20 @@ import type { } from 'react'; import React from 'react'; import { findNodeHandle, Platform } from 'react-native'; -import { WorkletEventHandler } from '../reanimated2/WorkletEventHandler'; -import '../reanimated2/layoutReanimation/animationsManager'; +import { WorkletEventHandler } from '../WorkletEventHandler'; +import '../layoutReanimation/animationsManager'; import invariant from 'invariant'; import { adaptViewConfig } from '../ConfigHelper'; -import { RNRenderer } from '../reanimated2/platform-specific/RNRenderer'; -import { enableLayoutAnimations } from '../reanimated2/core'; -import { - SharedTransition, - LayoutAnimationType, -} from '../reanimated2/layoutReanimation'; -import type { StyleProps, ShadowNodeWrapper } from '../reanimated2/commonTypes'; -import { getShadowNodeWrapperFromRef } from '../reanimated2/fabricUtils'; -import { removeFromPropsRegistry } from '../reanimated2/PropsRegistry'; -import { getReduceMotionFromConfig } from '../reanimated2/animation/util'; +import { RNRenderer } from '../platform-specific/RNRenderer'; +import { enableLayoutAnimations } from '../core'; +import { SharedTransition, LayoutAnimationType } from '../layoutReanimation'; +import type { StyleProps, ShadowNodeWrapper } from '../commonTypes'; +import { getShadowNodeWrapperFromRef } from '../fabricUtils'; +import { removeFromPropsRegistry } from '../PropsRegistry'; +import { getReduceMotionFromConfig } from '../animation/util'; import { maybeBuild } from '../animationBuilder'; -import { SkipEnteringContext } from '../reanimated2/component/LayoutAnimationConfig'; -import type { AnimateProps } from '../reanimated2'; +import { SkipEnteringContext } from '../component/LayoutAnimationConfig'; +import type { AnimateProps } from '../helperTypes'; import JSPropsUpdater from './JSPropsUpdater'; import type { AnimatedComponentProps, @@ -36,12 +33,7 @@ import type { } from './commonTypes'; import { has, flattenArray } from './utils'; import setAndForwardRef from './setAndForwardRef'; -import { - isFabric, - isJest, - isWeb, - shouldBeUseWeb, -} from '../reanimated2/PlatformChecker'; +import { isFabric, isJest, isWeb, shouldBeUseWeb } from '../PlatformChecker'; import { InlinePropManager } from './InlinePropManager'; import { PropsFilter } from './PropsFilter'; import { @@ -50,11 +42,11 @@ import { configureWebLayoutAnimations, getReducedMotionFromConfig, saveSnapshot, -} from '../reanimated2/layoutReanimation/web'; -import { updateLayoutAnimations } from '../reanimated2/UpdateLayoutAnimations'; -import type { CustomConfig } from '../reanimated2/layoutReanimation/web/config'; +} from '../layoutReanimation/web'; +import { updateLayoutAnimations } from '../UpdateLayoutAnimations'; +import type { CustomConfig } from '../layoutReanimation/web/config'; import type { FlatList, FlatListProps } from 'react-native'; -import { addHTMLMutationObserver } from '../reanimated2/layoutReanimation/web/domUtils'; +import { addHTMLMutationObserver } from '../layoutReanimation/web/domUtils'; import { getViewInfo } from './getViewInfo'; const IS_WEB = isWeb(); diff --git a/packages/react-native-reanimated/src/reanimated2/errors.ts b/packages/react-native-reanimated/src/errors.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/errors.ts rename to packages/react-native-reanimated/src/errors.ts diff --git a/packages/react-native-reanimated/src/reanimated2/fabricUtils.ts b/packages/react-native-reanimated/src/fabricUtils.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/fabricUtils.ts rename to packages/react-native-reanimated/src/fabricUtils.ts diff --git a/packages/react-native-reanimated/src/reanimated2/fabricUtils.web.ts b/packages/react-native-reanimated/src/fabricUtils.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/fabricUtils.web.ts rename to packages/react-native-reanimated/src/fabricUtils.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/frameCallback/FrameCallbackRegistryJS.ts b/packages/react-native-reanimated/src/frameCallback/FrameCallbackRegistryJS.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/frameCallback/FrameCallbackRegistryJS.ts rename to packages/react-native-reanimated/src/frameCallback/FrameCallbackRegistryJS.ts diff --git a/packages/react-native-reanimated/src/reanimated2/frameCallback/FrameCallbackRegistryUI.ts b/packages/react-native-reanimated/src/frameCallback/FrameCallbackRegistryUI.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/frameCallback/FrameCallbackRegistryUI.ts rename to packages/react-native-reanimated/src/frameCallback/FrameCallbackRegistryUI.ts diff --git a/packages/react-native-reanimated/src/reanimated2/frameCallback/index.ts b/packages/react-native-reanimated/src/frameCallback/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/frameCallback/index.ts rename to packages/react-native-reanimated/src/frameCallback/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/globals.d.ts b/packages/react-native-reanimated/src/globals.d.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/globals.d.ts rename to packages/react-native-reanimated/src/globals.d.ts diff --git a/packages/react-native-reanimated/src/reanimated2/helperTypes.ts b/packages/react-native-reanimated/src/helperTypes.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/helperTypes.ts rename to packages/react-native-reanimated/src/helperTypes.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/commonTypes.ts b/packages/react-native-reanimated/src/hook/commonTypes.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/commonTypes.ts rename to packages/react-native-reanimated/src/hook/commonTypes.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/index.ts b/packages/react-native-reanimated/src/hook/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/index.ts rename to packages/react-native-reanimated/src/hook/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedGestureHandler.ts b/packages/react-native-reanimated/src/hook/useAnimatedGestureHandler.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedGestureHandler.ts rename to packages/react-native-reanimated/src/hook/useAnimatedGestureHandler.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedKeyboard.ts b/packages/react-native-reanimated/src/hook/useAnimatedKeyboard.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedKeyboard.ts rename to packages/react-native-reanimated/src/hook/useAnimatedKeyboard.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedProps.ts b/packages/react-native-reanimated/src/hook/useAnimatedProps.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedProps.ts rename to packages/react-native-reanimated/src/hook/useAnimatedProps.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedReaction.ts b/packages/react-native-reanimated/src/hook/useAnimatedReaction.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedReaction.ts rename to packages/react-native-reanimated/src/hook/useAnimatedReaction.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedRef.ts b/packages/react-native-reanimated/src/hook/useAnimatedRef.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedRef.ts rename to packages/react-native-reanimated/src/hook/useAnimatedRef.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedScrollHandler.ts b/packages/react-native-reanimated/src/hook/useAnimatedScrollHandler.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedScrollHandler.ts rename to packages/react-native-reanimated/src/hook/useAnimatedScrollHandler.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedSensor.ts b/packages/react-native-reanimated/src/hook/useAnimatedSensor.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedSensor.ts rename to packages/react-native-reanimated/src/hook/useAnimatedSensor.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useAnimatedStyle.ts b/packages/react-native-reanimated/src/hook/useAnimatedStyle.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useAnimatedStyle.ts rename to packages/react-native-reanimated/src/hook/useAnimatedStyle.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useComposedEventHandler.ts b/packages/react-native-reanimated/src/hook/useComposedEventHandler.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useComposedEventHandler.ts rename to packages/react-native-reanimated/src/hook/useComposedEventHandler.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useDerivedValue.ts b/packages/react-native-reanimated/src/hook/useDerivedValue.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useDerivedValue.ts rename to packages/react-native-reanimated/src/hook/useDerivedValue.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useEvent.ts b/packages/react-native-reanimated/src/hook/useEvent.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useEvent.ts rename to packages/react-native-reanimated/src/hook/useEvent.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useFrameCallback.ts b/packages/react-native-reanimated/src/hook/useFrameCallback.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useFrameCallback.ts rename to packages/react-native-reanimated/src/hook/useFrameCallback.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useHandler.ts b/packages/react-native-reanimated/src/hook/useHandler.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useHandler.ts rename to packages/react-native-reanimated/src/hook/useHandler.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useReducedMotion.ts b/packages/react-native-reanimated/src/hook/useReducedMotion.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useReducedMotion.ts rename to packages/react-native-reanimated/src/hook/useReducedMotion.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useScrollViewOffset.ts b/packages/react-native-reanimated/src/hook/useScrollViewOffset.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useScrollViewOffset.ts rename to packages/react-native-reanimated/src/hook/useScrollViewOffset.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useSharedValue.ts b/packages/react-native-reanimated/src/hook/useSharedValue.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useSharedValue.ts rename to packages/react-native-reanimated/src/hook/useSharedValue.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/useWorkletCallback.ts b/packages/react-native-reanimated/src/hook/useWorkletCallback.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/useWorkletCallback.ts rename to packages/react-native-reanimated/src/hook/useWorkletCallback.ts diff --git a/packages/react-native-reanimated/src/reanimated2/hook/utils.ts b/packages/react-native-reanimated/src/hook/utils.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/hook/utils.ts rename to packages/react-native-reanimated/src/hook/utils.ts diff --git a/packages/react-native-reanimated/src/index.ts b/packages/react-native-reanimated/src/index.ts index c4778d0c6954..03b213772359 100644 --- a/packages/react-native-reanimated/src/index.ts +++ b/packages/react-native-reanimated/src/index.ts @@ -1,5 +1,290 @@ 'use strict'; + +import './publicGlobals'; import * as Animated from './Animated'; -export * from './reanimated2'; export default Animated; + +export type { WorkletRuntime } from './core'; +export { + runOnJS, + runOnUI, + createWorkletRuntime, + runOnRuntime, + makeMutable, + makeShareableCloneRecursive, + isReanimated3, + isConfigured, + enableLayoutAnimations, + getViewProp, + executeOnUIRuntimeSync, +} from './core'; +export type { + GestureHandlers, + AnimatedRef, + DerivedValue, + ScrollHandler, + ScrollHandlers, + ScrollHandlerProcessed, + FrameCallback, + ScrollEvent, + EventHandler, + EventHandlerProcessed, + UseHandlerContext, + ReanimatedEvent, +} from './hook'; +export { + useAnimatedProps, + useEvent, + useHandler, + useWorkletCallback, + useSharedValue, + useReducedMotion, + useAnimatedStyle, + useAnimatedGestureHandler, + useAnimatedReaction, + useAnimatedRef, + useAnimatedScrollHandler, + useDerivedValue, + useAnimatedSensor, + useFrameCallback, + useAnimatedKeyboard, + useScrollViewOffset, + useComposedEventHandler, +} from './hook'; +export type { + DelayAnimation, + RepeatAnimation, + SequenceAnimation, + StyleLayoutAnimation, + WithTimingConfig, + TimingAnimation, + WithSpringConfig, + SpringAnimation, + WithDecayConfig, + DecayAnimation, +} from './animation'; +export { + cancelAnimation, + defineAnimation, + withClamp, + withDecay, + withDelay, + withRepeat, + withSequence, + withSpring, + withTiming, +} from './animation'; +export type { ExtrapolationConfig, ExtrapolationType } from './interpolation'; +export { Extrapolation, interpolate, clamp } from './interpolation'; +export type { + InterpolationOptions, + InterpolateConfig, + InterpolateRGB, + InterpolateHSV, +} from './interpolateColor'; +export { + /** + * @deprecated Please use {@link Extrapolation} instead. + */ + Extrapolate, + ColorSpace, + interpolateColor, + useInterpolateConfig, +} from './interpolateColor'; +export type { + EasingFunction, + EasingFn, + EasingFunctionFactory, + EasingFactoryFn, +} from './Easing'; +export { Easing } from './Easing'; +export type { ComponentCoords } from './platformFunctions'; +export { + measure, + dispatchCommand, + scrollTo, + setGestureState, + setNativeProps, + getRelativeCoords, +} from './platformFunctions'; +export type { ParsedColorArray } from './Colors'; +export { isColor, processColor, convertToRGBA } from './Colors'; +export { createAnimatedPropAdapter } from './PropAdapters'; +export type { + LayoutAnimation, + EntryAnimationsValues, + ExitAnimationsValues, + EntryExitAnimationFunction, + LayoutAnimationsValues, + LayoutAnimationFunction, + ILayoutAnimationBuilder, + IEntryExitAnimationBuilder, +} from './layoutReanimation'; +export { + BaseAnimationBuilder, + ComplexAnimationBuilder, + Keyframe, + // Flip + FlipInXUp, + FlipInYLeft, + FlipInXDown, + FlipInYRight, + FlipInEasyX, + FlipInEasyY, + FlipOutXUp, + FlipOutYLeft, + FlipOutXDown, + FlipOutYRight, + FlipOutEasyX, + FlipOutEasyY, + // Stretch + StretchInX, + StretchInY, + StretchOutX, + StretchOutY, + // Fade + FadeIn, + FadeInRight, + FadeInLeft, + FadeInUp, + FadeInDown, + FadeOut, + FadeOutRight, + FadeOutLeft, + FadeOutUp, + FadeOutDown, + // Slide + SlideInRight, + SlideInLeft, + SlideOutRight, + SlideOutLeft, + SlideInUp, + SlideInDown, + SlideOutUp, + SlideOutDown, + // Zoom + ZoomIn, + ZoomInRotate, + ZoomInLeft, + ZoomInRight, + ZoomInUp, + ZoomInDown, + ZoomInEasyUp, + ZoomInEasyDown, + ZoomOut, + ZoomOutRotate, + ZoomOutLeft, + ZoomOutRight, + ZoomOutUp, + ZoomOutDown, + ZoomOutEasyUp, + ZoomOutEasyDown, + // Bounce + BounceIn, + BounceInDown, + BounceInUp, + BounceInLeft, + BounceInRight, + BounceOut, + BounceOutDown, + BounceOutUp, + BounceOutLeft, + BounceOutRight, + // Lightspeed + LightSpeedInRight, + LightSpeedInLeft, + LightSpeedOutRight, + LightSpeedOutLeft, + // Pinwheel + PinwheelIn, + PinwheelOut, + // Rotate + RotateInDownLeft, + RotateInDownRight, + RotateInUpLeft, + RotateInUpRight, + RotateOutDownLeft, + RotateOutDownRight, + RotateOutUpLeft, + RotateOutUpRight, + // Roll + RollInLeft, + RollInRight, + RollOutLeft, + RollOutRight, + // Transitions + Layout, + LinearTransition, + FadingTransition, + SequencedTransition, + JumpingTransition, + CurvedTransition, + EntryExitTransition, + combineTransition, + // SET + SharedTransition, + SharedTransitionType, +} from './layoutReanimation'; +export { isSharedValue } from './isSharedValue'; +export type { + StyleProps, + SharedValue, + AnimatableValueObject, + AnimatableValue, + AnimationObject, + SensorConfig, + Animation, + AnimatedSensor, + AnimationCallback, + Value3D, + ValueRotation, + AnimatedKeyboardInfo, + AnimatedKeyboardOptions, + MeasuredDimensions, +} from './commonTypes'; +export { + SensorType, + IOSReferenceFrame, + InterfaceOrientation, + KeyboardState, + ReduceMotion, + isWorkletFunction, +} from './commonTypes'; +export type { FrameInfo } from './frameCallback'; +export { getUseOfValueInStyleWarning } from './pluginUtils'; +export { + withReanimatedTimer, + advanceAnimationByTime, + advanceAnimationByFrame, + setUpTests, + getAnimatedStyle, +} from './jestUtils'; +export { LayoutAnimationConfig } from './component/LayoutAnimationConfig'; +export { PerformanceMonitor } from './component/PerformanceMonitor'; +export type { + Adaptable, + AdaptTransforms, + AnimateProps, + AnimatedProps, + AnimatedTransform, + TransformStyleTypes, + TransformArrayItem, + AnimateStyle, + AnimatedStyle, + AnimatedStyleProp, + StylesOrDefault, +} from './helperTypes'; +export type { AnimatedScrollViewProps } from './component/ScrollView'; +export type { FlatListPropsWithLayout } from './component/FlatList'; +export { startMapper, stopMapper } from './mappers'; +export { + startScreenTransition, + finishScreenTransition, + ScreenTransition, +} from './screenTransition'; +export type { + AnimatedScreenTransition, + GoBackGesture, + ScreenTransitionConfig, +} from './screenTransition'; diff --git a/packages/react-native-reanimated/src/index.web.ts b/packages/react-native-reanimated/src/index.web.ts deleted file mode 100644 index a8aa767d0797..000000000000 --- a/packages/react-native-reanimated/src/index.web.ts +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; -export * from './reanimated2'; -export * as default from './Animated'; // If this line fails, you probably forgot some installation steps. Check out the installation guide here: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/getting-started#installation 1) Make sure reanimated's babel plugin is installed in your babel.config.js (you should have 'react-native-reanimated/plugin' listed there - also see the above link for details) 2) Make sure you reset build cache after updating the config, run: yarn start --reset-cache diff --git a/packages/react-native-reanimated/src/reanimated2/initializers.ts b/packages/react-native-reanimated/src/initializers.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/initializers.ts rename to packages/react-native-reanimated/src/initializers.ts diff --git a/packages/react-native-reanimated/src/reanimated2/interpolateColor.ts b/packages/react-native-reanimated/src/interpolateColor.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/interpolateColor.ts rename to packages/react-native-reanimated/src/interpolateColor.ts diff --git a/packages/react-native-reanimated/src/reanimated2/interpolation.ts b/packages/react-native-reanimated/src/interpolation.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/interpolation.ts rename to packages/react-native-reanimated/src/interpolation.ts diff --git a/packages/react-native-reanimated/src/reanimated2/isSharedValue.ts b/packages/react-native-reanimated/src/isSharedValue.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/isSharedValue.ts rename to packages/react-native-reanimated/src/isSharedValue.ts diff --git a/packages/react-native-reanimated/src/reanimated2/jestUtils.ts b/packages/react-native-reanimated/src/jestUtils.ts similarity index 99% rename from packages/react-native-reanimated/src/reanimated2/jestUtils.ts rename to packages/react-native-reanimated/src/jestUtils.ts index 470adae58fd8..5b221a1348ec 100644 --- a/packages/react-native-reanimated/src/reanimated2/jestUtils.ts +++ b/packages/react-native-reanimated/src/jestUtils.ts @@ -6,7 +6,7 @@ import type { AnimatedComponentProps, IAnimatedComponentInternal, InitialComponentProps, -} from '../createAnimatedComponent/commonTypes'; +} from './createAnimatedComponent/commonTypes'; import { isJest } from './PlatformChecker'; import type { DefaultStyle } from './hook/commonTypes'; diff --git a/packages/react-native-reanimated/src/reanimated2/jestUtils.web.ts b/packages/react-native-reanimated/src/jestUtils.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/jestUtils.web.ts rename to packages/react-native-reanimated/src/jestUtils.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/js-reanimated/JSReanimated.ts b/packages/react-native-reanimated/src/js-reanimated/JSReanimated.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/js-reanimated/JSReanimated.ts rename to packages/react-native-reanimated/src/js-reanimated/JSReanimated.ts diff --git a/packages/react-native-reanimated/src/reanimated2/js-reanimated/WebSensor.ts b/packages/react-native-reanimated/src/js-reanimated/WebSensor.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/js-reanimated/WebSensor.ts rename to packages/react-native-reanimated/src/js-reanimated/WebSensor.ts diff --git a/packages/react-native-reanimated/src/reanimated2/js-reanimated/index.ts b/packages/react-native-reanimated/src/js-reanimated/index.ts similarity index 99% rename from packages/react-native-reanimated/src/reanimated2/js-reanimated/index.ts rename to packages/react-native-reanimated/src/js-reanimated/index.ts index 550c210ffba5..e8099ce63dc3 100644 --- a/packages/react-native-reanimated/src/reanimated2/js-reanimated/index.ts +++ b/packages/react-native-reanimated/src/js-reanimated/index.ts @@ -3,7 +3,7 @@ import JSReanimated from './JSReanimated'; import type { StyleProps } from '../commonTypes'; import type { AnimatedStyle } from '../helperTypes'; import { isWeb } from '../PlatformChecker'; -import { PropsAllowlists } from '../../propsAllowlists'; +import { PropsAllowlists } from '../propsAllowlists'; // eslint-disable-next-line @typescript-eslint/no-explicit-any let createReactDOMStyle: (style: any) => any; diff --git a/packages/react-native-reanimated/src/reanimated2/js-reanimated/react-native-web.d.ts b/packages/react-native-reanimated/src/js-reanimated/react-native-web.d.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/js-reanimated/react-native-web.d.ts rename to packages/react-native-reanimated/src/js-reanimated/react-native-web.d.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/BaseAnimationBuilder.ts b/packages/react-native-reanimated/src/layoutReanimation/animationBuilder/BaseAnimationBuilder.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/BaseAnimationBuilder.ts rename to packages/react-native-reanimated/src/layoutReanimation/animationBuilder/BaseAnimationBuilder.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/ComplexAnimationBuilder.ts b/packages/react-native-reanimated/src/layoutReanimation/animationBuilder/ComplexAnimationBuilder.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/ComplexAnimationBuilder.ts rename to packages/react-native-reanimated/src/layoutReanimation/animationBuilder/ComplexAnimationBuilder.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/Keyframe.ts b/packages/react-native-reanimated/src/layoutReanimation/animationBuilder/Keyframe.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/Keyframe.ts rename to packages/react-native-reanimated/src/layoutReanimation/animationBuilder/Keyframe.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/commonTypes.ts b/packages/react-native-reanimated/src/layoutReanimation/animationBuilder/commonTypes.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/commonTypes.ts rename to packages/react-native-reanimated/src/layoutReanimation/animationBuilder/commonTypes.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/index.ts b/packages/react-native-reanimated/src/layoutReanimation/animationBuilder/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationBuilder/index.ts rename to packages/react-native-reanimated/src/layoutReanimation/animationBuilder/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationsManager.ts b/packages/react-native-reanimated/src/layoutReanimation/animationsManager.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/animationsManager.ts rename to packages/react-native-reanimated/src/layoutReanimation/animationsManager.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Bounce.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Bounce.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Bounce.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Bounce.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Fade.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Fade.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Fade.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Fade.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Flip.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Flip.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Flip.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Flip.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Lightspeed.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Lightspeed.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Lightspeed.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Lightspeed.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Pinwheel.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Pinwheel.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Pinwheel.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Pinwheel.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Roll.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Roll.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Roll.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Roll.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Rotate.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Rotate.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Rotate.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Rotate.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Slide.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Slide.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Slide.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Slide.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Stretch.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Stretch.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Stretch.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Stretch.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Zoom.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Zoom.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/Zoom.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/Zoom.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/index.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultAnimations/index.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultAnimations/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/CurvedTransition.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/CurvedTransition.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/CurvedTransition.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/CurvedTransition.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/EntryExitTransition.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/EntryExitTransition.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/EntryExitTransition.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/EntryExitTransition.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/FadingTransition.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/FadingTransition.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/FadingTransition.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/FadingTransition.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/JumpingTransition.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/JumpingTransition.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/JumpingTransition.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/JumpingTransition.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/LinearTransition.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/LinearTransition.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/LinearTransition.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/LinearTransition.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/SequencedTransition.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/SequencedTransition.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/SequencedTransition.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/SequencedTransition.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/index.ts b/packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/defaultTransitions/index.ts rename to packages/react-native-reanimated/src/layoutReanimation/defaultTransitions/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/index.ts b/packages/react-native-reanimated/src/layoutReanimation/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/index.ts rename to packages/react-native-reanimated/src/layoutReanimation/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/ProgressTransitionManager.ts b/packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/ProgressTransitionManager.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/ProgressTransitionManager.ts rename to packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/ProgressTransitionManager.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/SharedTransition.ts b/packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/SharedTransition.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/SharedTransition.ts rename to packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/SharedTransition.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/SharedTransition.web.ts b/packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/SharedTransition.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/SharedTransition.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/SharedTransition.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/index.ts b/packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/sharedTransitions/index.ts rename to packages/react-native-reanimated/src/layoutReanimation/sharedTransitions/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Bounce.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Bounce.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Bounce.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Bounce.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Fade.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Fade.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Fade.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Fade.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Flip.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Flip.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Flip.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Flip.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Lightspeed.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Lightspeed.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Lightspeed.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Lightspeed.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Pinwheel.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Pinwheel.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Pinwheel.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Pinwheel.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Roll.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Roll.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Roll.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Roll.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Rotate.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Rotate.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Rotate.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Rotate.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Slide.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Slide.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Slide.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Slide.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Stretch.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Stretch.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Stretch.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Stretch.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Zoom.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animation/Zoom.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animation/Zoom.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animation/Zoom.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animationParser.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animationParser.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animationParser.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animationParser.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animationsManager.ts b/packages/react-native-reanimated/src/layoutReanimation/web/animationsManager.ts similarity index 98% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animationsManager.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/animationsManager.ts index 4c8eac97405f..a94acc24c1e2 100644 --- a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/animationsManager.ts +++ b/packages/react-native-reanimated/src/layoutReanimation/web/animationsManager.ts @@ -5,7 +5,7 @@ import { Animations } from './config'; import type { AnimatedComponentProps, LayoutAnimationStaticContext, -} from '../../../createAnimatedComponent/commonTypes'; +} from '../../createAnimatedComponent/commonTypes'; import { LayoutAnimationType } from '../animationBuilder/commonTypes'; import { getProcessedConfig, diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/componentStyle.ts b/packages/react-native-reanimated/src/layoutReanimation/web/componentStyle.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/componentStyle.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/componentStyle.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/componentUtils.ts b/packages/react-native-reanimated/src/layoutReanimation/web/componentUtils.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/componentUtils.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/componentUtils.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/config.ts b/packages/react-native-reanimated/src/layoutReanimation/web/config.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/config.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/config.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/createAnimation.ts b/packages/react-native-reanimated/src/layoutReanimation/web/createAnimation.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/createAnimation.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/createAnimation.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/domUtils.ts b/packages/react-native-reanimated/src/layoutReanimation/web/domUtils.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/domUtils.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/domUtils.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/index.ts b/packages/react-native-reanimated/src/layoutReanimation/web/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/index.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/transition/Fading.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/transition/Fading.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/transition/Fading.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/transition/Fading.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/transition/Linear.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/transition/Linear.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/transition/Linear.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/transition/Linear.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/transition/Sequenced.web.ts b/packages/react-native-reanimated/src/layoutReanimation/web/transition/Sequenced.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/layoutReanimation/web/transition/Sequenced.web.ts rename to packages/react-native-reanimated/src/layoutReanimation/web/transition/Sequenced.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/mappers.ts b/packages/react-native-reanimated/src/mappers.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/mappers.ts rename to packages/react-native-reanimated/src/mappers.ts diff --git a/packages/react-native-reanimated/src/mock.ts b/packages/react-native-reanimated/src/mock.ts index cdc5e966e52b..1a9b52a6c357 100644 --- a/packages/react-native-reanimated/src/mock.ts +++ b/packages/react-native-reanimated/src/mock.ts @@ -7,7 +7,7 @@ import type { WithDecayConfig, AnimatableValue, AnimationCallback, -} from './reanimated2'; +} from './index'; import { IOSReferenceFrame, InterfaceOrientation, @@ -22,7 +22,7 @@ import { advanceAnimationByFrame, setUpTests, getAnimatedStyle, -} from './reanimated2'; +} from './index'; import { View as ViewRN, Text as TextRN, diff --git a/packages/react-native-reanimated/src/reanimated2/mockedRequestAnimationFrame.ts b/packages/react-native-reanimated/src/mockedRequestAnimationFrame.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/mockedRequestAnimationFrame.ts rename to packages/react-native-reanimated/src/mockedRequestAnimationFrame.ts diff --git a/packages/react-native-reanimated/src/reanimated2/mutables.ts b/packages/react-native-reanimated/src/mutables.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/mutables.ts rename to packages/react-native-reanimated/src/mutables.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platform-specific/RNRenderer.ts b/packages/react-native-reanimated/src/platform-specific/RNRenderer.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platform-specific/RNRenderer.ts rename to packages/react-native-reanimated/src/platform-specific/RNRenderer.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platform-specific/RNRenderer.web.ts b/packages/react-native-reanimated/src/platform-specific/RNRenderer.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platform-specific/RNRenderer.web.ts rename to packages/react-native-reanimated/src/platform-specific/RNRenderer.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platform-specific/checkCppVersion.ts b/packages/react-native-reanimated/src/platform-specific/checkCppVersion.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platform-specific/checkCppVersion.ts rename to packages/react-native-reanimated/src/platform-specific/checkCppVersion.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platform-specific/jsVersion.ts b/packages/react-native-reanimated/src/platform-specific/jsVersion.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platform-specific/jsVersion.ts rename to packages/react-native-reanimated/src/platform-specific/jsVersion.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/dispatchCommand.ts b/packages/react-native-reanimated/src/platformFunctions/dispatchCommand.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/dispatchCommand.ts rename to packages/react-native-reanimated/src/platformFunctions/dispatchCommand.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/dispatchCommand.web.ts b/packages/react-native-reanimated/src/platformFunctions/dispatchCommand.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/dispatchCommand.web.ts rename to packages/react-native-reanimated/src/platformFunctions/dispatchCommand.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/getRelativeCoords.ts b/packages/react-native-reanimated/src/platformFunctions/getRelativeCoords.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/getRelativeCoords.ts rename to packages/react-native-reanimated/src/platformFunctions/getRelativeCoords.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/index.ts b/packages/react-native-reanimated/src/platformFunctions/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/index.ts rename to packages/react-native-reanimated/src/platformFunctions/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/measure.ts b/packages/react-native-reanimated/src/platformFunctions/measure.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/measure.ts rename to packages/react-native-reanimated/src/platformFunctions/measure.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/measure.web.ts b/packages/react-native-reanimated/src/platformFunctions/measure.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/measure.web.ts rename to packages/react-native-reanimated/src/platformFunctions/measure.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/scrollTo.ts b/packages/react-native-reanimated/src/platformFunctions/scrollTo.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/scrollTo.ts rename to packages/react-native-reanimated/src/platformFunctions/scrollTo.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/scrollTo.web.ts b/packages/react-native-reanimated/src/platformFunctions/scrollTo.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/scrollTo.web.ts rename to packages/react-native-reanimated/src/platformFunctions/scrollTo.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/setGestureState.ts b/packages/react-native-reanimated/src/platformFunctions/setGestureState.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/setGestureState.ts rename to packages/react-native-reanimated/src/platformFunctions/setGestureState.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/setGestureState.web.ts b/packages/react-native-reanimated/src/platformFunctions/setGestureState.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/setGestureState.web.ts rename to packages/react-native-reanimated/src/platformFunctions/setGestureState.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/setNativeProps.ts b/packages/react-native-reanimated/src/platformFunctions/setNativeProps.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/setNativeProps.ts rename to packages/react-native-reanimated/src/platformFunctions/setNativeProps.ts diff --git a/packages/react-native-reanimated/src/reanimated2/platformFunctions/setNativeProps.web.ts b/packages/react-native-reanimated/src/platformFunctions/setNativeProps.web.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/platformFunctions/setNativeProps.web.ts rename to packages/react-native-reanimated/src/platformFunctions/setNativeProps.web.ts diff --git a/packages/react-native-reanimated/src/reanimated2/pluginUtils.ts b/packages/react-native-reanimated/src/pluginUtils.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/pluginUtils.ts rename to packages/react-native-reanimated/src/pluginUtils.ts diff --git a/packages/react-native-reanimated/src/reanimated2/publicGlobals.ts b/packages/react-native-reanimated/src/publicGlobals.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/publicGlobals.ts rename to packages/react-native-reanimated/src/publicGlobals.ts diff --git a/packages/react-native-reanimated/src/reanimated2/index.ts b/packages/react-native-reanimated/src/reanimated2/index.ts deleted file mode 100644 index 7b2d715e1030..000000000000 --- a/packages/react-native-reanimated/src/reanimated2/index.ts +++ /dev/null @@ -1,287 +0,0 @@ -'use strict'; - -import './publicGlobals'; - -export type { WorkletRuntime } from './core'; -export { - runOnJS, - runOnUI, - createWorkletRuntime, - runOnRuntime, - makeMutable, - makeShareableCloneRecursive, - isReanimated3, - isConfigured, - enableLayoutAnimations, - getViewProp, - executeOnUIRuntimeSync, -} from './core'; -export type { - GestureHandlers, - AnimatedRef, - DerivedValue, - ScrollHandler, - ScrollHandlers, - ScrollHandlerProcessed, - FrameCallback, - ScrollEvent, - EventHandler, - EventHandlerProcessed, - UseHandlerContext, - ReanimatedEvent, -} from './hook'; -export { - useAnimatedProps, - useEvent, - useHandler, - useWorkletCallback, - useSharedValue, - useReducedMotion, - useAnimatedStyle, - useAnimatedGestureHandler, - useAnimatedReaction, - useAnimatedRef, - useAnimatedScrollHandler, - useDerivedValue, - useAnimatedSensor, - useFrameCallback, - useAnimatedKeyboard, - useScrollViewOffset, - useComposedEventHandler, -} from './hook'; -export type { - DelayAnimation, - RepeatAnimation, - SequenceAnimation, - StyleLayoutAnimation, - WithTimingConfig, - TimingAnimation, - WithSpringConfig, - SpringAnimation, - WithDecayConfig, - DecayAnimation, -} from './animation'; -export { - cancelAnimation, - defineAnimation, - withClamp, - withDecay, - withDelay, - withRepeat, - withSequence, - withSpring, - withTiming, -} from './animation'; -export type { ExtrapolationConfig, ExtrapolationType } from './interpolation'; -export { Extrapolation, interpolate, clamp } from './interpolation'; -export type { - InterpolationOptions, - InterpolateConfig, - InterpolateRGB, - InterpolateHSV, -} from './interpolateColor'; -export { - /** - * @deprecated Please use {@link Extrapolation} instead. - */ - Extrapolate, - ColorSpace, - interpolateColor, - useInterpolateConfig, -} from './interpolateColor'; -export type { - EasingFunction, - EasingFn, - EasingFunctionFactory, - EasingFactoryFn, -} from './Easing'; -export { Easing } from './Easing'; -export type { ComponentCoords } from './platformFunctions'; -export { - measure, - dispatchCommand, - scrollTo, - setGestureState, - setNativeProps, - getRelativeCoords, -} from './platformFunctions'; -export type { ParsedColorArray } from './Colors'; -export { isColor, processColor, convertToRGBA } from './Colors'; -export { createAnimatedPropAdapter } from './PropAdapters'; -export type { - LayoutAnimation, - EntryAnimationsValues, - ExitAnimationsValues, - EntryExitAnimationFunction, - LayoutAnimationsValues, - LayoutAnimationFunction, - ILayoutAnimationBuilder, - IEntryExitAnimationBuilder, -} from './layoutReanimation'; -export { - BaseAnimationBuilder, - ComplexAnimationBuilder, - Keyframe, - // Flip - FlipInXUp, - FlipInYLeft, - FlipInXDown, - FlipInYRight, - FlipInEasyX, - FlipInEasyY, - FlipOutXUp, - FlipOutYLeft, - FlipOutXDown, - FlipOutYRight, - FlipOutEasyX, - FlipOutEasyY, - // Stretch - StretchInX, - StretchInY, - StretchOutX, - StretchOutY, - // Fade - FadeIn, - FadeInRight, - FadeInLeft, - FadeInUp, - FadeInDown, - FadeOut, - FadeOutRight, - FadeOutLeft, - FadeOutUp, - FadeOutDown, - // Slide - SlideInRight, - SlideInLeft, - SlideOutRight, - SlideOutLeft, - SlideInUp, - SlideInDown, - SlideOutUp, - SlideOutDown, - // Zoom - ZoomIn, - ZoomInRotate, - ZoomInLeft, - ZoomInRight, - ZoomInUp, - ZoomInDown, - ZoomInEasyUp, - ZoomInEasyDown, - ZoomOut, - ZoomOutRotate, - ZoomOutLeft, - ZoomOutRight, - ZoomOutUp, - ZoomOutDown, - ZoomOutEasyUp, - ZoomOutEasyDown, - // Bounce - BounceIn, - BounceInDown, - BounceInUp, - BounceInLeft, - BounceInRight, - BounceOut, - BounceOutDown, - BounceOutUp, - BounceOutLeft, - BounceOutRight, - // Lightspeed - LightSpeedInRight, - LightSpeedInLeft, - LightSpeedOutRight, - LightSpeedOutLeft, - // Pinwheel - PinwheelIn, - PinwheelOut, - // Rotate - RotateInDownLeft, - RotateInDownRight, - RotateInUpLeft, - RotateInUpRight, - RotateOutDownLeft, - RotateOutDownRight, - RotateOutUpLeft, - RotateOutUpRight, - // Roll - RollInLeft, - RollInRight, - RollOutLeft, - RollOutRight, - // Transitions - Layout, - LinearTransition, - FadingTransition, - SequencedTransition, - JumpingTransition, - CurvedTransition, - EntryExitTransition, - combineTransition, - // SET - SharedTransition, - SharedTransitionType, -} from './layoutReanimation'; -export { isSharedValue } from './isSharedValue'; -export type { - StyleProps, - SharedValue, - AnimatableValueObject, - AnimatableValue, - AnimationObject, - SensorConfig, - Animation, - AnimatedSensor, - AnimationCallback, - Value3D, - ValueRotation, - AnimatedKeyboardInfo, - AnimatedKeyboardOptions, - MeasuredDimensions, -} from './commonTypes'; -export { - SensorType, - IOSReferenceFrame, - InterfaceOrientation, - KeyboardState, - ReduceMotion, - isWorkletFunction, -} from './commonTypes'; -export type { FrameInfo } from './frameCallback'; -export { getUseOfValueInStyleWarning } from './pluginUtils'; -export { - withReanimatedTimer, - advanceAnimationByTime, - advanceAnimationByFrame, - setUpTests, - getAnimatedStyle, -} from './jestUtils'; -export { LayoutAnimationConfig } from './component/LayoutAnimationConfig'; -export { PerformanceMonitor } from './component/PerformanceMonitor'; -export type { - Adaptable, - AdaptTransforms, - AnimateProps, - AnimatedProps, - AnimatedTransform, - TransformStyleTypes, - TransformArrayItem, - AnimateStyle, - AnimatedStyle, - AnimatedStyleProp, - StylesOrDefault, -} from './helperTypes'; -export type { AnimatedScrollViewProps } from './component/ScrollView'; -export type { FlatListPropsWithLayout } from './component/FlatList'; -export { startMapper, stopMapper } from './mappers'; -export { - startScreenTransition, - finishScreenTransition, - ScreenTransition, -} from './screenTransition'; -export type { - AnimatedScreenTransition, - GoBackGesture, - ScreenTransitionConfig, -} from './screenTransition'; diff --git a/packages/react-native-reanimated/src/reanimated2/runtimes.ts b/packages/react-native-reanimated/src/runtimes.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/runtimes.ts rename to packages/react-native-reanimated/src/runtimes.ts diff --git a/packages/react-native-reanimated/src/reanimated2/screenTransition/RNScreensTurboModule.ts b/packages/react-native-reanimated/src/screenTransition/RNScreensTurboModule.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/screenTransition/RNScreensTurboModule.ts rename to packages/react-native-reanimated/src/screenTransition/RNScreensTurboModule.ts diff --git a/packages/react-native-reanimated/src/reanimated2/screenTransition/animationManager.ts b/packages/react-native-reanimated/src/screenTransition/animationManager.ts similarity index 95% rename from packages/react-native-reanimated/src/reanimated2/screenTransition/animationManager.ts rename to packages/react-native-reanimated/src/screenTransition/animationManager.ts index d8c426783c9b..16ba13179529 100644 --- a/packages/react-native-reanimated/src/reanimated2/screenTransition/animationManager.ts +++ b/packages/react-native-reanimated/src/screenTransition/animationManager.ts @@ -1,7 +1,7 @@ 'use strict'; import type { LockAxis, ScreenTransitionConfig } from './commonTypes'; -import { configureProps } from '../../ConfigHelper'; +import { configureProps } from '../ConfigHelper'; import { applyStyle } from './styleUpdater'; import { getSwipeSimulator } from './swipeSimulator'; diff --git a/packages/react-native-reanimated/src/reanimated2/screenTransition/commonTypes.ts b/packages/react-native-reanimated/src/screenTransition/commonTypes.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/screenTransition/commonTypes.ts rename to packages/react-native-reanimated/src/screenTransition/commonTypes.ts diff --git a/packages/react-native-reanimated/src/reanimated2/screenTransition/index.ts b/packages/react-native-reanimated/src/screenTransition/index.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/screenTransition/index.ts rename to packages/react-native-reanimated/src/screenTransition/index.ts diff --git a/packages/react-native-reanimated/src/reanimated2/screenTransition/presets.ts b/packages/react-native-reanimated/src/screenTransition/presets.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/screenTransition/presets.ts rename to packages/react-native-reanimated/src/screenTransition/presets.ts diff --git a/packages/react-native-reanimated/src/reanimated2/screenTransition/styleUpdater.ts b/packages/react-native-reanimated/src/screenTransition/styleUpdater.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/screenTransition/styleUpdater.ts rename to packages/react-native-reanimated/src/screenTransition/styleUpdater.ts diff --git a/packages/react-native-reanimated/src/reanimated2/screenTransition/swipeSimulator.ts b/packages/react-native-reanimated/src/screenTransition/swipeSimulator.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/screenTransition/swipeSimulator.ts rename to packages/react-native-reanimated/src/screenTransition/swipeSimulator.ts diff --git a/packages/react-native-reanimated/src/reanimated2/shareableMappingCache.ts b/packages/react-native-reanimated/src/shareableMappingCache.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/shareableMappingCache.ts rename to packages/react-native-reanimated/src/shareableMappingCache.ts diff --git a/packages/react-native-reanimated/src/reanimated2/shareables.ts b/packages/react-native-reanimated/src/shareables.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/shareables.ts rename to packages/react-native-reanimated/src/shareables.ts diff --git a/packages/react-native-reanimated/src/reanimated2/threads.ts b/packages/react-native-reanimated/src/threads.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/threads.ts rename to packages/react-native-reanimated/src/threads.ts diff --git a/packages/react-native-reanimated/src/reanimated2/valueSetter.ts b/packages/react-native-reanimated/src/valueSetter.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/valueSetter.ts rename to packages/react-native-reanimated/src/valueSetter.ts diff --git a/packages/react-native-reanimated/src/reanimated2/valueUnpacker.ts b/packages/react-native-reanimated/src/valueUnpacker.ts similarity index 100% rename from packages/react-native-reanimated/src/reanimated2/valueUnpacker.ts rename to packages/react-native-reanimated/src/valueUnpacker.ts diff --git a/yarn.lock b/yarn.lock index 784c1d7a8aaa..3d67fbedd30c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19362,7 +19362,7 @@ __metadata: "@types/react": "npm:^18.2.6" "@types/react-test-renderer": "npm:^18.0.0" babel-jest: "npm:^29.6.3" - eslint: "npm:^8.0.0-0" + eslint: "npm:^8.57.0" expo: "npm:^50.0.2" jest: "npm:^29.6.3" prettier: "npm:2.8.8" @@ -19370,7 +19370,7 @@ __metadata: react-native: "npm:react-native-tvos@0.73.4-0" react-native-reanimated: "workspace:*" react-test-renderer: "npm:18.2.0" - typescript: "npm:5.0.4" + typescript: "npm:~5.3.0" languageName: unknown linkType: soft