change default privateimeoptions to null

Summary: Following up the comment here https://www.internalfb.com/diff/D60190252?dst_version_fbid=1187004342629649&transaction_fbid=410116234830975 Reviewed By: adityasharat Differential Revision: D60642328 fbshipit-source-id: 83cf6616f58a9091a48dffa00e3f9458a6b8a66c
facebook · Aug 2, 2024 · 6dc6dca · 6dc6dca
1 parent ce9a8c3
commit 6dc6dca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/litho-widget-material/src/main/java/com/facebook/litho/widget/MaterialTextInputSpec.java b/litho-widget-material/src/main/java/com/facebook/litho/widget/MaterialTextInputSpec.java
@@ -104,7 +104,6 @@ class MaterialTextInputSpec {
   @PropDefault protected static final int inputType = TextInputSpec.inputType;
   @PropDefault protected static final int rawInputType = TextInputSpec.rawInputType;
   @PropDefault protected static final int imeOptions = TextInputSpec.imeOptions;
-  @PropDefault protected static final String privateImeOptions = TextInputSpec.privateImeOptions;
   @PropDefault protected static final int cursorDrawableRes = TextInputSpec.cursorDrawableRes;
   @PropDefault static final boolean multiline = TextInputSpec.multiline;
   @PropDefault protected static final int minLines = TextInputSpec.minLines;
@@ -159,7 +158,7 @@ static void onMeasure(
       @Prop(optional = true) int inputType,
       @Prop(optional = true) int rawInputType,
       @Prop(optional = true) int imeOptions,
-      @Prop(optional = true) String privateImeOptions,
+      @Prop(optional = true) @Nullable String privateImeOptions,
       @Prop(optional = true, varArg = "inputFilter") List<InputFilter> inputFilters,
       @Prop(optional = true) boolean multiline,
       @Prop(optional = true) TextUtils.TruncateAt ellipsize,
@@ -364,7 +363,7 @@ static void onMount(
       @Prop(optional = true) int inputType,
       @Prop(optional = true) int rawInputType,
       @Prop(optional = true) int imeOptions,
-      @Prop(optional = true) String privateImeOptions,
+      @Prop(optional = true) @Nullable String privateImeOptions,
       @Prop(optional = true, varArg = "inputFilter") List<InputFilter> inputFilters,
       @Prop(optional = true) boolean multiline,
       @Prop(optional = true) int minLines,

diff --git a/litho-widget/src/main/java/com/facebook/litho/widget/TextInputSpec.java b/litho-widget/src/main/java/com/facebook/litho/widget/TextInputSpec.java
@@ -228,7 +228,6 @@ class TextInputSpec {
   @PropDefault protected static final int inputType = EditorInfo.TYPE_CLASS_TEXT;
   @PropDefault protected static final int rawInputType = EditorInfo.TYPE_NULL;
   @PropDefault protected static final int imeOptions = EditorInfo.IME_NULL;
-  @PropDefault protected static final String privateImeOptions = "";
   @PropDefault protected static final int cursorDrawableRes = -1;
   @PropDefault static final boolean multiline = false;
   @PropDefault protected static final int minLines = 1;
@@ -291,7 +290,7 @@ static void onMeasure(
       @Prop(optional = true) int inputType,
       @Prop(optional = true) int rawInputType,
       @Prop(optional = true) int imeOptions,
-      @Prop(optional = true) String privateImeOptions,
+      @Prop(optional = true) @Nullable String privateImeOptions,
       @Prop(optional = true, varArg = "inputFilter") List<InputFilter> inputFilters,
       @Prop(optional = true) boolean multiline,
       @Prop(optional = true) TextUtils.TruncateAt ellipsize,
@@ -534,7 +533,9 @@ static void setParams(
     editText.setTypeface(typeface, 0);
     editText.setGravity(gravity);
     editText.setImeOptions(imeOptions);
-    editText.setPrivateImeOptions(privateImeOptions);
+    if (privateImeOptions != null) {
+      editText.setPrivateImeOptions(privateImeOptions);
+    }
     editText.setFocusable(editable);
     editText.setFocusableInTouchMode(editable);
     editText.setLongClickable(editable);
@@ -831,7 +832,7 @@ static void onMount(
       @Prop(optional = true) int inputType,
       @Prop(optional = true) int rawInputType,
       @Prop(optional = true) int imeOptions,
-      @Prop(optional = true) String privateImeOptions,
+      @Prop(optional = true) @Nullable String privateImeOptions,
       @Prop(optional = true, varArg = "inputFilter") List<InputFilter> inputFilters,
       @Prop(optional = true) boolean multiline,
       @Prop(optional = true) int minLines,
@@ -954,6 +955,7 @@ static void onUnmount(
     }
     editText.setTextState(null);
     editText.removeOnWindowFocusChangeListener();
+    editText.setPrivateImeOptions(null);
     mountedView.set(null);
   }