react-native 0.71.4 → 0.72.0-rc.0

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

@@ -17,7 +17,6 @@ import android.content.res.Configuration;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.collection.ArrayMap;
 import com.facebook.common.logging.FLog;
 import com.facebook.debug.holder.PrinterHolder;
 import com.facebook.debug.tags.ReactDebugOverlayTags;
@@ -49,7 +48,6 @@ import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -109,11 +107,8 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   private final List<UIManagerModuleListener> mListeners = new ArrayList<>();
   private final CopyOnWriteArrayList<UIManagerListener> mUIManagerListeners =
       new CopyOnWriteArrayList<>();
-  private @Nullable Map<String, WritableMap> mViewManagerConstantsCache;
-  private volatile int mViewManagerConstantsCacheSize;
 
   private int mBatchId = 0;
-  private int mNumRootViews = 0;
 
   public UIManagerModule(
       ReactApplicationContext reactContext,
@@ -251,50 +246,8 @@ public class UIManagerModule extends ReactContextBaseJavaModule
     }
   }
 
-  /**
-   * Helper method to pre-compute the constants for a view manager. This method ensures that we
-   * don't block for getting the constants for view managers during TTI
-   *
-   * @deprecated this method will be removed in the future
-   * @param viewManagerNames {@link List<String>} names of ViewManagers
-   */
-  @Deprecated
-  @Override
-  public void preInitializeViewManagers(List<String> viewManagerNames) {
-    Map<String, WritableMap> constantsMap = new ArrayMap<>();
-    for (String viewManagerName : viewManagerNames) {
-      WritableMap constants = computeConstantsForViewManager(viewManagerName);
-      if (constants != null) {
-        constantsMap.put(viewManagerName, constants);
-      }
-    }
-
-    // To ensure that this is thread safe, we return an unmodifiableMap
-    // We use mViewManagerConstantsCacheSize to count the times we access the contents of the map
-    // Once we have accessed all the values, we free this cache
-    // Assumption is that JS gets the constants only once for each viewManager.
-    // Using this mechanism prevents expensive synchronized blocks, due to the nature of how this is
-    // accessed - write one, read multiple times, and then throw the data away.
-    mViewManagerConstantsCacheSize = viewManagerNames.size();
-    mViewManagerConstantsCache = Collections.unmodifiableMap(constantsMap);
-  }
-
   @ReactMethod(isBlockingSynchronousMethod = true)
   public @Nullable WritableMap getConstantsForViewManager(@Nullable String viewManagerName) {
-    if (mViewManagerConstantsCache != null
-        && mViewManagerConstantsCache.containsKey(viewManagerName)) {
-      WritableMap constants = mViewManagerConstantsCache.get(viewManagerName);
-      if (--mViewManagerConstantsCacheSize <= 0) {
-        // Looks like we have read all the values from the cache, so we may as well free this cache
-        mViewManagerConstantsCache = null;
-      }
-      return constants;
-    } else {
-      return computeConstantsForViewManager(viewManagerName);
-    }
-  }
-
-  private @Nullable WritableMap computeConstantsForViewManager(@Nullable String viewManagerName) {
     ViewManager targetView =
         viewManagerName != null ? mUIImplementation.resolveViewManager(viewManagerName) : null;
     if (targetView == null) {
@@ -403,7 +356,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule
             -1);
 
     mUIImplementation.registerRootView(rootView, tag, themedRootContext);
-    mNumRootViews++;
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     return tag;
   }
@@ -427,7 +379,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   @ReactMethod
   public void removeRootView(int rootViewTag) {
     mUIImplementation.removeRootView(rootViewTag);
-    mNumRootViews--;
   }
 
   public void updateNodeSize(int nodeViewTag, int newWidth, int newHeight) {
@@ -768,12 +719,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule
       listener.willDispatchViewUpdates(this);
     }
     try {
-      // If there are no RootViews registered, there will be no View updates to dispatch.
-      // This is a hack to prevent this from being called when Fabric is used everywhere.
-      // This should no longer be necessary in Bridgeless Mode.
-      if (mNumRootViews > 0) {
-        mUIImplementation.dispatchViewUpdates(batchId);
-      }
+      mUIImplementation.dispatchViewUpdates(batchId);
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     }

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

