Skip to content

fix(textinput): backporting of fixes for next 0.70 patch release #36875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 17, 2023
Merged

fix(textinput): backporting of fixes for next 0.70 patch release #36875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ddef56
Fix measurement of uncontrolled TextInput after edit
NickGerleman Feb 9, 2023
6d8868b
Minimize EditText Spans 1/9: Fix precedence (#36543)
NickGerleman Mar 24, 2023
ff991aa
Minimize EditText Spans 2/9: Make stripAttributeEquivalentSpans gener…
NickGerleman Mar 24, 2023
62d9920
Minimize EditText Spans 3/9: ReactBackgroundColorSpan (#36547)
NickGerleman Mar 24, 2023
205623c
Minimize EditText Spans 4/9: ReactForegroundColorSpan (#36545)
NickGerleman Mar 24, 2023
f1c33b9
Minimize EditText Spans 5/9: Strikethrough and Underline (#36544)
NickGerleman Mar 24, 2023
ab822c4
Minimize EditText Spans 6/9: letterSpacing (#36548)
NickGerleman Mar 24, 2023
471cc51
Minimize EditText Spans 7/9: Avoid temp list (#36576)
NickGerleman Mar 24, 2023
322f721
Minimize EditText Spans 8/9: CustomStyleSpan (#36577)
NickGerleman Mar 24, 2023
62364d0
Support MapBuffer in TextInput State
JoshuaGross Aug 16, 2022
5339e95
Mimimize EditText Spans 9/9: Remove addSpansForMeasurement() (#36575)
NickGerleman Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public void updateMeasureState(TextPaint paint) {
apply(paint);
}

public float getSpacing() {
return mLetterSpacing;
}

private void apply(TextPaint paint) {
if (!Float.isNaN(mLetterSpacing)) {
paint.setLetterSpacing(mLetterSpacing);
Expand Down
4 changes: 4 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ public int getWeight() {
return mFontFamily;
}

public @Nullable String getFontFeatureSettings() {
return mFeatureSettings;
}

private static void apply(
Paint paint,
int style,
Expand Down
6 changes: 1 addition & 5 deletions ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public class ReactTextUpdate {
private final int mSelectionEnd;
private final int mJustificationMode;

public boolean mContainsMultipleFragments;

/**
* @deprecated Use a non-deprecated constructor for ReactTextUpdate instead. This one remains
* because it's being used by a unit test that isn't currently open source.
Expand Down Expand Up @@ -142,13 +140,11 @@ public static ReactTextUpdate buildReactTextUpdateFromState(
int jsEventCounter,
int textAlign,
int textBreakStrategy,
int justificationMode,
boolean containsMultipleFragments) {
int justificationMode) {

ReactTextUpdate reactTextUpdate =
new ReactTextUpdate(
text, jsEventCounter, false, textAlign, textBreakStrategy, justificationMode);
reactTextUpdate.mContainsMultipleFragments = containsMultipleFragments;
return reactTextUpdate;
}

Expand Down
5 changes: 5 additions & 0 deletions ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ public static boolean isRTL(MapBuffer attributedString) {

MapBuffer fragment = fragments.getMapBuffer((short) 0);
MapBuffer textAttributes = fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES);

if (!textAttributes.contains(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION)) {
return false;
}

return TextAttributeProps.getLayoutDirection(
textAttributes.getString(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION))
== LayoutDirection.RTL;
Expand Down
5 changes: 4 additions & 1 deletion ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ rn_android_library(
"pfh:ReactNative_CommonInfrastructurePlaceholder",
"supermodule:xplat/default/public.react_native.infra",
],
language = "JAVA",
language = "KOTLIN",
pure_kotlin = False,
required_for_source_only_abi = True,
visibility = [
"PUBLIC",
Expand All @@ -29,7 +30,9 @@ rn_android_library(
react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
react_native_target("java/com/facebook/react/views/scroll:scroll"),
react_native_target("java/com/facebook/react/views/text:text"),
react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
react_native_target("java/com/facebook/react/views/view:view"),
react_native_target("java/com/facebook/react/config:config"),
],
exported_deps = [
react_native_dep("third-party/android/androidx:appcompat"),
Expand Down
Loading