Skip to content

Commit 4466776

Browse files
cubuspl42cubuspl42
committed
Move the new span package to an internal sub-package
1 parent 29a3267 commit 4466776

28 files changed

+91
-91
lines changed

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
import com.facebook.react.uimanager.ReactShadowNode;
3232
import com.facebook.react.uimanager.ViewProps;
3333
import com.facebook.react.uimanager.annotations.ReactProp;
34-
import com.facebook.react.views.text.span.CustomLetterSpacingSpan;
35-
import com.facebook.react.views.text.span.CustomLineHeightSpan;
36-
import com.facebook.react.views.text.span.CustomStyleSpan;
37-
import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
38-
import com.facebook.react.views.text.span.ReactBackgroundColorSpan;
39-
import com.facebook.react.views.text.span.ReactClickableSpan;
40-
import com.facebook.react.views.text.span.ReactForegroundColorSpan;
41-
import com.facebook.react.views.text.span.ReactSpan;
42-
import com.facebook.react.views.text.span.ReactStrikethroughSpan;
43-
import com.facebook.react.views.text.span.ReactTagSpan;
44-
import com.facebook.react.views.text.span.ReactUnderlineSpan;
45-
import com.facebook.react.views.text.span.SetSpanOperation;
46-
import com.facebook.react.views.text.span.ShadowStyleSpan;
47-
import com.facebook.react.views.text.span.TextInlineImageSpan;
48-
import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
34+
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
35+
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
36+
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
37+
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
38+
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
39+
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
40+
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
41+
import com.facebook.react.views.text.internal.span.ReactSpan;
42+
import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
43+
import com.facebook.react.views.text.internal.span.ReactTagSpan;
44+
import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
45+
import com.facebook.react.views.text.internal.span.SetSpanOperation;
46+
import com.facebook.react.views.text.internal.span.ShadowStyleSpan;
47+
import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
48+
import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
4949
import com.facebook.yoga.YogaDirection;
5050
import com.facebook.yoga.YogaUnit;
5151
import com.facebook.yoga.YogaValue;

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package com.facebook.react.views.text;
99

1010
import com.facebook.react.uimanager.LayoutShadowNode;
11-
import com.facebook.react.views.text.span.TextInlineImageSpan;
11+
import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
1212
import com.facebook.yoga.YogaNode;
1313

