Disable rendering of inline views in Classic RN code for views that are rendered in Fabric

Summary:
This diff disables the rendering of TextInlineViews in ClassicRN when the users is running with Fabric enabled.

changelog: [internal]

Reviewed By: JoshuaGross

Differential Revision: D20087254

fbshipit-source-id: b4664b17b4c845d212f72e75eee58860fe31abee
This commit is contained in:
David Vacca 2020-02-25 12:51:55 -08:00 коммит произвёл Facebook Github Bot
Родитель 8bc7ad605d
Коммит 0e69922125
1 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -34,6 +34,8 @@ import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.ReactCompoundView;
import com.facebook.react.uimanager.UIManagerModule;
import com.facebook.react.uimanager.ViewDefaults;
import com.facebook.react.uimanager.common.UIManagerType;
import com.facebook.react.uimanager.common.ViewUtil;
import com.facebook.react.uimanager.events.RCTEventEmitter;
import com.facebook.react.views.view.ReactViewBackgroundManager;
import java.util.ArrayList;
@ -66,7 +68,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
mDefaultGravityVertical = getGravity() & Gravity.VERTICAL_GRAVITY_MASK;
}
private WritableMap inlineViewJson(
private static WritableMap inlineViewJson(
int visibility, int index, int left, int top, int right, int bottom) {
WritableMap json = Arguments.createMap();
if (visibility == View.GONE) {
@ -96,7 +98,9 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
@Override
protected void onLayout(
boolean changed, int textViewLeft, int textViewTop, int textViewRight, int textViewBottom) {
if (!(getText() instanceof Spanned)) {
// TODO T62882314: Delete this method when Fabric is fully released in OSS
if (!(getText() instanceof Spanned)
|| ViewUtil.getUIManagerType(getId()) == UIManagerType.FABRIC) {
/**
* In general, {@link #setText} is called via {@link ReactTextViewManager#updateExtraData}
* before we are laid out. This ordering is a requirement because we utilize the data from