diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java index d32428f81..2b5036c7b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java @@ -38,7 +38,8 @@ import android.graphics.RectF; // These should only ever be set from within the DrawView, their only purpose is to prevent // excessive rounding on the UI thread in FlatViewGroup, and they are left package protected to - // speed up direct access. + // speed up direct access. For overflow visible, these are the adjusted bounds while taking + // overflowing elements into account. /* package */ int mLogicalLeft; /* package */ int mLogicalTop; /* package */ int mLogicalRight; diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java index 740c46409..2786cb7bf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java @@ -69,11 +69,10 @@ import com.facebook.react.uimanager.ViewManagerRegistry; int reactTag, @Nullable DrawCommand[] drawCommands, @Nullable AttachDetachListener[] listeners, - @Nullable NodeRegion[] nodeRegions, - Rect logicalAdjustment) { + @Nullable NodeRegion[] nodeRegions) { FlatViewGroup view = (FlatViewGroup) resolveView(reactTag); if (drawCommands != null) { - view.mountDrawCommands(drawCommands, logicalAdjustment); + view.mountDrawCommands(drawCommands); } if (listeners != null) { view.mountAttachDetachListeners(listeners); diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java index 1426f7c70..c775c3502 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java @@ -397,10 +397,6 @@ import com.facebook.react.views.view.ReactClippingViewGroupHelper; } } - /* package */ final Rect getLogicalOffset() { - return mLogicalOffset; - } - /* package */ void updateNodeRegion( float left, float top, diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java index fdbeeae25..8753db095 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java @@ -51,19 +51,16 @@ import com.facebook.react.uimanager.UIViewOperationQueue; private final @Nullable DrawCommand[] mDrawCommands; private final @Nullable AttachDetachListener[] mAttachDetachListeners; private final @Nullable NodeRegion[] mNodeRegions; - private final Rect mLogicalAdjustment; private UpdateMountState( int reactTag, @Nullable DrawCommand[] drawCommands, @Nullable AttachDetachListener[] listeners, - @Nullable NodeRegion[] nodeRegions, - Rect logicalAdjustment) { + @Nullable NodeRegion[] nodeRegions) { mReactTag = reactTag; mDrawCommands = drawCommands; mAttachDetachListeners = listeners; mNodeRegions = nodeRegions; - mLogicalAdjustment = logicalAdjustment; } @Override @@ -72,8 +69,7 @@ import com.facebook.react.uimanager.UIViewOperationQueue; mReactTag, mDrawCommands, mAttachDetachListeners, - mNodeRegions, - mLogicalAdjustment); + mNodeRegions); } } @@ -355,14 +351,12 @@ import com.facebook.react.uimanager.UIViewOperationQueue; int reactTag, @Nullable DrawCommand[] drawCommands, @Nullable AttachDetachListener[] listeners, - @Nullable NodeRegion[] nodeRegions, - Rect logicalOffset) { + @Nullable NodeRegion[] nodeRegions) { enqueueUIOperation(new UpdateMountState( reactTag, drawCommands, listeners, - nodeRegions, - logicalOffset)); + nodeRegions)); } public void enqueueUpdateViewGroup(int reactTag, int[] viewsToAdd, int[] viewsToDetach) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java index f5b6ca987..c2b468aa1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java @@ -108,10 +108,6 @@ import com.facebook.react.views.view.ReactClippingViewGroup; private static final ArrayList EMPTY_DETACHED_VIEWS = new ArrayList<>(0); private @Nullable DrawCommandManager mDrawCommandManager; - // for overflow visible, these adjustments are what we can apply to know the actual bounds of - // a ViewGroup while taking overflowing elements into account. - /* package */ Rect mLogicalAdjustments = EMPTY_RECT; - /* package */ FlatViewGroup(Context context) { super(context); setClipChildren(false); @@ -568,8 +564,7 @@ import com.facebook.react.views.view.ReactClippingViewGroup; ++mDrawChildIndex; } - /* package */ void mountDrawCommands(DrawCommand[] drawCommands, Rect logicalAdjustments) { - mLogicalAdjustments = logicalAdjustments; + /* package */ void mountDrawCommands(DrawCommand[] drawCommands) { if (mDrawCommandManager != null) { mDrawCommandManager.mountDrawCommands(drawCommands); } else { diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java index 1bf37ef3c..2cfd51353 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java @@ -334,8 +334,7 @@ import com.facebook.react.uimanager.events.EventDispatcher; node.getReactTag(), drawCommands, listeners, - nodeRegions, - node.getLogicalOffset()); + nodeRegions); } if (node.hasUnseenUpdates()) {