@@ -16,7 +16,7 @@ import java.util.WeakHashMap;
 
 /** Class providing children management API for view managers of classes extending ViewGroup. */
 public abstract class ViewGroupManager<T extends ViewGroup>
-    extends BaseViewManager<T, LayoutShadowNode> implements IViewManagerWithChildren {
+    extends BaseViewManager<T, LayoutShadowNode> implements IViewGroupManager<T> {
 
   private static WeakHashMap<View, Integer> mZIndexHash = new WeakHashMap<>();
 
@@ -33,6 +33,7 @@ public abstract class ViewGroupManager<T extends ViewGroup>
   @Override
   public void updateExtraData(T root, Object extraData) {}
 
+  @Override
   public void addView(T parent, View child, int index) {
     parent.addView(child, index);
   }
@@ -60,14 +61,17 @@ public abstract class ViewGroupManager<T extends ViewGroup>
     return mZIndexHash.get(view);
   }
 
+  @Override
   public int getChildCount(T parent) {
     return parent.getChildCount();
   }
 
+  @Override
   public View getChildAt(T parent, int index) {
     return parent.getChildAt(index);
   }
 
+  @Override
   public void removeViewAt(T parent, int index) {
     UiThreadUtil.assertOnUiThread();
 
@@ -105,14 +109,4 @@ public abstract class ViewGroupManager<T extends ViewGroup>
   public boolean needsCustomLayoutForChildren() {
     return false;
   }
-
-  /**
-   * Returns whether or not this View type should promote its grandchildren as Views. This is an
-   * optimization for Scrollable containers when using Nodes, where instead of having one ViewGroup
-   * containing a large number of draw commands (and thus being more expensive in the case of an
-   * invalidate or re-draw), we split them up into several draw commands.
-   */
-  public boolean shouldPromoteGrandchildren() {
-    return false;
-  }
 }

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

@@ -234,7 +234,7 @@ public abstract class ViewManager<T extends View, C extends ReactShadowNode>
   }
 
   /**
-   * Called when a View is removed from the hierachy. This should be used to reset any properties.
+   * Called when a View is removed from the hierarchy. This should be used to reset any properties.
    */
   protected T prepareToRecycleView(@NonNull ThemedReactContext reactContext, @NonNull T view) {
     return view;

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

@@ -12,6 +12,7 @@ import android.content.res.Configuration;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.MapBuilder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -51,7 +52,7 @@ public final class ViewManagerRegistry implements ComponentCallbacks2 {
    *     view manager registered for the className received as a parameter.
    * @return the {@link ViewManager} registered to the className received as a parameter
    */
-  public ViewManager get(String className) {
+  public synchronized ViewManager get(String className) {
     ViewManager viewManager = mViewManagers.get(className);
     if (viewManager != null) {
       return viewManager;
@@ -84,7 +85,7 @@ public final class ViewManagerRegistry implements ComponentCallbacks2 {
    *     there is no ViewManager associated to the className received as a parameter.
    */
   @Nullable
-  ViewManager getViewManagerIfExists(String className) {
+  /* package */ synchronized ViewManager getViewManagerIfExists(String className) {
     ViewManager viewManager = mViewManagers.get(className);
     if (viewManager != null) {
       return viewManager;
@@ -97,12 +98,16 @@ public final class ViewManagerRegistry implements ComponentCallbacks2 {
 
   /** Send lifecycle signal to all ViewManagers that StopSurface has been called. */
   public void onSurfaceStopped(final int surfaceId) {
+    final List<ViewManager> viewManagers;
+    synchronized (this) {
+      viewManagers = new ArrayList<>(mViewManagers.values());
+    }
     Runnable runnable =
         new Runnable() {
           @Override
           public void run() {
-            for (Map.Entry<String, ViewManager> entry : mViewManagers.entrySet()) {
-              entry.getValue().onSurfaceStopped(surfaceId);
+            for (ViewManager viewManager : viewManagers) {
+              viewManager.onSurfaceStopped(surfaceId);
             }
           }
         };
@@ -116,12 +121,16 @@ public final class ViewManagerRegistry implements ComponentCallbacks2 {
   /** ComponentCallbacks2 method. */
   @Override
   public void onTrimMemory(int level) {
+    final List<ViewManager> viewManagers;
+    synchronized (this) {
+      viewManagers = new ArrayList<>(mViewManagers.values());
+    }
     Runnable runnable =
         new Runnable() {
           @Override
           public void run() {
-            for (Map.Entry<String, ViewManager> entry : mViewManagers.entrySet()) {
-              entry.getValue().trimMemory();
+            for (ViewManager viewManager : viewManagers) {
+              viewManager.trimMemory();
             }
           }
         };

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

@@ -135,10 +135,17 @@ public class ViewProps {
   public static final String BORDER_RIGHT_COLOR = "borderRightColor";
   public static final String BORDER_TOP_COLOR = "borderTopColor";
   public static final String BORDER_BOTTOM_COLOR = "borderBottomColor";
+  public static final String BORDER_BLOCK_COLOR = "borderBlockColor";
+  public static final String BORDER_BLOCK_END_COLOR = "borderBlockEndColor";
+  public static final String BORDER_BLOCK_START_COLOR = "borderBlockStartColor";
   public static final String BORDER_TOP_START_RADIUS = "borderTopStartRadius";
   public static final String BORDER_TOP_END_RADIUS = "borderTopEndRadius";
   public static final String BORDER_BOTTOM_START_RADIUS = "borderBottomStartRadius";
   public static final String BORDER_BOTTOM_END_RADIUS = "borderBottomEndRadius";
+  public static final String BORDER_END_END_RADIUS = "borderEndEndRadius";
+  public static final String BORDER_END_START_RADIUS = "borderEndStartRadius";
+  public static final String BORDER_START_END_RADIUS = "borderStartEndRadius";
+  public static final String BORDER_START_START_RADIUS = "borderStartStartRadius";
   public static final String BORDER_START_COLOR = "borderStartColor";
   public static final String BORDER_END_COLOR = "borderEndColor";
   public static final String ON_LAYOUT = "onLayout";
@@ -295,6 +302,15 @@ public class ViewProps {
       case BORDER_BOTTOM_COLOR:
         return map.getType(BORDER_BOTTOM_COLOR) == ReadableType.Number
             && map.getInt(BORDER_BOTTOM_COLOR) == Color.TRANSPARENT;
+      case BORDER_BLOCK_COLOR:
+        return map.getType(BORDER_BLOCK_COLOR) == ReadableType.Number
+            && map.getInt(BORDER_BLOCK_COLOR) == Color.TRANSPARENT;
+      case BORDER_BLOCK_END_COLOR:
+        return map.getType(BORDER_BLOCK_END_COLOR) == ReadableType.Number
+            && map.getInt(BORDER_BLOCK_END_COLOR) == Color.TRANSPARENT;
+      case BORDER_BLOCK_START_COLOR:
+        return map.getType(BORDER_BLOCK_START_COLOR) == ReadableType.Number
+            && map.getInt(BORDER_BLOCK_START_COLOR) == Color.TRANSPARENT;
       case BORDER_WIDTH:
         return map.isNull(BORDER_WIDTH) || map.getDouble(BORDER_WIDTH) == 0d;
       case BORDER_LEFT_WIDTH:

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

@@ -8,18 +8,15 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        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"),
-    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
     deps = [
+        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-utils"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java

@@ -77,7 +77,7 @@ public abstract class Event<T extends Event> {
     //
     // Why does this matter?
     // Events can be sent to Views that are part of the View hierarchy *but not directly managed
-    // by React Native*. For example, embedded custom hierachies, Litho hierachies, etc.
+    // by React Native*. For example, embedded custom hierarchies, Litho hierarchies, etc.
     // In those cases it's important to know that the Event should be sent to the Fabric or
     // non-Fabric UIManager, and we cannot use the ViewTag for inference since it's not controlled
     // by RN and is essentially a random number.

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventCategoryDef.java

@@ -14,12 +14,15 @@ import static com.facebook.react.uimanager.events.EventCategoryDef.DISCRETE;
 import static com.facebook.react.uimanager.events.EventCategoryDef.UNSPECIFIED;
 
 import androidx.annotation.IntDef;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Java specific declaration of the `RawEvent::Category` enum. Keep in sync with
  * `renderer/core/RawEvent.h`.
  */
 @IntDef(value = {CONTINUOUS_START, CONTINUOUS_END, UNSPECIFIED, DISCRETE, CONTINUOUS})
+@Retention(RetentionPolicy.SOURCE)
 public @interface EventCategoryDef {
   /** Start of a continuous event. To be used with touchStart. */
   int CONTINUOUS_START = 0;

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.java

@@ -18,8 +18,10 @@ import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.TouchTargetHelper;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class PointerEvent extends Event<PointerEvent> {
   private static final String TAG = PointerEvent.class.getSimpleName();
@@ -122,18 +124,21 @@ public class PointerEvent extends Event<PointerEvent> {
           new EventAnimationDriverMatchSpec() {
             @Override
             public boolean match(int viewTag, String eventName) {
-              if (!PointerEventHelper.isBubblingEvent(eventName)) {
+              if (!eventName.equals(mEventName)) {
                 return false;
               }
 
-              List<TouchTargetHelper.ViewTarget> viewTargets =
-                  mEventState.getHitPathForActivePointer();
-              for (TouchTargetHelper.ViewTarget viewTarget : viewTargets) {
-                if (viewTarget.getViewId() == viewTag && eventName.equals(mEventName)) {
-                  return true;
+              if (PointerEventHelper.isBubblingEvent(eventName)) {
+                for (TouchTargetHelper.ViewTarget viewTarget :
+                    mEventState.getHitPathForActivePointer()) {
+                  if (viewTarget.getViewId() == viewTag) {
+                    return true;
+                  }
                 }
+                return false;
+              } else {
+                return getViewTag() == viewTag;
               }
-              return false;
             }
           };
     }
@@ -184,9 +189,9 @@ public class PointerEvent extends Event<PointerEvent> {
     String pointerType = PointerEventHelper.getW3CPointerType(mMotionEvent.getToolType(index));
     pointerEvent.putString("pointerType", pointerType);
 
-    pointerEvent.putBoolean(
-        "isPrimary",
-        PointerEventHelper.isPrimary(pointerId, mEventState.getPrimaryPointerId(), mMotionEvent));
+    boolean isPrimary =
+        mEventState.supportsHover(pointerId) || pointerId == mEventState.mPrimaryPointerId;
+    pointerEvent.putBoolean("isPrimary", isPrimary);
 
     // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent
     // Client refers to upper left edge of the content area (viewport)
@@ -310,6 +315,7 @@ public class PointerEvent extends Event<PointerEvent> {
     private Map<Integer, float[]> mOffsetByPointerId;
     private Map<Integer, List<TouchTargetHelper.ViewTarget>> mHitPathByPointerId;
     private Map<Integer, float[]> mEventCoordinatesByPointerId;
+    private Set<Integer> mHoveringPointerIds;
 
     public PointerEventState(
         int primaryPointerId,
@@ -318,7 +324,8 @@ public class PointerEvent extends Event<PointerEvent> {
         int surfaceId,
         Map<Integer, float[]> offsetByPointerId,
         Map<Integer, List<TouchTargetHelper.ViewTarget>> hitPathByPointerId,
-        Map<Integer, float[]> eventCoordinatesByPointerId) {
+        Map<Integer, float[]> eventCoordinatesByPointerId,
+        Set<Integer> hoveringPointerIds) {
       mPrimaryPointerId = primaryPointerId;
       mActivePointerId = activePointerId;
       mLastButtonState = lastButtonState;
@@ -326,6 +333,7 @@ public class PointerEvent extends Event<PointerEvent> {
       mOffsetByPointerId = offsetByPointerId;
       mHitPathByPointerId = hitPathByPointerId;
       mEventCoordinatesByPointerId = eventCoordinatesByPointerId;
+      mHoveringPointerIds = new HashSet<>(hoveringPointerIds);
     }
 
     public int getLastButtonState() {
@@ -344,6 +352,10 @@ public class PointerEvent extends Event<PointerEvent> {
       return mActivePointerId;
     }
 
+    public boolean supportsHover(int pointerId) {
+      return mHoveringPointerIds.contains(pointerId);
+    }
+
     public final Map<Integer, float[]> getOffsetByPointerId() {
       return mOffsetByPointerId;
     }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEventHelper.java

@@ -11,9 +11,7 @@ import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;
 import androidx.annotation.Nullable;
-import com.facebook.common.logging.FLog;
 import com.facebook.react.R;
-import com.facebook.react.common.ReactConstants;
 
 /** Class responsible for generating catalyst touch events based on android {@link MotionEvent}. */
 public class PointerEventHelper {
@@ -22,6 +20,7 @@ public class PointerEventHelper {
   public static final String POINTER_TYPE_PEN = "pen";
   public static final String POINTER_TYPE_MOUSE = "mouse";
   public static final String POINTER_TYPE_UNKNOWN = "";
+  private static final int X_FLAG_SUPPORTS_HOVER = 0x01000000;
 
   public static enum EVENT {
     CANCEL,
@@ -51,31 +50,6 @@ public class PointerEventHelper {
   public static final String POINTER_OVER = "topPointerOver";
   public static final String POINTER_OUT = "topPointerOut";
 
-  /** We don't dispatch capture events from native; that's currently handled by JS. */
-  public static @Nullable String getDispatchableEventName(EVENT event) {
-    switch (event) {
-      case LEAVE:
-        return PointerEventHelper.POINTER_LEAVE;
-      case DOWN:
-        return PointerEventHelper.POINTER_DOWN;
-      case MOVE:
-        return PointerEventHelper.POINTER_MOVE;
-      case ENTER:
-        return PointerEventHelper.POINTER_ENTER;
-      case CANCEL:
-        return PointerEventHelper.POINTER_CANCEL;
-      case UP:
-        return PointerEventHelper.POINTER_UP;
-      case OVER:
-        return PointerEventHelper.POINTER_OVER;
-      case OUT:
-        return PointerEventHelper.POINTER_OUT;
-      default:
-        FLog.e(ReactConstants.TAG, "No dispatchable event name for type: " + event);
-        return null;
-    }
-  }
-
   // https://w3c.github.io/pointerevents/#the-buttons-property
   public static int getButtons(String eventName, String pointerType, int buttonState) {
     if (isExitEvent(eventName)) {
@@ -116,14 +90,6 @@ public class PointerEventHelper {
     return -1;
   }
 
-  public static boolean isPrimary(int pointerId, int primaryPointerId, MotionEvent event) {
-    if (supportsHover(event)) {
-      return true;
-    }
-
-    return pointerId == primaryPointerId;
-  }
-
   public static String getW3CPointerType(final int toolType) {
     // https://www.w3.org/TR/pointerevents3/#dom-pointerevent-pointertype
     switch (toolType) {
@@ -141,7 +107,7 @@ public class PointerEventHelper {
 
   public static boolean isListening(@Nullable View view, EVENT event) {
     if (view == null) {
-      return false;
+      return true;
     }
 
     switch (event) {
@@ -184,8 +150,16 @@ public class PointerEventHelper {
   }
 
   public static boolean supportsHover(MotionEvent motionEvent) {
-    int source = motionEvent.getSource();
-    return source == InputDevice.SOURCE_MOUSE || source == InputDevice.SOURCE_CLASS_POINTER;
+    // A flag has been set on the MotionEvent to indicate it supports hover
+    // See D36958947 on justifications for this.
+    // TODO(luwe): Leverage previous events to determine if MotionEvent
+    //  is from an input device that supports hover
+    boolean supportsHoverFlag = (motionEvent.getFlags() & X_FLAG_SUPPORTS_HOVER) != 0;
+    if (supportsHoverFlag) {
+      return true;
+    }
+
+    return motionEvent.isFromSource(InputDevice.SOURCE_MOUSE);
   }
 
   public static boolean isExitEvent(String eventName) {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java

@@ -20,12 +20,12 @@ public interface RCTEventEmitter extends JavaScriptModule {
   /**
    * Deprecated in favor of RCTModernEventEmitter.receiveEvent.
    *
-   * @param targetTag
-   * @param eventName
-   * @param event
+   * @param targetReactTag react tag of the view that receives the event
+   * @param eventName name of event
+   * @param event event params
    */
   @Deprecated
-  void receiveEvent(int targetTag, String eventName, @Nullable WritableMap event);
+  void receiveEvent(int targetReactTag, String eventName, @Nullable WritableMap event);
 
   /**
    * Receive and process touches

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/util/ReactFindViewUtil.java

@@ -43,11 +43,6 @@ public class ReactFindViewUtil {
   public interface OnMultipleViewsFoundListener {
 
     void onViewFound(View view, String nativeId);
-    /**
-     * Called when all teh views have been found
-     *
-     * @param map
-     */
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/views/common/BUCK

@@ -8,17 +8,14 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
-        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"),
-    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
+        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-utils"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/BUCK

@@ -8,26 +8,25 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        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"),
-    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
         YOGA_TARGET,
         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/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:drawerlayout"),
+        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/jsr-305:jsr-305"),
+        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
         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/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
-        react_native_root_target(":generated_components_java-FBReactNativeComponentSpec"),
+        react_native_target("res:uimanager"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java

@@ -10,10 +10,16 @@ package com.facebook.react.views.drawer;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import com.facebook.common.logging.FLog;
+import com.facebook.react.R;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
 
 /**
@@ -29,6 +35,30 @@ import com.facebook.react.uimanager.events.NativeGestureUtil;
 
   public ReactDrawerLayout(ReactContext reactContext) {
     super(reactContext);
+    ViewCompat.setAccessibilityDelegate(
+        this,
+        new AccessibilityDelegateCompat() {
+          @Override
+          public void onInitializeAccessibilityNodeInfo(
+              View host, AccessibilityNodeInfoCompat info) {
+            super.onInitializeAccessibilityNodeInfo(host, info);
+            final AccessibilityRole accessibilityRole =
+                (AccessibilityRole) host.getTag(R.id.accessibility_role);
+            if (accessibilityRole != null) {
+              info.setClassName(AccessibilityRole.getValue(accessibilityRole));
+            }
+          }
+
+          @Override
+          public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {
+            super.onInitializeAccessibilityEvent(host, event);
+            final AccessibilityRole accessibilityRole =
+                (AccessibilityRole) host.getTag(R.id.accessibility_role);
+            if (accessibilityRole != null) {
+              event.setClassName(AccessibilityRole.getValue(accessibilityRole));
+            }
+          }
+        });
   }
 
   @Override