react-native-tvos 0.78.0-0rc3 → 0.79.0-0

package/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.DynamicFromObject;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.annotations.UnstableReactNativeAPI;
+import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.annotations.ReactPropGroup;
 import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
@@ -66,7 +67,7 @@ import javax.lang.model.util.Types;
  * reflection.
  */
 @SupportedAnnotationTypes("com.facebook.react.uimanager.annotations.ReactPropertyHolder")
-@SupportedSourceVersion(SourceVersion.RELEASE_7)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
 public class ReactPropertyProcessor extends ProcessorBase {
   private static final Map<TypeName, String> DEFAULT_TYPES;
   private static final Set<TypeName> BOXED_PRIMITIVES;
@@ -93,6 +94,8 @@ public class ReactPropertyProcessor extends ProcessorBase {
 
   private static final TypeName PROPERTY_MAP_TYPE =
       ParameterizedTypeName.get(Map.class, String.class, String.class);
+  public static final String VIEW_MANAGER_INTERFACE =
+      "com.facebook.react.uimanager.ViewManagerWithGeneratedInterface";
 
   private final Map<ClassName, ClassInfo> mClasses;
 
@@ -100,6 +103,7 @@ public class ReactPropertyProcessor extends ProcessorBase {
   @SuppressFieldNotInitialized private Messager mMessager;
   @SuppressFieldNotInitialized private Elements mElements;
   @SuppressFieldNotInitialized private Types mTypes;
+  @SuppressFieldNotInitialized private TypeMirror mViewManagerWithGeneratedInterface = null;
 
   static {
     DEFAULT_TYPES = new HashMap<>();
@@ -144,6 +148,17 @@ public class ReactPropertyProcessor extends ProcessorBase {
     mTypes = processingEnv.getTypeUtils();
   }
 
+  private TypeMirror getViewManagerWithGeneratedInterface() {
+    if (mViewManagerWithGeneratedInterface == null) {
+      TypeElement typeElement = mElements.getTypeElement(VIEW_MANAGER_INTERFACE);
+      if (typeElement == null || typeElement.asType() == null) {
+        throw new IllegalStateException("Could not find " + VIEW_MANAGER_INTERFACE);
+      }
+      mViewManagerWithGeneratedInterface = typeElement.asType();
+    }
+    return mViewManagerWithGeneratedInterface;
+  }
+
   @Override
   public boolean processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     // Clear properties from previous rounds
@@ -154,7 +169,10 @@ public class ReactPropertyProcessor extends ProcessorBase {
       try {
         TypeElement classType = (TypeElement) element;
         ClassName className = ClassName.get(classType);
-        mClasses.put(className, parseClass(className, classType));
+        ClassInfo classInfo = parseClass(className, classType);
+        if (classInfo != null) {
+          mClasses.put(className, classInfo);
+        }
       } catch (Exception e) {
         error(element, e.getMessage());
       }
@@ -192,9 +210,19 @@ public class ReactPropertyProcessor extends ProcessorBase {
     return typeName.equals(SHADOW_NODE_IMPL_TYPE);
   }
 
-  private ClassInfo parseClass(ClassName className, TypeElement typeElement) {
+  private @Nullable ClassInfo parseClass(ClassName className, TypeElement typeElement) {
     TypeName targetType = getTargetType(typeElement.asType());
     TypeName viewType = isShadowNodeType(targetType) ? null : targetType;
+    boolean implementsViewManagerWithGeneratedInterface =
+        mTypes.isAssignable(typeElement.asType(), getViewManagerWithGeneratedInterface());
+
+    if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE
+        && (implementsViewManagerWithGeneratedInterface || viewType == null)) {
+      // When "MINIFY_LEGACY_ARCHITECTURE" is enabled, we don't want to generate the props setter
+      // for classes that implement ViewManagerWithGeneratedInterface or that are not a ViewManager.
+      // This is because we will be using the new architecture for these classes.
+      return null;
+    }
 
     ClassInfo classInfo = new ClassInfo(className, typeElement, viewType);
     findProperties(classInfo, typeElement);

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -81,7 +81,7 @@ public class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) :
     throw UnsupportedOperationException("Unimplemented method 'destroy'")
   }
 
-  override public val isDestroyed: Boolean
+  public override val isDestroyed: Boolean
     get() = throw UnsupportedOperationException("Unimplemented method 'isDestroyed'")
 
   @VisibleForTesting
@@ -93,16 +93,16 @@ public class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) :
       reactHost.currentReactContext?.getJSModule(jsInterface)
 
   @get:Deprecated("Deprecated in Java")
-  override public val javaScriptContextHolder: JavaScriptContextHolder
+  public override val javaScriptContextHolder: JavaScriptContextHolder
     get() = reactHost.getJavaScriptContextHolder()!!
 
   @Suppress("INAPPLICABLE_JVM_NAME")
   @get:Deprecated("Deprecated in Java")
   @get:JvmName("getJSCallInvokerHolder") // This is needed to keep backward compatibility
-  override public val jsCallInvokerHolder: CallInvokerHolder
+  public override val jsCallInvokerHolder: CallInvokerHolder
     get() = reactHost.getJSCallInvokerHolder()!!
 
-  override public val nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder
+  public override val nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder
     get() =
         throw UnsupportedOperationException(
             "Unimplemented method 'getNativeMethodCallInvokerHolder'")
@@ -116,23 +116,23 @@ public class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) :
   override fun getNativeModule(moduleName: String): NativeModule? =
       reactHost.getNativeModule(moduleName)
 
-  override public val nativeModules: Collection<NativeModule>
+  public override val nativeModules: Collection<NativeModule>
     get() = reactHost.getNativeModules()
 
-  override public val reactQueueConfiguration: ReactQueueConfiguration
+  public override val reactQueueConfiguration: ReactQueueConfiguration
     get() = reactHost.reactQueueConfiguration!!
 
-  override public val runtimeExecutor: RuntimeExecutor?
+  public override val runtimeExecutor: RuntimeExecutor?
     get() = reactHost.getRuntimeExecutor()
 
-  override public val runtimeScheduler: RuntimeScheduler?
+  public override val runtimeScheduler: RuntimeScheduler?
     get() = throw UnsupportedOperationException("Unimplemented method 'getRuntimeScheduler'")
 
-  override public fun extendNativeModules(modules: NativeModuleRegistry) {
+  public override fun extendNativeModules(modules: NativeModuleRegistry) {
     throw UnsupportedOperationException("Unimplemented method 'extendNativeModules'")
   }
 
-  override public val sourceURL: String?
+  public override val sourceURL: String?
     get() = throw UnsupportedOperationException("Unimplemented method 'getSourceURL'")
 
   override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {

package/ReactAndroid/src/main/java/com/facebook/react/runtime/JSTimerExecutor.kt

@@ -19,15 +19,15 @@ internal class JSTimerExecutor(private val mHybridData: HybridData) : JavaScript
 
   private external fun callTimers(timerIDs: WritableNativeArray)
 
-  override public fun callTimers(timerIDs: WritableArray) {
+  override fun callTimers(timerIDs: WritableArray) {
     callTimers(timerIDs as WritableNativeArray)
   }
 
-  override public fun callIdleCallbacks(frameTime: Double) {
+  override fun callIdleCallbacks(frameTime: Double) {
     // TODO T52558331
   }
 
-  override public fun emitTimeDriftWarning(warningMessage: String) {
+  override fun emitTimeDriftWarning(warningMessage: String) {
     // TODO T52558331
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java

@@ -1026,12 +1026,6 @@ public class ReactHostImpl implements ReactHost {
         TAG, new ReactNoCrashSoftException(method + ": " + message, throwable));
   }
 
-  private Executor getDefaultReactInstanceExecutor() {
-    return ReactNativeFeatureFlags.useImmediateExecutorInAndroidBridgeless()
-        ? Task.IMMEDIATE_EXECUTOR
-        : mBGExecutor;
-  }
-
   /** Schedule work on a ReactInstance that is already created. */
   private Task<Boolean> callWithExistingReactInstance(
       final String callingMethod,
@@ -1040,17 +1034,14 @@ public class ReactHostImpl implements ReactHost {
     final String method = "callWithExistingReactInstance(" + callingMethod + ")";
 
     if (executor == null) {
-      executor = getDefaultReactInstanceExecutor();
+      executor = Task.IMMEDIATE_EXECUTOR;
     }
 
     return mCreateReactInstanceTaskRef
         .get()
         .onSuccess(
             task -> {
-              final ReactInstance reactInstance =
-                  ReactNativeFeatureFlags.completeReactInstanceCreationOnBgThreadOnAndroid()
-                      ? task.getResult()
-                      : mReactInstance;
+              final ReactInstance reactInstance = task.getResult();
               if (reactInstance == null) {
                 raiseSoftException(method, "Execute: reactInstance is null. Dropping work.");
                 return FALSE;
@@ -1070,16 +1061,13 @@ public class ReactHostImpl implements ReactHost {
     final String method = "callAfterGetOrCreateReactInstance(" + callingMethod + ")";
 
     if (executor == null) {
-      executor = getDefaultReactInstanceExecutor();
+      executor = Task.IMMEDIATE_EXECUTOR;
     }
 
     return getOrCreateReactInstance()
         .onSuccess(
             task -> {
-              final ReactInstance reactInstance =
-                  ReactNativeFeatureFlags.completeReactInstanceCreationOnBgThreadOnAndroid()
-                      ? task.getResult()
-                      : mReactInstance;
+              final ReactInstance reactInstance = task.getResult();
               if (reactInstance == null) {
                 raiseSoftException(method, "Execute: reactInstance is null. Dropping work.");
                 return null;
@@ -1280,13 +1268,9 @@ public class ReactHostImpl implements ReactHost {
                 return reactInstance;
               };
 
-          if (ReactNativeFeatureFlags.completeReactInstanceCreationOnBgThreadOnAndroid()) {
-            creationTask.onSuccess(lifecycleUpdateTask, mUIExecutor);
-            return creationTask.onSuccess(
-                task -> task.getResult().mInstance, Task.IMMEDIATE_EXECUTOR);
-          } else {
-            return creationTask.onSuccess(lifecycleUpdateTask, mUIExecutor);
-          }
+          creationTask.onSuccess(lifecycleUpdateTask, mUIExecutor);
+          return creationTask.onSuccess(
+              task -> task.getResult().mInstance, Task.IMMEDIATE_EXECUTOR);
         });
   }
 
@@ -1480,12 +1464,10 @@ public class ReactHostImpl implements ReactHost {
     if (mReloadTask == null) {
       // When using the immediate executor, we want to avoid scheduling any further work immediately
       // when destruction is kicked off.
-      Task<ReactInstance> createTask =
-          ReactNativeFeatureFlags.completeReactInstanceCreationOnBgThreadOnAndroid()
-              ? mCreateReactInstanceTaskRef.getAndReset()
-              : mCreateReactInstanceTaskRef.get();
+      log(method, "Resetting createReactInstance task ref");
       mReloadTask =
-          createTask
+          mCreateReactInstanceTaskRef
+              .getAndReset()
               .continueWithTask(
                   (task) -> {
                     log(method, "Starting React Native reload");
@@ -1570,14 +1552,6 @@ public class ReactHostImpl implements ReactHost {
                       reactInstance.destroy();
                     }
 
-                    // Originally, we reset the instance task ref quite late, leading to potential
-                    // racing invocations while shutting down
-                    if (!ReactNativeFeatureFlags
-                        .completeReactInstanceCreationOnBgThreadOnAndroid()) {
-                      log(method, "Resetting createReactInstance task ref");
-                      mCreateReactInstanceTaskRef.reset();
-                    }
-
                     log(method, "Resetting start task ref");
                     mStartTask = null;
 
@@ -1656,13 +1630,10 @@ public class ReactHostImpl implements ReactHost {
     if (mDestroyTask == null) {
       // When using the immediate executor, we want to avoid scheduling any further work immediately
       // when destruction is kicked off.
-      Task<ReactInstance> createTask =
-          ReactNativeFeatureFlags.completeReactInstanceCreationOnBgThreadOnAndroid()
-              ? mCreateReactInstanceTaskRef.getAndReset()
-              : mCreateReactInstanceTaskRef.get();
-
+      log(method, "Resetting createReactInstance task ref");
       mDestroyTask =
-          createTask
+          mCreateReactInstanceTaskRef
+              .getAndReset()
               .continueWithTask(
                   task -> {
                     log(method, "Starting React Native destruction");
@@ -1768,14 +1739,6 @@ public class ReactHostImpl implements ReactHost {
                       reactInstance.destroy();
                     }
 
-                    // Originally, we reset the instance task ref quite late, leading to potential
-                    // racing invocations while shutting down
-                    if (!ReactNativeFeatureFlags
-                        .completeReactInstanceCreationOnBgThreadOnAndroid()) {
-                      log(method, "Resetting createReactInstance task ref");
-                      mCreateReactInstanceTaskRef.reset();
-                    }
-
                     log(method, "Resetting start task ref");
                     mStartTask = null;
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt

@@ -11,7 +11,6 @@ import android.app.Activity
 import android.os.Bundle
 import android.view.View
 import com.facebook.react.bridge.JSBundleLoader
-import com.facebook.react.bridge.JavaJSExecutor
 import com.facebook.react.bridge.JavaScriptExecutorFactory
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.ReactInstanceDevHelper
@@ -27,10 +26,6 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) :
     ReactInstanceDevHelper {
 
-  override fun onReloadWithJSDebugger(proxyExecutorFactory: JavaJSExecutor.Factory) {
-    // Not implemented, only used by BridgeDevSupportManager to reload with proxy executor
-  }
-
   override fun onJSBundleLoadedFromServer() {
     // Not implemented, only referenced by BridgeDevSupportManager
   }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

@@ -23,7 +23,7 @@ internal class ReactHostInspectorTarget(private val reactHostImpl: ReactHostImpl
 
   private external fun initHybrid(reactHostImpl: ReactHostImpl, executor: Executor): HybridData
 
-  public external fun sendDebuggerResumeCommand()
+  external fun sendDebuggerResumeCommand()
 
   override fun close() {
     mHybridData.resetNative()

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java

@@ -288,21 +288,18 @@ final class ReactInstance {
   }
 
   void initializeEagerTurboModules() {
-    Runnable task =
-        () -> {
-          Systrace.beginSection(
-              Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "initializeEagerTurboModules");
-          // Eagerly initialize TurboModules
-          for (String moduleName : mTurboModuleManager.getEagerInitModuleNames()) {
-            mTurboModuleManager.getModule(moduleName);
-          }
-          Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
-        };
-    if (ReactNativeFeatureFlags.initEagerTurboModulesOnNativeModulesQueueAndroid()) {
-      mQueueConfiguration.getNativeModulesQueueThread().runOnQueue(task);
-    } else {
-      task.run();
-    }
+    mQueueConfiguration
+        .getNativeModulesQueueThread()
+        .runOnQueue(
+            () -> {
+              Systrace.beginSection(
+                  Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "initializeEagerTurboModules");
+              // Eagerly initialize TurboModules
+              for (String moduleName : mTurboModuleManager.getEagerInitModuleNames()) {
+                mTurboModuleManager.getModule(moduleName);
+              }
+              Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+            });
   }
 
   private static synchronized void loadLibraryIfNeeded() {

package/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Executors.kt

@@ -24,8 +24,8 @@ import java.util.concurrent.Executor
  * threads.
  */
 internal object Executors {
-  @JvmField public val UI_THREAD: Executor = UIThreadExecutor()
-  @JvmField public val IMMEDIATE: Executor = ImmediateExecutor()
+  @JvmField val UI_THREAD: Executor = UIThreadExecutor()
+  @JvmField val IMMEDIATE: Executor = ImmediateExecutor()
 
   private class UIThreadExecutor : Executor {
     override fun execute(command: Runnable) {

package/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.kt

@@ -16,33 +16,33 @@ package com.facebook.react.runtime.internal.bolts
 internal class TaskCompletionSource<TResult>() {
 
   /** @return the Task associated with this TaskCompletionSource. */
-  public val task: Task<TResult> = Task()
+  val task: Task<TResult> = Task()
 
   /** Sets the cancelled flag on the Task if the Task hasn't already been completed. */
-  public fun trySetCancelled(): Boolean = task.trySetCancelled()
+  fun trySetCancelled(): Boolean = task.trySetCancelled()
 
   /** Sets the result on the Task if the Task hasn't already been completed. */
-  public fun trySetResult(result: TResult?): Boolean = task.trySetResult(result)
+  fun trySetResult(result: TResult?): Boolean = task.trySetResult(result)
 
   /** Sets the error on the Task if the Task hasn't already been completed. */
-  public fun trySetError(error: Exception?): Boolean = task.trySetError(error)
+  fun trySetError(error: Exception?): Boolean = task.trySetError(error)
 
   /** Sets the cancelled flag on the task, throwing if the Task has already been completed. */
-  public fun setCancelled(): Unit {
+  fun setCancelled(): Unit {
     if (!trySetCancelled()) {
       throw IllegalStateException("Cannot cancel a completed task.")
     }
   }
 
   /** Sets the result of the Task, throwing if the Task has already been completed. */
-  public fun setResult(result: TResult?): Unit {
+  fun setResult(result: TResult?): Unit {
     if (!trySetResult(result)) {
       throw IllegalStateException("Cannot set the result of a completed task.")
     }
   }
 
   /** Sets the error of the Task, throwing if the Task has already been completed. */
-  public fun setError(error: Exception?): Unit {
+  fun setError(error: Exception?): Unit {
     if (!trySetError(error)) {
       throw IllegalStateException("Cannot set the error on a completed task.")
     }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.kt

@@ -21,7 +21,7 @@ internal class UnobservedErrorNotifier(private var task: Task<*>?) {
     }
   }
 
-  public fun setObserved(): Unit {
+  fun setObserved(): Unit {
     task = null
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/soloader/OpenSourceMergedSoMapping.kt

@@ -20,7 +20,7 @@ import com.facebook.soloader.ExternalSoMapping
  */
 public object OpenSourceMergedSoMapping : ExternalSoMapping {
 
-  override public fun mapLibName(input: String): String =
+  public override fun mapLibName(input: String): String =
       when (input) {
         "fabricjni",
         "jsinspector",
@@ -49,7 +49,7 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
         else -> input
       }
 
-  override public fun invokeJniOnload(libraryName: String): Unit {
+  public override fun invokeJniOnload(libraryName: String): Unit {
     when (libraryName) {
       "fabricjni" -> libfabricjni_so()
       "hermes_executor" -> libhermes_executor_so()

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt

@@ -13,7 +13,6 @@ import android.graphics.Path
 import android.graphics.Rect
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
-import android.graphics.drawable.LayerDrawable
 import android.os.Build
 import android.view.View
 import android.widget.ImageView
@@ -106,14 +105,10 @@ public object BackgroundStyleApplicator {
 
     composite.borderInsets = composite.borderInsets ?: BorderInsets()
     composite.borderInsets?.setBorderWidth(edge, width)
+
     if (Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
-      val innerShadows = composite.innerShadows
-      if (innerShadows != null) {
-        for (i in 0 until innerShadows.numberOfLayers) {
-          val shadow = innerShadows.getDrawable(i)
-          (shadow as InsetBoxShadowDrawable).borderInsets = composite.borderInsets
-          shadow.invalidateSelf()
-        }
+      for (shadow in composite.innerShadows.filterIsInstance<InsetBoxShadowDrawable>()) {
+        shadow.borderInsets = composite.borderInsets
       }
     }
   }
@@ -174,30 +169,16 @@ public object BackgroundStyleApplicator {
     }
 
     if (Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) {
-      val outerShadows = compositeBackgroundDrawable.outerShadows
-      if (outerShadows != null) {
-        for (i in 0 until outerShadows.numberOfLayers) {
-          val shadow = outerShadows.getDrawable(i)
-          if (shadow is OutsetBoxShadowDrawable) {
-            shadow.borderRadius = shadow.borderRadius ?: BorderRadiusStyle()
-            shadow.borderRadius?.set(corner, radius)
-            shadow.invalidateSelf()
-          }
-        }
+      for (shadow in
+          compositeBackgroundDrawable.outerShadows.filterIsInstance<OutsetBoxShadowDrawable>()) {
+        shadow.borderRadius = compositeBackgroundDrawable.borderRadius
       }
     }
 
     if (Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
-      val innerShadows = compositeBackgroundDrawable.innerShadows
-      if (innerShadows != null) {
-        for (i in 0 until innerShadows.numberOfLayers) {
-          val shadow = innerShadows.getDrawable(i)
-          if (shadow is InsetBoxShadowDrawable) {
-            shadow.borderRadius = shadow.borderRadius ?: BorderRadiusStyle()
-            shadow.borderRadius?.set(corner, radius)
-            shadow.invalidateSelf()
-          }
-        }
+      for (shadow in
+          compositeBackgroundDrawable.innerShadows.filterIsInstance<InsetBoxShadowDrawable>()) {
+        shadow.borderRadius = compositeBackgroundDrawable.borderRadius
       }
     }
 
@@ -291,8 +272,8 @@ public object BackgroundStyleApplicator {
       return
     }
 
-    var innerShadows: LayerDrawable? = null
-    var outerShadows: LayerDrawable? = null
+    var innerShadows = mutableListOf<InsetBoxShadowDrawable>()
+    var outerShadows = mutableListOf<OutsetBoxShadowDrawable>()
 
     val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view)
     val borderInsets = compositeBackgroundDrawable.borderInsets
@@ -302,7 +283,7 @@ public object BackgroundStyleApplicator {
      * z-ordering of user-provided shadow-list is opposite direction of LayerDrawable z-ordering
      * https://drafts.csswg.org/css-backgrounds/#shadow-layers
      */
-    for (boxShadow in shadows.asReversed()) {
+    for (boxShadow in shadows) {
       val offsetX = boxShadow.offsetX
       val offsetY = boxShadow.offsetY
       val color = boxShadow.color ?: Color.BLACK
@@ -311,10 +292,7 @@ public object BackgroundStyleApplicator {
       val inset = boxShadow.inset ?: false
 
       if (inset && Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
-        if (innerShadows == null) {
-          innerShadows = LayerDrawable(emptyArray())
-        }
-        innerShadows.addLayer(
+        innerShadows.add(
             InsetBoxShadowDrawable(
                 context = view.context,
                 borderRadius = borderRadius,
@@ -325,10 +303,7 @@ public object BackgroundStyleApplicator {
                 blurRadius = blurRadius,
                 spread = spreadDistance))
       } else if (!inset && Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) {
-        if (outerShadows == null) {
-          outerShadows = LayerDrawable(emptyArray())
-        }
-        outerShadows.addLayer(
+        outerShadows.add(
             OutsetBoxShadowDrawable(
                 context = view.context,
                 borderRadius = borderRadius,
@@ -340,8 +315,9 @@ public object BackgroundStyleApplicator {
       }
     }
 
-    view.background = ensureCompositeBackgroundDrawable(view).withNewOuterShadow(outerShadows)
-    view.background = ensureCompositeBackgroundDrawable(view).withNewInnerShadow(innerShadows)
+    view.background =
+        ensureCompositeBackgroundDrawable(view)
+            .withNewShadows(outerShadows = outerShadows, innerShadows = innerShadows)
   }
 
   @JvmStatic

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

@@ -414,7 +414,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
         contentDescription.add(text.asString());
       }
     }
-    if (contentDescription.size() > 0) {
+    if (!contentDescription.isEmpty()) {
       view.setContentDescription(TextUtils.join(", ", contentDescription));
     }
   }
@@ -626,7 +626,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     throw new IllegalStateException("Invalid float property value: " + value);
   }
 
-  private void updateViewAccessibility(@NonNull T view) {
+  protected void updateViewAccessibility(@NonNull T view) {
     ReactAccessibilityDelegate.setDelegate(
         view, view.isFocusable(), view.getImportantForAccessibility());
   }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt

@@ -23,8 +23,8 @@ public abstract class BaseViewManagerDelegate<
     T : View, U : BaseViewManager<T, out LayoutShadowNode>>(
     @Suppress("NoHungarianNotation") @JvmField protected val mViewManager: U
 ) : ViewManagerDelegate<T> {
-  @Suppress("DEPRECATION")
-  override public fun setProperty(view: T, propName: String?, value: Any?) {
+  @Suppress("ACCIDENTAL_OVERRIDE", "DEPRECATION")
+  public override fun setProperty(view: T, propName: String, value: Any?) {
     when (propName) {
       ViewProps.ACCESSIBILITY_ACTIONS ->
           mViewManager.setAccessibilityActions(view, value as ReadableArray?)
@@ -146,6 +146,7 @@ public abstract class BaseViewManagerDelegate<
     }
   }
 
-  override public fun receiveCommand(view: T, commandName: String?, args: ReadableArray?): Unit =
+  @Suppress("ACCIDENTAL_OVERRIDE")
+  public override fun receiveCommand(view: T, commandName: String, args: ReadableArray?): Unit =
       Unit
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BlendModeHelper.kt

@@ -19,7 +19,7 @@ internal object BlendModeHelper {
 
   /** @see https://www.w3.org/TR/compositing-1/#mix-blend-mode */
   @JvmStatic
-  public fun parseMixBlendMode(mixBlendMode: String?): BlendMode? {
+  fun parseMixBlendMode(mixBlendMode: String?): BlendMode? {
     if (mixBlendMode == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
       return null
     }
@@ -46,6 +46,6 @@ internal object BlendModeHelper {
   }
 
   @JvmStatic
-  public fun needsIsolatedLayer(view: ViewGroup): Boolean =
+  fun needsIsolatedLayer(view: ViewGroup): Boolean =
       view.children.any { it.getTag(R.id.mix_blend_mode) != null }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolver.kt

@@ -12,5 +12,5 @@ import com.facebook.proguard.annotations.DoNotStripAny
 @DoNotStripAny
 internal interface ComponentNameResolver {
   /* returns a list of all the component names that are registered in React Native. */
-  public val componentNames: Array<String>?
+  val componentNames: Array<String>?
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolverBinding.kt

@@ -18,6 +18,5 @@ internal object ComponentNameResolverBinding {
     SoLoader.loadLibrary("uimanagerjni")
   }
 
-  @JvmStatic
-  public external fun install(runtimeExecutor: RuntimeExecutor, componentNameResolver: Any)
+  @JvmStatic external fun install(runtimeExecutor: RuntimeExecutor, componentNameResolver: Any)
 }