diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index c205ec1b961..c2e71aec7e7 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -7493,7 +7493,7 @@ public class com/facebook/react/views/text/TextAttributes { public fun toString ()Ljava/lang/String; } -public class com/facebook/react/views/text/TextLayoutManagerMapBuffer { +public class com/facebook/react/views/text/TextLayoutManager { public static final field AS_KEY_CACHE_ID S public static final field AS_KEY_FRAGMENTS S public static final field AS_KEY_HASH S diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index faf9cacf767..f823ae02405 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -80,7 +80,7 @@ public class ReactFeatureFlags { public static boolean dispatchPointerEvents = false; - /** Feature Flag to enable a cache of Spannable objects used by TextLayoutManagerMapBuffer */ + /** Feature Flag to enable a cache of Spannable objects used by TextLayoutManager */ public static boolean enableTextSpannableCache = false; /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 6c91f7610ac..2c6731dd21f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -85,7 +85,7 @@ import com.facebook.react.uimanager.events.EventCategoryDef; import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.react.uimanager.events.FabricEventDispatcher; import com.facebook.react.uimanager.events.RCTEventEmitter; -import com.facebook.react.views.text.TextLayoutManagerMapBuffer; +import com.facebook.react.views.text.TextLayoutManager; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -497,7 +497,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener, UIBlo float width, float height) { return (NativeArray) - TextLayoutManagerMapBuffer.measureLines( + TextLayoutManager.measureLines( mReactApplicationContext, attributedString, paragraphAttributes, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java index ba18d3447ac..e0ae77db3c3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java @@ -365,7 +365,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie protected void onDraw(Canvas canvas) { if (mAdjustsFontSizeToFit && getSpanned() != null && mShouldAdjustSpannableFontSize) { mShouldAdjustSpannableFontSize = false; - TextLayoutManagerMapBuffer.adjustSpannableFontToFit( + TextLayoutManager.adjustSpannableFontToFit( getSpanned(), getWidth(), YogaMeasureMode.EXACTLY, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java index 3788872bd31..22670ab0517 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java @@ -145,17 +145,17 @@ public class ReactTextViewManager MapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING); MapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES); Spannable spanned = - TextLayoutManagerMapBuffer.getOrCreateSpannableForText( + TextLayoutManager.getOrCreateSpannableForText( view.getContext(), attributedString, mReactTextViewManagerCallback); view.setSpanned(spanned); float minimumFontSize = - (float) paragraphAttributes.getDouble(TextLayoutManagerMapBuffer.PA_KEY_MINIMUM_FONT_SIZE); + (float) paragraphAttributes.getDouble(TextLayoutManager.PA_KEY_MINIMUM_FONT_SIZE); view.setMinimumFontSize(minimumFontSize); int textBreakStrategy = TextAttributeProps.getTextBreakStrategy( - paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_TEXT_BREAK_STRATEGY)); + paragraphAttributes.getString(TextLayoutManager.PA_KEY_TEXT_BREAK_STRATEGY)); int currentJustificationMode = Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? 0 : view.getJustificationMode(); @@ -163,8 +163,7 @@ public class ReactTextViewManager spanned, -1, // UNUSED FOR TEXT false, // TODO add this into local Data - TextLayoutManagerMapBuffer.getTextGravity( - attributedString, spanned, view.getGravityHorizontal()), + TextLayoutManager.getTextGravity(attributedString, spanned, view.getGravityHorizontal()), textBreakStrategy, TextAttributeProps.getJustificationMode(props, currentJustificationMode)); } @@ -193,7 +192,7 @@ public class ReactTextViewManager float height, YogaMeasureMode heightMode, @Nullable float[] attachmentsPositions) { - return TextLayoutManagerMapBuffer.measureText( + return TextLayoutManager.measureText( context, localData, props, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java index 22f590515b3..284b2fcd39e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java @@ -58,7 +58,7 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; /** Class responsible of creating {@link Spanned} object for the JS representation of Text */ -public class TextLayoutManagerMapBuffer { +public class TextLayoutManager { // constants for AttributedString serialization public static final short AS_KEY_HASH = 0; @@ -86,7 +86,7 @@ public class TextLayoutManagerMapBuffer { private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false; - private static final String TAG = TextLayoutManagerMapBuffer.class.getSimpleName(); + private static final String TAG = TextLayoutManager.class.getSimpleName(); // It's important to pass the ANTI_ALIAS_FLAG flag to the constructor rather than setting it // later by calling setFlags. This is because the latter approach triggers a bug on Android 4.4.2. diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java index f4ba299933c..2a09434f269 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java @@ -55,7 +55,7 @@ import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.react.views.text.ReactTextUpdate; import com.facebook.react.views.text.ReactTypefaceUtils; import com.facebook.react.views.text.TextAttributes; -import com.facebook.react.views.text.TextLayoutManagerMapBuffer; +import com.facebook.react.views.text.TextLayoutManager; import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan; import com.facebook.react.views.text.internal.span.CustomLineHeightSpan; import com.facebook.react.views.text.internal.span.CustomStyleSpan; @@ -216,7 +216,7 @@ public class ReactEditText extends AppCompatEditText { if (DEBUG_MODE) { FLog.e(TAG, "finalize[" + getId() + "] delete cached spannable"); } - TextLayoutManagerMapBuffer.deleteCachedSpannableForTag(getId()); + TextLayoutManager.deleteCachedSpannableForTag(getId()); } // After the text changes inside an EditText, TextView checks if a layout() has been requested. @@ -1219,7 +1219,7 @@ public class ReactEditText extends AppCompatEditText { } addSpansFromStyleAttributes(sb); - TextLayoutManagerMapBuffer.setCachedSpannableForTag(getId(), sb); + TextLayoutManager.setCachedSpannableForTag(getId(), sb); } void setEventDispatcher(@Nullable EventDispatcher eventDispatcher) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index 2e468334ec6..eb6fcab6e0f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -67,7 +67,7 @@ import com.facebook.react.views.text.ReactTextUpdate; import com.facebook.react.views.text.ReactTextViewManagerCallback; import com.facebook.react.views.text.ReactTypefaceUtils; import com.facebook.react.views.text.TextAttributeProps; -import com.facebook.react.views.text.TextLayoutManagerMapBuffer; +import com.facebook.react.views.text.TextLayoutManager; import com.facebook.react.views.text.TextTransform; import com.facebook.react.views.text.internal.span.TextInlineImageSpan; import com.facebook.yoga.YogaConstants; @@ -1389,12 +1389,12 @@ public class ReactTextInputManager extends BaseViewManager