react-native 0.84.0-nightly-20251106-de5141a3d → 0.84.0-nightly-20251108-7486a2bc5

package/React/Views/RCTDebuggingOverlayManager.m

@@ -17,10 +17,7 @@
 
 @implementation RCTDebuggingOverlayManager
 
-+ (NSString *)moduleName
-{
-  return @"DebuggingOverlay";
-}
+RCT_EXPORT_MODULE(DebuggingOverlay)
 
 - (UIView *)view
 {

package/React/Views/RCTModalHostViewManager.m

@@ -40,10 +40,7 @@
   NSPointerArray *_hostViews;
 }
 
-+ (NSString *)moduleName
-{
-  return @"ModalHostViewManager ";
-}
+RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {

package/React/Views/RCTModalManager.m

@@ -17,10 +17,7 @@
 
 @implementation RCTModalManager
 
-+ (NSString *)moduleName
-{
-  return @"ModalManager";
-}
+RCT_EXPORT_MODULE();
 
 - (NSArray<NSString *> *)supportedEvents
 {

package/React/Views/RCTSwitchManager.m

@@ -16,10 +16,7 @@
 
 @implementation RCTSwitchManager
 
-+ (NSString *)moduleName
-{
-  return @"SwitchManager";
-}
+RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {

package/React/Views/RCTViewManager.m

@@ -128,10 +128,7 @@ RCT_MULTI_ENUM_CONVERTER(
 
 @synthesize bridge = _bridge;
 
-+ (NSString *)moduleName
-{
-  return @"RCTViewManager";
-}
+RCT_EXPORT_MODULE()
 
 - (dispatch_queue_t)methodQueue
 {

package/React/Views/RefreshControl/RCTRefreshControlManager.m

@@ -15,10 +15,7 @@
 
 @implementation RCTRefreshControlManager
 
-+ (NSString *)moduleName
-{
-  return @"RefreshControlManager";
-}
+RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {

package/React/Views/SafeAreaView/RCTSafeAreaViewManager.m

@@ -15,10 +15,7 @@
 
 @implementation RCTSafeAreaViewManager
 
-+ (NSString *)moduleName
-{
-  return @"SafeAreaViewManager";
-}
+RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {

package/React/Views/ScrollView/RCTScrollContentViewManager.m

@@ -14,10 +14,7 @@
 
 @implementation RCTScrollContentViewManager
 
-+ (NSString *)moduleName
-{
-  return @"ScrollContentViewManager";
-}
+RCT_EXPORT_MODULE()
 
 - (RCTScrollContentView *)view
 {

package/React/Views/ScrollView/RCTScrollViewManager.m

@@ -53,10 +53,7 @@ RCT_ENUM_CONVERTER(
 
 @implementation RCTScrollViewManager
 
-+ (NSString *)moduleName
-{
-  return @"ScrollViewManager";
-}
+RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {

package/ReactAndroid/api/ReactAndroid.api

@@ -680,19 +680,6 @@ public final class com/facebook/react/bridge/CxxCallbackImpl : com/facebook/jni/
 	public fun invoke ([Ljava/lang/Object;)V
 }
 
-public class com/facebook/react/bridge/CxxModuleWrapper : com/facebook/react/bridge/CxxModuleWrapperBase {
-	protected fun <init> (Lcom/facebook/jni/HybridData;)V
-}
-
-public class com/facebook/react/bridge/CxxModuleWrapperBase : com/facebook/react/bridge/NativeModule {
-	protected fun <init> (Lcom/facebook/jni/HybridData;)V
-	public fun canOverrideExistingModule ()Z
-	public fun getName ()Ljava/lang/String;
-	public fun initialize ()V
-	public fun invalidate ()V
-	protected final fun resetModule (Lcom/facebook/jni/HybridData;)V
-}
-
 public final class com/facebook/react/bridge/DefaultJSExceptionHandler : com/facebook/react/bridge/JSExceptionHandler {
 	public fun <init> ()V
 	public fun handleException (Ljava/lang/Exception;)V

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.84.0-nightly-20251106-de5141a3d
+VERSION_NAME=0.84.0-nightly-20251108-7486a2bc5
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.kt

@@ -8,7 +8,6 @@
 package com.facebook.react
 
 import com.facebook.jni.HybridData
-import com.facebook.react.bridge.CxxModuleWrapper
 import com.facebook.react.bridge.ModuleSpec
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
@@ -103,7 +102,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
                       moduleClass.name,
                       reactModule.canOverrideExistingModule,
                       true,
-                      reactModule.isCxxModule,
+                      false,
                       ReactModuleInfo.classIsTurboModule(moduleClass),
                   )
               else
@@ -112,7 +111,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
                       moduleClass.name,
                       module.canOverrideExistingModule(),
                       true,
-                      CxxModuleWrapper::class.java.isAssignableFrom(moduleClass),
+                      false,
                       ReactModuleInfo.classIsTurboModule(moduleClass),
                   )
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -157,7 +157,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
         mReactQueueConfiguration.getJSQueueThread(),
         mNativeModulesQueueThread,
         mNativeModuleRegistry.getJavaModules(this),
-        mNativeModuleRegistry.getCxxModules(),
         mInspectorTarget);
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
     Systrace.endSection(TRACE_TAG_REACT);
@@ -212,13 +211,11 @@ public class CatalystInstanceImpl implements CatalystInstance {
     // Extend the Java-visible registry of modules
     mNativeModuleRegistry.registerModules(modules);
     Collection<JavaModuleWrapper> javaModules = modules.getJavaModules(this);
-    Collection<ModuleHolder> cxxModules = modules.getCxxModules();
     // Extend the Cxx-visible registry of modules wrapped in appropriate interfaces
-    jniExtendNativeModules(javaModules, cxxModules);
+    jniExtendNativeModules(javaModules);
   }
 
-  private native void jniExtendNativeModules(
-      Collection<JavaModuleWrapper> javaModules, Collection<ModuleHolder> cxxModules);
+  private native void jniExtendNativeModules(Collection<JavaModuleWrapper> javaModules);
 
   private native void initializeBridge(
       InstanceCallback callback,
@@ -226,7 +223,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
       MessageQueueThread jsQueue,
       MessageQueueThread moduleQueue,
       Collection<JavaModuleWrapper> javaModules,
-      Collection<ModuleHolder> cxxModules,
       @Nullable ReactInstanceManagerInspectorTarget inspectorTarget);
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt

@@ -60,7 +60,7 @@ public class ModuleHolder {
             nativeModule.javaClass.simpleName,
             nativeModule.canOverrideExistingModule(),
             true,
-            CxxModuleWrapper::class.java.isAssignableFrom(nativeModule.javaClass),
+            false,
             ReactModuleInfo.classIsTurboModule(nativeModule.javaClass),
         )
 
@@ -108,7 +108,7 @@ public class ModuleHolder {
     get() = reactModuleInfo.isTurboModule
 
   public val isCxxModule: Boolean
-    get() = reactModuleInfo.isCxxModule
+    get() = false
 
   public val className: String
     get() = reactModuleInfo.className

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt

@@ -36,25 +36,10 @@ public class NativeModuleRegistry(
   @JvmName("getJavaModules") // This is needed because this method is accessed by JNI
   internal fun getJavaModules(jsInstance: JSInstance): List<JavaModuleWrapper> = buildList {
     for ((_, value) in modules) {
-      if (!value.isCxxModule) {
-        add(JavaModuleWrapper(jsInstance, value))
-      }
+      add(JavaModuleWrapper(jsInstance, value))
     }
   }
 
-  @get:JvmName(
-      "getCxxModules"
-  ) // This is needed till there are Java Consumer of this API inside React
-  // Native
-  internal val cxxModules: List<ModuleHolder>
-    get() = buildList {
-      for ((_, value) in modules) {
-        if (value.isCxxModule) {
-          add(value)
-        }
-      }
-    }
-
   /** Adds any new modules to the current module registry */
   @JvmName(
       "registerModules"

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -1485,7 +1485,7 @@ public class FabricUIManager
         mBinding.driveCxxAnimations();
       }
 
-      if (mBinding != null) {
+      if (!ReactNativeFeatureFlags.disableViewPreallocationAndroid() && mBinding != null) {
         mBinding.drainPreallocateViewsQueue();
       }
 

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<9646ebeba75ec903be5ade7e2333f0c8>>
+ * @generated SignedSource<<01feab16132bc07b79b359178e322327>>
  */
 
 /**
@@ -66,6 +66,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun disableFabricCommitInCXXAnimated(): Boolean = accessor.disableFabricCommitInCXXAnimated()
 
+  /**
+   * Force disable view preallocation for images triggered from createNode off the main thread on Android
+   */
+  @JvmStatic
+  public fun disableImageViewPreallocationAndroid(): Boolean = accessor.disableImageViewPreallocationAndroid()
+
   /**
    * Prevent FabricMountingManager from reordering mountItems, which may lead to invalid state on the UI thread
    */
@@ -90,6 +96,12 @@ public object ReactNativeFeatureFlags {
   @JvmStatic
   public fun disableTextLayoutManagerCacheAndroid(): Boolean = accessor.disableTextLayoutManagerCacheAndroid()
 
+  /**
+   * Force disable view preallocation triggered from createNode off the main thread on Android
+   */
+  @JvmStatic
+  public fun disableViewPreallocationAndroid(): Boolean = accessor.disableViewPreallocationAndroid()
+
   /**
    * When enabled, the accessibilityOrder prop will propagate to native platforms and define the accessibility order.
    */

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<9d6ccbe6d02608901fc18ad88baab176>>
+ * @generated SignedSource<<405bf283e4631e166cd57f5dfe30d5f9>>
  */
 
 /**
@@ -26,10 +26,12 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var cxxNativeAnimatedRemoveJsSyncCache: Boolean? = null
   private var disableEarlyViewCommandExecutionCache: Boolean? = null
   private var disableFabricCommitInCXXAnimatedCache: Boolean? = null
+  private var disableImageViewPreallocationAndroidCache: Boolean? = null
   private var disableMountItemReorderingAndroidCache: Boolean? = null
   private var disableOldAndroidAttachmentMetricsWorkaroundsCache: Boolean? = null
   private var disableSubviewClippingAndroidCache: Boolean? = null
   private var disableTextLayoutManagerCacheAndroidCache: Boolean? = null
+  private var disableViewPreallocationAndroidCache: Boolean? = null
   private var enableAccessibilityOrderCache: Boolean? = null
   private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
   private var enableAndroidLinearTextCache: Boolean? = null
@@ -157,6 +159,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun disableImageViewPreallocationAndroid(): Boolean {
+    var cached = disableImageViewPreallocationAndroidCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.disableImageViewPreallocationAndroid()
+      disableImageViewPreallocationAndroidCache = cached
+    }
+    return cached
+  }
+
   override fun disableMountItemReorderingAndroid(): Boolean {
     var cached = disableMountItemReorderingAndroidCache
     if (cached == null) {
@@ -193,6 +204,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun disableViewPreallocationAndroid(): Boolean {
+    var cached = disableViewPreallocationAndroidCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.disableViewPreallocationAndroid()
+      disableViewPreallocationAndroidCache = cached
+    }
+    return cached
+  }
+
   override fun enableAccessibilityOrder(): Boolean {
     var cached = enableAccessibilityOrderCache
     if (cached == null) {

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<fbc551ca005a7d8abcd2cf2e5d29a3a6>>
+ * @generated SignedSource<<bffd645aa55b941acff92ca4efe6192a>>
  */
 
 /**
@@ -40,6 +40,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun disableFabricCommitInCXXAnimated(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun disableImageViewPreallocationAndroid(): Boolean
+
   @DoNotStrip @JvmStatic public external fun disableMountItemReorderingAndroid(): Boolean
 
   @DoNotStrip @JvmStatic public external fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean
@@ -48,6 +50,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun disableTextLayoutManagerCacheAndroid(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun disableViewPreallocationAndroid(): Boolean
+
   @DoNotStrip @JvmStatic public external fun enableAccessibilityOrder(): Boolean
 
   @DoNotStrip @JvmStatic public external fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<7b8a5ad9a3353ea32a39bd139e9174f7>>
+ * @generated SignedSource<<a25d191472f7777804175ef9f56521d6>>
  */
 
 /**
@@ -35,6 +35,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun disableFabricCommitInCXXAnimated(): Boolean = false
 
+  override fun disableImageViewPreallocationAndroid(): Boolean = false
+
   override fun disableMountItemReorderingAndroid(): Boolean = false
 
   override fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean = true
@@ -43,6 +45,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun disableTextLayoutManagerCacheAndroid(): Boolean = false
 
+  override fun disableViewPreallocationAndroid(): Boolean = false
+
   override fun enableAccessibilityOrder(): Boolean = false
 
   override fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = false

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<9bb9a7cf89c92f5a397b2328fa983dc6>>
+ * @generated SignedSource<<e8531e8c374d0ea1e604a2f3d5000078>>
  */
 
 /**
@@ -30,10 +30,12 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var cxxNativeAnimatedRemoveJsSyncCache: Boolean? = null
   private var disableEarlyViewCommandExecutionCache: Boolean? = null
   private var disableFabricCommitInCXXAnimatedCache: Boolean? = null
+  private var disableImageViewPreallocationAndroidCache: Boolean? = null
   private var disableMountItemReorderingAndroidCache: Boolean? = null
   private var disableOldAndroidAttachmentMetricsWorkaroundsCache: Boolean? = null
   private var disableSubviewClippingAndroidCache: Boolean? = null
   private var disableTextLayoutManagerCacheAndroidCache: Boolean? = null
+  private var disableViewPreallocationAndroidCache: Boolean? = null
   private var enableAccessibilityOrderCache: Boolean? = null
   private var enableAccumulatedUpdatesInRawPropsAndroidCache: Boolean? = null
   private var enableAndroidLinearTextCache: Boolean? = null
@@ -167,6 +169,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun disableImageViewPreallocationAndroid(): Boolean {
+    var cached = disableImageViewPreallocationAndroidCache
+    if (cached == null) {
+      cached = currentProvider.disableImageViewPreallocationAndroid()
+      accessedFeatureFlags.add("disableImageViewPreallocationAndroid")
+      disableImageViewPreallocationAndroidCache = cached
+    }
+    return cached
+  }
+
   override fun disableMountItemReorderingAndroid(): Boolean {
     var cached = disableMountItemReorderingAndroidCache
     if (cached == null) {
@@ -207,6 +219,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun disableViewPreallocationAndroid(): Boolean {
+    var cached = disableViewPreallocationAndroidCache
+    if (cached == null) {
+      cached = currentProvider.disableViewPreallocationAndroid()
+      accessedFeatureFlags.add("disableViewPreallocationAndroid")
+      disableViewPreallocationAndroidCache = cached
+    }
+    return cached
+  }
+
   override fun enableAccessibilityOrder(): Boolean {
     var cached = enableAccessibilityOrderCache
     if (cached == null) {

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<eeb5d70e45eecdef0d9307cbe8ff17c2>>
+ * @generated SignedSource<<2325f5410537941e25998ca8c59bf51d>>
  */
 
 /**
@@ -35,6 +35,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun disableFabricCommitInCXXAnimated(): Boolean
 
+  @DoNotStrip public fun disableImageViewPreallocationAndroid(): Boolean
+
   @DoNotStrip public fun disableMountItemReorderingAndroid(): Boolean
 
   @DoNotStrip public fun disableOldAndroidAttachmentMetricsWorkarounds(): Boolean
@@ -43,6 +45,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun disableTextLayoutManagerCacheAndroid(): Boolean
 
+  @DoNotStrip public fun disableViewPreallocationAndroid(): Boolean
+
   @DoNotStrip public fun enableAccessibilityOrder(): Boolean
 
   @DoNotStrip public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean

package/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.kt

@@ -11,7 +11,6 @@ import androidx.annotation.GuardedBy
 import com.facebook.common.logging.FLog
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.bridge.CxxModuleWrapper
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.common.annotations.FrameworkAPI
@@ -110,39 +109,7 @@ public class TurboModuleManager(
     }
 
     val module = getModule(moduleName)
-    return if (module !is CxxModuleWrapper && module !is TurboModule) module else null
-  }
-
-  // used from TurboModuleManager.cpp
-  @Suppress("unused")
-  @DoNotStrip
-  private fun getLegacyCxxModule(moduleName: String): CxxModuleWrapper? {
-    /*
-     * This API is invoked from global.nativeModuleProxy.
-     * Only call getModule if the native module is a legacy module.
-     */
-    if (!isLegacyModule(moduleName)) {
-      return null
-    }
-
-    val module = getModule(moduleName)
-    return if (module is CxxModuleWrapper && module !is TurboModule) module else null
-  }
-
-  // used from TurboModuleManager.cpp
-  @Suppress("unused")
-  @DoNotStrip
-  private fun getTurboLegacyCxxModule(moduleName: String): CxxModuleWrapper? {
-    /*
-     * This API is invoked from global.__turboModuleProxy.
-     * Only call getModule if the native module is a turbo module.
-     */
-    if (!isTurboModule(moduleName)) {
-      return null
-    }
-
-    val module = getModule(moduleName)
-    return if (module is CxxModuleWrapper && module is TurboModule) module else null
+    return if (module !is TurboModule) module else null
   }
 
   // used from TurboModuleManager.cpp
@@ -158,7 +125,7 @@ public class TurboModuleManager(
     }
 
     val module = getModule(moduleName)
-    return if (module !is CxxModuleWrapper && module is TurboModule) module else null
+    return if (module is TurboModule) module else null
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 84,
     "patch" to 0,
-    "prerelease" to "nightly-20251106-de5141a3d"
+    "prerelease" to "nightly-20251108-7486a2bc5"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -474,14 +474,13 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   public void setImportantForAccessibility(
       @NonNull T view, @Nullable String importantForAccessibility) {
     if (importantForAccessibility == null || importantForAccessibility.equals("auto")) {
-      ViewCompat.setImportantForAccessibility(view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
     } else if (importantForAccessibility.equals("yes")) {
-      ViewCompat.setImportantForAccessibility(view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_YES);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
     } else if (importantForAccessibility.equals("no")) {
-      ViewCompat.setImportantForAccessibility(view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
     } else if (importantForAccessibility.equals("no-hide-descendants")) {
-      ViewCompat.setImportantForAccessibility(
-          view, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
+      view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainerStateExperimental.kt

@@ -49,6 +49,13 @@ internal class VirtualViewContainerStateExperimental(scrollView: ViewGroup) :
     }
   }
 
+  override fun remove(virtualView: VirtualView) {
+    super.remove(virtualView)
+    HPV.remove(virtualView.virtualViewID)
+    P.remove(virtualView.virtualViewID)
+    V.remove(virtualView.virtualViewID)
+  }
+
   /**
    * Perform mode update check on a single VirtualView. Does not check other VirtualViews in the
    * collection. Use carefully

package/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

@@ -29,6 +29,7 @@
 #include <react/renderer/scheduler/SchedulerToolbox.h>
 #include <react/renderer/uimanager/primitives.h>
 #include <react/utils/ContextContainer.h>
+#include <string_view>
 
 namespace facebook::react {
 
@@ -672,6 +673,17 @@ void FabricUIManagerBinding::schedulerShouldRenderTransactions(
 
 void FabricUIManagerBinding::schedulerDidRequestPreliminaryViewAllocation(
     const ShadowNode& shadowNode) {
+  using namespace std::literals::string_view_literals;
+
+  if (ReactNativeFeatureFlags::disableViewPreallocationAndroid()) {
+    return;
+  }
+
+  if (ReactNativeFeatureFlags::disableImageViewPreallocationAndroid() &&
+      std::string_view(shadowNode.getComponentName()) == "Image"sv) {
+    return;
+  }
+
   auto mountingManager = getMountingManager("preallocateView");
   if (!mountingManager) {
     return;