react-native 0.0.0-201c10733 → 0.0.0-268efb102

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

@@ -166,8 +166,22 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     if (accessibilityState == null) {
       return;
     }
+    if (accessibilityState.hasKey("selected")) {
+      boolean prevSelected = view.isSelected();
+      boolean nextSelected = accessibilityState.getBoolean("selected");
+      view.setSelected(nextSelected);
+
+      // For some reason, Android does not announce "unselected" when state changes.
+      // This is inconsistent with other platforms, but also with the "checked" state.
+      // So manually announce this.
+      if (view.isAccessibilityFocused() && prevSelected && !nextSelected) {
+        view.announceForAccessibility(
+            view.getContext().getString(R.string.state_unselected_description));
+      }
+    } else {
+      view.setSelected(false);
+    }
     view.setTag(R.id.accessibility_state, accessibilityState);
-    view.setSelected(false);
     view.setEnabled(true);
 
     // For states which don't have corresponding methods in

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

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+import com.facebook.proguard.annotations.DoNotStripAny;
+
+@DoNotStripAny
+public interface ComponentNameResolver {
+
+  /* returns a list of all the component names that are registered in React Native. */
+  String[] getComponentNames();
+}

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.proguard.annotations.DoNotStripAny;
+import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.soloader.SoLoader;
+
+@DoNotStripAny
+public class ComponentNameResolverManager {
+
+  static {
+    staticInit();
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  private final HybridData mHybridData;
+
+  public ComponentNameResolverManager(
+      RuntimeExecutor runtimeExecutor, Object componentNameResolver) {
+    mHybridData = initHybrid(runtimeExecutor, componentNameResolver);
+    installJSIBindings();
+  }
+
+  private native HybridData initHybrid(
+      RuntimeExecutor runtimeExecutor, Object componentNameResolver);
+
+  private native void installJSIBindings();
+
+  private static void staticInit() {
+    SoLoader.loadLibrary("uimanagerjni");
+  }
+}

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

@@ -13,9 +13,8 @@ import android.view.Display;
 import android.view.WindowManager;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Holds an instance of the current DisplayMetrics so we don't have to thread it through all the
@@ -81,40 +80,20 @@ public class DisplayMetricsHolder {
     return sScreenDisplayMetrics;
   }
 
-  public static Map<String, Map<String, Object>> getDisplayMetricsMap(double fontScale) {
+  public static WritableMap getDisplayMetricsWritableMap(double fontScale) {
     Assertions.assertCondition(
         sWindowDisplayMetrics != null && sScreenDisplayMetrics != null,
-        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics");
-    final Map<String, Map<String, Object>> result = new HashMap<>();
-    result.put("windowPhysicalPixels", getPhysicalPixelsMap(sWindowDisplayMetrics, fontScale));
-    result.put("screenPhysicalPixels", getPhysicalPixelsMap(sScreenDisplayMetrics, fontScale));
-    return result;
-  }
-
-  public static WritableNativeMap getDisplayMetricsNativeMap(double fontScale) {
-    Assertions.assertCondition(
-        sWindowDisplayMetrics != null && sScreenDisplayMetrics != null,
-        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics");
+        "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or"
+            + " initDisplayMetrics");
     final WritableNativeMap result = new WritableNativeMap();
     result.putMap(
-        "windowPhysicalPixels", getPhysicalPixelsNativeMap(sWindowDisplayMetrics, fontScale));
+        "windowPhysicalPixels", getPhysicalPixelsWritableMap(sWindowDisplayMetrics, fontScale));
     result.putMap(
-        "screenPhysicalPixels", getPhysicalPixelsNativeMap(sScreenDisplayMetrics, fontScale));
-    return result;
-  }
-
-  private static Map<String, Object> getPhysicalPixelsMap(
-      DisplayMetrics displayMetrics, double fontScale) {
-    final Map<String, Object> result = new HashMap<>();
-    result.put("width", displayMetrics.widthPixels);
-    result.put("height", displayMetrics.heightPixels);
-    result.put("scale", displayMetrics.density);
-    result.put("fontScale", fontScale);
-    result.put("densityDpi", displayMetrics.densityDpi);
+        "screenPhysicalPixels", getPhysicalPixelsWritableMap(sScreenDisplayMetrics, fontScale));
     return result;
   }
 
-  private static WritableNativeMap getPhysicalPixelsNativeMap(
+  private static WritableMap getPhysicalPixelsWritableMap(
       DisplayMetrics displayMetrics, double fontScale) {
     final WritableNativeMap result = new WritableNativeMap();
     result.putInt("width", displayMetrics.widthPixels);

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

@@ -66,15 +66,6 @@ public class FabricViewStateManager {
       return;
     }
 
-    Runnable failureRunnable =
-        new Runnable() {
-          @Override
-          // Run on the UI thread
-          public void run() {
-            FLog.e(TAG, "UpdateState failed - retrying! " + numTries);
-            setState(stateWrapper, stateUpdateCallback, numTries + 1);
-          }
-        };
     @Nullable WritableMap stateUpdate = stateUpdateCallback.getStateUpdate();
     if (stateUpdate == null) {
       return;
@@ -88,7 +79,7 @@ public class FabricViewStateManager {
     setState(mStateWrapper, stateUpdateCallback, 0);
   }
 
-  public @Nullable ReadableMap getState() {
-    return mStateWrapper != null ? mStateWrapper.getState() : null;
+  public @Nullable ReadableMap getStateData() {
+    return mStateWrapper != null ? mStateWrapper.getStateData() : null;
   }
 }

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

@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.TouchEvent;
 import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper;
@@ -50,14 +51,22 @@ public class JSTouchDispatcher {
     mTargetTag = -1;
   }
 
+  /**
+   * See Event.java. By contract, this surfaceId should be a valid SurfaceId in Fabric, and should
+   * ALWAYS return -1 in non-Fabric.
+   *
+   * @return
+   */
   private int getSurfaceId() {
-    if (mRootViewGroup instanceof ReactRoot) {
+    if (mRootViewGroup != null
+        && mRootViewGroup instanceof ReactRoot
+        && ((ReactRoot) mRootViewGroup).getUIManagerType() == UIManagerType.FABRIC) {
+      if (mRootViewGroup.getContext() instanceof ThemedReactContext) {
+        ThemedReactContext context = (ThemedReactContext) mRootViewGroup.getContext();
+        return context.getSurfaceId();
+      }
       return ((ReactRoot) mRootViewGroup).getRootViewTag();
     }
-    if (mRootViewGroup != null && mRootViewGroup.getContext() instanceof ThemedReactContext) {
-      ThemedReactContext context = (ThemedReactContext) mRootViewGroup.getContext();
-      return context.getSurfaceId();
-    }
     return -1;
   }
 

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

@@ -30,7 +30,6 @@ import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
@@ -278,17 +277,10 @@ public class NativeViewHierarchyManager {
     try {
       ViewManager viewManager = mViewManagers.get(className);
 
-      View view = viewManager.createView(tag, themedContext, null, null, mJSResponderHandler);
+      View view =
+          viewManager.createView(tag, themedContext, initialProps, null, mJSResponderHandler);
       mTagsToViews.put(tag, view);
       mTagsToViewManagers.put(tag, viewManager);
-
-      // Use android View id field to store React tag. This is possible since we don't inflate
-      // React views from layout xmls. Thus it is easier to just reuse that field instead of
-      // creating another (potentially much more expensive) mapping from view to React tag
-      view.setId(tag);
-      if (initialProps != null) {
-        viewManager.updateProperties(view, initialProps);
-      }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT_VIEW);
     }
@@ -859,9 +851,8 @@ public class NativeViewHierarchyManager {
               + commandId);
     }
     ViewManager viewManager = resolveViewManager(reactTag);
-    ViewManagerDelegate delegate;
-    if (ReactFeatureFlags.useViewManagerDelegatesForCommands
-        && (delegate = viewManager.getDelegate()) != null) {
+    ViewManagerDelegate delegate = viewManager.getDelegate();
+    if (delegate != null) {
       delegate.receiveCommand(view, commandId, args);
     } else {
       viewManager.receiveCommand(view, commandId, args);

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

@@ -13,7 +13,6 @@ import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.config.ReactFeatureFlags;
 
 /**
  * Class responsible for optimizing the native view hierarchy while still respecting the final UI
@@ -425,18 +424,16 @@ public class NativeViewHierarchyOptimizer {
     // Bit of a hack: we need to update the layout of this node's children now that it's no longer
     // layout-only, but we may still receive more layout updates at the end of this batch that we
     // don't want to ignore.
-    if (ReactFeatureFlags.enableTransitionLayoutOnlyViewCleanup) {
-      FLog.i(
-          TAG,
-          "Transitioning LayoutOnlyView - tag: "
-              + node.getReactTag()
-              + " - rootTag: "
-              + node.getRootTag()
-              + " - hasProps: "
-              + (props != null)
-              + " - tagsWithLayout.size: "
-              + mTagsWithLayoutVisited.size());
-    }
+    FLog.i(
+        TAG,
+        "Transitioning LayoutOnlyView - tag: "
+            + node.getReactTag()
+            + " - rootTag: "
+            + node.getRootTag()
+            + " - hasProps: "
+            + (props != null)
+            + " - tagsWithLayout.size: "
+            + mTagsWithLayoutVisited.size());
     Assertions.assertCondition(mTagsWithLayoutVisited.size() == 0);
     applyLayoutBase(node);
     for (int i = 0; i < node.getChildCount(); i++) {

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

@@ -7,11 +7,11 @@
 
 package com.facebook.react.uimanager;
 
+import androidx.annotation.Nullable;
 import androidx.core.util.Pools;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Event used to notify JS component about changes of its position or dimensions */
 public class OnLayoutEvent extends Event<OnLayoutEvent> {
@@ -21,12 +21,18 @@ public class OnLayoutEvent extends Event<OnLayoutEvent> {
 
   private int mX, mY, mWidth, mHeight;
 
+  @Deprecated
   public static OnLayoutEvent obtain(int viewTag, int x, int y, int width, int height) {
+    return obtain(-1, viewTag, x, y, width, height);
+  }
+
+  public static OnLayoutEvent obtain(
+      int surfaceId, int viewTag, int x, int y, int width, int height) {
     OnLayoutEvent event = EVENTS_POOL.acquire();
     if (event == null) {
       event = new OnLayoutEvent();
     }
-    event.init(viewTag, x, y, width, height);
+    event.init(surfaceId, viewTag, x, y, width, height);
     return event;
   }
 
@@ -37,8 +43,13 @@ public class OnLayoutEvent extends Event<OnLayoutEvent> {
 
   private OnLayoutEvent() {}
 
+  @Deprecated
   protected void init(int viewTag, int x, int y, int width, int height) {
-    super.init(viewTag);
+    init(-1, viewTag, x, y, width, height);
+  }
+
+  protected void init(int surfaceId, int viewTag, int x, int y, int width, int height) {
+    super.init(surfaceId, viewTag);
     mX = x;
     mY = y;
     mWidth = width;
@@ -50,8 +61,9 @@ public class OnLayoutEvent extends Event<OnLayoutEvent> {
     return "topLayout";
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
+  protected WritableMap getEventData() {
     WritableMap layout = Arguments.createMap();
     layout.putDouble("x", PixelUtil.toDIPFromPixel(mX));
     layout.putDouble("y", PixelUtil.toDIPFromPixel(mY));
@@ -61,7 +73,6 @@ public class OnLayoutEvent extends Event<OnLayoutEvent> {
     WritableMap event = Arguments.createMap();
     event.putMap("layout", layout);
     event.putInt("target", getViewTag());
-
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), event);
+    return event;
   }
 }

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

@@ -24,11 +24,6 @@ public class PixelUtil {
     return toPixelFromDIP((float) value);
   }
 
-  /** Convert from PX to SP */
-  public static float toSPFromPixel(float value) {
-    return value / DisplayMetricsHolder.getScreenDisplayMetrics().scaledDensity;
-  }
-
   /** Convert from SP to PX */
   public static float toPixelFromSP(float value) {
     return toPixelFromSP(value, Float.NaN);
@@ -58,6 +53,6 @@ public class PixelUtil {
 
   /** @return {@link float} that represents the density of the display metrics for device screen. */
   public static float getDisplayMetricDensity() {
-    return DisplayMetricsHolder.getScreenDisplayMetrics().density;
+    return DisplayMetricsHolder.getWindowDisplayMetrics().density;
   }
 }

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

@@ -26,7 +26,7 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
-import com.facebook.react.bridge.ReactSoftException;
+import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
@@ -35,7 +35,6 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import java.util.HashMap;
 
 /**
@@ -83,6 +82,7 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
   public enum AccessibilityRole {
     NONE,
     BUTTON,
+    TOGGLEBUTTON,
     LINK,
     SEARCH,
     IMAGE,
@@ -107,12 +107,15 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
     TAB,
     TABLIST,
     TIMER,
+    LIST,
     TOOLBAR;
 
     public static String getValue(AccessibilityRole role) {
       switch (role) {
         case BUTTON:
           return "android.widget.Button";
+        case TOGGLEBUTTON:
+          return "android.widget.ToggleButton";
         case SEARCH:
           return "android.widget.EditText";
         case IMAGE:
@@ -133,6 +136,8 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
           return "android.widget.SpinButton";
         case SWITCH:
           return "android.widget.Switch";
+        case LIST:
+          return "android.widget.AbsListView";
         case NONE:
         case LINK:
         case SUMMARY:
@@ -293,27 +298,28 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
       final WritableMap event = Arguments.createMap();
       event.putString("actionName", mAccessibilityActionsMap.get(action));
       ReactContext reactContext = (ReactContext) host.getContext();
-      if (reactContext.hasActiveCatalystInstance()) {
+      if (reactContext.hasActiveReactInstance()) {
         final int reactTag = host.getId();
+        final int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
         UIManager uiManager = UIManagerHelper.getUIManager(reactContext, reactTag);
         if (uiManager != null) {
           uiManager
               .<EventDispatcher>getEventDispatcher()
               .dispatchEvent(
-                  new Event(reactTag) {
+                  new Event(surfaceId, reactTag) {
                     @Override
                     public String getEventName() {
                       return TOP_ACCESSIBILITY_ACTION_EVENT;
                     }
 
                     @Override
-                    public void dispatch(RCTEventEmitter rctEventEmitter) {
-                      rctEventEmitter.receiveEvent(reactTag, TOP_ACCESSIBILITY_ACTION_EVENT, event);
+                    protected WritableMap getEventData() {
+                      return event;
                     }
                   });
         }
       } else {
-        ReactSoftException.logSoftException(
+        ReactSoftExceptionLogger.logSoftException(
             TAG, new ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance"));
       }
 
@@ -382,16 +388,16 @@ public class ReactAccessibilityDelegate extends AccessibilityDelegateCompat {
         spannable.setSpan(new URLSpan(""), 0, spannable.length(), 0);
         nodeInfo.setText(spannable);
       }
-    } else if (role.equals(AccessibilityRole.SEARCH)) {
-      nodeInfo.setRoleDescription(context.getString(R.string.search_description));
     } else if (role.equals(AccessibilityRole.IMAGE)) {
       nodeInfo.setRoleDescription(context.getString(R.string.image_description));
     } else if (role.equals(AccessibilityRole.IMAGEBUTTON)) {
       nodeInfo.setRoleDescription(context.getString(R.string.imagebutton_description));
       nodeInfo.setClickable(true);
     } else if (role.equals(AccessibilityRole.BUTTON)) {
-      nodeInfo.setRoleDescription(context.getString(R.string.button_description));
       nodeInfo.setClickable(true);
+    } else if (role.equals(AccessibilityRole.TOGGLEBUTTON)) {
+      nodeInfo.setClickable(true);
+      nodeInfo.setCheckable(true);
     } else if (role.equals(AccessibilityRole.SUMMARY)) {
       nodeInfo.setRoleDescription(context.getString(R.string.summary_description));
     } else if (role.equals(AccessibilityRole.HEADER)) {

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+/**
+ * Some Views may not function if added directly to a ViewGroup that clips them. For example, TTRC
+ * markers may rely on `onDraw` functionality to work properly, and will break if they're clipped
+ * out of the View hierarchy for any resaon.
+ *
+ * <p>This situation can occur more often in Fabric with View Flattening. We may prevent this sort
+ * of View Flattening from occurring in the future, but the connection is not entirely certain.
+ *
+ * <p>This can occur either because ReactViewGroup clips them out, using the ordinarary subview
+ * clipping feature. It is also possible if a View is added directly to a ReactRootView below the
+ * fold of the screen.
+ *
+ * <p>Generally the solution is to prevent View flattening in JS by adding `collapsable=false` to a
+ * parent component of the clipped view, and/or move the View higher up in the hierarchy so it is
+ * always rendered within the first page of the screen.
+ */
+public interface ReactClippingProhibitedView {}

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

@@ -43,12 +43,16 @@ public class ReactClippingViewGroupHelper {
         // Intersect the view with the parent's rectangle
         // This will result in the overlap with coordinates in the parent space
         if (!sHelperRect.intersect(
-            view.getLeft(), view.getTop(), view.getRight(), view.getBottom())) {
+            view.getLeft(),
+            view.getTop() + (int) view.getTranslationY(),
+            view.getRight(),
+            view.getBottom() + (int) view.getTranslationY())) {
           outputRect.setEmpty();
           return;
         }
         // Now we move the coordinates to the View's coordinate space
         sHelperRect.offset(-view.getLeft(), -view.getTop());
+        sHelperRect.offset(-(int) view.getTranslationX(), -(int) view.getTranslationY());
         sHelperRect.offset(view.getScrollX(), view.getScrollY());
         outputRect.set(sHelperRect);
         return;

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+/**
+ * Interface that should be implemented by {@link View} subclasses that support {@code overflow}
+ * style. This allows the overflow information to be used by {@link TouchTargetHelper} to determine
+ * if a View is touchable.
+ */
+public interface ReactOverflowView {
+  /**
+   * Gets the overflow state of a view. If set, this should be one of {@link ViewProps#HIDDEN},
+   * {@link ViewProps#VISIBLE} or {@link ViewProps#SCROLL}.
+   */
+  @Nullable
+  String getOverflow();
+}

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

@@ -7,8 +7,11 @@
 
 package com.facebook.react.uimanager;
 
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewParent;
+import androidx.annotation.UiThread;
 import com.facebook.infer.annotation.Assertions;
 
 public class RootViewUtil {
@@ -28,4 +31,19 @@ public class RootViewUtil {
       current = (View) next;
     }
   }
+
+  @UiThread
+  public static Point getViewportOffset(View v) {
+    int[] locationInWindow = new int[2];
+    v.getLocationInWindow(locationInWindow);
+
+    // we need to subtract visibleWindowCoords - to subtract possible window insets, split
+    // screen or multi window
+    Rect visibleWindowFrame = new Rect();
+    v.getWindowVisibleDisplayFrame(visibleWindowFrame);
+    locationInWindow[0] -= visibleWindowFrame.left;
+    locationInWindow[1] -= visibleWindowFrame.top;
+
+    return new Point(locationInWindow[0], locationInWindow[1]);
+  }
 }

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

@@ -9,6 +9,8 @@ package com.facebook.react.uimanager;
 
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import javax.annotation.Nullable;
 
 /**
  * This is a wrapper that can be used for passing State objects from Fabric C++ core to
@@ -16,14 +18,32 @@ import com.facebook.react.bridge.WritableMap;
  * by calling updateState, which communicates state back to the C++ layer.
  */
 public interface StateWrapper {
+
+  /**
+   * Get a ReadableMapBuffer object from the C++ layer, which is a K/V map of short keys to values.
+   *
+   * <p>Unstable API - DO NOT USE.
+   */
+  @Nullable
+  ReadableMapBuffer getStatDataMapBuffer();
+
   /**
    * Get a ReadableNativeMap object from the C++ layer, which is a K/V map of string keys to values.
    */
-  ReadableNativeMap getState();
+  @Nullable
+  ReadableNativeMap getStateData();
 
   /**
    * Pass a map of values back to the C++ layer. The operation is performed synchronously and cannot
    * fail.
    */
   void updateState(WritableMap map);
+
+  /**
+   * Mark state as unused and clean up in Java and in native. This should be called as early as
+   * possible when you know a StateWrapper will no longer be used. If there's ANY chance of it being
+   * used legitimately, don't destroy it! It is expected that all StateWrappers are destroyed
+   * immediately upon stopSurface.
+   */
+  void destroyState();
 }