react-native 0.71.6 → 0.72.0-rc.1

package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java

@@ -9,7 +9,9 @@ package com.facebook.react.shell;
 
 import androidx.annotation.Nullable;
 import com.facebook.react.TurboReactPackage;
+import com.facebook.react.ViewManagerOnDemandReactPackage;
 import com.facebook.react.animated.NativeAnimatedModule;
+import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.annotations.ReactModule;
@@ -23,6 +25,7 @@ import com.facebook.react.modules.blob.BlobModule;
 import com.facebook.react.modules.blob.FileReaderModule;
 import com.facebook.react.modules.camera.ImageStoreManager;
 import com.facebook.react.modules.clipboard.ClipboardModule;
+import com.facebook.react.modules.devtoolssettings.DevToolsSettingsManagerModule;
 import com.facebook.react.modules.dialog.DialogModule;
 import com.facebook.react.modules.fresco.FrescoModule;
 import com.facebook.react.modules.i18nmanager.I18nManagerModule;
@@ -37,6 +40,7 @@ import com.facebook.react.modules.toast.ToastModule;
 import com.facebook.react.modules.vibration.VibrationModule;
 import com.facebook.react.modules.websocket.WebSocketModule;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.views.drawer.ReactDrawerLayoutManager;
 import com.facebook.react.views.image.ReactImageManager;
@@ -45,7 +49,6 @@ import com.facebook.react.views.progressbar.ReactProgressBarViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollContainerViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollViewManager;
 import com.facebook.react.views.scroll.ReactScrollViewManager;
-import com.facebook.react.views.slider.ReactSliderManager;
 import com.facebook.react.views.swiperefresh.SwipeRefreshLayoutManager;
 import com.facebook.react.views.switchview.ReactSwitchManager;
 import com.facebook.react.views.text.ReactRawTextManager;
@@ -56,9 +59,11 @@ import com.facebook.react.views.textinput.ReactTextInputManager;
 import com.facebook.react.views.unimplementedview.ReactUnimplementedViewManager;
 import com.facebook.react.views.view.ReactViewManager;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.inject.Provider;
 
 /** Package defining basic modules and view managers. */
 @ReactModuleList(
@@ -85,9 +90,10 @@ import java.util.Map;
       VibrationModule.class,
       WebSocketModule.class,
     })
