@office-iss/react-native-win32 0.72.11 → 0.72.12

package/Libraries/Components/TextInput/TextInputState.win32.js

@@ -21,8 +21,7 @@ import type {
 
 import {Commands as AndroidTextInputCommands} from '../../Components/TextInput/AndroidTextInputNativeComponent';
 import {Commands as iOSTextInputCommands} from '../../Components/TextInput/RCTSingelineTextInputNativeComponent';
-
-import {UIManager} from 'react-native';
+import {Commands as Win32TextInputCommands} from '../../Components/TextInput/Win32TextInputNativeComponent';
 
 const {findNodeHandle} = require('../../ReactNative/RendererProxy');
 const Platform = require('../../Utilities/Platform');
@@ -106,7 +105,16 @@ function focusTextInput(textField: ?ComponentRef) {
     return;
   }
 
-  if (textField != null) {
+  // [Win32
+  if (Platform.OS === 'win32' && textField != null) {
+    // On Windows, we cannot test if the currentlyFocusedInputRef equals the
+    // target ref because the call to focus on the target ref may occur before
+    // an onBlur event for the target ref has been dispatched to JS but after
+    // the target ref has lost native focus.
+    focusInput(textField);
+    Win32TextInputCommands.focus(textField);
+    // Win32]
+  } else if (textField != null) {
     const fieldCanBeFocused =
       currentlyFocusedInputRef !== textField &&
       // $FlowFixMe - `currentProps` is missing in `NativeMethods`
@@ -126,11 +134,6 @@ function focusTextInput(textField: ?ComponentRef) {
     } else if (Platform.OS === 'android') {
       AndroidTextInputCommands.focus(textField);
     }
-    // [Win32
-    else if (Platform.OS === 'win32') {
-      UIManager.focus(findNodeHandle(textField));
-    }
-    // Win32]
   }
 }
 
@@ -164,7 +167,7 @@ function blurTextInput(textField: ?ComponentRef) {
     }
     // [Win32
     else if (Platform.OS === 'win32') {
-      UIManager.blur(findNodeHandle(textField));
+      Win32TextInputCommands.blur(textField);
     }
     // Win32]
   }

package/Libraries/Components/TextInput/Win32TextInputNativeComponent.js

@@ -0,0 +1,23 @@
+/**
+ * @flow
+ * @format
+ */
+
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
+
+import requireNativeComponent from '../../ReactNative/requireNativeComponent';
+import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import type {TextInputNativeCommands} from './TextInputNativeCommands';
+type NativeType = HostComponent<mixed>;
+
+type NativeCommands = TextInputNativeCommands<NativeType>;
+
+export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
+  supportedCommands: ['focus', 'blur', 'setTextAndSelection'],
+});
+
+const WindowsTextInputComponent: NativeType =
+  requireNativeComponent<mixed>('RCTTextInput');
+
+export default WindowsTextInputComponent;
+// [Windows]

package/overrides.json

@@ -142,6 +142,10 @@
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInputState.js",
       "baseHash": "60655baaca427e1c7c1b8884833b848335c4033b"
     },
+    {
+      "type": "platform",
+      "file": "src/Libraries/Components/TextInput/Win32TextInputNativeComponent.js"
+    },
     {
       "type": "copy",
       "file": "src/Libraries/Components/ToastAndroid/ToastAndroid.win32.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.72.11",
+  "version": "0.72.12",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",