diff --git a/apps/fabric-example/ios/Podfile.lock b/apps/fabric-example/ios/Podfile.lock index 855045da1246..afb9f4ac5f94 100644 --- a/apps/fabric-example/ios/Podfile.lock +++ b/apps/fabric-example/ios/Podfile.lock @@ -2125,10 +2125,10 @@ SPEC CHECKSUMS: boost: 4cb898d0bf20404aab1850c656dcea009429d6c1 DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 FBLazyVector: d08b51db67e61e1adaed7aefdb43b43f247ee46a - fmt: 8083860262b879fc92bca720969c91bdb88ada93 - glog: 79d13cd7c34b5d0cea5f4ca72c0e6b462ef8fb4d + fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120 + glog: 69ef571f3de08433d766d614c73a9838a06bf7eb hermes-engine: b205fccb3c7b52031e5bdb458a40f85f806bb7e8 - RCT-Folly: 62f9775ef5ef5819714c7923b4b3a3eb5bf32dab + RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740 RCTDeprecation: 8c3d64b4ab77cf28adefa261e04fd205c2715607 RCTRequired: 70f9b55e176be07e234e2efe43b31de14d7cd5ba RCTTypeSafety: 570d25d58d8795b1a146f5dee4965a05b6fdf8ac @@ -2191,7 +2191,7 @@ SPEC CHECKSUMS: RNCPicker: 7973f617de8809ab9e7577b93ce23d3449fb1ec7 RNFlashList: 2381687e1305c20b7e173e9a980e2b9a7a3973f5 RNGestureHandler: 8781e2529230a1bc3ea8d75e5c3cd071b6c6aed7 - RNReanimated: 1ccd1c76398c3c599cf12ad152e8ef2b920aa6b9 + RNReanimated: 43e063cf135eb457f105c7e48d1f735fee39ec5b RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2 RNSVG: 6b65086b51556fd9723d5570a3455e865e1304a3 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d diff --git a/apps/macos-example/macos/Podfile.lock b/apps/macos-example/macos/Podfile.lock index 607e771c37db..e5a395101117 100644 --- a/apps/macos-example/macos/Podfile.lock +++ b/apps/macos-example/macos/Podfile.lock @@ -1264,7 +1264,7 @@ SPEC CHECKSUMS: RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c RNCPicker: 3e2c37a8328f368ce14da050cdc8231deb5fc9f9 RNGestureHandler: f203fa4755a75b02d45a299b07d7ed878f636705 - RNReanimated: b40f25f1e59b7071a7c699c99527137c2a0ddc09 + RNReanimated: f27c64c70e04681e8c6e202442bce8db03fc27cd RNSVG: cb24fb322de8c1ebf59904e7aca0447bb8dbed5a SocketRocket: f6c6249082c011e6de2de60ed641ef8bbe0cfac9 Yoga: dd0f2dde9c2bf2398b406740154bd99d5293aed8 diff --git a/apps/paper-example/ios/Podfile.lock b/apps/paper-example/ios/Podfile.lock index a912eaa0b895..d830cac1db0a 100644 --- a/apps/paper-example/ios/Podfile.lock +++ b/apps/paper-example/ios/Podfile.lock @@ -1915,10 +1915,10 @@ SPEC CHECKSUMS: boost: 4cb898d0bf20404aab1850c656dcea009429d6c1 DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 FBLazyVector: d08b51db67e61e1adaed7aefdb43b43f247ee46a - fmt: 8083860262b879fc92bca720969c91bdb88ada93 - glog: 79d13cd7c34b5d0cea5f4ca72c0e6b462ef8fb4d + fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120 + glog: 69ef571f3de08433d766d614c73a9838a06bf7eb hermes-engine: b205fccb3c7b52031e5bdb458a40f85f806bb7e8 - RCT-Folly: 62f9775ef5ef5819714c7923b4b3a3eb5bf32dab + RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740 RCTDeprecation: 8c3d64b4ab77cf28adefa261e04fd205c2715607 RCTRequired: 70f9b55e176be07e234e2efe43b31de14d7cd5ba RCTTypeSafety: 570d25d58d8795b1a146f5dee4965a05b6fdf8ac @@ -1981,7 +1981,7 @@ SPEC CHECKSUMS: RNCPicker: 3e2c37a8328f368ce14da050cdc8231deb5fc9f9 RNFlashList: 2a5ca82c4998952060b77fa9a1eb05f7ed8783b6 RNGestureHandler: 79789b93c9a67c553ecdfb4121e8c267cba12447 - RNReanimated: 3daa2123ef575afadd66cd8a6b809129acbd4a47 + RNReanimated: 2141ea09c132fb9d4b58f9dbab31f901119f0302 RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06 RNSVG: cb24fb322de8c1ebf59904e7aca0447bb8dbed5a SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d diff --git a/apps/tvos-example/ios/Podfile.lock b/apps/tvos-example/ios/Podfile.lock index d5f2f4ded330..5df86e170bab 100644 --- a/apps/tvos-example/ios/Podfile.lock +++ b/apps/tvos-example/ios/Podfile.lock @@ -1261,7 +1261,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNReanimated: 3cc4305aa879359f791b4e95a5c2d60a0c2051fe + RNReanimated: d2471e47c524529201ef0a5e4dde0e525b3f3260 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000 diff --git a/packages/react-native-reanimated/Common/cpp/reanimated/RuntimeDecorators/RNRuntimeDecorator.cpp b/packages/react-native-reanimated/Common/cpp/reanimated/RuntimeDecorators/RNRuntimeDecorator.cpp index a5b1b5daca13..0397ff559ce5 100644 --- a/packages/react-native-reanimated/Common/cpp/reanimated/RuntimeDecorators/RNRuntimeDecorator.cpp +++ b/packages/react-native-reanimated/Common/cpp/reanimated/RuntimeDecorators/RNRuntimeDecorator.cpp @@ -43,7 +43,7 @@ void RNRuntimeDecorator::decorate( rnRuntime.global().setProperty( rnRuntime, - jsi::PropNameID::forAscii(rnRuntime, "__reanimatedModuleProxy"), + "__reanimatedModuleProxy", jsi::Object::createFromHostObject(rnRuntime, nativeReanimatedModule)); } diff --git a/packages/react-native-reanimated/RNReanimated.podspec b/packages/react-native-reanimated/RNReanimated.podspec index e6711f433295..16421070a32d 100644 --- a/packages/react-native-reanimated/RNReanimated.podspec +++ b/packages/react-native-reanimated/RNReanimated.podspec @@ -79,7 +79,7 @@ Pod::Spec.new do |s| s.subspec "reanimated" do |ss| ss.source_files = [ - "apple/**/*.{mm,h,m}", + "apple/reanimated/**/*.{mm,h,m}", "Common/cpp/reanimated/**/*.{cpp,h}", ] end diff --git a/packages/react-native-reanimated/android/CMakeLists.txt b/packages/react-native-reanimated/android/CMakeLists.txt index 78041e8f1a0b..bfb8fe4e0275 100644 --- a/packages/react-native-reanimated/android/CMakeLists.txt +++ b/packages/react-native-reanimated/android/CMakeLists.txt @@ -4,8 +4,6 @@ cmake_minimum_required(VERSION 3.8) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "") -set(CMAKE_VERBOSE_MAKEFILE ON) - if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 73) set(CMAKE_CXX_STANDARD 20) else() @@ -48,9 +46,10 @@ endif() set(ignoreMe "${JS_RUNTIME_DIR}") set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build") -set(ANDROID_SRC_DIR "${CMAKE_SOURCE_DIR}/src") -set(WORKLETS_COMMON_DIR "${CMAKE_SOURCE_DIR}/../Common/cpp/worklets") -set(REANIMATED_COMMON_DIR "${CMAKE_SOURCE_DIR}/../Common/cpp/reanimated") +set(WORKLETS_ANDROID_CPP_DIR "${CMAKE_SOURCE_DIR}/src/main/cpp/worklets") +set(WORKLETS_COMMON_CPP_DIR "${CMAKE_SOURCE_DIR}/../Common/cpp/worklets") +set(REANIMATED_ANDROID_CPP_DIR "${CMAKE_SOURCE_DIR}/src/main/cpp/reanimated") +set(REANIMATED_COMMON_CPP_DIR "${CMAKE_SOURCE_DIR}/../Common/cpp/reanimated") -add_subdirectory(${CMAKE_SOURCE_DIR}/src/main/worklets) -add_subdirectory(${CMAKE_SOURCE_DIR}/src/main/reanimated) +add_subdirectory(${WORKLETS_ANDROID_CPP_DIR}) +add_subdirectory(${REANIMATED_ANDROID_CPP_DIR}) diff --git a/packages/react-native-reanimated/android/build.gradle b/packages/react-native-reanimated/android/build.gradle index 4558653cdba1..83d541e225d3 100644 --- a/packages/react-native-reanimated/android/build.gradle +++ b/packages/react-native-reanimated/android/build.gradle @@ -430,11 +430,13 @@ def assertMinimalReactNativeVersion = task assertMinimalReactNativeVersionTask { } task prepareHeadersForPrefab(type: Copy) { - from("$projectDir/src/main/cpp") + from("$projectDir/src/main/cpp/reanimated") from("$projectDir/../Common/cpp/reanimated/AnimatedSensor") from("$projectDir/../Common/cpp/reanimated/Fabric") from("$projectDir/../Common/cpp/reanimated/LayoutAnimations") from("$projectDir/../Common/cpp/reanimated/NativeModules") + from("$projectDir/../Common/cpp/reanimated/RuntimeDecorators") + from("$projectDir/../Common/cpp/reanimated/Tools") from("$projectDir/../Common/cpp/worklets/Registries") from("$projectDir/../Common/cpp/worklets/SharedItems") from("$projectDir/../Common/cpp/worklets/Tools") diff --git a/packages/react-native-reanimated/android/src/main/cpp/AndroidUIScheduler.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/AndroidUIScheduler.cpp similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/AndroidUIScheduler.cpp rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/AndroidUIScheduler.cpp diff --git a/packages/react-native-reanimated/android/src/main/cpp/AndroidUIScheduler.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/AndroidUIScheduler.h similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/AndroidUIScheduler.h rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/AndroidUIScheduler.h diff --git a/packages/react-native-reanimated/android/src/main/reanimated/CMakeLists.txt b/packages/react-native-reanimated/android/src/main/cpp/reanimated/CMakeLists.txt similarity index 58% rename from packages/react-native-reanimated/android/src/main/reanimated/CMakeLists.txt rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/CMakeLists.txt index d9107a3ad785..a00d97c8f8da 100644 --- a/packages/react-native-reanimated/android/src/main/reanimated/CMakeLists.txt +++ b/packages/react-native-reanimated/android/src/main/cpp/reanimated/CMakeLists.txt @@ -1,31 +1,30 @@ cmake_minimum_required(VERSION 3.8) -file(GLOB_RECURSE REANIMATED_COMMON_SOURCES CONFIGURE_DEPENDS "${REANIMATED_COMMON_DIR}/*.cpp") -file(GLOB_RECURSE SOURCES_ANDROID CONFIGURE_DEPENDS "${ANDROID_SRC_DIR}/main/cpp/*.cpp") +file(GLOB_RECURSE REANIMATED_COMMON_CPP_SOURCES CONFIGURE_DEPENDS "${REANIMATED_COMMON_CPP_DIR}/*.cpp") +file(GLOB_RECURSE REANIMATED_ANDROID_CPP_SOURCES CONFIGURE_DEPENDS "${REANIMATED_ANDROID_CPP_DIR}/*.cpp") add_library( reanimated SHARED - ${REANIMATED_COMMON_SOURCES} - ${SOURCES_ANDROID} - "${ANDROID_SRC_DIR}/main/cpp/PlatformLogger.cpp" + ${REANIMATED_COMMON_CPP_SOURCES} + ${REANIMATED_ANDROID_CPP_SOURCES} ) target_include_directories( reanimated PRIVATE - "${REANIMATED_COMMON_DIR}/AnimatedSensor" - "${REANIMATED_COMMON_DIR}/Fabric" - "${REANIMATED_COMMON_DIR}/LayoutAnimations" - "${REANIMATED_COMMON_DIR}/NativeModules" - "${REANIMATED_COMMON_DIR}/Tools" - "${REANIMATED_COMMON_DIR}/RuntimeDecorators" + "${REANIMATED_COMMON_CPP_DIR}/AnimatedSensor" + "${REANIMATED_COMMON_CPP_DIR}/Fabric" + "${REANIMATED_COMMON_CPP_DIR}/LayoutAnimations" + "${REANIMATED_COMMON_CPP_DIR}/NativeModules" + "${REANIMATED_COMMON_CPP_DIR}/Tools" + "${REANIMATED_COMMON_CPP_DIR}/RuntimeDecorators" ) target_include_directories( reanimated PRIVATE - "${ANDROID_SRC_DIR}/main/cpp" + "${REANIMATED_ANDROID_CPP_DIR}" ) target_include_directories( diff --git a/packages/react-native-reanimated/android/src/main/cpp/JNIHelper.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/JNIHelper.cpp similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/JNIHelper.cpp rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/JNIHelper.cpp diff --git a/packages/react-native-reanimated/android/src/main/cpp/JNIHelper.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/JNIHelper.h similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/JNIHelper.h rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/JNIHelper.h diff --git a/packages/react-native-reanimated/android/src/main/cpp/LayoutAnimations.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/LayoutAnimations.cpp similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/LayoutAnimations.cpp rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/LayoutAnimations.cpp diff --git a/packages/react-native-reanimated/android/src/main/cpp/LayoutAnimations.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/LayoutAnimations.h similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/LayoutAnimations.h rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/LayoutAnimations.h diff --git a/packages/react-native-reanimated/android/src/main/cpp/NativeProxy.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/NativeProxy.cpp similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/NativeProxy.cpp rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/NativeProxy.cpp diff --git a/packages/react-native-reanimated/android/src/main/cpp/NativeProxy.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/NativeProxy.h similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/NativeProxy.h rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/NativeProxy.h diff --git a/packages/react-native-reanimated/android/src/main/cpp/OnLoad.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/OnLoad.cpp similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/OnLoad.cpp rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/OnLoad.cpp diff --git a/packages/react-native-reanimated/android/src/main/cpp/PlatformLogger.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/PlatformLogger.cpp similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/PlatformLogger.cpp rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/PlatformLogger.cpp diff --git a/packages/react-native-reanimated/android/src/main/cpp/TurboModule.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/TurboModule.cpp similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/TurboModule.cpp rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/TurboModule.cpp diff --git a/packages/react-native-reanimated/android/src/main/cpp/TurboModule.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/TurboModule.h similarity index 100% rename from packages/react-native-reanimated/android/src/main/cpp/TurboModule.h rename to packages/react-native-reanimated/android/src/main/cpp/reanimated/TurboModule.h diff --git a/packages/react-native-reanimated/android/src/main/worklets/CMakeLists.txt b/packages/react-native-reanimated/android/src/main/cpp/worklets/CMakeLists.txt similarity index 87% rename from packages/react-native-reanimated/android/src/main/worklets/CMakeLists.txt rename to packages/react-native-reanimated/android/src/main/cpp/worklets/CMakeLists.txt index efd3fc2da1fe..ce14d0cf53cd 100644 --- a/packages/react-native-reanimated/android/src/main/worklets/CMakeLists.txt +++ b/packages/react-native-reanimated/android/src/main/cpp/worklets/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) -file(GLOB_RECURSE WORKLETS_COMMON_SOURCES CONFIGURE_DEPENDS "${WORKLETS_COMMON_DIR}/*.cpp") +file(GLOB_RECURSE WORKLETS_COMMON_CPP_SOURCES CONFIGURE_DEPENDS "${WORKLETS_COMMON_CPP_DIR}/*.cpp") # Consume shared libraries and headers from prefabs find_package(fbjni REQUIRED CONFIG) @@ -13,17 +13,17 @@ endif() add_library( worklets SHARED - ${WORKLETS_COMMON_SOURCES} + ${WORKLETS_COMMON_CPP_SOURCES} ) # includes target_include_directories( worklets PUBLIC - "${WORKLETS_COMMON_DIR}/Registries" - "${WORKLETS_COMMON_DIR}/SharedItems" - "${WORKLETS_COMMON_DIR}/Tools" - "${WORKLETS_COMMON_DIR}/WorkletRuntime" + "${WORKLETS_COMMON_CPP_DIR}/Registries" + "${WORKLETS_COMMON_CPP_DIR}/SharedItems" + "${WORKLETS_COMMON_CPP_DIR}/Tools" + "${WORKLETS_COMMON_CPP_DIR}/WorkletRuntime" ) target_include_directories( diff --git a/packages/react-native-reanimated/apple/Fabric/REAInitializerRCTFabricSurface.h b/packages/react-native-reanimated/apple/reanimated/Fabric/REAInitializerRCTFabricSurface.h similarity index 100% rename from packages/react-native-reanimated/apple/Fabric/REAInitializerRCTFabricSurface.h rename to packages/react-native-reanimated/apple/reanimated/Fabric/REAInitializerRCTFabricSurface.h diff --git a/packages/react-native-reanimated/apple/Fabric/REAInitializerRCTFabricSurface.mm b/packages/react-native-reanimated/apple/reanimated/Fabric/REAInitializerRCTFabricSurface.mm similarity index 100% rename from packages/react-native-reanimated/apple/Fabric/REAInitializerRCTFabricSurface.mm rename to packages/react-native-reanimated/apple/reanimated/Fabric/REAInitializerRCTFabricSurface.mm diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REAAnimationsManager.h b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAAnimationsManager.h similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REAAnimationsManager.h rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAAnimationsManager.h diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REAAnimationsManager.m b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAAnimationsManager.m similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REAAnimationsManager.m rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAAnimationsManager.m diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REAFrame.h b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAFrame.h similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REAFrame.h rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAFrame.h diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REAFrame.m b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAFrame.m similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REAFrame.m rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAFrame.m diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REAScreensHelper.h b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAScreensHelper.h similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REAScreensHelper.h rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAScreensHelper.h diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REAScreensHelper.m b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAScreensHelper.m similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REAScreensHelper.m rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REAScreensHelper.m diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASharedElement.h b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedElement.h similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASharedElement.h rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedElement.h diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASharedElement.m b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedElement.m similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASharedElement.m rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedElement.m diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASharedTransitionManager.h b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedTransitionManager.h similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASharedTransitionManager.h rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedTransitionManager.h diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASharedTransitionManager.m b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedTransitionManager.m similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASharedTransitionManager.m rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASharedTransitionManager.m diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASnapshot.h b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASnapshot.h similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASnapshot.h rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASnapshot.h diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASnapshot.m b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASnapshot.m similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASnapshot.m rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASnapshot.m diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASwizzledUIManager.h b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASwizzledUIManager.h similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASwizzledUIManager.h rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASwizzledUIManager.h diff --git a/packages/react-native-reanimated/apple/LayoutReanimation/REASwizzledUIManager.mm b/packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASwizzledUIManager.mm similarity index 100% rename from packages/react-native-reanimated/apple/LayoutReanimation/REASwizzledUIManager.mm rename to packages/react-native-reanimated/apple/reanimated/LayoutReanimation/REASwizzledUIManager.mm diff --git a/packages/react-native-reanimated/apple/RCTEventDispatcher+Reanimated.h b/packages/react-native-reanimated/apple/reanimated/RCTEventDispatcher+Reanimated.h similarity index 100% rename from packages/react-native-reanimated/apple/RCTEventDispatcher+Reanimated.h rename to packages/react-native-reanimated/apple/reanimated/RCTEventDispatcher+Reanimated.h diff --git a/packages/react-native-reanimated/apple/RCTEventDispatcher+Reanimated.m b/packages/react-native-reanimated/apple/reanimated/RCTEventDispatcher+Reanimated.m similarity index 100% rename from packages/react-native-reanimated/apple/RCTEventDispatcher+Reanimated.m rename to packages/react-native-reanimated/apple/reanimated/RCTEventDispatcher+Reanimated.m diff --git a/packages/react-native-reanimated/apple/RCTUIView+Reanimated.h b/packages/react-native-reanimated/apple/reanimated/RCTUIView+Reanimated.h similarity index 100% rename from packages/react-native-reanimated/apple/RCTUIView+Reanimated.h rename to packages/react-native-reanimated/apple/reanimated/RCTUIView+Reanimated.h diff --git a/packages/react-native-reanimated/apple/RCTUIView+Reanimated.m b/packages/react-native-reanimated/apple/reanimated/RCTUIView+Reanimated.m similarity index 100% rename from packages/react-native-reanimated/apple/RCTUIView+Reanimated.m rename to packages/react-native-reanimated/apple/reanimated/RCTUIView+Reanimated.m diff --git a/packages/react-native-reanimated/apple/READisplayLink.h b/packages/react-native-reanimated/apple/reanimated/READisplayLink.h similarity index 100% rename from packages/react-native-reanimated/apple/READisplayLink.h rename to packages/react-native-reanimated/apple/reanimated/READisplayLink.h diff --git a/packages/react-native-reanimated/apple/REAModule.h b/packages/react-native-reanimated/apple/reanimated/REAModule.h similarity index 100% rename from packages/react-native-reanimated/apple/REAModule.h rename to packages/react-native-reanimated/apple/reanimated/REAModule.h diff --git a/packages/react-native-reanimated/apple/REAModule.mm b/packages/react-native-reanimated/apple/reanimated/REAModule.mm similarity index 100% rename from packages/react-native-reanimated/apple/REAModule.mm rename to packages/react-native-reanimated/apple/reanimated/REAModule.mm diff --git a/packages/react-native-reanimated/apple/REANodesManager.h b/packages/react-native-reanimated/apple/reanimated/REANodesManager.h similarity index 100% rename from packages/react-native-reanimated/apple/REANodesManager.h rename to packages/react-native-reanimated/apple/reanimated/REANodesManager.h diff --git a/packages/react-native-reanimated/apple/REANodesManager.mm b/packages/react-native-reanimated/apple/reanimated/REANodesManager.mm similarity index 100% rename from packages/react-native-reanimated/apple/REANodesManager.mm rename to packages/react-native-reanimated/apple/reanimated/REANodesManager.mm diff --git a/packages/react-native-reanimated/apple/REASlowAnimations.h b/packages/react-native-reanimated/apple/reanimated/REASlowAnimations.h similarity index 100% rename from packages/react-native-reanimated/apple/REASlowAnimations.h rename to packages/react-native-reanimated/apple/reanimated/REASlowAnimations.h diff --git a/packages/react-native-reanimated/apple/REASlowAnimations.mm b/packages/react-native-reanimated/apple/reanimated/REASlowAnimations.mm similarity index 100% rename from packages/react-native-reanimated/apple/REASlowAnimations.mm rename to packages/react-native-reanimated/apple/reanimated/REASlowAnimations.mm diff --git a/packages/react-native-reanimated/apple/REAUIKit.h b/packages/react-native-reanimated/apple/reanimated/REAUIKit.h similarity index 100% rename from packages/react-native-reanimated/apple/REAUIKit.h rename to packages/react-native-reanimated/apple/reanimated/REAUIKit.h diff --git a/packages/react-native-reanimated/apple/REAUtils.h b/packages/react-native-reanimated/apple/reanimated/REAUtils.h similarity index 100% rename from packages/react-native-reanimated/apple/REAUtils.h rename to packages/react-native-reanimated/apple/reanimated/REAUtils.h diff --git a/packages/react-native-reanimated/apple/REAUtils.m b/packages/react-native-reanimated/apple/reanimated/REAUtils.m similarity index 100% rename from packages/react-native-reanimated/apple/REAUtils.m rename to packages/react-native-reanimated/apple/reanimated/REAUtils.m diff --git a/packages/react-native-reanimated/apple/RNGestureHandlerStateManager.h b/packages/react-native-reanimated/apple/reanimated/RNGestureHandlerStateManager.h similarity index 100% rename from packages/react-native-reanimated/apple/RNGestureHandlerStateManager.h rename to packages/react-native-reanimated/apple/reanimated/RNGestureHandlerStateManager.h diff --git a/packages/react-native-reanimated/apple/keyboardObserver/REAKeyboardEventObserver.h b/packages/react-native-reanimated/apple/reanimated/keyboardObserver/REAKeyboardEventObserver.h similarity index 100% rename from packages/react-native-reanimated/apple/keyboardObserver/REAKeyboardEventObserver.h rename to packages/react-native-reanimated/apple/reanimated/keyboardObserver/REAKeyboardEventObserver.h diff --git a/packages/react-native-reanimated/apple/keyboardObserver/REAKeyboardEventObserver.mm b/packages/react-native-reanimated/apple/reanimated/keyboardObserver/REAKeyboardEventObserver.mm similarity index 100% rename from packages/react-native-reanimated/apple/keyboardObserver/REAKeyboardEventObserver.mm rename to packages/react-native-reanimated/apple/reanimated/keyboardObserver/REAKeyboardEventObserver.mm diff --git a/packages/react-native-reanimated/apple/native/NativeMethods.h b/packages/react-native-reanimated/apple/reanimated/native/NativeMethods.h similarity index 100% rename from packages/react-native-reanimated/apple/native/NativeMethods.h rename to packages/react-native-reanimated/apple/reanimated/native/NativeMethods.h diff --git a/packages/react-native-reanimated/apple/native/NativeMethods.mm b/packages/react-native-reanimated/apple/reanimated/native/NativeMethods.mm similarity index 100% rename from packages/react-native-reanimated/apple/native/NativeMethods.mm rename to packages/react-native-reanimated/apple/reanimated/native/NativeMethods.mm diff --git a/packages/react-native-reanimated/apple/native/NativeProxy.h b/packages/react-native-reanimated/apple/reanimated/native/NativeProxy.h similarity index 100% rename from packages/react-native-reanimated/apple/native/NativeProxy.h rename to packages/react-native-reanimated/apple/reanimated/native/NativeProxy.h diff --git a/packages/react-native-reanimated/apple/native/NativeProxy.mm b/packages/react-native-reanimated/apple/reanimated/native/NativeProxy.mm similarity index 98% rename from packages/react-native-reanimated/apple/native/NativeProxy.mm rename to packages/react-native-reanimated/apple/reanimated/native/NativeProxy.mm index 8586ed9d7f83..d96ee9687044 100644 --- a/packages/react-native-reanimated/apple/native/NativeProxy.mm +++ b/packages/react-native-reanimated/apple/reanimated/native/NativeProxy.mm @@ -73,7 +73,6 @@ static inline bool getIsReducedMotion() std::shared_ptr uiScheduler = std::make_shared(); std::shared_ptr jsScheduler = std::make_shared(rnRuntime, jsInvoker); constexpr auto isBridgeless = false; - const auto isReducedMotion = getIsReducedMotion(); auto nativeReanimatedModule = std::make_shared( rnRuntime, @@ -83,7 +82,7 @@ static inline bool getIsReducedMotion() platformDepMethodsHolder, valueUnpackerCode, isBridgeless, - isReducedMotion); + getIsReducedMotion()); commonInit(reaModule, nativeReanimatedModule); // Layout Animation callbacks setup @@ -119,7 +118,6 @@ static inline bool getIsReducedMotion() auto uiScheduler = std::make_shared(); auto jsScheduler = std::make_shared(runtime, runtimeExecutor); constexpr auto isBridgeless = true; - const auto isReducedMotion = getIsReducedMotion(); auto nativeReanimatedModule = std::make_shared( runtime, @@ -129,7 +127,7 @@ static inline bool getIsReducedMotion() platformDepMethodsHolder, valueUnpackerCode, isBridgeless, - isReducedMotion); + getIsReducedMotion()); commonInit(reaModule, nativeReanimatedModule); diff --git a/packages/react-native-reanimated/apple/native/PlatformDepMethodsHolderImpl.h b/packages/react-native-reanimated/apple/reanimated/native/PlatformDepMethodsHolderImpl.h similarity index 100% rename from packages/react-native-reanimated/apple/native/PlatformDepMethodsHolderImpl.h rename to packages/react-native-reanimated/apple/reanimated/native/PlatformDepMethodsHolderImpl.h diff --git a/packages/react-native-reanimated/apple/native/PlatformDepMethodsHolderImpl.mm b/packages/react-native-reanimated/apple/reanimated/native/PlatformDepMethodsHolderImpl.mm similarity index 100% rename from packages/react-native-reanimated/apple/native/PlatformDepMethodsHolderImpl.mm rename to packages/react-native-reanimated/apple/reanimated/native/PlatformDepMethodsHolderImpl.mm diff --git a/packages/react-native-reanimated/apple/native/PlatformLogger.mm b/packages/react-native-reanimated/apple/reanimated/native/PlatformLogger.mm similarity index 100% rename from packages/react-native-reanimated/apple/native/PlatformLogger.mm rename to packages/react-native-reanimated/apple/reanimated/native/PlatformLogger.mm diff --git a/packages/react-native-reanimated/apple/native/REAIOSUIScheduler.h b/packages/react-native-reanimated/apple/reanimated/native/REAIOSUIScheduler.h similarity index 100% rename from packages/react-native-reanimated/apple/native/REAIOSUIScheduler.h rename to packages/react-native-reanimated/apple/reanimated/native/REAIOSUIScheduler.h diff --git a/packages/react-native-reanimated/apple/native/REAIOSUIScheduler.mm b/packages/react-native-reanimated/apple/reanimated/native/REAIOSUIScheduler.mm similarity index 100% rename from packages/react-native-reanimated/apple/native/REAIOSUIScheduler.mm rename to packages/react-native-reanimated/apple/reanimated/native/REAIOSUIScheduler.mm diff --git a/packages/react-native-reanimated/apple/native/REAJSIUtils.h b/packages/react-native-reanimated/apple/reanimated/native/REAJSIUtils.h similarity index 100% rename from packages/react-native-reanimated/apple/native/REAJSIUtils.h rename to packages/react-native-reanimated/apple/reanimated/native/REAJSIUtils.h diff --git a/packages/react-native-reanimated/apple/native/REAMessageThread.h b/packages/react-native-reanimated/apple/reanimated/native/REAMessageThread.h similarity index 100% rename from packages/react-native-reanimated/apple/native/REAMessageThread.h rename to packages/react-native-reanimated/apple/reanimated/native/REAMessageThread.h diff --git a/packages/react-native-reanimated/apple/native/REAMessageThread.mm b/packages/react-native-reanimated/apple/reanimated/native/REAMessageThread.mm similarity index 100% rename from packages/react-native-reanimated/apple/native/REAMessageThread.mm rename to packages/react-native-reanimated/apple/reanimated/native/REAMessageThread.mm diff --git a/packages/react-native-reanimated/apple/sensor/ReanimatedSensor.h b/packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensor.h similarity index 100% rename from packages/react-native-reanimated/apple/sensor/ReanimatedSensor.h rename to packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensor.h diff --git a/packages/react-native-reanimated/apple/sensor/ReanimatedSensor.m b/packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensor.m similarity index 100% rename from packages/react-native-reanimated/apple/sensor/ReanimatedSensor.m rename to packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensor.m diff --git a/packages/react-native-reanimated/apple/sensor/ReanimatedSensorContainer.h b/packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensorContainer.h similarity index 100% rename from packages/react-native-reanimated/apple/sensor/ReanimatedSensorContainer.h rename to packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensorContainer.h diff --git a/packages/react-native-reanimated/apple/sensor/ReanimatedSensorContainer.m b/packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensorContainer.m similarity index 100% rename from packages/react-native-reanimated/apple/sensor/ReanimatedSensorContainer.m rename to packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensorContainer.m diff --git a/packages/react-native-reanimated/apple/sensor/ReanimatedSensorType.h b/packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensorType.h similarity index 100% rename from packages/react-native-reanimated/apple/sensor/ReanimatedSensorType.h rename to packages/react-native-reanimated/apple/reanimated/sensor/ReanimatedSensorType.h