@office-iss/react-native-win32 0.84.0 → 0.85.0-preview.1

package/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js

@@ -24,6 +24,7 @@ import type {TextInputNativeCommands} from './TextInputNativeCommands';
 
 import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import {colorAttribute} from '../View/ReactNativeStyleAttributes';
 
 export type KeyboardType =
   // Cross Platform
@@ -63,7 +64,7 @@ export type ReturnKeyType =
 
 export type SubmitBehavior = 'submit' | 'blurAndSubmit' | 'newline';
 
-export type AndroidTextInputNativeProps = $ReadOnly<{
+export type AndroidTextInputNativeProps = Readonly<{
   // This allows us to inherit everything from ViewProps except for style (see below)
   // This must be commented for Fabric codegen to work.
   ...Omit<ViewProps, 'style'>,
@@ -339,13 +340,13 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * Callback that is called when the text input is blurred.
    * `target` is the reactTag of the element
    */
-  onBlur?: ?BubblingEventHandler<$ReadOnly<{target: Int32}>>,
+  onBlur?: ?BubblingEventHandler<Readonly<{target: Int32}>>,
 
   /**
    * Callback that is called when the text input is focused.
    * `target` is the reactTag of the element
    */
-  onFocus?: ?BubblingEventHandler<$ReadOnly<{target: Int32}>>,
+  onFocus?: ?BubblingEventHandler<Readonly<{target: Int32}>>,
 
   /**
    * Callback that is called when the text input's text changes.
@@ -353,7 +354,7 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * TODO: differentiate between onChange and onChangeText
    */
   onChange?: ?BubblingEventHandler<
-    $ReadOnly<{target: Int32, eventCount: Int32, text: string}>,
+    Readonly<{target: Int32, eventCount: Int32, text: string}>,
   >,
 
   /**
@@ -362,7 +363,7 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * TODO: differentiate between onChange and onChangeText
    */
   onChangeText?: ?BubblingEventHandler<
-    $ReadOnly<{target: Int32, eventCount: Int32, text: string}>,
+    Readonly<{target: Int32, eventCount: Int32, text: string}>,
   >,
 
   /**
@@ -373,18 +374,16 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * Only called for multiline text inputs.
    */
   onContentSizeChange?: ?DirectEventHandler<
-    $ReadOnly<{
+    Readonly<{
       target: Int32,
-      contentSize: $ReadOnly<{width: Double, height: Double}>,
+      contentSize: Readonly<{width: Double, height: Double}>,
     }>,
   >,
 
   /**
    * Callback that is called when text input ends.
    */
-  onEndEditing?: ?BubblingEventHandler<
-    $ReadOnly<{target: Int32, text: string}>,
-  >,
+  onEndEditing?: ?BubblingEventHandler<Readonly<{target: Int32, text: string}>>,
 
   /**
    * Callback that is called when the text input selection is changed.
@@ -392,9 +391,9 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * `{ nativeEvent: { selection: { start, end } } }`.
    */
   onSelectionChange?: ?DirectEventHandler<
-    $ReadOnly<{
+    Readonly<{
       target: Int32,
-      selection: $ReadOnly<{start: Double, end: Double}>,
+      selection: Readonly<{start: Double, end: Double}>,
     }>,
   >,
 
@@ -403,7 +402,7 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * Invalid if `multiline={true}` is specified.
    */
   onSubmitEditing?: ?BubblingEventHandler<
-    $ReadOnly<{target: Int32, text: string}>,
+    Readonly<{target: Int32, text: string}>,
   >,
 
   /**
@@ -413,7 +412,7 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * the typed-in character otherwise including `' '` for space.
    * Fires before `onChange` callbacks.
    */
-  onKeyPress?: ?BubblingEventHandler<$ReadOnly<{target: Int32, key: string}>>,
+  onKeyPress?: ?BubblingEventHandler<Readonly<{target: Int32, key: string}>>,
 
   /**
    * Invoked on content scroll with `{ nativeEvent: { contentOffset: { x, y } } }`.
@@ -421,28 +420,28 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * is not provided for performance reasons.
    */
   onScroll?: ?DirectEventHandler<
-    $ReadOnly<{
+    Readonly<{
       target: Int32,
       responderIgnoreScroll: boolean,
-      contentInset: $ReadOnly<{
+      contentInset: Readonly<{
         top: Double, // always 0 on Android
         bottom: Double, // always 0 on Android
         left: Double, // always 0 on Android
         right: Double, // always 0 on Android
       }>,
-      contentOffset: $ReadOnly<{
+      contentOffset: Readonly<{
         x: Double,
         y: Double,
       }>,
-      contentSize: $ReadOnly<{
+      contentSize: Readonly<{
         width: Double, // always 0 on Android
         height: Double, // always 0 on Android
       }>,
-      layoutMeasurement: $ReadOnly<{
+      layoutMeasurement: Readonly<{
         width: Double,
         height: Double,
       }>,
-      velocity: $ReadOnly<{
+      velocity: Readonly<{
         x: Double, // always 0 on Android
         y: Double, // always 0 on Android
       }>,
@@ -479,7 +478,7 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
    * The start and end of the text input's selection. Set start and end to
    * the same value to position the cursor.
    */
-  selection?: ?$ReadOnly<{
+  selection?: ?Readonly<{
     start: Int32,
     end?: ?Int32,
   }>,
@@ -582,7 +581,7 @@ export type AndroidTextInputNativeProps = $ReadOnly<{
   textShadowRadius?: ?Float,
   textDecorationLine?: ?string,
   fontStyle?: ?string,
-  textShadowOffset?: ?$ReadOnly<{width?: ?Double, height?: ?Double}>,
+  textShadowOffset?: ?Readonly<{width?: ?Double, height?: ?Double}>,
   lineHeight?: ?Float,
   textTransform?: ?string,
   color?: ?Int32,
@@ -650,41 +649,33 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
     placeholder: true,
     inlineImagePadding: true,
     contextMenuHidden: true,
-    textShadowColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    textShadowColor: colorAttribute,
     maxLength: true,
     selectTextOnFocus: true,
     textShadowRadius: true,
-    underlineColorAndroid: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    underlineColorAndroid: colorAttribute,
     textDecorationLine: true,
     submitBehavior: true,
     textAlignVertical: true,
     fontStyle: true,
     textShadowOffset: true,
-    selectionColor: {process: require('../../StyleSheet/processColor').default},
-    selectionHandleColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
-    placeholderTextColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    selectionColor: colorAttribute,
+    selectionHandleColor: colorAttribute,
+    placeholderTextColor: colorAttribute,
     importantForAutofill: true,
     lineHeight: true,
     textTransform: true,
     returnKeyType: true,
     keyboardType: true,
     multiline: true,
-    color: {process: require('../../StyleSheet/processColor').default},
+    color: colorAttribute,
     autoComplete: true,
     numberOfLines: true,
     letterSpacing: true,
     returnKeyLabel: true,
     fontSize: true,
     onKeyPress: true,
-    cursorColor: {process: require('../../StyleSheet/processColor').default},
+    cursorColor: colorAttribute,
     text: true,
     showSoftInputOnFocus: true,
     textAlign: true,
@@ -706,22 +697,16 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
     editable: true,
     fontVariant: true,
     borderBottomRightRadius: true,
-    borderBottomColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    borderBottomColor: colorAttribute,
     borderRadius: true,
-    borderRightColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
-    borderColor: {process: require('../../StyleSheet/processColor').default},
+    borderRightColor: colorAttribute,
+    borderColor: colorAttribute,
     borderTopRightRadius: true,
     borderStyle: true,
     borderBottomLeftRadius: true,
-    borderLeftColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    borderLeftColor: colorAttribute,
     borderTopLeftRadius: true,
-    borderTopColor: {process: require('../../StyleSheet/processColor').default},
+    borderTopColor: colorAttribute,
   },
 };
 

package/Libraries/Components/TextInput/InputAccessoryView.js

@@ -76,7 +76,7 @@ import * as React from 'react';
  * For an example, look at InputAccessoryViewExample.js in RNTester.
  */
 
-export type InputAccessoryViewProps = $ReadOnly<{
+export type InputAccessoryViewProps = Readonly<{
   +children: React.Node,
   /**
    * An ID which is used to associate this `InputAccessoryView` to

package/Libraries/Components/TextInput/RCTTextInputViewConfig.js

@@ -11,6 +11,7 @@
 import type {PartialViewConfig} from '../../Renderer/shims/ReactNativeTypes';
 
 import {ConditionallyIgnoredEventHandlers} from '../../NativeComponent/ViewConfigIgnore';
+import {colorAttribute} from '../View/ReactNativeStyleAttributes';
 
 type PartialViewConfigWithoutName = Omit<PartialViewConfig, 'uiViewClassName'>;
 
@@ -111,22 +112,16 @@ const RCTTextInputViewConfig: PartialViewConfigWithoutName = {
     textShadowRadius: true,
     letterSpacing: true,
     textDecorationStyle: true,
-    textDecorationColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
-    color: {process: require('../../StyleSheet/processColor').default},
+    textDecorationColor: colorAttribute,
+    color: colorAttribute,
     maxFontSizeMultiplier: true,
-    textShadowColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    textShadowColor: colorAttribute,
     editable: true,
     inputAccessoryViewID: true,
     inputAccessoryViewButtonLabel: true,
     caretHidden: true,
     enablesReturnKeyAutomatically: true,
-    placeholderTextColor: {
-      process: require('../../StyleSheet/processColor').default,
-    },
+    placeholderTextColor: colorAttribute,
     clearButtonMode: true,
     keyboardType: true,
     selection: true,
@@ -134,7 +129,7 @@ const RCTTextInputViewConfig: PartialViewConfigWithoutName = {
     submitBehavior: true,
     mostRecentEventCount: true,
     scrollEnabled: true,
-    selectionColor: {process: require('../../StyleSheet/processColor').default},
+    selectionColor: colorAttribute,
     contextMenuHidden: true,
     secureTextEntry: true,
     placeholder: true,

package/Libraries/Components/TextInput/TextInput.flow.js

@@ -25,20 +25,21 @@ import * as React from 'react';
 /**
  * @see TextInputProps.onChange
  */
-type TextInputChangeEventData = $ReadOnly<{
+type TextInputChangeEventData = Readonly<{
   eventCount: number,
   target: number,
   text: string,
+  selection?: Selection,
 }>;
 
 export type TextInputChangeEvent =
   NativeSyntheticEvent<TextInputChangeEventData>;
 
 export type TextInputEvent = NativeSyntheticEvent<
-  $ReadOnly<{
+  Readonly<{
     eventCount: number,
     previousText: string,
-    range: $ReadOnly<{
+    range: Readonly<{
       start: number,
       end: number,
     }>,
@@ -47,9 +48,9 @@ export type TextInputEvent = NativeSyntheticEvent<
   }>,
 >;
 
-type TextInputContentSizeChangeEventData = $ReadOnly<{
+type TextInputContentSizeChangeEventData = Readonly<{
   target: number,
-  contentSize: $ReadOnly<{
+  contentSize: Readonly<{
     width: number,
     height: number,
   }>,
@@ -73,17 +74,17 @@ export type TextInputBlurEvent = BlurEvent;
  */
 export type TextInputFocusEvent = FocusEvent;
 
-type TargetEvent = $ReadOnly<{
+type TargetEvent = Readonly<{
   target: number,
   ...
 }>;
 
-export type Selection = $ReadOnly<{
+export type Selection = Readonly<{
   start: number,
   end: number,
 }>;
 
-type TextInputSelectionChangeEventData = $ReadOnly<{
+type TextInputSelectionChangeEventData = Readonly<{
   ...TargetEvent,
   selection: Selection,
   ...
@@ -95,7 +96,7 @@ type TextInputSelectionChangeEventData = $ReadOnly<{
 export type TextInputSelectionChangeEvent =
   NativeSyntheticEvent<TextInputSelectionChangeEventData>;
 
-type TextInputKeyPressEventData = $ReadOnly<{
+type TextInputKeyPressEventData = Readonly<{
   ...TargetEvent,
   key: string,
   target?: ?number,
@@ -109,7 +110,7 @@ type TextInputKeyPressEventData = $ReadOnly<{
 export type TextInputKeyPressEvent =
   NativeSyntheticEvent<TextInputKeyPressEventData>;
 
-type TextInputEndEditingEventData = $ReadOnly<{
+type TextInputEndEditingEventData = Readonly<{
   ...TargetEvent,
   eventCount: number,
   text: string,
@@ -122,7 +123,7 @@ type TextInputEndEditingEventData = $ReadOnly<{
 export type TextInputEndEditingEvent =
   NativeSyntheticEvent<TextInputEndEditingEventData>;
 
-type TextInputSubmitEditingEventData = $ReadOnly<{
+type TextInputSubmitEditingEventData = Readonly<{
   ...TargetEvent,
   eventCount: number,
   text: string,
@@ -266,7 +267,7 @@ export type EnterKeyHintTypeOptions =
 
 type PasswordRules = string;
 
-export type TextInputIOSProps = $ReadOnly<{
+export type TextInputIOSProps = Readonly<{
   /**
    * If true, the keyboard shortcuts (undo/redo and copy buttons) are disabled. The default value is false.
    * @platform ios
@@ -306,7 +307,7 @@ export type TextInputIOSProps = $ReadOnly<{
    */
   dataDetectorTypes?:
     | ?DataDetectorTypesType
-    | $ReadOnlyArray<DataDetectorTypesType>,
+    | ReadonlyArray<DataDetectorTypesType>,
 
   /**
    * If `true`, the keyboard disables the return key when there is no text and
@@ -403,7 +404,7 @@ export type TextInputIOSProps = $ReadOnly<{
   smartInsertDelete?: ?boolean,
 }>;
 
-export type TextInputAndroidProps = $ReadOnly<{
+export type TextInputAndroidProps = Readonly<{
   /**
    * When provided it will set the color of the cursor (or "caret") in the component.
    * Unlike the behavior of `selectionColor` the cursor color will be set independently
@@ -512,7 +513,7 @@ export type TextInputAndroidProps = $ReadOnly<{
   underlineColorAndroid?: ?ColorValue,
 }>;
 
-type TextInputBaseProps = $ReadOnly<{
+type TextInputBaseProps = Readonly<{
   /**
    * When provided, the text input will only accept drag and drop events for the specified
    * types. If null or not provided, the text input will accept all types of drag and drop events.
@@ -531,7 +532,7 @@ type TextInputBaseProps = $ReadOnly<{
    *
    * @see https://developer.android.com/reference/android/content/ClipData for more information on MIME types
    */
-  experimental_acceptDragAndDropTypes?: ?$ReadOnlyArray<string>,
+  experimental_acceptDragAndDropTypes?: ?ReadonlyArray<string>,
 
   /**
    * Can tell `TextInput` to automatically capitalize certain characters.
@@ -946,7 +947,7 @@ type TextInputBaseProps = $ReadOnly<{
    * The start and end of the text input's selection. Set start and end to
    * the same value to position the cursor.
    */
-  selection?: ?$ReadOnly<{
+  selection?: ?Readonly<{
     start: number,
     end?: ?number,
   }>,
@@ -1031,7 +1032,7 @@ type TextInputBaseProps = $ReadOnly<{
   textAlign?: ?('left' | 'center' | 'right'),
 }>;
 
-export type TextInputProps = $ReadOnly<{
+export type TextInputProps = Readonly<{
   ...Omit<ViewProps, 'style' | 'experimental_accessibilityOrder'>,
   ...TextInputIOSProps,
   ...TextInputAndroidProps,
@@ -1167,8 +1168,8 @@ type InternalTextInput = component(
   ...TextInputProps
 );
 
-export type TextInputComponentStatics = $ReadOnly<{
-  State: $ReadOnly<{
+export type TextInputComponentStatics = Readonly<{
+  State: Readonly<{
     currentlyFocusedInput: () => ?HostInstance,
     currentlyFocusedField: () => ?number,
     focusTextInput: (textField: ?HostInstance) => void,

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

@@ -25,20 +25,21 @@ import * as React from 'react';
 /**
  * @see TextInputProps.onChange
  */
-type TextInputChangeEventData = $ReadOnly<{
+type TextInputChangeEventData = Readonly<{
   eventCount: number,
   target: number,
   text: string,
+  selection?: Selection,
 }>;
 
 export type TextInputChangeEvent =
   NativeSyntheticEvent<TextInputChangeEventData>;
 
 export type TextInputEvent = NativeSyntheticEvent<
-  $ReadOnly<{
+  Readonly<{
     eventCount: number,
     previousText: string,
-    range: $ReadOnly<{
+    range: Readonly<{
       start: number,
       end: number,
     }>,
@@ -47,9 +48,9 @@ export type TextInputEvent = NativeSyntheticEvent<
   }>,
 >;
 
-type TextInputContentSizeChangeEventData = $ReadOnly<{
+type TextInputContentSizeChangeEventData = Readonly<{
   target: number,
-  contentSize: $ReadOnly<{
+  contentSize: Readonly<{
     width: number,
     height: number,
   }>,
@@ -73,17 +74,17 @@ export type TextInputBlurEvent = BlurEvent;
  */
 export type TextInputFocusEvent = FocusEvent;
 
-type TargetEvent = $ReadOnly<{
+type TargetEvent = Readonly<{
   target: number,
   ...
 }>;
 
-export type Selection = $ReadOnly<{
+export type Selection = Readonly<{
   start: number,
   end: number,
 }>;
 
-type TextInputSelectionChangeEventData = $ReadOnly<{
+type TextInputSelectionChangeEventData = Readonly<{
   ...TargetEvent,
   selection: Selection,
   ...
@@ -95,7 +96,7 @@ type TextInputSelectionChangeEventData = $ReadOnly<{
 export type TextInputSelectionChangeEvent =
   NativeSyntheticEvent<TextInputSelectionChangeEventData>;
 
-type TextInputKeyPressEventData = $ReadOnly<{
+type TextInputKeyPressEventData = Readonly<{
   ...TargetEvent,
   key: string,
   target?: ?number,
@@ -109,7 +110,7 @@ type TextInputKeyPressEventData = $ReadOnly<{
 export type TextInputKeyPressEvent =
   NativeSyntheticEvent<TextInputKeyPressEventData>;
 
-type TextInputEndEditingEventData = $ReadOnly<{
+type TextInputEndEditingEventData = Readonly<{
   ...TargetEvent,
   eventCount: number,
   text: string,
@@ -122,7 +123,7 @@ type TextInputEndEditingEventData = $ReadOnly<{
 export type TextInputEndEditingEvent =
   NativeSyntheticEvent<TextInputEndEditingEventData>;
 
-type TextInputSubmitEditingEventData = $ReadOnly<{
+type TextInputSubmitEditingEventData = Readonly<{
   ...TargetEvent,
   eventCount: number,
   text: string,
@@ -266,7 +267,7 @@ export type EnterKeyHintTypeOptions =
 
 type PasswordRules = string;
 
-export type TextInputIOSProps = $ReadOnly<{
+export type TextInputIOSProps = Readonly<{
   /**
    * If true, the keyboard shortcuts (undo/redo and copy buttons) are disabled. The default value is false.
    * @platform ios
@@ -306,7 +307,7 @@ export type TextInputIOSProps = $ReadOnly<{
    */
   dataDetectorTypes?:
     | ?DataDetectorTypesType
-    | $ReadOnlyArray<DataDetectorTypesType>,
+    | ReadonlyArray<DataDetectorTypesType>,
 
   /**
    * If `true`, the keyboard disables the return key when there is no text and
@@ -403,7 +404,7 @@ export type TextInputIOSProps = $ReadOnly<{
   smartInsertDelete?: ?boolean,
 }>;
 
-export type TextInputAndroidProps = $ReadOnly<{
+export type TextInputAndroidProps = Readonly<{
   /**
    * When provided it will set the color of the cursor (or "caret") in the component.
    * Unlike the behavior of `selectionColor` the cursor color will be set independently
@@ -514,7 +515,7 @@ export type TextInputAndroidProps = $ReadOnly<{
 
 // [Windows
 
-type SubmitKeyEvent = $ReadOnly<{|
+type SubmitKeyEvent = Readonly<{|
   altKey?: ?boolean,
   ctrlKey?: ?boolean,
   metaKey?: ?boolean,
@@ -522,7 +523,7 @@ type SubmitKeyEvent = $ReadOnly<{|
   code: string,
 |}>;
 
-export type TextInputWindowsProps = $ReadOnly<{|
+export type TextInputWindowsProps = Readonly<{|
   /**
    * If `true`, clears the text field synchronously before `onSubmitEditing` is emitted.
    * @platform windows
@@ -538,7 +539,7 @@ export type TextInputWindowsProps = $ReadOnly<{|
 
 // Windows]
 
-type TextInputBaseProps = $ReadOnly<{
+type TextInputBaseProps = Readonly<{
   /**
    * When provided, the text input will only accept drag and drop events for the specified
    * types. If null or not provided, the text input will accept all types of drag and drop events.
@@ -557,7 +558,7 @@ type TextInputBaseProps = $ReadOnly<{
    *
    * @see https://developer.android.com/reference/android/content/ClipData for more information on MIME types
    */
-  experimental_acceptDragAndDropTypes?: ?$ReadOnlyArray<string>,
+  experimental_acceptDragAndDropTypes?: ?ReadonlyArray<string>,
   /**
    * String to be read by screenreaders to indicate an error state. The acceptable parameters
    * of accessibilityErrorMessage is a string. Setting accessibilityInvalid to true activates
@@ -979,7 +980,7 @@ type TextInputBaseProps = $ReadOnly<{
    * The start and end of the text input's selection. Set start and end to
    * the same value to position the cursor.
    */
-  selection?: ?$ReadOnly<{
+  selection?: ?Readonly<{
     start: number,
     end?: ?number,
   }>,
@@ -1064,7 +1065,7 @@ type TextInputBaseProps = $ReadOnly<{
   textAlign?: ?('left' | 'center' | 'right'),
 }>;
 
-export type TextInputProps = $ReadOnly<{
+export type TextInputProps = Readonly<{
   ...Omit<ViewProps, 'style'>,
   ...TextInputIOSProps,
   ...TextInputAndroidProps,
@@ -1201,8 +1202,8 @@ type InternalTextInput = component(
   ...TextInputProps
 );
 
-export type TextInputComponentStatics = $ReadOnly<{
-  State: $ReadOnly<{
+export type TextInputComponentStatics = Readonly<{
+  State: Readonly<{
     currentlyFocusedInput: () => ?HostInstance,
     currentlyFocusedField: () => ?number,
     focusTextInput: (textField: ?HostInstance) => void,

package/Libraries/Components/TextInput/TextInput.js

@@ -120,7 +120,7 @@ export type {
   TextInputSubmitEditingEvent,
 };
 
-type TextInputStateType = $ReadOnly<{
+type TextInputStateType = Readonly<{
   /**
    * @deprecated Use currentlyFocusedInput
    * Returns the ID of the currently focused text field, if one exists
@@ -472,9 +472,13 @@ function InternalTextInput(props: TextInputProps): React.Node {
           getNativeRef(): ?TextInputInstance {
             return inputRef.current;
           },
-          // TODO: Fix this returning true on null === null, when no input is focused
           isFocused(): boolean {
-            return TextInputState.currentlyFocusedInput() === inputRef.current;
+            const currentlyFocusedInput =
+              TextInputState.currentlyFocusedInput();
+            return (
+              currentlyFocusedInput != null &&
+              currentlyFocusedInput === inputRef.current
+            );
           },
           setSelection(start: number, end: number): void {
             if (inputRef.current != null) {
@@ -965,7 +969,7 @@ TextInput.State = {
   focusTextInput: TextInputState.focusTextInput,
 };
 
-export type TextInputComponentStatics = $ReadOnly<{
+export type TextInputComponentStatics = Readonly<{
   State: TextInputStateType,
 }>;
 

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

@@ -133,7 +133,7 @@ export type {
   TextInputWindowsProps, // [Windows]
 };
 
-type TextInputStateType = $ReadOnly<{
+type TextInputStateType = Readonly<{
   /**
    * @deprecated Use currentlyFocusedInput
    * Returns the ID of the currently focused text field, if one exists
@@ -489,12 +489,11 @@ function InternalTextInput(props: TextInputProps): React.Node {
           getNativeRef(): ?TextInputInstance {
             return inputRef.current;
           },
-          // TODO: Fix this returning true on null === null, when no input is focused
           isFocused(): boolean {
             const currentlyFocusedInput =
               TextInputState.currentlyFocusedInput();
             return (
-              currentlyFocusedInput !== null &&
+              currentlyFocusedInput != null &&
               currentlyFocusedInput === inputRef.current
             );
           },
@@ -1102,7 +1101,7 @@ TextInput.State = {
   focusTextInput: TextInputState.focusTextInput,
 };
 
-export type TextInputComponentStatics = $ReadOnly<{
+export type TextInputComponentStatics = Readonly<{
   State: TextInputStateType,
 }>;
 

package/Libraries/Components/Touchable/PooledClass.js

@@ -105,7 +105,7 @@ const addPoolingTo = function <T>(
   pooler: Pooler,
 ): Class<T> & {
   getPooled(
-    ...args: $ReadOnlyArray<unknown>
+    ...args: ReadonlyArray<unknown>
   ): /* arguments of the constructor */ T,
   release(instance: unknown): void,
   ...