From 1e3cc80a913263c9b9ffd4e4f33d36057c3b617a Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Wed, 16 Mar 2022 12:26:09 +0800
Subject: [PATCH 01/33] reapply diff from
 https://github.com/facebook/react-native/compare/main...fabriziobertoglio1987:text-input-errors

---
 Libraries/Components/TextInput/TextInput.js   |  8 +++++++
 .../facebook/react/uimanager/ViewProps.java   |  1 +
 .../react/views/textinput/ReactEditText.java  |  8 +++++++
 .../textinput/ReactTextInputManager.java      |  5 +++++
 .../TextInput/TextInputSharedExamples.js      | 21 +++++++++++++++++++
 5 files changed, 43 insertions(+)

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 4e781fb66b..bc3efcec4f 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -402,6 +402,14 @@ type AndroidProps = $ReadOnly<{|
    */
   disableFullscreenUI?: ?boolean,
 
+  /**
+   * String to be read by screenreaders to indicate an error state. If this value is
+   * not null, an error will be announced. You can use onChangeText or onBlur to
+   * detect an error and set this prop. Once the error is gone, set this to null
+   * to clear the error
+   */
+  android_errorMessage?: ?Stringish,
+
   importantForAutofill?: ?(
     | 'auto'
     | 'no'
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index 661c3466dd..c020abdde3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -84,6 +84,7 @@ public class ViewProps {
   public static final String BACKGROUND_COLOR = "backgroundColor";
   public static final String FOREGROUND_COLOR = "foregroundColor";
   public static final String COLOR = "color";
+  public static final String ERROR_MESSAGE = "errorMessage";
   public static final String FONT_SIZE = "fontSize";
   public static final String FONT_WEIGHT = "fontWeight";
   public static final String FONT_STYLE = "fontStyle";
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 360de688d5..8b83e4bb80 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -122,6 +122,7 @@ public class ReactEditText extends AppCompatEditText
 
   private static final KeyListener sKeyListener = QwertyKeyListener.getInstanceForFullKeyboard();
   private @Nullable EventDispatcher mEventDispatcher;
+  private @Nullable String mErrorMessage = null;
 
   public ReactEditText(Context context) {
     super(context);
@@ -885,6 +886,7 @@ public void onAttachedToWindow() {
     if (mAutoFocus && !mDidAttachToWindow) {
       requestFocusInternal();
     }
+    setError(mErrorMessage);
 
     mDidAttachToWindow = true;
   }
@@ -1068,6 +1070,12 @@ void setEventDispatcher(@Nullable EventDispatcher eventDispatcher) {
     mEventDispatcher = eventDispatcher;
   }
 
+  public void setErrorMessage(String error) {
+    mErrorMessage = error;
+    setError(mErrorMessage);
+    invalidate();
+  }
+
   /**
    * This class will redirect *TextChanged calls to the listeners only in the case where the text is
    * changed by the user, and not explicitly set by JS.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 9f64b841f1..5a0507a330 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -372,6 +372,11 @@ public void updateExtraData(ReactEditText view, Object extraData) {
     }
   }
 
+  @ReactProp(name = ViewProps.ERROR_MESSAGE)
+  public void setAndroidErrorMessage(ReactEditText view, String error) {
+    view.setErrorMessage(error);
+  }
+
   @ReactProp(name = ViewProps.FONT_SIZE, defaultFloat = ViewDefaults.FONT_SIZE_SP)
   public void setFontSize(ReactEditText view, float fontSize) {
     view.setFontSize(fontSize);
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 19e758f2a7..e06ba8806d 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -473,7 +473,28 @@ class SelectionExample extends React.Component<
   }
 }
 
+function ErrorExample(): React.Node {
+  const [text, setText] = React.useState('');
+  const [error, setError] = React.useState(null);
+  return (
+    <TextInput
+      errorMessage={error}
+      onChangeText={newText => {
+        setText(newText);
+        setError(newText === 'error' ? 'this input is invalid' : null);
+      }}
+      value={text}
+    />
+  );
+}
+
 module.exports = ([
+  {
+    title: 'Error Message',
+    render: function (): React.Node {
+      return <ErrorExample />;
+    },
+  },
   {
     title: 'Auto-focus',
     render: function (): React.Node {

From a3b9dc2dd38b572222338bc267da5d1233dc13a6 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 10:51:13 +0800
Subject: [PATCH 02/33] testing solution from
 https://github.com/facebook/react-native/pull/29070

---
 .../com/facebook/react/views/textinput/ReactEditText.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 8b83e4bb80..0859417b3e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -565,7 +565,10 @@ public void maybeSetText(ReactTextUpdate reactTextUpdate) {
       // When we update text, we trigger onChangeText code that will
       // try to update state if the wrapper is available. Temporarily disable
       // to prevent an infinite loop.
-      getText().replace(0, length(), spannableStringBuilder);
+      int startPosition = getSelectionStart();
+      int endPosition = getSelectionEnd();
+      setText(spannableStringBuilder);
+      maybeSetSelection(mNativeEventCount, startPosition, endPosition);
     }
     mDisableTextDiffing = false;
 

From 98e4284442b45e841a4df0a582bb3b029c21d305 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 10:56:07 +0800
Subject: [PATCH 03/33] removing setError call in onAttachedToWindow callback

---
 .../java/com/facebook/react/views/textinput/ReactEditText.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 0859417b3e..0d6406fdae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -889,7 +889,6 @@ public void onAttachedToWindow() {
     if (mAutoFocus && !mDidAttachToWindow) {
       requestFocusInternal();
     }
-    setError(mErrorMessage);
 
     mDidAttachToWindow = true;
   }

From d04869a9ae28fba524755a68fa0afa2daa6ec674 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 11:10:34 +0800
Subject: [PATCH 04/33] restore original example

---
 .../TextInput/TextInputSharedExamples.js      | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index e06ba8806d..498f79d424 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -476,15 +476,30 @@ class SelectionExample extends React.Component<
 function ErrorExample(): React.Node {
   const [text, setText] = React.useState('');
   const [error, setError] = React.useState(null);
+  const textinput = React.useRef(null);
+  /*
+  React.useEffect(() => {
+    console.log('useEffect text: ' + text);
+    if (!!textinput && text.length > 7) {
+      setError(text);
+      console.log('setError() with text: ' + text);
+    }
+  });
+  */
   return (
-    <TextInput
-      errorMessage={error}
-      onChangeText={newText => {
-        setText(newText);
-        setError(newText === 'error' ? 'this input is invalid' : null);
-      }}
-      value={text}
-    />
+    <>
+      <Button title="create error" onPress={() => setError('button')} />
+      <TextInput
+        ref={textinput}
+        errorMessage={error}
+        onBlur={() => setError('onBlur')}
+        onChangeText={newText => {
+          setText(newText);
+          setError(newText === 'error' ? 'this input is invalid' : null);
+        }}
+        value={text}
+      />
+    </>
   );
 }
 

From b0aa709ce4a0d9b418cefa39aa1fb9ee26cdd1ce Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 14:31:37 +0800
Subject: [PATCH 05/33] update example

---
 .../facebook/react/views/textinput/ReactEditText.java    | 5 +----
 .../js/examples/TextInput/TextInputSharedExamples.js     | 9 ---------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 0d6406fdae..8280415513 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -122,7 +122,6 @@ public class ReactEditText extends AppCompatEditText
 
   private static final KeyListener sKeyListener = QwertyKeyListener.getInstanceForFullKeyboard();
   private @Nullable EventDispatcher mEventDispatcher;
-  private @Nullable String mErrorMessage = null;
 
   public ReactEditText(Context context) {
     super(context);
@@ -1073,9 +1072,7 @@ void setEventDispatcher(@Nullable EventDispatcher eventDispatcher) {
   }
 
   public void setErrorMessage(String error) {
-    mErrorMessage = error;
-    setError(mErrorMessage);
-    invalidate();
+    setError(error);
   }
 
   /**
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 498f79d424..d7700631d4 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -477,15 +477,6 @@ function ErrorExample(): React.Node {
   const [text, setText] = React.useState('');
   const [error, setError] = React.useState(null);
   const textinput = React.useRef(null);
-  /*
-  React.useEffect(() => {
-    console.log('useEffect text: ' + text);
-    if (!!textinput && text.length > 7) {
-      setError(text);
-      console.log('setError() with text: ' + text);
-    }
-  });
-  */
   return (
     <>
       <Button title="create error" onPress={() => setError('button')} />

From 5f06b2ac95cd2534db4530a2ea6dd0895c96b4b9 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 14:58:18 +0800
Subject: [PATCH 06/33] call setError in ReactTextInputManager

---
 .../com/facebook/react/views/textinput/ReactEditText.java     | 4 ----
 .../facebook/react/views/textinput/ReactTextInputManager.java | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 8280415513..bd8b06c52f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -1071,10 +1071,6 @@ void setEventDispatcher(@Nullable EventDispatcher eventDispatcher) {
     mEventDispatcher = eventDispatcher;
   }
 
-  public void setErrorMessage(String error) {
-    setError(error);
-  }
-
   /**
    * This class will redirect *TextChanged calls to the listeners only in the case where the text is
    * changed by the user, and not explicitly set by JS.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 5a0507a330..3c04d1967c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -374,7 +374,7 @@ public void updateExtraData(ReactEditText view, Object extraData) {
 
   @ReactProp(name = ViewProps.ERROR_MESSAGE)
   public void setAndroidErrorMessage(ReactEditText view, String error) {
-    view.setErrorMessage(error);
+    view.setError(error);
   }
 
   @ReactProp(name = ViewProps.FONT_SIZE, defaultFloat = ViewDefaults.FONT_SIZE_SP)

From 9cc73310351ac62daba4368e46e2421765004b5e Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 15:24:53 +0800
Subject: [PATCH 07/33] Error onBlur example

---
 .../TextInput/TextInputSharedExamples.js      | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index d7700631d4..e0bb37b104 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -473,24 +473,18 @@ class SelectionExample extends React.Component<
   }
 }
 
-function ErrorExample(): React.Node {
+function ErrorOnBlurExample(): React.Node {
   const [text, setText] = React.useState('');
   const [error, setError] = React.useState(null);
   const textinput = React.useRef(null);
   return (
-    <>
-      <Button title="create error" onPress={() => setError('button')} />
-      <TextInput
-        ref={textinput}
-        errorMessage={error}
-        onBlur={() => setError('onBlur')}
-        onChangeText={newText => {
-          setText(newText);
-          setError(newText === 'error' ? 'this input is invalid' : null);
-        }}
-        value={text}
-      />
-    </>
+    <TextInput
+      ref={textinput}
+      errorMessage={error}
+      onBlur={() => setError('onBlur')}
+      value={text}
+      style={styles.default}
+    />
   );
 }
 

From 089d575de8a582e3006bd609fbebca92382ebb60 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 15:37:12 +0800
Subject: [PATCH 08/33] draft examples

---
 .../TextInput/TextInputSharedExamples.js      | 43 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index e0bb37b104..2c4c131957 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -488,11 +488,50 @@ function ErrorOnBlurExample(): React.Node {
   );
 }
 
+function ErrorOnChangeExample(): React.Node {
+  const [text, setText] = React.useState('');
+  const [error, setError] = React.useState(null);
+  return (
+    <TextInput
+      errorMessage={error}
+      onChangeText={newText => {
+        setText(newText);
+        setError(newText === 'error' ? 'this input is invalid' : null);
+      }}
+      value={text}
+      style={styles.default}
+    />
+  );
+}
+
+function ErrorUseEffectExample(): React.Node {
+  const [error, setError] = React.useState(null);
+
+  React.useEffect(() => {
+    if (text.length() > 7) setError('too long');
+    if (text.length() < 7) setError(null);
+  });
+
+  return <TextInput value={text} errorMessage={error} style={styles.default} />;
+}
+
 module.exports = ([
   {
-    title: 'Error Message',
+    title: 'Error Message onBlur',
+    render: function (): React.Node {
+      return <ErrorOnBlurExample />;
+    },
+  },
+  {
+    title: 'Error Message added onChangeText',
+    render: function (): React.Node {
+      return <ErrorOnChangeExample />;
+    },
+  },
+  {
+    title: 'Error Message added with useEffect',
     render: function (): React.Node {
-      return <ErrorExample />;
+      return <ErrorUseEffectExample />;
     },
   },
   {

From fa21d9749b743bc271de4fe0ffc4ad6818b2ee9d Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 17:31:10 +0800
Subject: [PATCH 09/33] handle errors from diffent type of callbacks

---
 .../TextInput/TextInputSharedExamples.js      | 73 ++++++-------------
 1 file changed, 23 insertions(+), 50 deletions(-)

diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 2c4c131957..0686c7dbb2 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -473,65 +473,38 @@ class SelectionExample extends React.Component<
   }
 }
 
-function ErrorOnBlurExample(): React.Node {
+function ErrorExample(): React.Node {
   const [text, setText] = React.useState('');
   const [error, setError] = React.useState(null);
-  const textinput = React.useRef(null);
   return (
-    <TextInput
-      ref={textinput}
-      errorMessage={error}
-      onBlur={() => setError('onBlur')}
-      value={text}
-      style={styles.default}
-    />
-  );
-}
-
-function ErrorOnChangeExample(): React.Node {
-  const [text, setText] = React.useState('');
-  const [error, setError] = React.useState(null);
-  return (
-    <TextInput
-      errorMessage={error}
-      onChangeText={newText => {
-        setText(newText);
-        setError(newText === 'error' ? 'this input is invalid' : null);
-      }}
-      value={text}
-      style={styles.default}
-    />
+    <>
+      <Button onPress={() => setError('button')} title="Press to set error" />
+      <Text>
+        Type error in the below TextInput to display an error message.
+      </Text>
+      <TextInput
+        errorMessage={error}
+        onBlur={() => setError('onBlur')}
+        onChangeText={newText => {
+          setText(newText);
+          if (newText === 'error') {
+            setError('this input is invalid');
+          } else if (error !== 'onBlur') {
+            setError(null);
+          }
+        }}
+        value={text}
+        style={styles.default}
+      />
+    </>
   );
 }
 
-function ErrorUseEffectExample(): React.Node {
-  const [error, setError] = React.useState(null);
-
-  React.useEffect(() => {
-    if (text.length() > 7) setError('too long');
-    if (text.length() < 7) setError(null);
-  });
-
-  return <TextInput value={text} errorMessage={error} style={styles.default} />;
-}
-
 module.exports = ([
   {
-    title: 'Error Message onBlur',
-    render: function (): React.Node {
-      return <ErrorOnBlurExample />;
-    },
-  },
-  {
-    title: 'Error Message added onChangeText',
-    render: function (): React.Node {
-      return <ErrorOnChangeExample />;
-    },
-  },
-  {
-    title: 'Error Message added with useEffect',
+    title: 'Error Message',
     render: function (): React.Node {
-      return <ErrorUseEffectExample />;
+      return <ErrorExample />;
     },
   },
   {

From 3b7581cd763635aad605cc175bc3cb74182f4a85 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 18 Mar 2022 17:36:25 +0800
Subject: [PATCH 10/33] adding onEndEditing callback

---
 .../rn-tester/js/examples/TextInput/TextInputSharedExamples.js   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 0686c7dbb2..e12d9ac9eb 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -485,6 +485,7 @@ function ErrorExample(): React.Node {
       <TextInput
         errorMessage={error}
         onBlur={() => setError('onBlur')}
+        onEndEditing={() => setError('onEndEditing')}
         onChangeText={newText => {
           setText(newText);
           if (newText === 'error') {

From c5762a77a9e720e0129175afc38c7dcf23bea7bd Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 22 Mar 2022 15:28:32 +0800
Subject: [PATCH 11/33] revert changes to ReactEditText onChangeText

---
 .../com/facebook/react/views/textinput/ReactEditText.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index bd8b06c52f..360de688d5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -564,10 +564,7 @@ public void maybeSetText(ReactTextUpdate reactTextUpdate) {
       // When we update text, we trigger onChangeText code that will
       // try to update state if the wrapper is available. Temporarily disable
       // to prevent an infinite loop.
-      int startPosition = getSelectionStart();
-      int endPosition = getSelectionEnd();
-      setText(spannableStringBuilder);
-      maybeSetSelection(mNativeEventCount, startPosition, endPosition);
+      getText().replace(0, length(), spannableStringBuilder);
     }
     mDisableTextDiffing = false;
 

From 012d92d0b7e5de2436f186cdbff32ba128e537d5 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Wed, 23 Mar 2022 09:30:28 +0800
Subject: [PATCH 12/33] add errorMessage to ReactTextUpdate and
 maybeSetErrorMessage

allow to display error message on TextInput triggered in a onChangeText
callback. Fixes issue explained in:
https://github.com/fabriziobertoglio1987/react-native-notes/issues/12#issuecomment-1071989570

Related links:
https://github.com/fabriziobertoglio1987/react-native-notes/issues/12#issuecomment-1074827746
https://github.com/fabriziobertoglio1987/react-native/commit/d3d54e10687844ffce6283d07da93d29bbba4cc8
---
 .../AndroidTextInputNativeComponent.js        |  1 +
 .../facebook/react/uimanager/ViewProps.java   |  2 +-
 .../react/views/text/ReactTextUpdate.java     | 23 +++++++++++++++----
 .../react/views/textinput/ReactEditText.java  | 14 +++++++++++
 .../textinput/ReactTextInputManager.java      | 16 +++++++++----
 .../textinput/ReactTextInputShadowNode.java   |  3 ++-
 .../TextInput/TextInputSharedExamples.js      |  2 +-
 7 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
index e896a77f81..a335dc62b0 100644
--- a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
@@ -698,6 +698,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
     inlineImageLeft: true,
     editable: true,
     fontVariant: true,
+    android_errorMessage: true,
     borderBottomRightRadius: true,
     borderBottomColor: {process: require('../../StyleSheet/processColor')},
     borderRadius: true,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index c020abdde3..58b88fa02e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -84,7 +84,7 @@ public class ViewProps {
   public static final String BACKGROUND_COLOR = "backgroundColor";
   public static final String FOREGROUND_COLOR = "foregroundColor";
   public static final String COLOR = "color";
-  public static final String ERROR_MESSAGE = "errorMessage";
+  public static final String ANDROID_ERROR_MESSAGE = "android_errorMessage";
   public static final String FONT_SIZE = "fontSize";
   public static final String FONT_WEIGHT = "fontWeight";
   public static final String FONT_STYLE = "fontStyle";
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index f1591a5fe3..5e618d3549 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -11,6 +11,7 @@
 
 import android.text.Layout;
 import android.text.Spannable;
+import javax.annotation.Nullable;
 
 /**
  * Class that contains the data needed for a text update. Used by both <Text/> and <TextInput/>
@@ -30,6 +31,7 @@ public class ReactTextUpdate {
   private final int mSelectionStart;
   private final int mSelectionEnd;
   private final int mJustificationMode;
+  private @Nullable String mErrorMessage;
 
   public boolean mContainsMultipleFragments;
 
@@ -59,7 +61,8 @@ public ReactTextUpdate(
         Layout.BREAK_STRATEGY_HIGH_QUALITY,
         Layout.JUSTIFICATION_MODE_NONE,
         -1,
-        -1);
+        -1,
+        null);
   }
 
   public ReactTextUpdate(
@@ -85,7 +88,8 @@ public ReactTextUpdate(
         textBreakStrategy,
         justificationMode,
         -1,
-        -1);
+        -1,
+        null);
   }
 
   public ReactTextUpdate(
@@ -107,7 +111,8 @@ public ReactTextUpdate(
         textBreakStrategy,
         justificationMode,
         -1,
-        -1);
+        -1,
+        null);
   }
 
   public ReactTextUpdate(
@@ -122,7 +127,8 @@ public ReactTextUpdate(
       int textBreakStrategy,
       int justificationMode,
       int selectionStart,
-      int selectionEnd) {
+      int selectionEnd,
+      @Nullable String errorMessage) {
     mText = text;
     mJsEventCounter = jsEventCounter;
     mContainsImages = containsImages;
@@ -135,6 +141,7 @@ public ReactTextUpdate(
     mSelectionStart = selectionStart;
     mSelectionEnd = selectionEnd;
     mJustificationMode = justificationMode;
+    mErrorMessage = errorMessage;
   }
 
   public static ReactTextUpdate buildReactTextUpdateFromState(
@@ -143,15 +150,21 @@ public static ReactTextUpdate buildReactTextUpdateFromState(
       int textAlign,
       int textBreakStrategy,
       int justificationMode,
-      boolean containsMultipleFragments) {
+      boolean containsMultipleFragments,
+      @Nullable String errorMessage) {
 
     ReactTextUpdate reactTextUpdate =
         new ReactTextUpdate(
             text, jsEventCounter, false, textAlign, textBreakStrategy, justificationMode);
     reactTextUpdate.mContainsMultipleFragments = containsMultipleFragments;
+    reactTextUpdate.mErrorMessage = errorMessage;
     return reactTextUpdate;
   }
 
+  public @Nullable String getErrorMessage() {
+    return mErrorMessage;
+  }
+
   public Spannable getText() {
     return mText;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 360de688d5..c8e1b6bd19 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -509,6 +509,20 @@ public void maybeSetTextFromJS(ReactTextUpdate reactTextUpdate) {
     mIsSettingTextFromJS = false;
   }
 
+  /**
+   * Attempt to set an error message or fail silently. EventCounter is the same one used as with
+   * text.
+   *
+   * @param eventCounter
+   * @param errorMessage
+   */
+  public void maybeSetErrorMessage(int eventCounter, String errorMessage) {
+    if (!canUpdateWithEventCount(eventCounter) || getError() == errorMessage) {
+      return;
+    }
+    setError(errorMessage);
+  }
+
   public void maybeSetTextFromState(ReactTextUpdate reactTextUpdate) {
     mIsSettingTextFromState = true;
     maybeSetText(reactTextUpdate);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 3c04d1967c..2e58e038b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -325,7 +325,7 @@ private ReactTextUpdate getReactTextUpdate(
     sb.append(TextTransform.apply(text, TextTransform.UNSET));
 
     return new ReactTextUpdate(
-        sb, mostRecentEventCount, false, 0, 0, 0, 0, Gravity.NO_GRAVITY, 0, 0, start, end);
+        sb, mostRecentEventCount, false, 0, 0, 0, 0, Gravity.NO_GRAVITY, 0, 0, start, end, null);
   }
 
   @Override
@@ -369,11 +369,12 @@ public void updateExtraData(ReactEditText view, Object extraData) {
 
       view.maybeSetTextFromState(update);
       view.maybeSetSelection(update.getJsEventCounter(), selectionStart, selectionEnd);
+      view.maybeSetErrorMessage(update.getJsEventCounter(), update.getErrorMessage());
     }
   }
 
-  @ReactProp(name = ViewProps.ERROR_MESSAGE)
-  public void setAndroidErrorMessage(ReactEditText view, String error) {
+  @ReactProp(name = ViewProps.ANDROID_ERROR_MESSAGE)
+  public void setErrorMessage(ReactEditText view, String error) {
     view.setError(error);
   }
 
@@ -1325,12 +1326,19 @@ public Object updateState(
     int textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(paragraphAttributes.getString("textBreakStrategy"));
 
+    @Nullable
+    String errorMessage =
+        props.hasKey(ViewProps.ANDROID_ERROR_MESSAGE)
+            ? props.getString(ViewProps.ANDROID_ERROR_MESSAGE)
+            : null;
+
     return ReactTextUpdate.buildReactTextUpdateFromState(
         spanned,
         state.getInt("mostRecentEventCount"),
         TextAttributeProps.getTextAlignment(props, TextLayoutManager.isRTL(attributedString)),
         textBreakStrategy,
         TextAttributeProps.getJustificationMode(props),
-        containsMultipleFragments);
+        containsMultipleFragments,
+        errorMessage);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
index e621e1b585..26e077d523 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -246,7 +246,8 @@ public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
               mTextBreakStrategy,
               mJustificationMode,
               mSelectionStart,
-              mSelectionEnd);
+              mSelectionEnd,
+              null);
       uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
     }
   }
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index e12d9ac9eb..3ba638d1ee 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -483,7 +483,7 @@ function ErrorExample(): React.Node {
         Type error in the below TextInput to display an error message.
       </Text>
       <TextInput
-        errorMessage={error}
+        android_errorMessage={error}
         onBlur={() => setError('onBlur')}
         onEndEditing={() => setError('onEndEditing')}
         onChangeText={newText => {

From 15810e96d90e18dbd424666338fdec0127d403ed Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Wed, 23 Mar 2022 09:47:28 +0800
Subject: [PATCH 13/33] update method alphabetical order

---
 .../react/views/textinput/ReactEditText.java         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index c8e1b6bd19..e468f8f279 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -503,12 +503,6 @@ public int incrementAndGetEventCounter() {
     return ++mNativeEventCount;
   }
 
-  public void maybeSetTextFromJS(ReactTextUpdate reactTextUpdate) {
-    mIsSettingTextFromJS = true;
-    maybeSetText(reactTextUpdate);
-    mIsSettingTextFromJS = false;
-  }
-
   /**
    * Attempt to set an error message or fail silently. EventCounter is the same one used as with
    * text.
@@ -523,6 +517,12 @@ public void maybeSetErrorMessage(int eventCounter, String errorMessage) {
     setError(errorMessage);
   }
 
+  public void maybeSetTextFromJS(ReactTextUpdate reactTextUpdate) {
+    mIsSettingTextFromJS = true;
+    maybeSetText(reactTextUpdate);
+    mIsSettingTextFromJS = false;
+  }
+
   public void maybeSetTextFromState(ReactTextUpdate reactTextUpdate) {
     mIsSettingTextFromState = true;
     maybeSetText(reactTextUpdate);

From cad239bded5748753cee2266c27809e24c6199fb Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Wed, 23 Mar 2022 11:23:41 +0800
Subject: [PATCH 14/33] rename android_errorMessage to errorMessageAndroid

Following same implementation used with underlineColorAndroid
https://github.com/fabriziobertoglio1987/react-native/blob/15810e96d90e18dbd424666338fdec0127d403ed/Libraries/Components/TextInput/TextInput.js#L470
https://github.com/fabriziobertoglio1987/react-native/blob/15810e96d90e18dbd424666338fdec0127d403ed/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js#L203

While with other components (for example prop android_ripple), we use
the android_ prefix to denote platform specific props.
https://github.com/facebook/react-native/pull/29157#issuecomment-645724520
https://github.com/fabriziobertoglio1987/react-native/blob/15810e96d90e18dbd424666338fdec0127d403ed/Libraries/Components/Pressable/Pressable.js#L177

In the case of TextInput we already have Platform Logic that detects
Android/iOS platform.
https://github.com/fabriziobertoglio1987/react-native/blob/15810e96d90e18dbd424666338fdec0127d403ed/Libraries/Components/TextInput/TextInput.js#L1268

For this reason TextInput component does not use android_ props and
instead uses this naming convention underlineColorAndroid.

To be noted that the prop underlineColorAndroid is passed to both iOS
and Android version, while other props have platform specific logic for
android and iOS.
https://github.com/fabriziobertoglio1987/react-native/blob/15810e96d90e18dbd424666338fdec0127d403ed/Libraries/Components/TextInput/TextInput.js#L1334
https://github.com/fabriziobertoglio1987/react-native/blob/15810e96d90e18dbd424666338fdec0127d403ed/Libraries/Components/TextInput/TextInput.js#L1293

Example of a prop that have a specific value on Android and is different
from iOS
https://github.com/fabriziobertoglio1987/react-native/blob/15810e96d90e18dbd424666338fdec0127d403ed/Libraries/Components/TextInput/TextInput.js#L1271

I decided to follow the same solution used in underlineColorAndroid.
---
 .../TextInput/AndroidTextInputNativeComponent.js       | 10 +++++++++-
 Libraries/Components/TextInput/TextInput.js            |  2 +-
 .../java/com/facebook/react/uimanager/ViewProps.java   |  1 -
 .../react/views/textinput/ReactTextInputManager.java   |  8 +++-----
 .../js/examples/TextInput/TextInputSharedExamples.js   |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
index a335dc62b0..bcab27be7d 100644
--- a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
@@ -163,6 +163,14 @@ export type NativeProps = $ReadOnly<{|
     'off',
   >,
 
+  /**
+   * String to be read by screenreaders to indicate an error state. If this value is
+   * not null, an error will be announced. You can use onChangeText or onBlur to
+   * detect an error and set this prop. Once the error is gone, set this to null
+   * to clear the error
+   */
+  errorMessageAndroid?: ?Stringish,
+
   /**
    * Sets the return key to the label. Use it instead of `returnKeyType`.
    * @platform android
@@ -698,7 +706,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
     inlineImageLeft: true,
     editable: true,
     fontVariant: true,
-    android_errorMessage: true,
+    errorMessageAndroid: true,
     borderBottomRightRadius: true,
     borderBottomColor: {process: require('../../StyleSheet/processColor')},
     borderRadius: true,
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index bc3efcec4f..3bb2519bdb 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -408,7 +408,7 @@ type AndroidProps = $ReadOnly<{|
    * detect an error and set this prop. Once the error is gone, set this to null
    * to clear the error
    */
-  android_errorMessage?: ?Stringish,
+  errorMessageAndroid?: ?Stringish,
 
   importantForAutofill?: ?(
     | 'auto'
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index 58b88fa02e..661c3466dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -84,7 +84,6 @@ public class ViewProps {
   public static final String BACKGROUND_COLOR = "backgroundColor";
   public static final String FOREGROUND_COLOR = "foregroundColor";
   public static final String COLOR = "color";
-  public static final String ANDROID_ERROR_MESSAGE = "android_errorMessage";
   public static final String FONT_SIZE = "fontSize";
   public static final String FONT_WEIGHT = "fontWeight";
   public static final String FONT_STYLE = "fontStyle";
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 2e58e038b6..66fac702f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -373,8 +373,8 @@ public void updateExtraData(ReactEditText view, Object extraData) {
     }
   }
 
-  @ReactProp(name = ViewProps.ANDROID_ERROR_MESSAGE)
-  public void setErrorMessage(ReactEditText view, String error) {
+  @ReactProp(name = "errorMessageAndroid")
+  public void setErrorMessage(ReactEditText view, @Nullable String error) {
     view.setError(error);
   }
 
@@ -1328,9 +1328,7 @@ public Object updateState(
 
     @Nullable
     String errorMessage =
-        props.hasKey(ViewProps.ANDROID_ERROR_MESSAGE)
-            ? props.getString(ViewProps.ANDROID_ERROR_MESSAGE)
-            : null;
+        props.hasKey("errorMessageAndroid") ? props.getString("errorMessageAndroid") : null;
 
     return ReactTextUpdate.buildReactTextUpdateFromState(
         spanned,
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 3ba638d1ee..e68078eff0 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -483,7 +483,7 @@ function ErrorExample(): React.Node {
         Type error in the below TextInput to display an error message.
       </Text>
       <TextInput
-        android_errorMessage={error}
+        errorMessageAndroid={error}
         onBlur={() => setError('onBlur')}
         onEndEditing={() => setError('onEndEditing')}
         onChangeText={newText => {

From aa53df11257c595aecddda5959855f74899541b8 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Wed, 23 Mar 2022 12:49:28 +0800
Subject: [PATCH 15/33] adding @platform android to errorMessageAndroid
 comments

---
 .../Components/TextInput/AndroidTextInputNativeComponent.js     | 2 ++
 Libraries/Components/TextInput/TextInput.js                     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
index bcab27be7d..f626ad0c92 100644
--- a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+++ b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
@@ -168,6 +168,8 @@ export type NativeProps = $ReadOnly<{|
    * not null, an error will be announced. You can use onChangeText or onBlur to
    * detect an error and set this prop. Once the error is gone, set this to null
    * to clear the error
+   *
+   * @platform android
    */
   errorMessageAndroid?: ?Stringish,
 
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 3bb2519bdb..9198d58d90 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -407,6 +407,8 @@ type AndroidProps = $ReadOnly<{|
    * not null, an error will be announced. You can use onChangeText or onBlur to
    * detect an error and set this prop. Once the error is gone, set this to null
    * to clear the error
+   *
+   * @platform android
    */
   errorMessageAndroid?: ?Stringish,
 

From b5786376f4efc590386860a574d29db90f3cddaf Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Wed, 23 Mar 2022 12:52:26 +0800
Subject: [PATCH 16/33] moving TextInput example at the bottom of the list

---
 .../js/examples/TextInput/TextInputSharedExamples.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index e68078eff0..536c43ff70 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -502,12 +502,6 @@ function ErrorExample(): React.Node {
 }
 
 module.exports = ([
-  {
-    title: 'Error Message',
-    render: function (): React.Node {
-      return <ErrorExample />;
-    },
-  },
   {
     title: 'Auto-focus',
     render: function (): React.Node {
@@ -726,4 +720,10 @@ module.exports = ([
       );
     },
   },
+  {
+    title: 'Error Message',
+    render: function (): React.Node {
+      return <ErrorExample />;
+    },
+  },
 ]: Array<RNTesterModuleExample>);

From 1e54f76fb1fcc4676edccfa11b61a5f245c94558 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Fri, 25 Mar 2022 16:22:32 +0800
Subject: [PATCH 17/33] Debug issue
 https://github.com/facebook/react-native/pull/33468#discussion_r835036889

---
 .../textinput/ReactTextInputManager.java      |  2 ++
 .../attributedstring/TextAttributes.cpp       |  1 +
 .../attributedstring/TextAttributes.h         |  4 ++-
 .../components/text/ParagraphShadowNode.cpp   |  2 ++
 .../renderer/components/text/conversions.h    |  5 ++--
 .../AndroidTextInputComponentDescriptor.h     |  6 ++--
 .../AndroidTextInputProps.cpp                 | 27 +++++++++++++----
 .../androidtextinput/AndroidTextInputProps.h  |  1 +
 .../AndroidTextInputShadowNode.cpp            | 14 +++++++--
 .../AndroidTextInputState.cpp                 | 29 ++++++++++++++-----
 .../androidtextinput/AndroidTextInputState.h  |  7 ++++-
 .../textinput/iostextinput/TextInputProps.cpp |  6 ++++
 12 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 66fac702f0..f9b9d3ff57 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -23,6 +23,7 @@
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
@@ -1301,6 +1302,7 @@ public Object updateState(
     }
 
     ReadableNativeMap state = stateWrapper.getStateData();
+    Log.w("TESTING::ReactTextInputManager", "state: " + (state));
 
     if (state == null) {
       return null;
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
index 3728f0c361..e79ad5e1d8 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -159,6 +159,7 @@ TextAttributes TextAttributes::defaultTextAttributes() {
     textAttributes.backgroundColor = clearColor();
     textAttributes.fontSize = 14.0;
     textAttributes.fontSizeMultiplier = 1.0;
+    textAttributes.errorMessageAndroid = "TextAttributes defaultTextAttributes";
     return textAttributes;
   }();
   return textAttributes;
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
index 82b8547507..8e2e74fec0 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.h
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
@@ -78,6 +78,7 @@ class TextAttributes : public DebugStringConvertible {
   // construction.
   std::optional<LayoutDirection> layoutDirection{};
   std::optional<AccessibilityRole> accessibilityRole{};
+  std::optional<std::string> errorMessageAndroid{"TextAttributes"};
 
 #pragma mark - Operations
 
@@ -129,7 +130,8 @@ struct hash<facebook::react::TextAttributes> {
         textAttributes.textShadowColor,
         textAttributes.isHighlighted,
         textAttributes.layoutDirection,
-        textAttributes.accessibilityRole);
+        textAttributes.accessibilityRole,
+        textAttributes.errorMessageAndroid);
   }
 };
 } // namespace std
diff --git a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
index 7c42ae7672..30a1319624 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
@@ -109,6 +109,7 @@ void ParagraphShadowNode::updateStateIfNeeded(Content const &content) {
     return;
   }
 
+  // content.attributedString.errorMessageAndroid = "updateStateIfNeeded";
   setStateData(ParagraphState{
       content.attributedString,
       content.paragraphAttributes,
@@ -132,6 +133,7 @@ Size ParagraphShadowNode::measureContent(
     auto string = BaseTextShadowNode::getEmptyPlaceholder();
     auto textAttributes = TextAttributes::defaultTextAttributes();
     textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
+    textAttributes.errorMessageAndroid = "error";
     textAttributes.apply(getConcreteProps().textAttributes);
     attributedString.appendFragment({string, textAttributes, {}});
   }
diff --git a/ReactCommon/react/renderer/components/text/conversions.h b/ReactCommon/react/renderer/components/text/conversions.h
index 712b8f2fde..dcd2ef82aa 100644
--- a/ReactCommon/react/renderer/components/text/conversions.h
+++ b/ReactCommon/react/renderer/components/text/conversions.h
@@ -21,8 +21,9 @@ inline folly::dynamic toDynamic(ParagraphState const &paragraphState) {
   folly::dynamic newState = folly::dynamic::object();
   newState["attributedString"] = toDynamic(paragraphState.attributedString);
   newState["paragraphAttributes"] =
-      toDynamic(paragraphState.paragraphAttributes);
-  newState["hash"] = newState["attributedString"]["hash"];
+    toDynamic(paragraphState.paragraphAttributes);
+  newState["hash"] = 1987; // newState["attributedString"]["hash"];
+  newState["errorMessageAndroid"] = "conversions.h";
   return newState;
 }
 
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
index 60c1490878..181520f4e0 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -16,7 +16,7 @@
 #include <yoga/YGValue.h>
 
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-
+#include <string>
 namespace facebook {
 namespace react {
 
@@ -70,6 +70,7 @@ class AndroidTextInputComponentDescriptor final
       env->DeleteLocalRef(defaultTextInputPaddingArray);
     }
 
+    std::string error = "AndroidTextInputComponentDescriptor";
     return std::make_shared<AndroidTextInputShadowNode::ConcreteState>(
         std::make_shared<AndroidTextInputState const>(AndroidTextInputState(
             0,
@@ -81,7 +82,8 @@ class AndroidTextInputComponentDescriptor final
             ((YGValue)theme[YGEdgeStart]).value,
             ((YGValue)theme[YGEdgeEnd]).value,
             ((YGValue)theme[YGEdgeTop]).value,
-            ((YGValue)theme[YGEdgeBottom]).value)),
+            ((YGValue)theme[YGEdgeBottom]).value,
+            error)),
         family);
   }
 
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
index 1075179f1a..e576636440 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
@@ -48,26 +48,42 @@ AndroidTextInputProps::AndroidTextInputProps(
           "autoComplete",
           sourceProps.autoComplete,
           {})),
-      returnKeyLabel(convertRawProp(context, rawProps,
+      returnKeyLabel(convertRawProp(
+          context,
+          rawProps,
           "returnKeyLabel",
           sourceProps.returnKeyLabel,
           {})),
-      numberOfLines(convertRawProp(context, rawProps,
+      numberOfLines(convertRawProp(
+          context,
+          rawProps,
           "numberOfLines",
           sourceProps.numberOfLines,
           {0})),
-      disableFullscreenUI(convertRawProp(context, rawProps,
+      disableFullscreenUI(convertRawProp(
+          context,
+          rawProps,
           "disableFullscreenUI",
           sourceProps.disableFullscreenUI,
           {false})),
-      textBreakStrategy(convertRawProp(context, rawProps,
+      textBreakStrategy(convertRawProp(
+          context,
+          rawProps,
           "textBreakStrategy",
           sourceProps.textBreakStrategy,
           {})),
-      underlineColorAndroid(convertRawProp(context, rawProps,
+      underlineColorAndroid(convertRawProp(
+          context,
+          rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
+      errorMessageAndroid(convertRawProp(
+          context,
+          rawProps,
+          "errorMessageAndroid",
+          sourceProps.errorMessageAndroid,
+          {})),
       inlineImageLeft(convertRawProp(context, rawProps,
           "inlineImageLeft",
           sourceProps.inlineImageLeft,
@@ -267,6 +283,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["disableFullscreenUI"] = disableFullscreenUI;
   props["textBreakStrategy"] = textBreakStrategy;
   props["underlineColorAndroid"] = toAndroidRepr(underlineColorAndroid);
+  props["errorMessageAndroid"] = errorMessageAndroid;
   props["inlineImageLeft"] = inlineImageLeft;
   props["inlineImagePadding"] = inlineImagePadding;
   props["importantForAutofill"] = importantForAutofill;
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
index aad4572bd4..4359d4f40e 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
@@ -115,6 +115,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
   const bool disableFullscreenUI{false};
   const std::string textBreakStrategy{};
   const SharedColor underlineColorAndroid{};
+  const std::string errorMessageAndroid{};
   const std::string inlineImageLeft{};
   const int inlineImagePadding{0};
   const std::string importantForAutofill{};
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
index fa497f2e13..c20956c8e2 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -7,6 +7,7 @@
 
 #include "AndroidTextInputShadowNode.h"
 
+#include <glog/logging.h>
 #include <fbjni/fbjni.h>
 #include <react/debug/react_native_assert.h>
 #include <react/jni/ReadableNativeMap.h>
@@ -16,7 +17,7 @@
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/core/conversions.h>
-
+#include <string>
 #include <utility>
 
 using namespace facebook::jni;
@@ -146,12 +147,18 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
            ? 0
            : getConcreteProps().mostRecentEventCount);
   auto newAttributedString = getMostRecentAttributedString();
-
+  // std::string mostRecentEventCountToString =
+  //     std::to_string(state.mostRecentEventCount);
+  // std::string defaultTextAttributesToString =
+  // std::to_string(defaultTextAttributes);
+  // LOG(ERROR) << "TESTING: state.errorMessageAndroid" + state.errorMessageAndroid;
+  // LOG(ERROR) << "TESTING: defaultTextAttributes" + defaultTextAttributesToString;
   // Even if we're here and updating state, it may be only to update the layout
   // manager If that is the case, make sure we don't update text: pass in the
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
+  std::string test = "AndroidTextInputShadowNode";
   setStateData(AndroidTextInputState{
       newEventCount,
       newAttributedString,
@@ -162,7 +169,8 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
       state.defaultThemePaddingStart,
       state.defaultThemePaddingEnd,
       state.defaultThemePaddingTop,
-      state.defaultThemePaddingBottom});
+      state.defaultThemePaddingBottom,
+      test});
 }
 
 #pragma mark - LayoutableShadowNode
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
index a2deb59db3..2c47a7b07a 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
@@ -5,13 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "AndroidTextInputState.h"
+#include <glog/logging.h>
 
+#include <logger/react_native_log.h>
+#include <glog/logging.h>
+#include <logger/react_native_log.h>
+#include "AndroidTextInputState.h"
+#include <iostream>
 #include <react/renderer/components/text/conversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
+#include <string>
 
 #include <utility>
-
+using namespace std;
 namespace facebook {
 namespace react {
 
@@ -25,7 +31,8 @@ AndroidTextInputState::AndroidTextInputState(
     float defaultThemePaddingStart,
     float defaultThemePaddingEnd,
     float defaultThemePaddingTop,
-    float defaultThemePaddingBottom)
+    float defaultThemePaddingBottom,
+    std::string defaultErrorMessageAndroid)
     : mostRecentEventCount(mostRecentEventCount),
       attributedString(std::move(attributedString)),
       reactTreeAttributedString(std::move(reactTreeAttributedString)),
@@ -35,7 +42,8 @@ AndroidTextInputState::AndroidTextInputState(
       defaultThemePaddingStart(defaultThemePaddingStart),
       defaultThemePaddingEnd(defaultThemePaddingEnd),
       defaultThemePaddingTop(defaultThemePaddingTop),
-      defaultThemePaddingBottom(defaultThemePaddingBottom) {}
+      defaultThemePaddingBottom(defaultThemePaddingBottom),
+      defaultErrorMessageAndroid(defaultErrorMessageAndroid) {}
 
 AndroidTextInputState::AndroidTextInputState(
     AndroidTextInputState const &previousState,
@@ -51,6 +59,7 @@ AndroidTextInputState::AndroidTextInputState(
       attributedString(previousState.attributedString),
       reactTreeAttributedString(previousState.reactTreeAttributedString),
       paragraphAttributes(previousState.paragraphAttributes),
+      errorMessageAndroid(previousState.errorMessageAndroid),
       defaultTextAttributes(previousState.defaultTextAttributes),
       defaultParentShadowView(previousState.defaultParentShadowView),
       defaultThemePaddingStart(data.getDefault(
@@ -68,7 +77,11 @@ AndroidTextInputState::AndroidTextInputState(
       defaultThemePaddingBottom(data.getDefault(
                                         "themePaddingBottom",
                                         previousState.defaultThemePaddingBottom)
-                                    .getDouble()){};
+                                    .getDouble()),
+      defaultErrorMessageAndroid(data.getDefault(
+          "defaultErrorMessageAndroid",
+          previousState.defaultErrorMessageAndroid)
+                                    .getString()) {};
 
 #ifdef ANDROID
 folly::dynamic AndroidTextInputState::getDynamic() const {
@@ -80,12 +93,14 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   // called from Java to trigger a relayout with a `cachedAttributedStringId`,
   // so Java has all up-to-date information and we should pass an empty map
   // through.
+
   if (cachedAttributedStringId == 0) {
     newState["mostRecentEventCount"] = mostRecentEventCount;
     newState["attributedString"] = toDynamic(attributedString);
     newState["hash"] = newState["attributedString"]["hash"];
-    newState["paragraphAttributes"] =
-        toDynamic(paragraphAttributes); // TODO: can we memoize this in Java?
+    newState["paragraphAttributes"] = toDynamic(
+        paragraphAttributes); // TODO: can we memoize this in Java?
+    newState["errorMessageAndroid"] = errorMessageAndroid;
   }
   return newState;
 }
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
index 4dc50ac941..1915427c56 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
@@ -10,6 +10,7 @@
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
+#include <string>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
@@ -54,6 +55,8 @@ class AndroidTextInputState final {
    */
   ParagraphAttributes paragraphAttributes{};
 
+  std::string errorMessageAndroid{};
+
   /**
    * Default TextAttributes used if we need to construct a new Fragment.
    * Only used if text is inserted into an AttributedString with no existing
@@ -76,6 +79,7 @@ class AndroidTextInputState final {
   float defaultThemePaddingEnd{NAN};
   float defaultThemePaddingTop{NAN};
   float defaultThemePaddingBottom{NAN};
+  std::string defaultErrorMessageAndroid{};
 
   AndroidTextInputState(
       int64_t mostRecentEventCount,
@@ -87,7 +91,8 @@ class AndroidTextInputState final {
       float defaultThemePaddingStart,
       float defaultThemePaddingEnd,
       float defaultThemePaddingTop,
-      float defaultThemePaddingBottom);
+      float defaultThemePaddingBottom,
+      std::string defaultErrorMessageAndroid);
 
   AndroidTextInputState() = default;
   AndroidTextInputState(
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
index a8716286ae..4e3d52bfc3 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
@@ -69,6 +69,12 @@ TextInputProps::TextInputProps(
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
+      errorMessageAndroid(convertRawProp(
+          context,
+          rawProps,
+          "errorMessageAndroid",
+          sourceProps.errorMessageAndroid,
+          {})),
       text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
       mostRecentEventCount(convertRawProp(
           context,

From 7664fcb499873e64e0d03fbf93368d8e922523c2 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Mon, 28 Mar 2022 15:59:25 +0800
Subject: [PATCH 18/33] now update state in C++, but why??

---
 .../text/TextLayoutManagerMapBuffer.java      |   1 +
 .../attributedstring/ParagraphAttributes.cpp  |  12 +-
 .../attributedstring/ParagraphAttributes.h    |   5 +-
 .../attributedstring/TextAttributes.cpp       |   1 +
 .../renderer/attributedstring/conversions.h   |  10 +
 .../AndroidTextInputShadowNode.cpp            |   6 +-
 .../AndroidTextInputState.cpp                 |  11 +-
 .../TextInput/TextInputExample.android.js     | 310 +-----------------
 .../TextInput/TextInputSharedExamples.js      | 221 +------------
 9 files changed, 37 insertions(+), 540 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
index b73c0e5fa0..3f8ffd530b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -62,6 +62,7 @@ public class TextLayoutManagerMapBuffer {
   public static final short PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
   public static final short PA_KEY_INCLUDE_FONT_PADDING = 4;
   public static final short PA_KEY_HYPHENATION_FREQUENCY = 5;
+  public static final short PA_KEY_ERROR_MESSAGE = 6;
 
   private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false;
 
diff --git a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
index 773c8d6a38..81db8a792d 100644
--- a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
@@ -16,20 +16,24 @@ namespace facebook {
 namespace react {
 
 bool ParagraphAttributes::operator==(const ParagraphAttributes &rhs) const {
+  LOG(ERROR) << "TESTING:: rhs.maximumNumberOfLines: " << rhs.maximumNumberOfLines;
+  LOG(ERROR) << "TESTING:: rhs.errorMessageAndroid: " << rhs.errorMessageAndroid;
   return std::tie(
              maximumNumberOfLines,
              ellipsizeMode,
              textBreakStrategy,
              adjustsFontSizeToFit,
              includeFontPadding,
-             android_hyphenationFrequency) ==
+             android_hyphenationFrequency,
+             errorMessageAndroid) ==
       std::tie(
              rhs.maximumNumberOfLines,
              rhs.ellipsizeMode,
              rhs.textBreakStrategy,
              rhs.adjustsFontSizeToFit,
              rhs.includeFontPadding,
-             rhs.android_hyphenationFrequency) &&
+             rhs.android_hyphenationFrequency,
+             rhs.errorMessageAndroid) &&
       floatEquality(minimumFontSize, rhs.minimumFontSize) &&
       floatEquality(maximumFontSize, rhs.maximumFontSize);
 }
@@ -51,7 +55,9 @@ SharedDebugStringConvertibleList ParagraphAttributes::getDebugProps() const {
       debugStringConvertibleItem("maximumFontSize", maximumFontSize),
       debugStringConvertibleItem("includeFontPadding", includeFontPadding),
       debugStringConvertibleItem(
-          "android_hyphenationFrequency", android_hyphenationFrequency)};
+          "android_hyphenationFrequency", android_hyphenationFrequency),
+      debugStringConvertibleItem(
+          "errorMessageAndroid", errorMessageAndroid)};
 }
 #endif
 
diff --git a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h
index c71909b89a..a2b6e2da66 100644
--- a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h
+++ b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h
@@ -64,6 +64,8 @@ class ParagraphAttributes : public DebugStringConvertible {
    */
   HyphenationFrequency android_hyphenationFrequency{};
 
+  std::string errorMessageAndroid{};
+
   /*
    * In case of font size adjustment enabled, defines minimum and maximum
    * font sizes.
@@ -99,7 +101,8 @@ struct hash<facebook::react::ParagraphAttributes> {
         attributes.minimumFontSize,
         attributes.maximumFontSize,
         attributes.includeFontPadding,
-        attributes.android_hyphenationFrequency);
+        attributes.android_hyphenationFrequency, 
+        attributes.errorMessageAndroid);
   }
 };
 } // namespace std
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
index e79ad5e1d8..4e6f59d5f4 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -93,6 +93,7 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   layoutDirection = textAttributes.layoutDirection.has_value()
       ? textAttributes.layoutDirection
       : layoutDirection;
+  // LOG(ERROR) << "TESTING:: " << (std::string)getDebugProps();
   accessibilityRole = textAttributes.accessibilityRole.has_value()
       ? textAttributes.accessibilityRole
       : accessibilityRole;
diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
index 96cbc0c5d7..7e4f3cb60a 100644
--- a/ReactCommon/react/renderer/attributedstring/conversions.h
+++ b/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -592,6 +592,7 @@ inline void fromRawValue(
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
+    LOG(ERROR) << "TESTING:: AccessibilityRole: " << string;
     if (string == "none") {
       result = AccessibilityRole::None;
     } else if (string == "button") {
@@ -685,6 +686,7 @@ inline void fromRawValue(
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
+    LOG(ERROR) << "TESTING:: HyphenationFrequency value: " << string;
     if (string == "none") {
       result = HyphenationFrequency::None;
     } else if (string == "normal") {
@@ -760,6 +762,7 @@ inline ParagraphAttributes convertRawProp(
       "android_hyphenationFrequency",
       sourceParagraphAttributes.android_hyphenationFrequency,
       defaultParagraphAttributes.android_hyphenationFrequency);
+  paragraphAttributes.errorMessageAndroid = sourceParagraphAttributes.errorMessageAndroid;
 
   return paragraphAttributes;
 }
@@ -798,6 +801,9 @@ inline folly::dynamic toDynamic(
   values(
       "android_hyphenationFrequency",
       toString(paragraphAttributes.android_hyphenationFrequency));
+  values(
+      "errorMessageAndroid",
+      toString(paragraphAttributes.errorMessageAndroid));
 
   return values;
 }
@@ -990,6 +996,7 @@ constexpr static MapBuffer::Key PA_KEY_TEXT_BREAK_STRATEGY = 2;
 constexpr static MapBuffer::Key PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
 constexpr static MapBuffer::Key PA_KEY_INCLUDE_FONT_PADDING = 4;
 constexpr static MapBuffer::Key PA_KEY_HYPHENATION_FREQUENCY = 5;
+constexpr static MapBuffer::Key PA_KEY_ERROR_MESSAGE = 6;
 
 inline MapBuffer toMapBuffer(const ParagraphAttributes &paragraphAttributes) {
   auto builder = MapBufferBuilder();
@@ -1007,6 +1014,9 @@ inline MapBuffer toMapBuffer(const ParagraphAttributes &paragraphAttributes) {
   builder.putString(
       PA_KEY_HYPHENATION_FREQUENCY,
       toString(paragraphAttributes.android_hyphenationFrequency));
+  builder.putString(
+      PA_KEY_ERROR_MESSAGE,
+      toString(paragraphAttributes.errorMessageAndroid));
 
   return builder.build();
 }
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
index c20956c8e2..6bac8bccd7 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -133,6 +133,8 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   if (getConcreteProps().mostRecentEventCount < state.mostRecentEventCount) {
     return;
   }
+  LOG(ERROR) << "TESTING:: getConcreteProps().errorMessageAndroid: " << getConcreteProps().errorMessageAndroid;
+  LOG(ERROR) << "TESTING:: state.errorMessageAndroid: " << state.errorMessageAndroid;
 
   // Store default TextAttributes in state.
   // In the case where the TextInput is completely empty (no value, no
@@ -158,7 +160,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
-  std::string test = "AndroidTextInputShadowNode";
+  std::string errorMessageAndroid = getConcreteProps().errorMessageAndroid;
   setStateData(AndroidTextInputState{
       newEventCount,
       newAttributedString,
@@ -170,7 +172,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
       state.defaultThemePaddingEnd,
       state.defaultThemePaddingTop,
       state.defaultThemePaddingBottom,
-      test});
+      errorMessageAndroid});
 }
 
 #pragma mark - LayoutableShadowNode
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
index 2c47a7b07a..ffd237e79e 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
@@ -37,13 +37,13 @@ AndroidTextInputState::AndroidTextInputState(
       attributedString(std::move(attributedString)),
       reactTreeAttributedString(std::move(reactTreeAttributedString)),
       paragraphAttributes(std::move(paragraphAttributes)),
+      errorMessageAndroid(defaultErrorMessageAndroid),
       defaultTextAttributes(std::move(defaultTextAttributes)),
       defaultParentShadowView(std::move(defaultParentShadowView)),
       defaultThemePaddingStart(defaultThemePaddingStart),
       defaultThemePaddingEnd(defaultThemePaddingEnd),
       defaultThemePaddingTop(defaultThemePaddingTop),
-      defaultThemePaddingBottom(defaultThemePaddingBottom),
-      defaultErrorMessageAndroid(defaultErrorMessageAndroid) {}
+      defaultThemePaddingBottom(defaultThemePaddingBottom) {}
 
 AndroidTextInputState::AndroidTextInputState(
     AndroidTextInputState const &previousState,
@@ -77,11 +77,7 @@ AndroidTextInputState::AndroidTextInputState(
       defaultThemePaddingBottom(data.getDefault(
                                         "themePaddingBottom",
                                         previousState.defaultThemePaddingBottom)
-                                    .getDouble()),
-      defaultErrorMessageAndroid(data.getDefault(
-          "defaultErrorMessageAndroid",
-          previousState.defaultErrorMessageAndroid)
-                                    .getString()) {};
+                                    .getDouble()) {};
 
 #ifdef ANDROID
 folly::dynamic AndroidTextInputState::getDynamic() const {
@@ -93,6 +89,7 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   // called from Java to trigger a relayout with a `cachedAttributedStringId`,
   // so Java has all up-to-date information and we should pass an empty map
   // through.
+  LOG(ERROR) << "TESTING:: errorMessageAndroid: " << errorMessageAndroid;
 
   if (cachedAttributedStringId == 0) {
     newState["mostRecentEventCount"] = mostRecentEventCount;
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js b/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
index 8238cd876a..e54dcfcb05 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
@@ -148,312 +148,4 @@ exports.title = 'TextInput';
 exports.documentationURL = 'https://reactnative.dev/docs/textinput';
 exports.category = 'Basic';
 exports.description = 'Single and multi-line text inputs.';
-exports.examples = ([
-  ...TextInputSharedExamples,
-  {
-    title: 'Colors and text inputs',
-    render: function (): React.Node {
-      return (
-        <View>
-          <TextInput
-            style={[styles.singleLine]}
-            defaultValue="Default color text"
-          />
-          <TextInput
-            style={[styles.singleLine, {color: 'green'}]}
-            defaultValue="Green Text"
-          />
-          <TextInput
-            placeholder="Default placeholder text color"
-            style={styles.singleLine}
-          />
-          <TextInput
-            placeholder="Red placeholder text color"
-            placeholderTextColor="red"
-            style={styles.singleLine}
-          />
-          <TextInput
-            placeholder="Default underline color"
-            style={styles.singleLine}
-          />
-          <TextInput
-            placeholder="Blue underline color"
-            style={styles.singleLine}
-            underlineColorAndroid="blue"
-          />
-          <TextInput
-            defaultValue="Same BackgroundColor as View "
-            style={[
-              styles.singleLine,
-              {backgroundColor: 'rgba(100, 100, 100, 0.3)'},
-            ]}>
-            <Text style={{backgroundColor: 'rgba(100, 100, 100, 0.3)'}}>
-              Darker backgroundColor
-            </Text>
-          </TextInput>
-          <TextInput
-            defaultValue="Highlight Color is red"
-            selectionColor={'red'}
-            style={styles.singleLine}
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Font Weight',
-    render: function (): React.Node {
-      return (
-        <View>
-          <TextInput
-            defaultValue="Font Weight (default)"
-            style={[styles.singleLine]}
-          />
-          {[
-            'normal',
-            'bold',
-            '900',
-            '800',
-            '700',
-            '600',
-            '500',
-            '400',
-            '300',
-            '200',
-            '100',
-          ].map(fontWeight => (
-            <TextInput
-              defaultValue={`Font Weight (${fontWeight})`}
-              key={fontWeight}
-              style={[styles.singleLine, {fontWeight}]}
-            />
-          ))}
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Text input, themes and heights',
-    render: function (): React.Node {
-      return (
-        <TextInput
-          placeholder="If you set height, beware of padding set from themes"
-          style={[styles.singleLineWithHeightTextInput]}
-        />
-      );
-    },
-  },
-  {
-    title: 'letterSpacing',
-    render: function (): React.Node {
-      return (
-        <View>
-          <TextInput
-            style={[styles.singleLine, {letterSpacing: 0}]}
-            placeholder="letterSpacing = 0"
-          />
-          <TextInput
-            style={[styles.singleLine, {letterSpacing: 2}]}
-            placeholder="letterSpacing = 2"
-          />
-          <TextInput
-            style={[styles.singleLine, {letterSpacing: 9}]}
-            placeholder="letterSpacing = 9"
-          />
-          <TextInput
-            style={[styles.singleLine, {letterSpacing: -1}]}
-            placeholder="letterSpacing = -1"
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Passwords',
-    render: function (): React.Node {
-      return (
-        <View>
-          <TextInput
-            defaultValue="iloveturtles"
-            secureTextEntry={true}
-            style={styles.singleLine}
-          />
-          <TextInput
-            secureTextEntry={true}
-            style={[styles.singleLine, {color: 'red'}]}
-            placeholder="color is supported too"
-            placeholderTextColor="red"
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Editable',
-    render: function (): React.Node {
-      return (
-        <TextInput
-          defaultValue="Can't touch this! (>'-')> ^(' - ')^ <('-'<) (>'-')> ^(' - ')^"
-          editable={false}
-          style={styles.singleLine}
-        />
-      );
-    },
-  },
-  {
-    title: 'Multiline',
-    render: function (): React.Node {
-      return (
-        <View>
-          <TextInput
-            autoCorrect={true}
-            placeholder="multiline, aligned top-left"
-            placeholderTextColor="red"
-            multiline={true}
-            style={[
-              styles.multiline,
-              {textAlign: 'left', textAlignVertical: 'top'},
-            ]}
-          />
-          <TextInput
-            autoCorrect={true}
-            placeholder="multiline, aligned center"
-            placeholderTextColor="green"
-            multiline={true}
-            style={[
-              styles.multiline,
-              {textAlign: 'center', textAlignVertical: 'center'},
-            ]}
-          />
-          <TextInput
-            autoCorrect={true}
-            multiline={true}
-            style={[
-              styles.multiline,
-              {color: 'blue'},
-              {textAlign: 'right', textAlignVertical: 'bottom'},
-            ]}>
-            <Text style={styles.multiline}>
-              multiline with children, aligned bottom-right
-            </Text>
-          </TextInput>
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Fixed number of lines',
-    platform: 'android',
-    render: function (): React.Node {
-      return (
-        <View>
-          <TextInput
-            numberOfLines={2}
-            multiline={true}
-            placeholder="Two line input"
-          />
-          <TextInput
-            numberOfLines={5}
-            multiline={true}
-            placeholder="Five line input"
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Auto-expanding',
-    render: function (): React.Node {
-      return (
-        <View>
-          <AutogrowingTextInputExample
-            enablesReturnKeyAutomatically={true}
-            returnKeyType="done"
-            multiline={true}
-            style={{maxHeight: 400, minHeight: 20, backgroundColor: '#eeeeee'}}>
-            generic generic generic
-            <Text style={{fontSize: 6, color: 'red'}}>
-              small small small small small small
-            </Text>
-            <Text>regular regular</Text>
-            <Text style={{fontSize: 30, color: 'green'}}>
-              huge huge huge huge huge
-            </Text>
-            generic generic generic
-          </AutogrowingTextInputExample>
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Return key',
-    render: function (): React.Node {
-      const returnKeyTypes = [
-        'none',
-        'go',
-        'search',
-        'send',
-        'done',
-        'previous',
-        'next',
-      ];
-      const returnKeyLabels = ['Compile', 'React Native'];
-      const examples = returnKeyTypes.map(type => {
-        return (
-          <TextInput
-            key={type}
-            returnKeyType={type}
-            placeholder={'returnKeyType: ' + type}
-            style={styles.singleLine}
-          />
-        );
-      });
-      const types = returnKeyLabels.map(type => {
-        return (
-          <TextInput
-            key={type}
-            returnKeyLabel={type}
-            placeholder={'returnKeyLabel: ' + type}
-            style={styles.singleLine}
-          />
-        );
-      });
-      return (
-        <View>
-          {examples}
-          {types}
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Inline Images',
-    render: function (): React.Node {
-      return (
-        <View>
-          <TextInput
-            inlineImageLeft="ic_menu_black_24dp"
-            placeholder="This has drawableLeft set"
-            style={styles.singleLine}
-          />
-          <TextInput
-            inlineImageLeft="ic_menu_black_24dp"
-            inlineImagePadding={30}
-            placeholder="This has drawableLeft and drawablePadding set"
-            style={styles.singleLine}
-          />
-          <TextInput
-            placeholder="This does not have drawable props set"
-            style={styles.singleLine}
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Toggle Default Padding',
-    render: function (): React.Node {
-      return <ToggleDefaultPaddingExample />;
-    },
-  },
-]: Array<RNTesterModuleExample>);
+exports.examples = ([...TextInputSharedExamples]: Array<RNTesterModuleExample>);
diff --git a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
index 536c43ff70..5e7d91cf56 100644
--- a/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
+++ b/packages/rn-tester/js/examples/TextInput/TextInputSharedExamples.js
@@ -483,6 +483,9 @@ function ErrorExample(): React.Node {
         Type error in the below TextInput to display an error message.
       </Text>
       <TextInput
+        maximumNumberOfLines={2}
+        accessibilityRole="button"
+        hyphenationFrequency="normal"
         errorMessageAndroid={error}
         onBlur={() => setError('onBlur')}
         onEndEditing={() => setError('onEndEditing')}
@@ -502,224 +505,6 @@ function ErrorExample(): React.Node {
 }
 
 module.exports = ([
-  {
-    title: 'Auto-focus',
-    render: function (): React.Node {
-      return (
-        <TextInput
-          autoFocus={true}
-          style={styles.default}
-          accessibilityLabel="I am the accessibility label for text input"
-        />
-      );
-    },
-  },
-  {
-    name: 'maxLength',
-    title: "Live Re-Write (<sp>  ->  '_') + maxLength",
-    render: function (): React.Node {
-      return <RewriteExample />;
-    },
-  },
-  {
-    title: 'Live Re-Write (no spaces allowed)',
-    render: function (): React.Node {
-      return <RewriteExampleInvalidCharacters />;
-    },
-  },
-  {
-    name: 'clearButton',
-    title: 'Live Re-Write (no spaces allowed) and clear',
-    render: function (): React.Node {
-      return <RewriteInvalidCharactersAndClearExample />;
-    },
-  },
-  {
-    title: 'Auto-capitalize',
-    name: 'autoCapitalize',
-    render: function (): React.Node {
-      return (
-        <View>
-          <WithLabel label="none">
-            <TextInput
-              testID="capitalize-none"
-              autoCapitalize="none"
-              style={styles.default}
-            />
-          </WithLabel>
-          <WithLabel label="sentences">
-            <TextInput
-              testID="capitalize-sentences"
-              autoCapitalize="sentences"
-              style={styles.default}
-            />
-          </WithLabel>
-          <WithLabel label="words">
-            <TextInput
-              testID="capitalize-words"
-              autoCapitalize="words"
-              style={styles.default}
-            />
-          </WithLabel>
-          <WithLabel label="characters">
-            <TextInput
-              testID="capitalize-characters"
-              autoCapitalize="characters"
-              style={styles.default}
-            />
-          </WithLabel>
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Auto-correct',
-    render: function (): React.Node {
-      return (
-        <View>
-          <WithLabel label="true">
-            <TextInput autoCorrect={true} style={styles.default} />
-          </WithLabel>
-          <WithLabel label="false">
-            <TextInput autoCorrect={false} style={styles.default} />
-          </WithLabel>
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Keyboard types',
-    name: 'keyboardTypes',
-    render: function (): React.Node {
-      const keyboardTypes = [
-        'default',
-        'ascii-capable',
-        'numbers-and-punctuation',
-        'url',
-        'number-pad',
-        'phone-pad',
-        'name-phone-pad',
-        'email-address',
-        'decimal-pad',
-        'twitter',
-        'web-search',
-        'ascii-capable-number-pad',
-        'numeric',
-      ];
-      const examples = keyboardTypes.map(type => {
-        return (
-          <WithLabel key={type} label={type}>
-            <TextInput keyboardType={type} style={styles.default} />
-          </WithLabel>
-        );
-      });
-      return <View>{examples}</View>;
-    },
-  },
-  {
-    title: 'Blur on submit',
-    render: function (): React.Element<any> {
-      return <BlurOnSubmitExample />;
-    },
-  },
-  {
-    title: 'Event handling',
-    render: function (): React.Element<any> {
-      return <TextEventsExample />;
-    },
-  },
-  {
-    title: 'fontFamily, fontWeight and fontStyle',
-    render: function (): React.Node {
-      const fontFamilyA = Platform.OS === 'ios' ? 'Cochin' : 'sans-serif';
-      const fontFamilyB = Platform.OS === 'ios' ? 'Courier' : 'serif';
-
-      return (
-        <View>
-          <TextInput
-            style={[styles.singleLine, {fontFamily: fontFamilyA}]}
-            placeholder={`Custom fonts like ${fontFamilyA} are supported`}
-          />
-          <TextInput
-            style={[
-              styles.singleLine,
-              {fontFamily: fontFamilyA, fontWeight: 'bold'},
-            ]}
-            placeholder={`${fontFamilyA} bold`}
-          />
-          <TextInput
-            style={[
-              styles.singleLine,
-              {fontFamily: fontFamilyA, fontWeight: '500'},
-            ]}
-            placeholder={`${fontFamilyA} 500`}
-          />
-          <TextInput
-            style={[
-              styles.singleLine,
-              {fontFamily: fontFamilyA, fontStyle: 'italic'},
-            ]}
-            placeholder={`${fontFamilyA} italic`}
-          />
-          <TextInput
-            style={[styles.singleLine, {fontFamily: fontFamilyB}]}
-            placeholder={fontFamilyB}
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Attributed text',
-    name: 'attributedText',
-    render: function (): React.Node {
-      return <TokenizedTextExample />;
-    },
-  },
-  {
-    title: 'Text selection & cursor placement',
-    name: 'cursorPlacement',
-    render: function (): React.Node {
-      return (
-        <View>
-          <SelectionExample
-            testID="singleline"
-            style={styles.default}
-            value="text selection can be changed"
-          />
-          <SelectionExample
-            testID="multiline"
-            multiline
-            style={styles.multiline}
-            value={'multiline text selection\ncan also be changed'}
-          />
-        </View>
-      );
-    },
-  },
-  {
-    title: 'Text selection & cursor placement (imperative)',
-    name: 'cursorPlacementImperative',
-    render: function (): React.Node {
-      return (
-        <View>
-          <SelectionExample
-            testID="singlelineImperative"
-            style={styles.default}
-            value="text selection can be changed imperatively"
-            imperative={true}
-          />
-          <SelectionExample
-            testID="multilineImperative"
-            multiline
-            style={styles.multiline}
-            value={'multiline text selection\ncan also be changed imperatively'}
-            imperative={true}
-          />
-        </View>
-      );
-    },
-  },
   {
     title: 'Error Message',
     render: function (): React.Node {

From 3c8bdc1552010309210ac3725322a331fccb9cbd Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Mon, 28 Mar 2022 16:05:31 +0800
Subject: [PATCH 19/33] error message is taken from the
 state.errorMessageAndroid instead of props

---
 .../facebook/react/views/textinput/ReactTextInputManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index f9b9d3ff57..8f3bd833a2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1339,6 +1339,6 @@ public Object updateState(
         textBreakStrategy,
         TextAttributeProps.getJustificationMode(props),
         containsMultipleFragments,
-        errorMessage);
+        state.getString("errorMessageAndroid"));
   }
 }

From b03ac7e04e446a06272d22e4abdadcda7f5fc992 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Mon, 28 Mar 2022 16:26:26 +0800
Subject: [PATCH 20/33] set null errorMessage in java if error is empty string

---
 .../views/textinput/ReactTextInputManager.java    | 15 +++++++++++----
 .../AndroidTextInputComponentDescriptor.h         |  2 +-
 .../AndroidTextInputShadowNode.cpp                |  6 ------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 8f3bd833a2..ee9067ca09 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1328,9 +1328,16 @@ public Object updateState(
     int textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(paragraphAttributes.getString("textBreakStrategy"));
 
-    @Nullable
-    String errorMessage =
-        props.hasKey("errorMessageAndroid") ? props.getString("errorMessageAndroid") : null;
+    @Nullable String errorMessageAndroid;
+    if (state.hasKey("errorMessageAndroid")) {
+      String string = state.getString("errorMessageAndroid");
+      Log.w("TESTING::ReactTextInputManager", "string: " + (string));
+      Log.w("TESTING::ReactTextInputManager", "string.length(): " + (string.length()));
+      errorMessageAndroid = string.length() > 0 ? string : null;
+      Log.w("TESTING::ReactTextInputManager", "errorMessageAndroid: " + (errorMessageAndroid));
+    } else {
+      errorMessageAndroid = null;
+    }
 
     return ReactTextUpdate.buildReactTextUpdateFromState(
         spanned,
@@ -1339,6 +1346,6 @@ public Object updateState(
         textBreakStrategy,
         TextAttributeProps.getJustificationMode(props),
         containsMultipleFragments,
-        state.getString("errorMessageAndroid"));
+        errorMessageAndroid);
   }
 }
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
index 181520f4e0..623f1bc4bd 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -70,7 +70,7 @@ class AndroidTextInputComponentDescriptor final
       env->DeleteLocalRef(defaultTextInputPaddingArray);
     }
 
-    std::string error = "AndroidTextInputComponentDescriptor";
+    std::string error = "";
     return std::make_shared<AndroidTextInputShadowNode::ConcreteState>(
         std::make_shared<AndroidTextInputState const>(AndroidTextInputState(
             0,
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
index 6bac8bccd7..a1ce19c4be 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -149,12 +149,6 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
            ? 0
            : getConcreteProps().mostRecentEventCount);
   auto newAttributedString = getMostRecentAttributedString();
-  // std::string mostRecentEventCountToString =
-  //     std::to_string(state.mostRecentEventCount);
-  // std::string defaultTextAttributesToString =
-  // std::to_string(defaultTextAttributes);
-  // LOG(ERROR) << "TESTING: state.errorMessageAndroid" + state.errorMessageAndroid;
-  // LOG(ERROR) << "TESTING: defaultTextAttributes" + defaultTextAttributesToString;
   // Even if we're here and updating state, it may be only to update the layout
   // manager If that is the case, make sure we don't update text: pass in the
   // current attributedString unchanged, and pass in zero for the "event count"

From c83510ba656605419ab7c06dede4c630e109090f Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:10:50 +0800
Subject: [PATCH 21/33] trigger error message from paragraphAttributes

1) include errorMessageAndroid in the cpp paragraphAttributes
2) trigger in ReactTextInputManager the error
---
 .../react/views/textinput/ReactTextInputManager.java       | 4 ++--
 ReactCommon/react/renderer/attributedstring/conversions.h  | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index ee9067ca09..73dfeea880 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1329,8 +1329,8 @@ public Object updateState(
         TextAttributeProps.getTextBreakStrategy(paragraphAttributes.getString("textBreakStrategy"));
 
     @Nullable String errorMessageAndroid;
-    if (state.hasKey("errorMessageAndroid")) {
-      String string = state.getString("errorMessageAndroid");
+    if (paragraphAttributes.hasKey("errorMessageAndroid")) {
+      String string = paragraphAttributes.getString("errorMessageAndroid");
       Log.w("TESTING::ReactTextInputManager", "string: " + (string));
       Log.w("TESTING::ReactTextInputManager", "string.length(): " + (string.length()));
       errorMessageAndroid = string.length() > 0 ? string : null;
diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
index 7e4f3cb60a..a3ff4359ed 100644
--- a/ReactCommon/react/renderer/attributedstring/conversions.h
+++ b/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -762,7 +762,12 @@ inline ParagraphAttributes convertRawProp(
       "android_hyphenationFrequency",
       sourceParagraphAttributes.android_hyphenationFrequency,
       defaultParagraphAttributes.android_hyphenationFrequency);
-  paragraphAttributes.errorMessageAndroid = sourceParagraphAttributes.errorMessageAndroid;
+  paragraphAttributes.errorMessageAndroid = convertRawProp(
+      context,
+      rawProps,
+      "errorMessageAndroid",
+      sourceParagraphAttributes.errorMessageAndroid,
+      defaultParagraphAttributes.errorMessageAndroid);
 
   return paragraphAttributes;
 }

From ca38b9cf3c89f1e6e406a0d93b67126f8567ea95 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:15:36 +0800
Subject: [PATCH 22/33] adding errorMessageAndroid to Text.js props

---
 Libraries/Text/TextNativeComponent.js | 1 +
 Libraries/Text/TextProps.js           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Libraries/Text/TextNativeComponent.js b/Libraries/Text/TextNativeComponent.js
index b5d5557e38..8f7e5360cb 100644
--- a/Libraries/Text/TextNativeComponent.js
+++ b/Libraries/Text/TextNativeComponent.js
@@ -45,6 +45,7 @@ export const NativeText: HostComponent<NativeTextProps> =
       onInlineViewLayout: true,
       dataDetectorType: true,
       android_hyphenationFrequency: true,
+      errorMessageAndroid: true,
     },
     directEventTypes: {
       topTextLayout: {
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index e07f315e53..f43d621bb5 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -68,6 +68,7 @@ export type TextProps = $ReadOnly<{|
    *
    */
   android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
+  errorMessageAndroid?: ?Stringish,
   children?: ?Node,
 
   /**

From 4828e1d92adeff899dc09343cd783d63dec7c02d Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:15:56 +0800
Subject: [PATCH 23/33] Revert "adding errorMessageAndroid to Text.js props"

This reverts commit ca38b9cf3c89f1e6e406a0d93b67126f8567ea95.
---
 Libraries/Text/TextNativeComponent.js | 1 -
 Libraries/Text/TextProps.js           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Libraries/Text/TextNativeComponent.js b/Libraries/Text/TextNativeComponent.js
index 8f7e5360cb..b5d5557e38 100644
--- a/Libraries/Text/TextNativeComponent.js
+++ b/Libraries/Text/TextNativeComponent.js
@@ -45,7 +45,6 @@ export const NativeText: HostComponent<NativeTextProps> =
       onInlineViewLayout: true,
       dataDetectorType: true,
       android_hyphenationFrequency: true,
-      errorMessageAndroid: true,
     },
     directEventTypes: {
       topTextLayout: {
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index f43d621bb5..e07f315e53 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -68,7 +68,6 @@ export type TextProps = $ReadOnly<{|
    *
    */
   android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
-  errorMessageAndroid?: ?Stringish,
   children?: ?Node,
 
   /**

From 418945d3a8471d20a7108dd99055c754a1dc32da Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:17:39 +0800
Subject: [PATCH 24/33] adding errorMessageAndroid to TextAnchorView.java

---
 .../react/views/text/ReactTextAnchorViewManager.java         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
index 06cd9c5853..d60331e9e6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
@@ -105,6 +105,11 @@ public void setSelectionColor(ReactTextView view, @Nullable Integer color) {
     }
   }
 
+  @ReactProp(name = "errorMessageAndroid")
+  public void setErrorMessage(ReactTextView view, @Nullable String error) {
+    view.setError(error);
+  }
+
   @ReactProp(name = "android_hyphenationFrequency")
   public void setAndroidHyphenationFrequency(ReactTextView view, @Nullable String frequency) {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {

From aa3229ff5ec04418c9af94df979f060bd02f3ec7 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:17:45 +0800
Subject: [PATCH 25/33] Revert "adding errorMessageAndroid to
 TextAnchorView.java"

This reverts commit 418945d3a8471d20a7108dd99055c754a1dc32da.
---
 .../react/views/text/ReactTextAnchorViewManager.java         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
index d60331e9e6..06cd9c5853 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
@@ -105,11 +105,6 @@ public void setSelectionColor(ReactTextView view, @Nullable Integer color) {
     }
   }
 
-  @ReactProp(name = "errorMessageAndroid")
-  public void setErrorMessage(ReactTextView view, @Nullable String error) {
-    view.setError(error);
-  }
-
   @ReactProp(name = "android_hyphenationFrequency")
   public void setAndroidHyphenationFrequency(ReactTextView view, @Nullable String frequency) {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {

From 74725bce48b9deb2297f63f2bf295faf6fae4497 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:30:31 +0800
Subject: [PATCH 26/33] move errorMessage from AndroidTextInputState to
 paragraphAttributes

---
 .../AndroidTextInputComponentDescriptor.h                | 3 +--
 .../androidtextinput/AndroidTextInputShadowNode.cpp      | 9 +++++----
 .../androidtextinput/AndroidTextInputState.cpp           | 7 +------
 .../components/androidtextinput/AndroidTextInputState.h  | 6 +-----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
index 623f1bc4bd..57408cac36 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -82,8 +82,7 @@ class AndroidTextInputComponentDescriptor final
             ((YGValue)theme[YGEdgeStart]).value,
             ((YGValue)theme[YGEdgeEnd]).value,
             ((YGValue)theme[YGEdgeTop]).value,
-            ((YGValue)theme[YGEdgeBottom]).value,
-            error)),
+            ((YGValue)theme[YGEdgeBottom]).value)),
         family);
   }
 
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
index a1ce19c4be..9d89062b1d 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -133,8 +133,6 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   if (getConcreteProps().mostRecentEventCount < state.mostRecentEventCount) {
     return;
   }
-  LOG(ERROR) << "TESTING:: getConcreteProps().errorMessageAndroid: " << getConcreteProps().errorMessageAndroid;
-  LOG(ERROR) << "TESTING:: state.errorMessageAndroid: " << state.errorMessageAndroid;
 
   // Store default TextAttributes in state.
   // In the case where the TextInput is completely empty (no value, no
@@ -154,7 +152,11 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
+  /*
   std::string errorMessageAndroid = getConcreteProps().errorMessageAndroid;
+  ParagraphAttributes paragraphAttributes = getConcreteProps().paragraphAttributes;
+  paragraphAttributes.errorMessageAndroid = errorMessageAndroid;
+  */
   setStateData(AndroidTextInputState{
       newEventCount,
       newAttributedString,
@@ -165,8 +167,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
       state.defaultThemePaddingStart,
       state.defaultThemePaddingEnd,
       state.defaultThemePaddingTop,
-      state.defaultThemePaddingBottom,
-      errorMessageAndroid});
+      state.defaultThemePaddingBottom});
 }
 
 #pragma mark - LayoutableShadowNode
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
index ffd237e79e..20a597fdad 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
@@ -31,13 +31,11 @@ AndroidTextInputState::AndroidTextInputState(
     float defaultThemePaddingStart,
     float defaultThemePaddingEnd,
     float defaultThemePaddingTop,
-    float defaultThemePaddingBottom,
-    std::string defaultErrorMessageAndroid)
+    float defaultThemePaddingBottom)
     : mostRecentEventCount(mostRecentEventCount),
       attributedString(std::move(attributedString)),
       reactTreeAttributedString(std::move(reactTreeAttributedString)),
       paragraphAttributes(std::move(paragraphAttributes)),
-      errorMessageAndroid(defaultErrorMessageAndroid),
       defaultTextAttributes(std::move(defaultTextAttributes)),
       defaultParentShadowView(std::move(defaultParentShadowView)),
       defaultThemePaddingStart(defaultThemePaddingStart),
@@ -59,7 +57,6 @@ AndroidTextInputState::AndroidTextInputState(
       attributedString(previousState.attributedString),
       reactTreeAttributedString(previousState.reactTreeAttributedString),
       paragraphAttributes(previousState.paragraphAttributes),
-      errorMessageAndroid(previousState.errorMessageAndroid),
       defaultTextAttributes(previousState.defaultTextAttributes),
       defaultParentShadowView(previousState.defaultParentShadowView),
       defaultThemePaddingStart(data.getDefault(
@@ -89,7 +86,6 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   // called from Java to trigger a relayout with a `cachedAttributedStringId`,
   // so Java has all up-to-date information and we should pass an empty map
   // through.
-  LOG(ERROR) << "TESTING:: errorMessageAndroid: " << errorMessageAndroid;
 
   if (cachedAttributedStringId == 0) {
     newState["mostRecentEventCount"] = mostRecentEventCount;
@@ -97,7 +93,6 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
     newState["hash"] = newState["attributedString"]["hash"];
     newState["paragraphAttributes"] = toDynamic(
         paragraphAttributes); // TODO: can we memoize this in Java?
-    newState["errorMessageAndroid"] = errorMessageAndroid;
   }
   return newState;
 }
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
index 1915427c56..ed66f93743 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
@@ -55,8 +55,6 @@ class AndroidTextInputState final {
    */
   ParagraphAttributes paragraphAttributes{};
 
-  std::string errorMessageAndroid{};
-
   /**
    * Default TextAttributes used if we need to construct a new Fragment.
    * Only used if text is inserted into an AttributedString with no existing
@@ -79,7 +77,6 @@ class AndroidTextInputState final {
   float defaultThemePaddingEnd{NAN};
   float defaultThemePaddingTop{NAN};
   float defaultThemePaddingBottom{NAN};
-  std::string defaultErrorMessageAndroid{};
 
   AndroidTextInputState(
       int64_t mostRecentEventCount,
@@ -91,8 +88,7 @@ class AndroidTextInputState final {
       float defaultThemePaddingStart,
       float defaultThemePaddingEnd,
       float defaultThemePaddingTop,
-      float defaultThemePaddingBottom,
-      std::string defaultErrorMessageAndroid);
+      float defaultThemePaddingBottom);
 
   AndroidTextInputState() = default;
   AndroidTextInputState(

From 847091d5ed10f5b00987d0f74400e4d0f9d62191 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:35:28 +0800
Subject: [PATCH 27/33] remove formatting changes to AndroidTextInputProps.cpp

---
 .../AndroidTextInputProps.cpp                 | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
index e576636440..22f608e365 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
@@ -48,39 +48,27 @@ AndroidTextInputProps::AndroidTextInputProps(
           "autoComplete",
           sourceProps.autoComplete,
           {})),
-      returnKeyLabel(convertRawProp(
-          context,
-          rawProps,
+      returnKeyLabel(convertRawProp(context, rawProps,
           "returnKeyLabel",
           sourceProps.returnKeyLabel,
           {})),
-      numberOfLines(convertRawProp(
-          context,
-          rawProps,
+      numberOfLines(convertRawProp(context, rawProps,
           "numberOfLines",
           sourceProps.numberOfLines,
           {0})),
-      disableFullscreenUI(convertRawProp(
-          context,
-          rawProps,
+      disableFullscreenUI(convertRawProp(context, rawProps,
           "disableFullscreenUI",
           sourceProps.disableFullscreenUI,
           {false})),
-      textBreakStrategy(convertRawProp(
-          context,
-          rawProps,
+      textBreakStrategy(convertRawProp(context, rawProps,
           "textBreakStrategy",
           sourceProps.textBreakStrategy,
           {})),
-      underlineColorAndroid(convertRawProp(
-          context,
-          rawProps,
+      underlineColorAndroid(convertRawProp(context, rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      errorMessageAndroid(convertRawProp(
-          context,
-          rawProps,
+      errorMessageAndroid(convertRawProp(context, rawProps,
           "errorMessageAndroid",
           sourceProps.errorMessageAndroid,
           {})),

From c1a6416b7d347ad1a47a46a7447687a6e783b9e8 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:40:38 +0800
Subject: [PATCH 28/33] clean up diff .cpp files

---
 .../attributedstring/ParagraphAttributes.cpp    |  2 --
 .../attributedstring/TextAttributes.cpp         |  2 --
 .../components/text/ParagraphShadowNode.cpp     |  2 --
 .../AndroidTextInputShadowNode.cpp              |  9 ++-------
 .../androidtextinput/AndroidTextInputState.cpp  | 17 +++++------------
 .../textinput/iostextinput/TextInputProps.cpp   |  6 ------
 6 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
index 81db8a792d..f08e0f36a5 100644
--- a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
@@ -16,8 +16,6 @@ namespace facebook {
 namespace react {
 
 bool ParagraphAttributes::operator==(const ParagraphAttributes &rhs) const {
-  LOG(ERROR) << "TESTING:: rhs.maximumNumberOfLines: " << rhs.maximumNumberOfLines;
-  LOG(ERROR) << "TESTING:: rhs.errorMessageAndroid: " << rhs.errorMessageAndroid;
   return std::tie(
              maximumNumberOfLines,
              ellipsizeMode,
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
index 4e6f59d5f4..3728f0c361 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -93,7 +93,6 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   layoutDirection = textAttributes.layoutDirection.has_value()
       ? textAttributes.layoutDirection
       : layoutDirection;
-  // LOG(ERROR) << "TESTING:: " << (std::string)getDebugProps();
   accessibilityRole = textAttributes.accessibilityRole.has_value()
       ? textAttributes.accessibilityRole
       : accessibilityRole;
@@ -160,7 +159,6 @@ TextAttributes TextAttributes::defaultTextAttributes() {
     textAttributes.backgroundColor = clearColor();
     textAttributes.fontSize = 14.0;
     textAttributes.fontSizeMultiplier = 1.0;
-    textAttributes.errorMessageAndroid = "TextAttributes defaultTextAttributes";
     return textAttributes;
   }();
   return textAttributes;
diff --git a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
index 30a1319624..7c42ae7672 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
@@ -109,7 +109,6 @@ void ParagraphShadowNode::updateStateIfNeeded(Content const &content) {
     return;
   }
 
-  // content.attributedString.errorMessageAndroid = "updateStateIfNeeded";
   setStateData(ParagraphState{
       content.attributedString,
       content.paragraphAttributes,
@@ -133,7 +132,6 @@ Size ParagraphShadowNode::measureContent(
     auto string = BaseTextShadowNode::getEmptyPlaceholder();
     auto textAttributes = TextAttributes::defaultTextAttributes();
     textAttributes.fontSizeMultiplier = layoutContext.fontSizeMultiplier;
-    textAttributes.errorMessageAndroid = "error";
     textAttributes.apply(getConcreteProps().textAttributes);
     attributedString.appendFragment({string, textAttributes, {}});
   }
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
index 9d89062b1d..fa497f2e13 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
@@ -7,7 +7,6 @@
 
 #include "AndroidTextInputShadowNode.h"
 
-#include <glog/logging.h>
 #include <fbjni/fbjni.h>
 #include <react/debug/react_native_assert.h>
 #include <react/jni/ReadableNativeMap.h>
@@ -17,7 +16,7 @@
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
 #include <react/renderer/core/conversions.h>
-#include <string>
+
 #include <utility>
 
 using namespace facebook::jni;
@@ -147,16 +146,12 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
            ? 0
            : getConcreteProps().mostRecentEventCount);
   auto newAttributedString = getMostRecentAttributedString();
+
   // Even if we're here and updating state, it may be only to update the layout
   // manager If that is the case, make sure we don't update text: pass in the
   // current attributedString unchanged, and pass in zero for the "event count"
   // so no changes are applied There's no way to prevent a state update from
   // flowing to Java, so we just ensure it's a noop in those cases.
-  /*
-  std::string errorMessageAndroid = getConcreteProps().errorMessageAndroid;
-  ParagraphAttributes paragraphAttributes = getConcreteProps().paragraphAttributes;
-  paragraphAttributes.errorMessageAndroid = errorMessageAndroid;
-  */
   setStateData(AndroidTextInputState{
       newEventCount,
       newAttributedString,
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
index 20a597fdad..a2deb59db3 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
@@ -5,19 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <glog/logging.h>
-
-#include <logger/react_native_log.h>
-#include <glog/logging.h>
-#include <logger/react_native_log.h>
 #include "AndroidTextInputState.h"
-#include <iostream>
+
 #include <react/renderer/components/text/conversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
-#include <string>
 
 #include <utility>
-using namespace std;
+
 namespace facebook {
 namespace react {
 
@@ -74,7 +68,7 @@ AndroidTextInputState::AndroidTextInputState(
       defaultThemePaddingBottom(data.getDefault(
                                         "themePaddingBottom",
                                         previousState.defaultThemePaddingBottom)
-                                    .getDouble()) {};
+                                    .getDouble()){};
 
 #ifdef ANDROID
 folly::dynamic AndroidTextInputState::getDynamic() const {
@@ -86,13 +80,12 @@ folly::dynamic AndroidTextInputState::getDynamic() const {
   // called from Java to trigger a relayout with a `cachedAttributedStringId`,
   // so Java has all up-to-date information and we should pass an empty map
   // through.
-
   if (cachedAttributedStringId == 0) {
     newState["mostRecentEventCount"] = mostRecentEventCount;
     newState["attributedString"] = toDynamic(attributedString);
     newState["hash"] = newState["attributedString"]["hash"];
-    newState["paragraphAttributes"] = toDynamic(
-        paragraphAttributes); // TODO: can we memoize this in Java?
+    newState["paragraphAttributes"] =
+        toDynamic(paragraphAttributes); // TODO: can we memoize this in Java?
   }
   return newState;
 }
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
index 4e3d52bfc3..a8716286ae 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
@@ -69,12 +69,6 @@ TextInputProps::TextInputProps(
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      errorMessageAndroid(convertRawProp(
-          context,
-          rawProps,
-          "errorMessageAndroid",
-          sourceProps.errorMessageAndroid,
-          {})),
       text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
       mostRecentEventCount(convertRawProp(
           context,

From cea3355a7639ab718eb11f985ecda2f7a9ad2bf5 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 09:44:53 +0800
Subject: [PATCH 29/33] clean up diff .h files

---
 ReactCommon/react/renderer/attributedstring/TextAttributes.h  | 4 +---
 ReactCommon/react/renderer/attributedstring/conversions.h     | 2 --
 .../androidtextinput/AndroidTextInputComponentDescriptor.h    | 3 +--
 .../components/androidtextinput/AndroidTextInputState.h       | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
index 8e2e74fec0..82b8547507 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.h
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
@@ -78,7 +78,6 @@ class TextAttributes : public DebugStringConvertible {
   // construction.
   std::optional<LayoutDirection> layoutDirection{};
   std::optional<AccessibilityRole> accessibilityRole{};
-  std::optional<std::string> errorMessageAndroid{"TextAttributes"};
 
 #pragma mark - Operations
 
@@ -130,8 +129,7 @@ struct hash<facebook::react::TextAttributes> {
         textAttributes.textShadowColor,
         textAttributes.isHighlighted,
         textAttributes.layoutDirection,
-        textAttributes.accessibilityRole,
-        textAttributes.errorMessageAndroid);
+        textAttributes.accessibilityRole);
   }
 };
 } // namespace std
diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
index a3ff4359ed..58cccd21d3 100644
--- a/ReactCommon/react/renderer/attributedstring/conversions.h
+++ b/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -592,7 +592,6 @@ inline void fromRawValue(
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
-    LOG(ERROR) << "TESTING:: AccessibilityRole: " << string;
     if (string == "none") {
       result = AccessibilityRole::None;
     } else if (string == "button") {
@@ -686,7 +685,6 @@ inline void fromRawValue(
   react_native_assert(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
-    LOG(ERROR) << "TESTING:: HyphenationFrequency value: " << string;
     if (string == "none") {
       result = HyphenationFrequency::None;
     } else if (string == "normal") {
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
index 57408cac36..60c1490878 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -16,7 +16,7 @@
 #include <yoga/YGValue.h>
 
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <string>
+
 namespace facebook {
 namespace react {
 
@@ -70,7 +70,6 @@ class AndroidTextInputComponentDescriptor final
       env->DeleteLocalRef(defaultTextInputPaddingArray);
     }
 
-    std::string error = "";
     return std::make_shared<AndroidTextInputShadowNode::ConcreteState>(
         std::make_shared<AndroidTextInputState const>(AndroidTextInputState(
             0,
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
index ed66f93743..4dc50ac941 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
@@ -10,7 +10,6 @@
 #include <react/renderer/attributedstring/AttributedString.h>
 #include <react/renderer/attributedstring/ParagraphAttributes.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
-#include <string>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>

From 70778d7d6afb839634f1e5b01872975d416b7142 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 10:07:20 +0800
Subject: [PATCH 30/33] clean up diff for all files

---
 .../react/views/text/TextLayoutManagerMapBuffer.java         | 1 -
 ReactCommon/react/renderer/attributedstring/conversions.h    | 4 ----
 ReactCommon/react/renderer/components/text/conversions.h     | 5 ++---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
index 3f8ffd530b..b73c0e5fa0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
@@ -62,7 +62,6 @@ public class TextLayoutManagerMapBuffer {
   public static final short PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
   public static final short PA_KEY_INCLUDE_FONT_PADDING = 4;
   public static final short PA_KEY_HYPHENATION_FREQUENCY = 5;
-  public static final short PA_KEY_ERROR_MESSAGE = 6;
 
   private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false;
 
diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
index 58cccd21d3..dc8ec74afc 100644
--- a/ReactCommon/react/renderer/attributedstring/conversions.h
+++ b/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -999,7 +999,6 @@ constexpr static MapBuffer::Key PA_KEY_TEXT_BREAK_STRATEGY = 2;
 constexpr static MapBuffer::Key PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
 constexpr static MapBuffer::Key PA_KEY_INCLUDE_FONT_PADDING = 4;
 constexpr static MapBuffer::Key PA_KEY_HYPHENATION_FREQUENCY = 5;
-constexpr static MapBuffer::Key PA_KEY_ERROR_MESSAGE = 6;
 
 inline MapBuffer toMapBuffer(const ParagraphAttributes &paragraphAttributes) {
   auto builder = MapBufferBuilder();
@@ -1017,9 +1016,6 @@ inline MapBuffer toMapBuffer(const ParagraphAttributes &paragraphAttributes) {
   builder.putString(
       PA_KEY_HYPHENATION_FREQUENCY,
       toString(paragraphAttributes.android_hyphenationFrequency));
-  builder.putString(
-      PA_KEY_ERROR_MESSAGE,
-      toString(paragraphAttributes.errorMessageAndroid));
 
   return builder.build();
 }
diff --git a/ReactCommon/react/renderer/components/text/conversions.h b/ReactCommon/react/renderer/components/text/conversions.h
index dcd2ef82aa..712b8f2fde 100644
--- a/ReactCommon/react/renderer/components/text/conversions.h
+++ b/ReactCommon/react/renderer/components/text/conversions.h
@@ -21,9 +21,8 @@ inline folly::dynamic toDynamic(ParagraphState const &paragraphState) {
   folly::dynamic newState = folly::dynamic::object();
   newState["attributedString"] = toDynamic(paragraphState.attributedString);
   newState["paragraphAttributes"] =
-    toDynamic(paragraphState.paragraphAttributes);
-  newState["hash"] = 1987; // newState["attributedString"]["hash"];
-  newState["errorMessageAndroid"] = "conversions.h";
+      toDynamic(paragraphState.paragraphAttributes);
+  newState["hash"] = newState["attributedString"]["hash"];
   return newState;
 }
 

From 761396fcf196d546d54e76a07d7c97f1d20d50fb Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 10:10:17 +0800
Subject: [PATCH 31/33] delete some log messages

---
 .../facebook/react/views/textinput/ReactTextInputManager.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 73dfeea880..9bdc76031b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1331,10 +1331,7 @@ public Object updateState(
     @Nullable String errorMessageAndroid;
     if (paragraphAttributes.hasKey("errorMessageAndroid")) {
       String string = paragraphAttributes.getString("errorMessageAndroid");
-      Log.w("TESTING::ReactTextInputManager", "string: " + (string));
-      Log.w("TESTING::ReactTextInputManager", "string.length(): " + (string.length()));
       errorMessageAndroid = string.length() > 0 ? string : null;
-      Log.w("TESTING::ReactTextInputManager", "errorMessageAndroid: " + (errorMessageAndroid));
     } else {
       errorMessageAndroid = null;
     }

From 27c55f105e23211d990f84ae8b10f1280dedb7b6 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 11:34:11 +0800
Subject: [PATCH 32/33] remove null type from errorMessage

this solution has some disadvantages
- differs from current API proposal
- user can not set empty error message

maybe better solution to set null type in cpp
---
 .../react/views/text/ReactTextUpdate.java     | 20 +++++++------------
 .../react/views/textinput/ReactEditText.java  |  6 +++++-
 .../textinput/ReactTextInputManager.java      | 13 +++++-------
 .../textinput/ReactTextInputShadowNode.java   |  3 +--
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index 5e618d3549..7ae19d6c10 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -11,7 +11,6 @@
 
 import android.text.Layout;
 import android.text.Spannable;
-import javax.annotation.Nullable;
 
 /**
  * Class that contains the data needed for a text update. Used by both <Text/> and <TextInput/>
@@ -31,7 +30,7 @@ public class ReactTextUpdate {
   private final int mSelectionStart;
   private final int mSelectionEnd;
   private final int mJustificationMode;
-  private @Nullable String mErrorMessage;
+  private String mErrorMessage;
 
   public boolean mContainsMultipleFragments;
 
@@ -61,8 +60,7 @@ public ReactTextUpdate(
         Layout.BREAK_STRATEGY_HIGH_QUALITY,
         Layout.JUSTIFICATION_MODE_NONE,
         -1,
-        -1,
-        null);
+        -1);
   }
 
   public ReactTextUpdate(
@@ -88,8 +86,7 @@ public ReactTextUpdate(
         textBreakStrategy,
         justificationMode,
         -1,
-        -1,
-        null);
+        -1);
   }
 
   public ReactTextUpdate(
@@ -111,8 +108,7 @@ public ReactTextUpdate(
         textBreakStrategy,
         justificationMode,
         -1,
-        -1,
-        null);
+        -1);
   }
 
   public ReactTextUpdate(
@@ -127,8 +123,7 @@ public ReactTextUpdate(
       int textBreakStrategy,
       int justificationMode,
       int selectionStart,
-      int selectionEnd,
-      @Nullable String errorMessage) {
+      int selectionEnd) {
     mText = text;
     mJsEventCounter = jsEventCounter;
     mContainsImages = containsImages;
@@ -141,7 +136,6 @@ public ReactTextUpdate(
     mSelectionStart = selectionStart;
     mSelectionEnd = selectionEnd;
     mJustificationMode = justificationMode;
-    mErrorMessage = errorMessage;
   }
 
   public static ReactTextUpdate buildReactTextUpdateFromState(
@@ -151,7 +145,7 @@ public static ReactTextUpdate buildReactTextUpdateFromState(
       int textBreakStrategy,
       int justificationMode,
       boolean containsMultipleFragments,
-      @Nullable String errorMessage) {
+      String errorMessage) {
 
     ReactTextUpdate reactTextUpdate =
         new ReactTextUpdate(
@@ -161,7 +155,7 @@ public static ReactTextUpdate buildReactTextUpdateFromState(
     return reactTextUpdate;
   }
 
-  public @Nullable String getErrorMessage() {
+  public String getErrorMessage() {
     return mErrorMessage;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index e468f8f279..0321de10fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -514,7 +514,11 @@ public void maybeSetErrorMessage(int eventCounter, String errorMessage) {
     if (!canUpdateWithEventCount(eventCounter) || getError() == errorMessage) {
       return;
     }
-    setError(errorMessage);
+    if (errorMessage.length() == 0) {
+      setError(null);
+    } else {
+      setError(errorMessage);
+    }
   }
 
   public void maybeSetTextFromJS(ReactTextUpdate reactTextUpdate) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 9bdc76031b..20632c0da3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -326,7 +326,7 @@ private ReactTextUpdate getReactTextUpdate(
     sb.append(TextTransform.apply(text, TextTransform.UNSET));
 
     return new ReactTextUpdate(
-        sb, mostRecentEventCount, false, 0, 0, 0, 0, Gravity.NO_GRAVITY, 0, 0, start, end, null);
+        sb, mostRecentEventCount, false, 0, 0, 0, 0, Gravity.NO_GRAVITY, 0, 0, start, end);
   }
 
   @Override
@@ -1328,13 +1328,10 @@ public Object updateState(
     int textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(paragraphAttributes.getString("textBreakStrategy"));
 
-    @Nullable String errorMessageAndroid;
-    if (paragraphAttributes.hasKey("errorMessageAndroid")) {
-      String string = paragraphAttributes.getString("errorMessageAndroid");
-      errorMessageAndroid = string.length() > 0 ? string : null;
-    } else {
-      errorMessageAndroid = null;
-    }
+    String errorMessageAndroid =
+        paragraphAttributes.hasKey("errorMessageAndroid")
+            ? paragraphAttributes.getString("errorMessageAndroid")
+            : "";
 
     return ReactTextUpdate.buildReactTextUpdateFromState(
         spanned,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
index 26e077d523..e621e1b585 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -246,8 +246,7 @@ public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
               mTextBreakStrategy,
               mJustificationMode,
               mSelectionStart,
-              mSelectionEnd,
-              null);
+              mSelectionEnd);
       uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
     }
   }

From acd4f3aa28d37f705c334461c0dadcf3bbd8a768 Mon Sep 17 00:00:00 2001
From: fabriziobertoglio1987 <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Mar 2022 11:37:35 +0800
Subject: [PATCH 33/33] Revert "remove null type from errorMessage"

This reverts commit 27c55f105e23211d990f84ae8b10f1280dedb7b6.
---
 .../react/views/text/ReactTextUpdate.java     | 20 ++++++++++++-------
 .../react/views/textinput/ReactEditText.java  |  6 +-----
 .../textinput/ReactTextInputManager.java      | 13 +++++++-----
 .../textinput/ReactTextInputShadowNode.java   |  3 ++-
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index 7ae19d6c10..5e618d3549 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -11,6 +11,7 @@
 
 import android.text.Layout;
 import android.text.Spannable;
+import javax.annotation.Nullable;
 
 /**
  * Class that contains the data needed for a text update. Used by both <Text/> and <TextInput/>
@@ -30,7 +31,7 @@ public class ReactTextUpdate {
   private final int mSelectionStart;
   private final int mSelectionEnd;
   private final int mJustificationMode;
-  private String mErrorMessage;
+  private @Nullable String mErrorMessage;
 
   public boolean mContainsMultipleFragments;
 
@@ -60,7 +61,8 @@ public ReactTextUpdate(
         Layout.BREAK_STRATEGY_HIGH_QUALITY,
         Layout.JUSTIFICATION_MODE_NONE,
         -1,
-        -1);
+        -1,
+        null);
   }
 
   public ReactTextUpdate(
@@ -86,7 +88,8 @@ public ReactTextUpdate(
         textBreakStrategy,
         justificationMode,
         -1,
-        -1);
+        -1,
+        null);
   }
 
   public ReactTextUpdate(
@@ -108,7 +111,8 @@ public ReactTextUpdate(
         textBreakStrategy,
         justificationMode,
         -1,
-        -1);
+        -1,
+        null);
   }
 
   public ReactTextUpdate(
@@ -123,7 +127,8 @@ public ReactTextUpdate(
       int textBreakStrategy,
       int justificationMode,
       int selectionStart,
-      int selectionEnd) {
+      int selectionEnd,
+      @Nullable String errorMessage) {
     mText = text;
     mJsEventCounter = jsEventCounter;
     mContainsImages = containsImages;
@@ -136,6 +141,7 @@ public ReactTextUpdate(
     mSelectionStart = selectionStart;
     mSelectionEnd = selectionEnd;
     mJustificationMode = justificationMode;
+    mErrorMessage = errorMessage;
   }
 
   public static ReactTextUpdate buildReactTextUpdateFromState(
@@ -145,7 +151,7 @@ public static ReactTextUpdate buildReactTextUpdateFromState(
       int textBreakStrategy,
       int justificationMode,
       boolean containsMultipleFragments,
-      String errorMessage) {
+      @Nullable String errorMessage) {
 
     ReactTextUpdate reactTextUpdate =
         new ReactTextUpdate(
@@ -155,7 +161,7 @@ public static ReactTextUpdate buildReactTextUpdateFromState(
     return reactTextUpdate;
   }
 
-  public String getErrorMessage() {
+  public @Nullable String getErrorMessage() {
     return mErrorMessage;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 0321de10fb..e468f8f279 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -514,11 +514,7 @@ public void maybeSetErrorMessage(int eventCounter, String errorMessage) {
     if (!canUpdateWithEventCount(eventCounter) || getError() == errorMessage) {
       return;
     }
-    if (errorMessage.length() == 0) {
-      setError(null);
-    } else {
-      setError(errorMessage);
-    }
+    setError(errorMessage);
   }
 
   public void maybeSetTextFromJS(ReactTextUpdate reactTextUpdate) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 20632c0da3..9bdc76031b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -326,7 +326,7 @@ private ReactTextUpdate getReactTextUpdate(
     sb.append(TextTransform.apply(text, TextTransform.UNSET));
 
     return new ReactTextUpdate(
-        sb, mostRecentEventCount, false, 0, 0, 0, 0, Gravity.NO_GRAVITY, 0, 0, start, end);
+        sb, mostRecentEventCount, false, 0, 0, 0, 0, Gravity.NO_GRAVITY, 0, 0, start, end, null);
   }
 
   @Override
@@ -1328,10 +1328,13 @@ public Object updateState(
     int textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(paragraphAttributes.getString("textBreakStrategy"));
 
-    String errorMessageAndroid =
-        paragraphAttributes.hasKey("errorMessageAndroid")
-            ? paragraphAttributes.getString("errorMessageAndroid")
-            : "";
+    @Nullable String errorMessageAndroid;
+    if (paragraphAttributes.hasKey("errorMessageAndroid")) {
+      String string = paragraphAttributes.getString("errorMessageAndroid");
+      errorMessageAndroid = string.length() > 0 ? string : null;
+    } else {
+      errorMessageAndroid = null;
+    }
 
     return ReactTextUpdate.buildReactTextUpdateFromState(
         spanned,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
index e621e1b585..26e077d523 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -246,7 +246,8 @@ public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
               mTextBreakStrategy,
               mJustificationMode,
               mSelectionStart,
-              mSelectionEnd);
+              mSelectionEnd,
+              null);
       uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
     }
   }