Move the new span package to an internal sub-package

cubuspl42 · Jan 25, 2024 · 4466776 · 4466776
1 parent 29a3267
commit 4466776
Show file tree

Hide file tree

Showing 28 changed files with 91 additions and 91 deletions.
diff --git a/...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -31,21 +31,21 @@
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.text.span.CustomLetterSpacingSpan;
-import com.facebook.react.views.text.span.CustomLineHeightSpan;
-import com.facebook.react.views.text.span.CustomStyleSpan;
-import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
-import com.facebook.react.views.text.span.ReactBackgroundColorSpan;
-import com.facebook.react.views.text.span.ReactClickableSpan;
-import com.facebook.react.views.text.span.ReactForegroundColorSpan;
-import com.facebook.react.views.text.span.ReactSpan;
-import com.facebook.react.views.text.span.ReactStrikethroughSpan;
-import com.facebook.react.views.text.span.ReactTagSpan;
-import com.facebook.react.views.text.span.ReactUnderlineSpan;
-import com.facebook.react.views.text.span.SetSpanOperation;
-import com.facebook.react.views.text.span.ShadowStyleSpan;
-import com.facebook.react.views.text.span.TextInlineImageSpan;
-import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
+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;
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactClickableSpan;
+import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactSpan;
+import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
+import com.facebook.react.views.text.internal.span.ReactTagSpan;
+import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
+import com.facebook.react.views.text.internal.span.SetSpanOperation;
+import com.facebook.react.views.text.internal.span.ShadowStyleSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaDirection;
 import com.facebook.yoga.YogaUnit;
 import com.facebook.yoga.YogaValue;

diff --git a/...ctAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java b/...ctAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
@@ -8,7 +8,7 @@
 package com.facebook.react.views.text;
 
 import com.facebook.react.uimanager.LayoutShadowNode;
-import com.facebook.react.views.text.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.yoga.YogaNode;
 
 /** Base class for {@link YogaNode}s that represent inline images. */

diff --git a/...-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/...-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -32,8 +32,8 @@
 import com.facebook.react.uimanager.UIViewOperationQueue;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
-import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaBaselineFunction;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaDirection;

diff --git a/.../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/.../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -40,9 +40,9 @@
 import com.facebook.react.uimanager.ViewDefaults;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
-import com.facebook.react.views.text.span.ReactTagSpan;
-import com.facebook.react.views.text.span.TextInlineImageSpan;
-import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
+import com.facebook.react.views.text.internal.span.ReactTagSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/...native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -25,8 +25,8 @@
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewProps;
-import com.facebook.react.views.text.span.ReactClickableSpan;
-import com.facebook.react.views.text.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.ReactClickableSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.yoga.YogaMeasureMode;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -38,19 +38,19 @@
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.text.fragments.BridgeTextFragmentList;
-import com.facebook.react.views.text.span.CustomLetterSpacingSpan;
-import com.facebook.react.views.text.span.CustomLineHeightSpan;
-import com.facebook.react.views.text.span.CustomStyleSpan;
-import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
-import com.facebook.react.views.text.span.ReactBackgroundColorSpan;
-import com.facebook.react.views.text.span.ReactClickableSpan;
-import com.facebook.react.views.text.span.ReactForegroundColorSpan;
-import com.facebook.react.views.text.span.ReactStrikethroughSpan;
-import com.facebook.react.views.text.span.ReactTagSpan;
-import com.facebook.react.views.text.span.ReactUnderlineSpan;
-import com.facebook.react.views.text.span.SetSpanOperation;
-import com.facebook.react.views.text.span.ShadowStyleSpan;
-import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
+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;
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactClickableSpan;
+import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
+import com.facebook.react.views.text.internal.span.ReactTagSpan;
+import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
+import com.facebook.react.views.text.internal.span.SetSpanOperation;
+import com.facebook.react.views.text.internal.span.ShadowStyleSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;

diff --git a/.../ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/.../ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -38,19 +38,19 @@
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
 import com.facebook.react.views.text.fragments.MapBufferTextFragmentList;
