Skip to content

Commit 256e25c

Browse files
authored
Merge pull request #36874 from facebook/kelset/071-backport-textinput-fixes
2 parents a0a2301 + 181bd38 commit 256e25c

File tree

6 files changed

+236
-132
lines changed

6 files changed

+236
-132
lines changed

ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ public void updateMeasureState(TextPaint paint) {
3737
apply(paint);
3838
}
3939

40+
public float getSpacing() {
41+
return mLetterSpacing;
42+
}
43+
4044
private void apply(TextPaint paint) {
4145
if (!Float.isNaN(mLetterSpacing)) {
4246
paint.setLetterSpacing(mLetterSpacing);

ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ public int getWeight() {
7171
return mFontFamily;
7272
}
7373

74+
public @Nullable String getFontFeatureSettings() {
75+
return mFeatureSettings;
76+
}
77+
7478
private static void apply(
7579
Paint paint,
7680
int style,

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ public class ReactTextUpdate {
3131
private final int mSelectionEnd;
3232
private final int mJustificationMode;
3333

34-
public boolean mContainsMultipleFragments;
35-
3634
/**
3735
* @deprecated Use a non-deprecated constructor for ReactTextUpdate instead. This one remains
3836
* because it's being used by a unit test that isn't currently open source.
@@ -142,13 +140,11 @@ public static ReactTextUpdate buildReactTextUpdateFromState(
142140
int jsEventCounter,
143141
int textAlign,
144142
int textBreakStrategy,
145-
int justificationMode,
146-
boolean containsMultipleFragments) {
143+
int justificationMode) {
147144

148145
ReactTextUpdate reactTextUpdate =
149146
new ReactTextUpdate(
150147
text, jsEventCounter, false, textAlign, textBreakStrategy, justificationMode);
151-
reactTextUpdate.mContainsMultipleFragments = containsMultipleFragments;
152148
return reactTextUpdate;
153149
}
154150

0 commit comments

Comments
 (0)