react-native-reanimated 4.3.1 → 4.3.2

package/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Legacy.cpp

@@ -635,38 +635,60 @@ void LayoutAnimationsProxy_Legacy::startEnteringAnimation(const int tag, ShadowV
 
   auto &viewProps = static_cast<const ViewProps &>(*mutation.newChildShadowView.props);
   auto opacity = viewProps.opacity;
+#ifdef ANDROID
+  const auto handle = pendingStarts_[tag].handle;
+  pendingStarts_[tag].count++;
+#endif
 
-  scheduleOnUI(uiScheduler_, [weakThis = weak_from_this(), finalView, current, mutation, opacity, tag]() {
-    auto strongThis = weakThis.lock();
-    if (!strongThis) {
-      return;
-    }
+  scheduleOnUI(
+      uiScheduler_,
+      [weakThis = weak_from_this(),
+       finalView,
+       current,
+       mutation,
+       opacity,
+       tag
+#ifdef ANDROID
+       ,
+       handle
+#endif
+  ]() {
+        auto strongThis = weakThis.lock();
+        if (!strongThis) {
+          return;
+        }
 
-    Rect window{};
-    {
-      auto &mutex = strongThis->mutex;
-      auto lock = std::unique_lock<std::recursive_mutex>(mutex);
-      strongThis->layoutAnimations_.insert_or_assign(
-          tag,
-          LayoutAnimation{
-              .finalView = finalView, .currentView = current, .parentTag = mutation.parentTag, .opacity = opacity});
-      window = strongThis->surfaceManager.getWindow(mutation.newChildShadowView.surfaceId);
-    }
+        Rect window{};
+        {
+          auto &mutex = strongThis->mutex;
+          auto lock = std::unique_lock<std::recursive_mutex>(mutex);
+#ifdef ANDROID
+          if (consumeIsCancelled(strongThis->pendingStarts_, tag, handle)) {
+            // the view was removed before this start could run
+            return;
+          }
+#endif
+          strongThis->layoutAnimations_.insert_or_assign(
+              tag,
+              LayoutAnimation{
+                  .finalView = finalView, .currentView = current, .parentTag = mutation.parentTag, .opacity = opacity});
+          window = strongThis->surfaceManager.getWindow(mutation.newChildShadowView.surfaceId);
+        }
 
-    Snapshot values(mutation.newChildShadowView, window);
-    auto &uiRuntime = strongThis->uiRuntime_;
-    jsi::Object yogaValues(uiRuntime);
-    yogaValues.setProperty(uiRuntime, "targetOriginX", values.x);
-    yogaValues.setProperty(uiRuntime, "targetGlobalOriginX", values.x);
-    yogaValues.setProperty(uiRuntime, "targetOriginY", values.y);
-    yogaValues.setProperty(uiRuntime, "targetGlobalOriginY", values.y);
-    yogaValues.setProperty(uiRuntime, "targetWidth", values.width);
-    yogaValues.setProperty(uiRuntime, "targetHeight", values.height);
-    yogaValues.setProperty(uiRuntime, "windowWidth", values.windowWidth);
-    yogaValues.setProperty(uiRuntime, "windowHeight", values.windowHeight);
-    strongThis->layoutAnimationsManager_->startLayoutAnimation(
-        uiRuntime, tag, LayoutAnimationType::ENTERING, yogaValues);
-  });
+        Snapshot values(mutation.newChildShadowView, window);
+        auto &uiRuntime = strongThis->uiRuntime_;
+        jsi::Object yogaValues(uiRuntime);
+        yogaValues.setProperty(uiRuntime, "targetOriginX", values.x);
+        yogaValues.setProperty(uiRuntime, "targetGlobalOriginX", values.x);
+        yogaValues.setProperty(uiRuntime, "targetOriginY", values.y);
+        yogaValues.setProperty(uiRuntime, "targetGlobalOriginY", values.y);
+        yogaValues.setProperty(uiRuntime, "targetWidth", values.width);
+        yogaValues.setProperty(uiRuntime, "targetHeight", values.height);
+        yogaValues.setProperty(uiRuntime, "windowWidth", values.windowWidth);
+        yogaValues.setProperty(uiRuntime, "windowHeight", values.windowHeight);
+        strongThis->layoutAnimationsManager_->startLayoutAnimation(
+            uiRuntime, tag, LayoutAnimationType::ENTERING, yogaValues);
+      });
 }
 
 void LayoutAnimationsProxy_Legacy::startExitingAnimation(const int tag, ShadowViewMutation &mutation) const {
@@ -674,38 +696,62 @@ void LayoutAnimationsProxy_Legacy::startExitingAnimation(const int tag, ShadowVi
   LOG(INFO) << "start exiting animation for tag " << tag << std::endl;
 #endif
   auto surfaceId = mutation.oldChildShadowView.surfaceId;
+#ifdef ANDROID
+  const auto handle = pendingStarts_[tag].handle;
+  pendingStarts_[tag].count++;
+#endif
 
-  scheduleOnUI(uiScheduler_, [weakThis = weak_from_this(), tag, mutation, surfaceId]() {
-    auto strongThis = weakThis.lock();
-    if (!strongThis) {
-      return;
-    }
-
-    auto oldView = mutation.oldChildShadowView;
-    Rect window{};
-    {
-      auto &mutex = strongThis->mutex;
-      auto lock = std::unique_lock<std::recursive_mutex>(mutex);
-      strongThis->createLayoutAnimation(mutation, oldView, surfaceId, tag);
-      window = strongThis->surfaceManager.getWindow(surfaceId);
-    }
+  scheduleOnUI(
+      uiScheduler_,
+      [weakThis = weak_from_this(),
+       tag,
+       mutation,
+       surfaceId
+#ifdef ANDROID
+       ,
+       handle
+#endif
+  ]() {
+        auto strongThis = weakThis.lock();
+        if (!strongThis) {
+          return;
+        }
 
-    Snapshot values(oldView, window);
+        auto oldView = mutation.oldChildShadowView;
+        Rect window{};
+        {
+          auto &mutex = strongThis->mutex;
+          auto lock = std::unique_lock<std::recursive_mutex>(mutex);
+#ifdef ANDROID
+          if (consumeIsCancelled(strongThis->pendingStarts_, tag, handle)) {
+            // the view was removed (e.g. its subtree was force-ended by a screen
+            // pop) before this start could run — its Remove+Delete are already on
+            // their way to the mounting layer, so starting the animation now
+            // would emit updates for a view that's about to be deleted
+            strongThis->layoutAnimationsManager_->clearLayoutAnimationConfig(tag);
+            return;
+          }
+#endif
+          strongThis->createLayoutAnimation(mutation, oldView, surfaceId, tag);
+          window = strongThis->surfaceManager.getWindow(surfaceId);
+        }
 
-    auto &uiRuntime = strongThis->uiRuntime_;
-    jsi::Object yogaValues(uiRuntime);
-    yogaValues.setProperty(uiRuntime, "currentOriginX", values.x);
-    yogaValues.setProperty(uiRuntime, "currentGlobalOriginX", values.x);
-    yogaValues.setProperty(uiRuntime, "currentOriginY", values.y);
-    yogaValues.setProperty(uiRuntime, "currentGlobalOriginY", values.y);
-    yogaValues.setProperty(uiRuntime, "currentWidth", values.width);
-    yogaValues.setProperty(uiRuntime, "currentHeight", values.height);
-    yogaValues.setProperty(uiRuntime, "windowWidth", values.windowWidth);
-    yogaValues.setProperty(uiRuntime, "windowHeight", values.windowHeight);
-    strongThis->layoutAnimationsManager_->startLayoutAnimation(
-        uiRuntime, tag, LayoutAnimationType::EXITING, yogaValues);
-    strongThis->layoutAnimationsManager_->clearLayoutAnimationConfig(tag);
-  });
+        Snapshot values(oldView, window);
+
+        auto &uiRuntime = strongThis->uiRuntime_;
+        jsi::Object yogaValues(uiRuntime);
+        yogaValues.setProperty(uiRuntime, "currentOriginX", values.x);
+        yogaValues.setProperty(uiRuntime, "currentGlobalOriginX", values.x);
+        yogaValues.setProperty(uiRuntime, "currentOriginY", values.y);
+        yogaValues.setProperty(uiRuntime, "currentGlobalOriginY", values.y);
+        yogaValues.setProperty(uiRuntime, "currentWidth", values.width);
+        yogaValues.setProperty(uiRuntime, "currentHeight", values.height);
+        yogaValues.setProperty(uiRuntime, "windowWidth", values.windowWidth);
+        yogaValues.setProperty(uiRuntime, "windowHeight", values.windowHeight);
+        strongThis->layoutAnimationsManager_->startLayoutAnimation(
+            uiRuntime, tag, LayoutAnimationType::EXITING, yogaValues);
+        strongThis->layoutAnimationsManager_->clearLayoutAnimationConfig(tag);
+      });
 }
 
 void LayoutAnimationsProxy_Legacy::startLayoutAnimation(const int tag, const ShadowViewMutation &mutation) const {
@@ -713,43 +759,64 @@ void LayoutAnimationsProxy_Legacy::startLayoutAnimation(const int tag, const Sha
   LOG(INFO) << "start layout animation for tag " << tag << std::endl;
 #endif
   auto surfaceId = mutation.oldChildShadowView.surfaceId;
+#ifdef ANDROID
+  const auto handle = pendingStarts_[tag].handle;
+  pendingStarts_[tag].count++;
+#endif
 
-  scheduleOnUI(uiScheduler_, [weakThis = weak_from_this(), mutation, surfaceId, tag]() {
-    auto strongThis = weakThis.lock();
-    if (!strongThis) {
-      return;
-    }
-
-    auto oldView = mutation.oldChildShadowView;
-    Rect window{};
-    {
-      auto &mutex = strongThis->mutex;
-      auto lock = std::unique_lock<std::recursive_mutex>(mutex);
-      strongThis->createLayoutAnimation(mutation, oldView, surfaceId, tag);
-      window = strongThis->surfaceManager.getWindow(surfaceId);
-    }
+  scheduleOnUI(
+      uiScheduler_,
+      [weakThis = weak_from_this(),
+       mutation,
+       surfaceId,
+       tag
+#ifdef ANDROID
+       ,
+       handle
+#endif
+  ]() {
+        auto strongThis = weakThis.lock();
+        if (!strongThis) {
+          return;
+        }
 
-    Snapshot currentValues(oldView, window);
-    Snapshot targetValues(mutation.newChildShadowView, window);
+        auto oldView = mutation.oldChildShadowView;
+        Rect window{};
+        {
+          auto &mutex = strongThis->mutex;
+          auto lock = std::unique_lock<std::recursive_mutex>(mutex);
+#ifdef ANDROID
+          if (consumeIsCancelled(strongThis->pendingStarts_, tag, handle)) {
+            // the view was removed before this start could run
+            return;
+          }
+#endif
+          strongThis->createLayoutAnimation(mutation, oldView, surfaceId, tag);
+          window = strongThis->surfaceManager.getWindow(surfaceId);
+        }
 
-    auto &uiRuntime = strongThis->uiRuntime_;
-    jsi::Object yogaValues(uiRuntime);
-    yogaValues.setProperty(uiRuntime, "currentOriginX", currentValues.x);
-    yogaValues.setProperty(uiRuntime, "currentGlobalOriginX", currentValues.x);
-    yogaValues.setProperty(uiRuntime, "currentOriginY", currentValues.y);
-    yogaValues.setProperty(uiRuntime, "currentGlobalOriginY", currentValues.y);
-    yogaValues.setProperty(uiRuntime, "currentWidth", currentValues.width);
-    yogaValues.setProperty(uiRuntime, "currentHeight", currentValues.height);
-    yogaValues.setProperty(uiRuntime, "targetOriginX", targetValues.x);
-    yogaValues.setProperty(uiRuntime, "targetGlobalOriginX", targetValues.x);
-    yogaValues.setProperty(uiRuntime, "targetOriginY", targetValues.y);
-    yogaValues.setProperty(uiRuntime, "targetGlobalOriginY", targetValues.y);
-    yogaValues.setProperty(uiRuntime, "targetWidth", targetValues.width);
-    yogaValues.setProperty(uiRuntime, "targetHeight", targetValues.height);
-    yogaValues.setProperty(uiRuntime, "windowWidth", targetValues.windowWidth);
-    yogaValues.setProperty(uiRuntime, "windowHeight", targetValues.windowHeight);
-    strongThis->layoutAnimationsManager_->startLayoutAnimation(uiRuntime, tag, LayoutAnimationType::LAYOUT, yogaValues);
-  });
+        Snapshot currentValues(oldView, window);
+        Snapshot targetValues(mutation.newChildShadowView, window);
+
+        auto &uiRuntime = strongThis->uiRuntime_;
+        jsi::Object yogaValues(uiRuntime);
+        yogaValues.setProperty(uiRuntime, "currentOriginX", currentValues.x);
+        yogaValues.setProperty(uiRuntime, "currentGlobalOriginX", currentValues.x);
+        yogaValues.setProperty(uiRuntime, "currentOriginY", currentValues.y);
+        yogaValues.setProperty(uiRuntime, "currentGlobalOriginY", currentValues.y);
+        yogaValues.setProperty(uiRuntime, "currentWidth", currentValues.width);
+        yogaValues.setProperty(uiRuntime, "currentHeight", currentValues.height);
+        yogaValues.setProperty(uiRuntime, "targetOriginX", targetValues.x);
+        yogaValues.setProperty(uiRuntime, "targetGlobalOriginX", targetValues.x);
+        yogaValues.setProperty(uiRuntime, "targetOriginY", targetValues.y);
+        yogaValues.setProperty(uiRuntime, "targetGlobalOriginY", targetValues.y);
+        yogaValues.setProperty(uiRuntime, "targetWidth", targetValues.width);
+        yogaValues.setProperty(uiRuntime, "targetHeight", targetValues.height);
+        yogaValues.setProperty(uiRuntime, "windowWidth", targetValues.windowWidth);
+        yogaValues.setProperty(uiRuntime, "windowHeight", targetValues.windowHeight);
+        strongThis->layoutAnimationsManager_->startLayoutAnimation(
+            uiRuntime, tag, LayoutAnimationType::LAYOUT, yogaValues);
+      });
 }
 
 void LayoutAnimationsProxy_Legacy::updateOngoingAnimationTarget(const int tag, const ShadowViewMutation &mutation)
@@ -759,6 +826,12 @@ void LayoutAnimationsProxy_Legacy::updateOngoingAnimationTarget(const int tag, c
 }
 
 void LayoutAnimationsProxy_Legacy::maybeCancelAnimation(const int tag) const {
+#ifdef ANDROID
+  // invalidate animation starts that are scheduled but haven't run yet
+  if (const auto it = pendingStarts_.find(tag); it != pendingStarts_.end()) {
+    it->second.handle++;
+  }
+#endif
   if (!layoutAnimations_.contains(tag)) {
     return;
   }

package/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp

@@ -717,11 +717,6 @@ void ReanimatedModuleProxy::performOperations() {
   }
 
   commitUpdates(uiRuntime, updatesBatch);
-
-  // Clear the entire cache after the commit
-  // (we don't know if the view is updated from outside of Reanimated
-  // so we have to clear the entire cache)
-  viewStylesRepository_->clearNodesCache();
 }
 
 void ReanimatedModuleProxy::performNonLayoutOperations() {
@@ -1292,7 +1287,8 @@ void ReanimatedModuleProxy::initializeFabric(const std::shared_ptr<UIManager> &u
 
     strongThis->requestFlushRegistry();
   };
-  mountHook_ = std::make_shared<ReanimatedMountHook>(uiManager_, updatesRegistryManager_, request);
+  mountHook_ =
+      std::make_shared<ReanimatedMountHook>(uiManager_, updatesRegistryManager_, viewStylesRepository_, request);
   commitHook_ = std::make_shared<ReanimatedCommitHook>(uiManager_, updatesRegistryManager_, layoutAnimationsProxy_);
 }
 

package/android/CMakeLists.txt

@@ -1,5 +1,5 @@
 project(Reanimated)
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -50,6 +50,9 @@ find_package(react-native-worklets REQUIRED CONFIG)
 add_library(reanimated SHARED ${REANIMATED_COMMON_CPP_SOURCES}
                               ${REANIMATED_ANDROID_CPP_SOURCES})
 
+target_precompile_headers(reanimated PRIVATE
+                          "${ANDROID_CPP_DIR}/ReanimatedPCH.h")
+
 if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
   include(
     "${REACT_NATIVE_DIR}/ReactCommon/cmake-utils/react-native-flags.cmake")

package/android/build.gradle

@@ -130,6 +130,8 @@ if (project == rootProject) {
 apply plugin: "com.android.library"
 apply plugin: "maven-publish"
 
+apply from: "./generate-stub-pch.gradle.kts"
+
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 36)
 

package/android/generate-stub-pch.gradle.kts

@@ -0,0 +1,84 @@
+import groovy.json.JsonSlurper
+
+// Workaround for Android Studio's C++ analyzer surfacing errors during Gradle
+// Sync when CMake's precompiled header binary (`cmake_pch.hxx.pch`, generated
+// from `ReanimatedPCH.h`) hasn't been built yet. The project compiles fine,
+// but on a clean sync the IDE can't index sources without the PCH binary. See
+// the underlying issue: https://issuetracker.google.com/issues/187448826
+
+// Generates minimal stub `.pch` files from an empty header so the IDE's C++
+// engine doesn't fail during sync. The actual build regenerates the real PCH
+// files via ninja because we set each stub PCH's mtime older than its source
+// (`cmake_pch.hxx.cxx`).
+
+// Adapted from Expo's PR: https://github.com/expo/expo/pull/45921
+
+val cxxDir = project.file(".cxx")
+
+val generateStubPCHTask = tasks.register("generateStubPCH") {
+    dependsOn("configureCMakeDebug")
+    doLast {
+        if (!cxxDir.exists()) {
+            return@doLast
+        }
+        cxxDir.walkTopDown().forEach { file ->
+            if (file.name != "compile_commands.json") {
+                return@forEach
+            }
+            @Suppress("UNCHECKED_CAST")
+            val entries = JsonSlurper().parseText(file.readText()) as List<Map<String, Any>>
+            entries.forEach entry@{ entry ->
+                val entryFile = entry["file"] as String
+                if (!entryFile.endsWith("cmake_pch.hxx.cxx")) {
+                    return@entry
+                }
+                val pchFile = File(entryFile.substring(0, entryFile.length - ".cxx".length) + ".pch")
+                if (!pchFile.exists() || pchFile.length() == 0L) {
+                    pchFile.parentFile.mkdirs()
+
+                    val command = entry["command"] as String
+                    val compiler = command.split(" ").first()
+                    val target = Regex("""--target=\S+""").find(command)!!.value
+                    val sysroot = Regex("""--sysroot=\S+""").find(command)!!.value
+
+                    val stubHeader = File(pchFile.parentFile, "stub_pch.hxx")
+                    stubHeader.writeText("")
+
+                    val process = ProcessBuilder(
+                        compiler,
+                        target,
+                        sysroot,
+                        "-x", "c++-header",
+                        "-o", pchFile.absolutePath,
+                        stubHeader.absolutePath,
+                    )
+                        .directory(File(entry["directory"] as String))
+                        .redirectErrorStream(true)
+                        .start()
+                    process.outputStream.close()
+                    if (process.waitFor() != 0) {
+                        throw GradleException(
+                            "Stub PCH generation failed: ${process.inputStream.bufferedReader().readText()}",
+                        )
+                    }
+                }
+                // Ensure PCH is older than source so ninja rebuilds the real one during build
+                pchFile.setLastModified(File(entryFile).lastModified() - 1)
+            }
+        }
+    }
+}
+
+// Register `prepareKotlinBuildScriptModel` if absent (Android Studio sync needs it
+// to exist so the stub PCH generation runs) or configure it if some other plugin
+// already registered it (e.g. on CI, where re-registering throws `Cannot add task
+// 'prepareKotlinBuildScriptModel' as a task with that name already exists.`).
+if (tasks.findByName("prepareKotlinBuildScriptModel") == null) {
+    tasks.register("prepareKotlinBuildScriptModel") {
+        dependsOn(generateStubPCHTask)
+    }
+} else {
+    tasks.named("prepareKotlinBuildScriptModel") {
+        dependsOn(generateStubPCHTask)
+    }
+}

package/android/src/main/cpp/ReanimatedPCH.h

@@ -0,0 +1,46 @@
+#pragma once
+
+// IWYU pragma: begin_keep
+
+// C++ standard library
+#include <algorithm>
+#include <atomic>
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <ostream>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+// fbjni
+#include <fbjni/fbjni.h>
+
+// folly
+#include <folly/Conv.h>
+#include <folly/Expected.h>
+#include <folly/Format.h>
+#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
+
+// jsi
+#include <jsi/JSIDynamic.h>
+#include <jsi/jsi.h>
+
+// react-native renderer (Fabric)
+#include <react/renderer/components/root/RootProps.h>
+#include <react/renderer/components/root/RootShadowNode.h>
+#include <react/renderer/components/view/BaseViewProps.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/EventDispatcher.h>
+#include <react/renderer/core/ShadowNode.h>
+#include <react/renderer/mounting/ShadowTree.h>
+#include <react/renderer/uimanager/UIManager.h>
+
+// IWYU pragma: end_keep

package/android/src/main/java/com/swmansion/reanimated/NativeProxy.java

@@ -15,6 +15,7 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.annotations.FrameworkAPI;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.soloader.SoLoader;
@@ -305,7 +306,19 @@ public class NativeProxy {
     }
 
     for (int i = 0; i < tags.length; i++) {
-      if (mFabricUIManager.resolveView(tags[i]) == null) {
+      try {
+        if (mFabricUIManager.resolveView(tags[i]) == null) {
+          tags[i] = -1;
+        }
+      } catch (IllegalViewOperationException e) {
+        // `resolveView` is expected to return `null` for a tag without a
+        // mounted view, but it instead throws when the tag's `ViewState` is
+        // already registered while the Android view hasn't been created yet.
+        // This happens when a view is mid-preallocation and a third-party view
+        // manager (e.g. lottie-react-native) dispatches an event synchronously
+        // from within `createView`, re-entering this code path. Treat it the
+        // same as a missing view.
+        // See https://github.com/software-mansion/react-native-reanimated/issues/9636.
         tags[i] = -1;
       }
     }

package/android/src/main/java/com/swmansion/reanimated/keyboard/KeyboardAnimationCallback.java

@@ -10,6 +10,7 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
   private final NotifyAboutKeyboardChangeFunction mNotifyAboutKeyboardChange;
   private static final int CONTENT_TYPE_MASK = WindowInsetsCompat.Type.ime();
   private final boolean mIsNavigationBarTranslucent;
+  private boolean mPendingStartDispatch = false;
 
   public KeyboardAnimationCallback(
       Keyboard keyboard,
@@ -30,7 +31,9 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
       return bounds;
     }
     mKeyboard.onAnimationStart();
-    mNotifyAboutKeyboardChange.call();
+    // Dispatching synchronously here can cancel the still-pending insets
+    // animation, so the dispatch is deferred to onProgress or onEnd.
+    mPendingStartDispatch = true;
     return super.onStart(animation, bounds);
   }
 
@@ -47,6 +50,7 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
       }
     }
     if (isAnyKeyboardAnimationRunning) {
+      mPendingStartDispatch = false;
       mKeyboard.updateHeight(insets, mIsNavigationBarTranslucent);
       mNotifyAboutKeyboardChange.call();
     }