1414
/** Base class for {@link YogaNode}s that represent inline images. */

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import com.facebook.react.uimanager.UIViewOperationQueue;
3333
import com.facebook.react.uimanager.annotations.ReactProp;
3434
import com.facebook.react.uimanager.events.RCTEventEmitter;
35-
import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
36-
import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
35+
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
36+
import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
3737
import com.facebook.yoga.YogaBaselineFunction;
3838
import com.facebook.yoga.YogaConstants;
3939
import com.facebook.yoga.YogaDirection;

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
import com.facebook.react.uimanager.ViewDefaults;
4141
import com.facebook.react.uimanager.common.UIManagerType;
4242
import com.facebook.react.uimanager.common.ViewUtil;
43-
import com.facebook.react.views.text.span.ReactTagSpan;
44-
import com.facebook.react.views.text.span.TextInlineImageSpan;
45-
import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
43+
import com.facebook.react.views.text.internal.span.ReactTagSpan;
44+
import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
45+
import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
4646
import com.facebook.react.views.view.ReactViewBackgroundManager;
4747
import java.util.ArrayList;
4848
import java.util.Collections;

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.facebook.react.uimanager.StateWrapper;
2626
import com.facebook.react.uimanager.ThemedReactContext;
2727
import com.facebook.react.uimanager.ViewProps;
28-
import com.facebook.react.views.text.span.ReactClickableSpan;
29-
import com.facebook.react.views.text.span.TextInlineImageSpan;
28+
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
29+
import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
3030
import com.facebook.yoga.YogaMeasureMode;
3131
import java.util.HashMap;
3232
import java.util.Map;

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@
3838
import com.facebook.react.uimanager.ReactStylesDiffMap;
3939
import com.facebook.react.uimanager.ViewProps;
4040
import com.facebook.react.views.text.fragments.BridgeTextFragmentList;
41-
import com.facebook.react.views.text.span.CustomLetterSpacingSpan;
42-
import com.facebook.react.views.text.span.CustomLineHeightSpan;
43-
import com.facebook.react.views.text.span.CustomStyleSpan;
44-
import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
45-
import com.facebook.react.views.text.span.ReactBackgroundColorSpan;
46-
import com.facebook.react.views.text.span.ReactClickableSpan;
47-
import com.facebook.react.views.text.span.ReactForegroundColorSpan;
48-
import com.facebook.react.views.text.span.ReactStrikethroughSpan;
49-
import com.facebook.react.views.text.span.ReactTagSpan;
50-
import com.facebook.react.views.text.span.ReactUnderlineSpan;
51-
import com.facebook.react.views.text.span.SetSpanOperation;
52-
import com.facebook.react.views.text.span.ShadowStyleSpan;
53-
import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
41+
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
42+
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
43+
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
44+
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
45+
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
46+
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
47+
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
48+
import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
49+
import com.facebook.react.views.text.internal.span.ReactTagSpan;
50+
import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
51+
import com.facebook.react.views.text.internal.span.SetSpanOperation;
52+
import com.facebook.react.views.text.internal.span.ShadowStyleSpan;
53+
import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
5454
import com.facebook.yoga.YogaConstants;
5555
import com.facebook.yoga.YogaMeasureMode;
5656
import com.facebook.yoga.YogaMeasureOutput;

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@
3838
import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
3939
import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
4040
import com.facebook.react.views.text.fragments.MapBufferTextFragmentList;
41-
import com.facebook.react.views.text.span.CustomLetterSpacingSpan;
42-
import com.facebook.react.views.text.span.CustomLineHeightSpan;
43-
import com.facebook.react.views.text.span.CustomStyleSpan;
44-
import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan;
45-
import com.facebook.react.views.text.span.ReactBackgroundColorSpan;
46-
import com.facebook.react.views.text.span.ReactClickableSpan;
47-
import com.facebook.react.views.text.span.ReactForegroundColorSpan;
48-
import com.facebook.react.views.text.span.ReactStrikethroughSpan;
49-
import com.facebook.react.views.text.span.ReactTagSpan;
50-
import com.facebook.react.views.text.span.ReactUnderlineSpan;
51-
import com.facebook.react.views.text.span.SetSpanOperation;
52-
import com.facebook.react.views.text.span.ShadowStyleSpan;
53-
import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan;
41+
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan;
42+
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
43+
import com.facebook.react.views.text.internal.span.CustomStyleSpan;
44+
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan;
45+
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan;
46+
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
47+
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan;
48+
import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan;
49+
import com.facebook.react.views.text.internal.span.ReactTagSpan;
50+
import com.facebook.react.views.text.internal.span.ReactUnderlineSpan;
51+
import com.facebook.react.views.text.internal.span.SetSpanOperation;
52+
import com.facebook.react.views.text.internal.span.ShadowStyleSpan;
53+
import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
5454
import com.facebook.yoga.YogaConstants;
5555
import com.facebook.yoga.YogaMeasureMode;
5656
import com.facebook.yoga.YogaMeasureOutput;

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutUtils.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ import com.facebook.react.uimanager.PixelUtil
1717
import com.facebook.react.uimanager.ReactAccessibilityDelegate
1818
import com.facebook.react.views.text.fragments.TextFragment
1919
import com.facebook.react.views.text.fragments.TextFragmentList
20-
import com.facebook.react.views.text.span.CustomLetterSpacingSpan
21-
import com.facebook.react.views.text.span.CustomLineHeightSpan
22-
import com.facebook.react.views.text.span.CustomStyleSpan
23-
import com.facebook.react.views.text.span.ReactAbsoluteSizeSpan
24-
import com.facebook.react.views.text.span.ReactBackgroundColorSpan
25-
import com.facebook.react.views.text.span.ReactClickableSpan
26-
import com.facebook.react.views.text.span.ReactForegroundColorSpan
27-
import com.facebook.react.views.text.span.ReactStrikethroughSpan
28-
import com.facebook.react.views.text.span.ReactTagSpan
29-
import com.facebook.react.views.text.span.ReactUnderlineSpan
30-
import com.facebook.react.views.text.span.SetSpanOperation
31-
import com.facebook.react.views.text.span.ShadowStyleSpan
32-
import com.facebook.react.views.text.span.TextInlineViewPlaceholderSpan
20+
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan
21+
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan
22+
import com.facebook.react.views.text.internal.span.CustomStyleSpan
23+
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan
24+
import com.facebook.react.views.text.internal.span.ReactBackgroundColorSpan
25+
import com.facebook.react.views.text.internal.span.ReactClickableSpan
26+
import com.facebook.react.views.text.internal.span.ReactForegroundColorSpan
27+
import com.facebook.react.views.text.internal.span.ReactStrikethroughSpan
28+
import com.facebook.react.views.text.internal.span.ReactTagSpan
29+
import com.facebook.react.views.text.internal.span.ReactUnderlineSpan
30+
import com.facebook.react.views.text.internal.span.SetSpanOperation
31+
import com.facebook.react.views.text.internal.span.ShadowStyleSpan
32+
import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan
3333

3434
/** Utility methods for building [Spannable]s */
3535
internal object TextLayoutUtils {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.facebook.react.uimanager.ViewProps;
2323
import com.facebook.react.uimanager.annotations.ReactProp;
2424
import com.facebook.react.views.text.ReactTextInlineImageShadowNode;
25-
import com.facebook.react.views.text.span.TextInlineImageSpan;
25+
import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
2626
import com.facebook.yoga.YogaConstants;
2727
import java.util.Locale;
2828

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.facebook.react.modules.fresco.ReactNetworkImageRequest;
2828
import com.facebook.react.uimanager.PixelUtil;
2929
import com.facebook.react.views.image.ImageResizeMode;
30-
import com.facebook.react.views.text.span.TextInlineImageSpan;
30+
import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
3131

3232
/**
3333
* FrescoBasedTextInlineImageSpan is a span for Images that are inside <Text/>. It computes its size

0 commit comments

Comments
 (0)