Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

AndroidTextInput: support using commands instead of setNativeProps (native change)

Browse Source 
Summary:
In AndroidTextInput, support codegen'd ViewCommands in native and add three commands that will eventually replace usage of setNativeProps on Android.

TextInput will use these commands in a future diff.

Changelog: [Internal]

Reviewed By: TheSavior

Differential Revision: D18612150

fbshipit-source-id: 5d427040686e8c5ab504dd845bc8ef863f558c35
This commit is contained in:
Joshua Gross
2019-11-27 12:55:48 -08:00
committed by Facebook Github Bot
parent 98b8a17645
commit 7ab5eb4caf
4 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class ReactTextViewManager
return new ReactTextUpdate(
spanned,
-1, // TODO add this into local Data?
state.hasKey("mostRecentEventCount") ? state.getInt("mostRecentEventCount") : -1,
false, // TODO add this into local Data
textViewProps.getTextAlign(),
textBreakStrategy,
ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+43 -2
View File
@@ -15,6 +15,7 @@ import android.text.InputFilter;
import android.text.InputType;
import android.text.Layout;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextWatcher;
import android.view.Gravity;
import android.view.KeyEvent;
@@ -55,6 +56,7 @@ import com.facebook.react.views.text.ReactTextUpdate;
import com.facebook.react.views.text.TextAttributeProps;
import com.facebook.react.views.text.TextInlineImageSpan;
import com.facebook.react.views.text.TextLayoutManager;
import com.facebook.react.views.text.TextTransform;
import com.facebook.yoga.YogaConstants;
import java.lang.reflect.Field;
import java.util.LinkedList;
@@ -72,6 +74,8 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
private static final int FOCUS_TEXT_INPUT = 1;
private static final int BLUR_TEXT_INPUT = 2;
private static final int SET_MOST_RECENT_EVENT_COUNT = 3;
private static final int SET_TEXT_AND_SELECTION = 4;
private static final int INPUT_TYPE_KEYBOARD_NUMBER_PAD = InputType.TYPE_CLASS_NUMBER;
private static final int INPUT_TYPE_KEYBOARD_DECIMAL_PAD =
@@ -177,10 +181,16 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
ReactEditText reactEditText, int commandId, @Nullable ReadableArray args) {
switch (commandId) {
case FOCUS_TEXT_INPUT:
reactEditText.requestFocusFromJS();
this.receiveCommand(reactEditText, "focus", args);
break;
case BLUR_TEXT_INPUT:
reactEditText.clearFocusFromJS();
this.receiveCommand(reactEditText, "blur", args);
break;
case SET_MOST_RECENT_EVENT_COUNT:
this.receiveCommand(reactEditText, "setMostRecentEventCount", args);
break;
case SET_TEXT_AND_SELECTION:
this.receiveCommand(reactEditText, "setTextAndSelection", args);
break;
}
}
@@ -197,9 +207,40 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
case "blurTextInput":
reactEditText.clearFocusFromJS();
break;
case "setMostRecentEventCount":
reactEditText.setMostRecentEventCount(args.getInt(0));
break;
case "setTextAndSelection":
int mostRecentEventCount = args.getInt(0);
if (mostRecentEventCount != UNSET) {
String text = args.getString(1);
int start = args.getInt(2);
int end = args.getInt(3);
if (end == UNSET) {
end = start;
}
// TODO: construct a ReactTextUpdate and use that with maybeSetText
// instead of calling setText, etc directly - doing that will definitely cause bugs.
reactEditText.maybeSetText(getReactTextUpdate(text, mostRecentEventCount, start, end));
}
break;
}
}
// TODO: if we're able to fill in all these values and call maybeSetText when appropriate
// I think this is all that's needed to fully support TextInput in Fabric
private ReactTextUpdate getReactTextUpdate(
String text, int mostRecentEventCount, int start, int end) {
SpannableStringBuilder sb = new SpannableStringBuilder();
sb.append(TextTransform.apply(text, TextTransform.UNSET));
return new ReactTextUpdate(
sb, mostRecentEventCount, false, 0, 0, 0, 0, Gravity.NO_GRAVITY, 0, 0, start, end);
}
@Override
public void updateExtraData(ReactEditText view, Object extraData) {
if (extraData instanceof ReactTextUpdate) {