@@ -56,6 +60,10 @@ public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callb
   @Override
   public void onEnd(@NonNull WindowInsetsAnimationCompat animation) {
     if (isKeyboardAnimation(animation)) {
+      if (mPendingStartDispatch) {
+        mNotifyAboutKeyboardChange.call();
+      }
+      mPendingStartDispatch = false;
       mKeyboard.onAnimationEnd();
       mNotifyAboutKeyboardChange.call();
     }

package/apple/reanimated/apple/ReanimatedModule.mm

@@ -130,7 +130,18 @@ RCT_EXPORT_MODULE(ReanimatedModule);
 - (BOOL)hasReactNativeFailedReload
 {
   id workletsModule = [_moduleRegistry moduleForName:"WorkletsModule"];
-  return ![_moduleRegistry moduleIsInitialized:[workletsModule class]];
+  if (![_moduleRegistry moduleIsInitialized:[workletsModule class]]) {
+    return YES;
+  }
+
+  // On a double reload React Native can momentarily leave the surface presenter without
+  // a scheduler. This is another manifestation of the same non-fatal reload race, so we
+  // bail on it here instead of asserting on a nil scheduler later in installTurboModule.
+  if ([_surfacePresenter scheduler] == nil) {
+    return YES;
+  }
+
+  return NO;
 }
 
 - (void)checkBridgeless

package/lib/module/common/constants/platform.js

@@ -8,12 +8,12 @@ function isWindowAvailable() {
   // @ts-ignore Fallback if `window` is undefined.
   return typeof window !== 'undefined';
 }
-export const IS_ANDROID = /* @__PURE__ */(() => Platform.OS === 'android')();
-export const IS_IOS = /* @__PURE__ */(() => Platform.OS === 'ios')();
-export const IS_WEB = Platform.OS === 'web';
-export const IS_JEST = !!process.env.JEST_WORKER_ID;
+export const IS_ANDROID = /* @__PURE__ */(() => Platform?.OS === 'android')();
+export const IS_IOS = /* @__PURE__ */(() => Platform?.OS === 'ios')();
+export const IS_WEB = Platform?.OS === 'web';
+export const IS_JEST = typeof globalThis.jest !== 'undefined' || process.env.NODE_ENV === 'test';
 /** @knipIgnore */
-export const IS_WINDOWS = Platform.OS === 'windows';
+export const IS_WINDOWS = Platform?.OS === 'windows';
 export const IS_WINDOW_AVAILABLE = isWindowAvailable();
 export const SHOULD_BE_USE_WEB = IS_JEST || IS_WEB || IS_WINDOWS;
 //# sourceMappingURL=platform.js.map

package/lib/module/common/constants/platform.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","isWindowAvailable","window","IS_ANDROID","OS","IS_IOS","IS_WEB","IS_JEST","process","env","JEST_WORKER_ID","IS_WINDOWS","IS_WINDOW_AVAILABLE","SHOULD_BE_USE_WEB"],"sourceRoot":"../../../../src","sources":["common/constants/platform.ts"],"mappings":"AAAA,YAAY;;AACZ,SAASA,QAAQ,QAAQ,cAAc;AAEvC,SAASC,iBAAiBA,CAAA,EAAG;EAC3B;EACA;EACA;EACA;EACA,OAAO,OAAOC,MAAM,KAAK,WAAW;AACtC;AAEA,OAAO,MAAMC,UAAmB,GAAG,eAAgB,CAAC,MAClDH,QAAQ,CAACI,EAAE,KAAK,SAAS,EAAE,CAAC;AAC9B,OAAO,MAAMC,MAAe,GAAG,eAAgB,CAAC,MAAML,QAAQ,CAACI,EAAE,KAAK,KAAK,EAAE,CAAC;AAC9E,OAAO,MAAME,MAAe,GAAGN,QAAQ,CAACI,EAAE,KAAK,KAAK;AACpD,OAAO,MAAMG,OAAgB,GAAG,CAAC,CAACC,OAAO,CAACC,GAAG,CAACC,cAAc;AAC5D;AACA,OAAO,MAAMC,UAAmB,GAAGX,QAAQ,CAACI,EAAE,KAAK,SAAS;AAE5D,OAAO,MAAMQ,mBAA4B,GAAGX,iBAAiB,CAAC,CAAC;AAE/D,OAAO,MAAMY,iBAAiB,GAAGN,OAAO,IAAID,MAAM,IAAIK,UAAU","ignoreList":[]}
+{"version":3,"names":["Platform","isWindowAvailable","window","IS_ANDROID","OS","IS_IOS","IS_WEB","IS_JEST","globalThis","jest","process","env","NODE_ENV","IS_WINDOWS","IS_WINDOW_AVAILABLE","SHOULD_BE_USE_WEB"],"sourceRoot":"../../../../src","sources":["common/constants/platform.ts"],"mappings":"AAAA,YAAY;;AACZ,SAASA,QAAQ,QAAQ,cAAc;AAEvC,SAASC,iBAAiBA,CAAA,EAAG;EAC3B;EACA;EACA;EACA;EACA,OAAO,OAAOC,MAAM,KAAK,WAAW;AACtC;AAEA,OAAO,MAAMC,UAAmB,GAAG,eAAgB,CAAC,MAClDH,QAAQ,EAAEI,EAAE,KAAK,SAAS,EAAE,CAAC;AAC/B,OAAO,MAAMC,MAAe,GAAG,eAAgB,CAAC,MAAML,QAAQ,EAAEI,EAAE,KAAK,KAAK,EAAE,CAAC;AAC/E,OAAO,MAAME,MAAe,GAAGN,QAAQ,EAAEI,EAAE,KAAK,KAAK;AACrD,OAAO,MAAMG,OAAgB,GAC3B,OAAOC,UAAU,CAACC,IAAI,KAAK,WAAW,IAAIC,OAAO,CAACC,GAAG,CAACC,QAAQ,KAAK,MAAM;AAC3E;AACA,OAAO,MAAMC,UAAmB,GAAGb,QAAQ,EAAEI,EAAE,KAAK,SAAS;AAE7D,OAAO,MAAMU,mBAA4B,GAAGb,iBAAiB,CAAC,CAAC;AAE/D,OAAO,MAAMc,iBAAiB,GAAGR,OAAO,IAAID,MAAM,IAAIO,UAAU","ignoreList":[]}

package/lib/module/createAnimatedComponent/getViewInfo.js

@@ -15,7 +15,9 @@
 //                         reactViewName via componentNameByReactViewName().
 export function getViewInfo(element) {
   return {
-    reactViewName: element?._viewConfig?.uiViewClassName ?? element?.__internalInstanceHandle?.type ?? element?.__internalInstanceHandle?.elementType,
+    reactViewName: element?.__viewConfig?.uiViewClassName ??
+    // ReactFabricHostComponent (e.g. react-native-macos) exposes `_viewConfig`.
+    element?._viewConfig?.uiViewClassName ?? element?.__internalInstanceHandle?.type ?? element?.__internalInstanceHandle?.elementType,
     viewTag: element?.__nativeTag
   };
 }

package/lib/module/createAnimatedComponent/getViewInfo.js.map

@@ -1 +1 @@
-{"version":3,"names":["getViewInfo","element","reactViewName","_viewConfig","uiViewClassName","__internalInstanceHandle","type","elementType","viewTag","__nativeTag"],"sourceRoot":"../../../src","sources":["createAnimatedComponent/getViewInfo.ts"],"mappings":"AAAA,YAAY;;AAIZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,WAAWA,CAACC,OAAqB,EAG/C;EACA,OAAO;IACLC,aAAa,EAAGD,OAAO,EAAEE,WAAW,EAAEC,eAAe,IACnDH,OAAO,EAAEI,wBAAwB,EAAEC,IAAI,IACvCL,OAAO,EAAEI,wBAAwB,EAAEE,WAAsB;IAC3DC,OAAO,EAAEP,OAAO,EAAEQ;EACpB,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["getViewInfo","element","reactViewName","__viewConfig","uiViewClassName","_viewConfig","__internalInstanceHandle","type","elementType","viewTag","__nativeTag"],"sourceRoot":"../../../src","sources":["createAnimatedComponent/getViewInfo.ts"],"mappings":"AAAA,YAAY;;AAIZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,WAAWA,CAACC,OAAqB,EAG/C;EACA,OAAO;IACLC,aAAa,EAAGD,OAAO,EAAEE,YAAY,EAAEC,eAAe;IACpD;IACAH,OAAO,EAAEI,WAAW,EAAED,eAAe,IACrCH,OAAO,EAAEK,wBAAwB,EAAEC,IAAI,IACvCN,OAAO,EAAEK,wBAAwB,EAAEE,WAAsB;IAC3DC,OAAO,EAAER,OAAO,EAAES;EACpB,CAAC;AACH","ignoreList":[]}

package/lib/module/css/component/AnimatedComponent.js

@@ -16,7 +16,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export default class AnimatedComponent extends Component {
   _cssStyle = {}; // RN style object with Reanimated CSS properties
   _componentRef = null;
-  _hasAnimatedRef = false;
   // Used only on web
   _componentDOMRef = null;
   _willUnmount = false;
@@ -95,7 +94,6 @@ export default class AnimatedComponent extends Component {
     // Component can specify ref which should be animated when animated version of the component is created.
     // Otherwise, we animate the component itself.
     if (componentRef && componentRef.getAnimatableRef) {
-      this._hasAnimatedRef = true;
       return componentRef.getAnimatableRef();
     }
     // Case for SVG components on Web