-import com.facebook.react.views.text.span.CustomLetterSpacingSpan;
-import com.facebook.react.views.text.span.CustomLineHeightSpan;
-import com.facebook.react.views.text.span.CustomStyleSpan;
-import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
-import com.facebook.react.views.text.span.ReactBackgroundColorSpan;
-import com.facebook.react.views.text.span.ReactClickableSpan;
-import com.facebook.react.views.text.span.ReactForegroundColorSpan;
-import com.facebook.react.views.text.span.ReactStrikethroughSpan;
-import com.facebook.react.views.text.span.ReactTagSpan;
-import com.facebook.react.views.text.span.ReactUnderlineSpan;
-import com.facebook.react.views.text.span.SetSpanOperation;
-import com.facebook.react.views.text.span.ShadowStyleSpan;
-import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
+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;
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactClickableSpan;
+import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
+import com.facebook.react.views.text.internal.span.ReactTagSpan;
+import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
+import com.facebook.react.views.text.internal.span.SetSpanOperation;
+import com.facebook.react.views.text.internal.span.ShadowStyleSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;

diff --git a/.../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt b/.../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt
@@ -17,19 +17,19 @@ import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.ReactAccessibilityDelegate
 import com.facebook.react.views.text.fragments.TextFragment
 import com.facebook.react.views.text.fragments.TextFragmentList