-public class MainReactPackage extends TurboReactPackage {
+public class MainReactPackage extends TurboReactPackage implements ViewManagerOnDemandReactPackage {
 
   private MainPackageConfig mConfig;
+  private @Nullable Map<String, ModuleSpec> mViewManagers;
 
   public MainReactPackage() {}
 
@@ -141,6 +147,8 @@ public class MainReactPackage extends TurboReactPackage {
         return new VibrationModule(context);
       case WebSocketModule.NAME:
         return new WebSocketModule(context);
+      case DevToolsSettingsManagerModule.NAME:
+        return new DevToolsSettingsManagerModule(context);
       default:
         return null;
     }
@@ -155,7 +163,6 @@ public class MainReactPackage extends TurboReactPackage {
     viewManagers.add(new ReactHorizontalScrollContainerViewManager());
     viewManagers.add(new ReactProgressBarViewManager());
     viewManagers.add(new ReactScrollViewManager());
-    viewManagers.add(new ReactSliderManager());
     viewManagers.add(new ReactSwitchManager());
     viewManagers.add(new SwipeRefreshLayoutManager());
 
@@ -174,6 +181,181 @@ public class MainReactPackage extends TurboReactPackage {
     return viewManagers;
   }
 
+  private static void appendMap(
+      Map<String, ModuleSpec> map, String name, Provider<? extends NativeModule> provider) {
+    map.put(name, ModuleSpec.viewManagerSpec(provider));
+  }
+
+  /** @return a map of view managers that should be registered with {@link UIManagerModule} */
+  public Map<String, ModuleSpec> getViewManagersMap(final ReactApplicationContext reactContext) {
+    if (mViewManagers == null) {
+      Map<String, ModuleSpec> viewManagers = new HashMap<>();
+      appendMap(
+          viewManagers,
+          ReactDrawerLayoutManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactDrawerLayoutManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactHorizontalScrollViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactHorizontalScrollViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactHorizontalScrollContainerViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactHorizontalScrollContainerViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactProgressBarViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactProgressBarViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactScrollViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactScrollViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactSwitchManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactSwitchManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          SwipeRefreshLayoutManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new SwipeRefreshLayoutManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          FrescoBasedReactTextInlineImageViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new FrescoBasedReactTextInlineImageViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactImageManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactImageManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactModalHostManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactModalHostManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactRawTextManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactRawTextManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactTextInputManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactTextInputManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactTextViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactTextViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactVirtualTextViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactVirtualTextViewManager();
+            }
+          });
+      appendMap(
+          viewManagers,
+          ReactUnimplementedViewManager.REACT_CLASS,
+          new Provider<NativeModule>() {
+            @Override
+            public NativeModule get() {
+              return new ReactUnimplementedViewManager();
+            }
+          });
+      mViewManagers = viewManagers;
+    }
+    return mViewManagers;
+  }
+
+  @Override
+  public List<ModuleSpec> getViewManagers(ReactApplicationContext reactContext) {
+    return new ArrayList<>(getViewManagersMap(reactContext).values());
+  }
+
+  @Override
+  public Collection<String> getViewManagerNames(ReactApplicationContext reactContext) {
+    return getViewManagersMap(reactContext).keySet();
+  }
+
+  @Override
+  public @Nullable ViewManager createViewManager(
+      ReactApplicationContext reactContext, String viewManagerName) {
+    ModuleSpec spec = getViewManagersMap(reactContext).get(viewManagerName);
+    return spec != null ? (ViewManager) spec.getProvider().get() : null;
+  }
+
   @Override
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
     try {
@@ -181,7 +363,8 @@ public class MainReactPackage extends TurboReactPackage {
           Class.forName("com.facebook.react.shell.MainReactPackage$$ReactModuleInfoProvider");
       return (ReactModuleInfoProvider) reactModuleInfoProviderClass.newInstance();
     } catch (ClassNotFoundException e) {
-      // In OSS case, the annotation processor does not run. We fall back on creating this byhand
+      // In the OSS case, the annotation processor does not run. We fall back to creating this by
+      // hand
       Class<? extends NativeModule>[] moduleList =
           new Class[] {
             AccessibilityInfoModule.class,
@@ -199,6 +382,7 @@ public class MainReactPackage extends TurboReactPackage {
             NativeAnimatedModule.class,
             NetworkingModule.class,
             PermissionsModule.class,
+            DevToolsSettingsManagerModule.class,
             ShareModule.class,
             StatusBarModule.class,
             SoundManagerModule.class,

package/ReactAndroid/src/main/java/com/facebook/react/surface/BUCK

@@ -17,7 +17,6 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),

package/ReactAndroid/src/main/java/com/facebook/react/turbomodule/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

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

@@ -15,8 +15,8 @@ import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.CxxModuleWrapper;
 import com.facebook.react.bridge.JSIModule;
+import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.RuntimeExecutor;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry;
@@ -31,18 +31,18 @@ import java.util.*;
 public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
   private static volatile boolean sIsSoLibraryLoaded;
   private final List<String> mEagerInitModuleNames;
-  private final TurboModuleProvider mJavaModuleProvider;
-  private final TurboModuleProvider mCxxModuleProvider;
+  private final ModuleProvider<TurboModule> mJavaModuleProvider;
+  private final ModuleProvider<TurboModule> mCxxModuleProvider;
 
   // Prevents the creation of new TurboModules once cleanup as been initiated.
-  private final Object mTurboModuleCleanupLock = new Object();
+  private final Object mModuleCleanupLock = new Object();
 
-  @GuardedBy("mTurboModuleCleanupLock")
-  private boolean mTurboModuleCleanupStarted = false;
+  @GuardedBy("mModuleCleanupLock")
+  private boolean mModuleCleanupStarted = false;
 
   // List of TurboModules that have been, or are currently being, instantiated
-  @GuardedBy("mTurboModuleCleanupLock")
-  private final Map<String, TurboModuleHolder> mTurboModuleHolders = new HashMap<>();
+  @GuardedBy("mModuleCleanupLock")
+  private final Map<String, ModuleHolder> mModuleHolders = new HashMap<>();
 
   @DoNotStrip
   @SuppressWarnings("unused")
@@ -59,16 +59,14 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
             runtimeExecutor,
             (CallInvokerHolderImpl) jsCallInvokerHolder,
             (CallInvokerHolderImpl) nativeCallInvokerHolder,
-            delegate,
-            ReactFeatureFlags.useGlobalCallbackCleanupScopeUsingRetainJSCallback,
-            ReactFeatureFlags.useTurboModuleManagerCallbackCleanupScope);
+            delegate);
     installJSIBindings();
 
     mEagerInitModuleNames =
         delegate == null ? new ArrayList<String>() : delegate.getEagerInitModuleNames();
 
     mJavaModuleProvider =
-        new TurboModuleProvider() {
+        new ModuleProvider<TurboModule>() {
           @Nullable
           public TurboModule getModule(String moduleName) {
             if (delegate == null) {
@@ -80,7 +78,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
         };
 
     mCxxModuleProvider =
-        new TurboModuleProvider() {
+        new ModuleProvider<TurboModule>() {
           @Nullable
           public TurboModule getModule(String moduleName) {
             if (delegate == null) {
@@ -134,10 +132,10 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
    */
   @Nullable
   public TurboModule getModule(String moduleName) {
-    TurboModuleHolder moduleHolder;
+    ModuleHolder moduleHolder;
 
-    synchronized (mTurboModuleCleanupLock) {
-      if (mTurboModuleCleanupStarted) {
+    synchronized (mModuleCleanupLock) {
+      if (mModuleCleanupStarted) {
         /*
          * Always return null after cleanup has started, so that getModule(moduleName) returns null.
          */
@@ -145,18 +143,18 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
       }
 
       /*
-       * TODO(T64619790): Should we populate mJavaTurboModuleHolders ahead of time, to avoid having
+       * TODO(T64619790): Should we populate mModuleHolders ahead of time, to avoid having
        * * to control concurrent access to it?
        */
-      if (!mTurboModuleHolders.containsKey(moduleName)) {
-        mTurboModuleHolders.put(moduleName, new TurboModuleHolder());
+      if (!mModuleHolders.containsKey(moduleName)) {
+        mModuleHolders.put(moduleName, new ModuleHolder());
       }
 
-      moduleHolder = mTurboModuleHolders.get(moduleName);
+      moduleHolder = mModuleHolders.get(moduleName);
     }
 
     TurboModulePerfLogger.moduleCreateStart(moduleName, moduleHolder.getModuleId());
-    TurboModule module = getModule(moduleName, moduleHolder, true);
+    TurboModule module = (TurboModule) getOrCreateModule(moduleName, moduleHolder, true);
 
     if (module != null) {
       TurboModulePerfLogger.moduleCreateEnd(moduleName, moduleHolder.getModuleId());
@@ -168,15 +166,14 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
   }
 
   /**
-   * Given a TurboModuleHolder, and the TurboModule's moduleName, return the TurboModule instance.
+   * Given a ModuleHolder, and the TurboModule's moduleName, return the TurboModule instance.
    *
-   * <p>Use the TurboModuleHolder to ensure that if n threads race to create TurboModule x, then
-   * only the first thread creates x. All n - 1 other threads wait until the x is created and
-   * initialized.
+   * <p>Use the ModuleHolder to ensure that if n threads race to create TurboModule x, then only the
+   * first thread creates x. All n - 1 other threads wait until the x is created and initialized.
    */
   @Nullable
-  private TurboModule getModule(
-      String moduleName, @NonNull TurboModuleHolder moduleHolder, boolean shouldPerfLog) {
+  private NativeModule getOrCreateModule(
+      String moduleName, @NonNull ModuleHolder moduleHolder, boolean shouldPerfLog) {
     boolean shouldCreateModule = false;
 
     synchronized (moduleHolder) {
@@ -197,18 +194,18 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
 
     if (shouldCreateModule) {
       TurboModulePerfLogger.moduleCreateConstructStart(moduleName, moduleHolder.getModuleId());
-      TurboModule turboModule = mJavaModuleProvider.getModule(moduleName);
+      NativeModule nativeModule = (NativeModule) mJavaModuleProvider.getModule(moduleName);
 
-      if (turboModule == null) {
-        turboModule = mCxxModuleProvider.getModule(moduleName);
+      if (nativeModule == null) {
+        nativeModule = (NativeModule) mCxxModuleProvider.getModule(moduleName);
       }
 
       TurboModulePerfLogger.moduleCreateConstructEnd(moduleName, moduleHolder.getModuleId());
       TurboModulePerfLogger.moduleCreateSetUpStart(moduleName, moduleHolder.getModuleId());
 
-      if (turboModule != null) {
+      if (nativeModule != null) {
         synchronized (moduleHolder) {
-          moduleHolder.setModule(turboModule);
+          moduleHolder.setModule(nativeModule);
         }
 
         /*
@@ -216,7 +213,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
          * NativeModules should be initialized after ReactApplicationContext has been set up.
          * Therefore, we should initialize on the TurboModule now.
          */
-        turboModule.initialize();
+        nativeModule.initialize();
       }
 
       TurboModulePerfLogger.moduleCreateSetUpEnd(moduleName, moduleHolder.getModuleId());
@@ -225,7 +222,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
         moduleHolder.notifyAll();
       }
 
-      return turboModule;
+      return nativeModule;
     }
 
     synchronized (moduleHolder) {
@@ -254,17 +251,17 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
 
   /** Which TurboModules have been created? */
   public Collection<TurboModule> getModules() {
-    final List<TurboModuleHolder> turboModuleHolders = new ArrayList<>();
-    synchronized (mTurboModuleCleanupLock) {
-      turboModuleHolders.addAll(mTurboModuleHolders.values());
+    final List<ModuleHolder> moduleHolders = new ArrayList<>();
+    synchronized (mModuleCleanupLock) {
+      moduleHolders.addAll(mModuleHolders.values());
     }
 
     final List<TurboModule> turboModules = new ArrayList<>();
-    for (final TurboModuleHolder moduleHolder : turboModuleHolders) {
+    for (final ModuleHolder moduleHolder : moduleHolders) {
       synchronized (moduleHolder) {
         // No need to wait for the TurboModule to finish being created and initialized
         if (moduleHolder.getModule() != null) {
-          turboModules.add(moduleHolder.getModule());
+          turboModules.add((TurboModule) moduleHolder.getModule());
         }
       }
     }
@@ -273,9 +270,9 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
   }
 
   public boolean hasModule(String moduleName) {
-    TurboModuleHolder moduleHolder;
-    synchronized (mTurboModuleCleanupLock) {
-      moduleHolder = mTurboModuleHolders.get(moduleName);
+    ModuleHolder moduleHolder;
+    synchronized (mModuleCleanupLock) {
+      moduleHolder = mModuleHolders.get(moduleName);
     }
 
     if (moduleHolder != null) {
@@ -293,9 +290,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
       RuntimeExecutor runtimeExecutor,
       CallInvokerHolderImpl jsCallInvokerHolder,
       CallInvokerHolderImpl nativeCallInvokerHolder,
-      TurboModuleManagerDelegate tmmDelegate,
-      boolean useGlobalCallbackCleanupScopeUsingRetainJSCallback,
-      boolean useTurboModuleManagerCallbackCleanupScope);
+      TurboModuleManagerDelegate tmmDelegate);
 
   private native void installJSIBindings();
 
@@ -307,34 +302,33 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
     /*
      * Halt the production of new TurboModules.
      *
-     * <p>After this point, mTurboModuleHolders will not be accessed by TurboModuleManager.
+     * <p>After this point, mModuleHolders will not be accessed by TurboModuleManager.
      * Therefore, it won't be modified.
      *
-     * <p>The TurboModuleHolders in mTurboModuleHolders, however, can still be populated with newly
+     * <p>The ModuleHolders in mModuleHolders, however, can still be populated with newly
      * created TurboModules.
      */
-    synchronized (mTurboModuleCleanupLock) {
-      mTurboModuleCleanupStarted = true;
+    synchronized (mModuleCleanupLock) {
+      mModuleCleanupStarted = true;
     }
 
-    for (final Map.Entry<String, TurboModuleHolder> moduleHolderEntry :
-        mTurboModuleHolders.entrySet()) {
+    for (final Map.Entry<String, ModuleHolder> moduleHolderEntry : mModuleHolders.entrySet()) {
       final String moduleName = moduleHolderEntry.getKey();
-      final TurboModuleHolder moduleHolder = moduleHolderEntry.getValue();
+      final ModuleHolder moduleHolder = moduleHolderEntry.getValue();
 
       /**
        * ReactNative could start tearing down before this particular TurboModule has been fully
        * initialized. In this case, we should wait for initialization to complete, before destroying
        * the TurboModule.
        */
-      final TurboModule turboModule = getModule(moduleName, moduleHolder, false);
+      final NativeModule nativeModule = getOrCreateModule(moduleName, moduleHolder, false);
 
-      if (turboModule != null) {
-        turboModule.invalidate();
+      if (nativeModule != null) {
+        nativeModule.invalidate();
       }
     }
 
-    mTurboModuleHolders.clear();
+    mModuleHolders.clear();
 
     // Delete the native part of this hybrid class.
     mHybridData.resetNative();
@@ -348,14 +342,14 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
     }
   }
 
-  private static class TurboModuleHolder {
-    private volatile TurboModule mModule = null;
+  private static class ModuleHolder {
+    private volatile NativeModule mModule = null;
     private volatile boolean mIsTryingToCreate = false;
     private volatile boolean mIsDoneCreatingModule = false;
     private static volatile int sHolderCount = 0;
     private volatile int mModuleId;
 
-    public TurboModuleHolder() {
+    public ModuleHolder() {
       mModuleId = sHolderCount;
       sHolderCount += 1;
     }
@@ -364,12 +358,12 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
       return mModuleId;
     }
 
-    void setModule(@NonNull TurboModule module) {
+    void setModule(@NonNull NativeModule module) {
       mModule = module;
     }
 
     @Nullable
-    TurboModule getModule() {
+    NativeModule getModule() {
       return mModule;
     }
 
@@ -391,8 +385,8 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
     }
   }
 
-  private interface TurboModuleProvider {
+  private interface ModuleProvider<T> {
     @Nullable
-    TurboModule getModule(String name);
+    T getModule(String name);
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK

@@ -17,15 +17,13 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
     deps = [
         YOGA_TARGET,
+        react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
     ],
@@ -52,25 +50,22 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:core"),
-        react_native_dep("third-party/android/androidx:fragment"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
-    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        YOGA_TARGET,
         ":DisplayMetrics",
+        YOGA_TARGET,
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+        react_native_dep("third-party/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
-        react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/debug/holder:holder"),
+        react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
@@ -102,15 +97,13 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),