kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-04 22:56:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix TextInput Spannable flags

Browse Source 
Summary:
The TextInput spannables are being set wrong by Nodes. Consequently,
when you hit space after a word, anything you type is highlighted, though it
shouldn't be.

Differential Revision: D3507516
This commit is contained in:
Ahmed El-Helw
2016-07-01 15:12:57 -07:00
parent 1b77f1a372
commit 4622532ca4
6 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
View File

@@ -54,14 +54,19 @@ import com.facebook.react.uimanager.annotations.ReactProp;
}
@Override
protected void performApplySpans(SpannableStringBuilder builder, int begin, int end) {
protected void performApplySpans(SpannableStringBuilder builder, int begin, int end, boolean isEditable) {
mFontStylingSpan.freeze();
// All spans will automatically extend to the right of the text, but not the left - except
// for spans that start at the beginning of the text.
final int flag = begin == 0 ?
Spannable.SPAN_INCLUSIVE_INCLUSIVE :
Spannable.SPAN_EXCLUSIVE_INCLUSIVE;
final int flag;
if (isEditable) {
flag = Spannable.SPAN_EXCLUSIVE_EXCLUSIVE;
} else {
flag = begin == 0 ?
Spannable.SPAN_INCLUSIVE_INCLUSIVE :
Spannable.SPAN_EXCLUSIVE_INCLUSIVE;
}
builder.setSpan(
mFontStylingSpan,
@@ -81,7 +86,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
for (int i = 0, childCount = getChildCount(); i < childCount; ++i) {
FlatTextShadowNode child = (FlatTextShadowNode) getChildAt(i);
child.applySpans(builder);
child.applySpans(builder, isEditable);
}
}
@@ -259,7 +264,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
/* package */ final SpannableStringBuilder getText() {
SpannableStringBuilder sb = new SpannableStringBuilder();
collectText(sb);
applySpans(sb);
applySpans(sb, isEditable());
return sb;
}