-import com.facebook.react.views.text.span.CustomLetterSpacingSpan
-import com.facebook.react.views.text.span.CustomLineHeightSpan
-import com.facebook.react.views.text.span.CustomStyleSpan
-import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan
-import com.facebook.react.views.text.span.ReactBackgroundColorSpan
-import com.facebook.react.views.text.span.ReactClickableSpan
-import com.facebook.react.views.text.span.ReactForegroundColorSpan
-import com.facebook.react.views.text.span.ReactStrikethroughSpan
-import com.facebook.react.views.text.span.ReactTagSpan
-import com.facebook.react.views.text.span.ReactUnderlineSpan
-import com.facebook.react.views.text.span.SetSpanOperation
-import com.facebook.react.views.text.span.ShadowStyleSpan
-import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan
+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
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan
+import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan
+import com.facebook.react.views.text.internal.span.ReactClickableSpan
+import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan
+import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan
+import com.facebook.react.views.text.internal.span.ReactTagSpan
+import com.facebook.react.views.text.internal.span.ReactUnderlineSpan
+import com.facebook.react.views.text.internal.span.SetSpanOperation
+import com.facebook.react.views.text.internal.span.ShadowStyleSpan
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan
 
 /** Utility methods for building [Spannable]s */
 internal object TextLayoutUtils {

diff --git a/...om/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/...om/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
@@ -22,7 +22,7 @@
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.text.ReactTextInlineImageShadowNode;
-import com.facebook.react.views.text.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.yoga.YogaConstants;
 import java.util.Locale;
 

diff --git a/...java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java b/...java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
@@ -27,7 +27,7 @@
 import com.facebook.react.modules.fresco.ReactNetworkImageRequest;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.views.image.ImageResizeMode;
-import com.facebook.react.views.text.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 
 /**
  * FrescoBasedTextInlineImageSpan is a span for Images that are inside <Text/>. It computes its size

diff --git a/...ws/text/span/CustomLetterSpacingSpan.java → ...nternal/span/CustomLetterSpacingSpan.java b/...ws/text/span/CustomLetterSpacingSpan.java → ...nternal/span/CustomLetterSpacingSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.TextPaint;
 import android.text.style.MetricAffectingSpan;

diff --git a/...views/text/span/CustomLineHeightSpan.java → ...t/internal/span/CustomLineHeightSpan.java b/...views/text/span/CustomLineHeightSpan.java → ...t/internal/span/CustomLineHeightSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.graphics.Paint;
 import android.text.style.LineHeightSpan;

diff --git a/...eact/views/text/span/CustomStyleSpan.java → ...s/text/internal/span/CustomStyleSpan.java b/...eact/views/text/span/CustomStyleSpan.java → ...s/text/internal/span/CustomStyleSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.content.res.AssetManager;
 import android.graphics.Paint;

diff --git a/...iews/text/span/ReactAbsoluteSizeSpan.java → .../internal/span/ReactAbsoluteSizeSpan.java b/...iews/text/span/ReactAbsoluteSizeSpan.java → .../internal/span/ReactAbsoluteSizeSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.style.AbsoluteSizeSpan;
 

diff --git a/...s/text/span/ReactBackgroundColorSpan.java → ...ternal/span/ReactBackgroundColorSpan.java b/...s/text/span/ReactBackgroundColorSpan.java → ...ternal/span/ReactBackgroundColorSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.style.BackgroundColorSpan;
 

diff --git a/...t/views/text/span/ReactClickableSpan.java → ...ext/internal/span/ReactClickableSpan.java b/...t/views/text/span/ReactClickableSpan.java → ...ext/internal/span/ReactClickableSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.TextPaint;
 import android.text.style.ClickableSpan;

diff --git a/...s/text/span/ReactForegroundColorSpan.java → ...ternal/span/ReactForegroundColorSpan.java b/...s/text/span/ReactForegroundColorSpan.java → ...ternal/span/ReactForegroundColorSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.style.ForegroundColorSpan;
 

diff --git a/...book/react/views/text/span/ReactSpan.java → ...t/views/text/internal/span/ReactSpan.java b/...book/react/views/text/span/ReactSpan.java → ...t/views/text/internal/span/ReactSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 /*
  * Enables us to distinguish between spans that were added by React Native and spans that were

diff --git a/...ews/text/span/ReactStrikethroughSpan.java → ...internal/span/ReactStrikethroughSpan.java b/...ews/text/span/ReactStrikethroughSpan.java → ...internal/span/ReactStrikethroughSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.style.StrikethroughSpan;
 

diff --git a/...k/react/views/text/span/ReactTagSpan.java → ...iews/text/internal/span/ReactTagSpan.java b/...k/react/views/text/span/ReactTagSpan.java → ...iews/text/internal/span/ReactTagSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 /**
  * Instances of this class are used to place reactTag information of nested text react nodes into

diff --git a/...t/views/text/span/ReactUnderlineSpan.java → ...ext/internal/span/ReactUnderlineSpan.java b/...t/views/text/span/ReactUnderlineSpan.java → ...ext/internal/span/ReactUnderlineSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.style.UnderlineSpan;
 

diff --git a/...act/views/text/span/SetSpanOperation.java → .../text/internal/span/SetSpanOperation.java b/...act/views/text/span/SetSpanOperation.java → .../text/internal/span/SetSpanOperation.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;

diff --git a/...eact/views/text/span/ShadowStyleSpan.java → ...s/text/internal/span/ShadowStyleSpan.java b/...eact/views/text/span/ShadowStyleSpan.java → ...s/text/internal/span/ShadowStyleSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.text.TextPaint;
 import android.text.style.CharacterStyle;

diff --git a/.../views/text/span/TextInlineImageSpan.java → ...xt/internal/span/TextInlineImageSpan.java b/.../views/text/span/TextInlineImageSpan.java → ...xt/internal/span/TextInlineImageSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.graphics.drawable.Drawable;
 import android.text.Spannable;

diff --git a/...t/span/TextInlineViewPlaceholderSpan.java → ...l/span/TextInlineViewPlaceholderSpan.java b/...t/span/TextInlineViewPlaceholderSpan.java → ...l/span/TextInlineViewPlaceholderSpan.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.views.text.span;
+package com.facebook.react.views.text.internal.span;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;

diff --git a/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -52,19 +52,19 @@
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.views.text.span.CustomLetterSpacingSpan;
-import com.facebook.react.views.text.span.CustomLineHeightSpan;
-import com.facebook.react.views.text.span.CustomStyleSpan;
-import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
-import com.facebook.react.views.text.span.ReactBackgroundColorSpan;
-import com.facebook.react.views.text.span.ReactForegroundColorSpan;
-import com.facebook.react.views.text.span.ReactSpan;
-import com.facebook.react.views.text.span.ReactStrikethroughSpan;
+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;
+import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
+import com.facebook.react.views.text.internal.span.ReactSpan;
+import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
 import com.facebook.react.views.text.ReactTextUpdate;
 import com.facebook.react.views.text.ReactTypefaceUtils;
-import com.facebook.react.views.text.span.ReactUnderlineSpan;
+import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
 import com.facebook.react.views.text.TextAttributes;
-import com.facebook.react.views.text.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
 import java.util.ArrayList;

diff --git a/.../ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/.../ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -69,7 +69,7 @@
 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.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
 import com.facebook.react.views.text.TextTransform;

diff --git a/...tive/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.kt b/...tive/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.kt
@@ -8,7 +8,7 @@
 package com.facebook.react.views.text
 
 import android.graphics.Paint
-import com.facebook.react.views.text.span.CustomLineHeightSpan
+import com.facebook.react.views.text.internal.span.CustomLineHeightSpan
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith