@office-iss/react-native-win32 0.0.0-canary.298 → 0.0.0-canary.299

package/Libraries/Core/ExceptionsManager.js

@@ -76,9 +76,6 @@ function reportException(
     message = namePrefix + message;
   }
 
-  message =
-    e.jsEngine == null ? message : `${message}, js engine: ${e.jsEngine}`;
-
   // $FlowFixMe[unclear-type]
   const extraData: Object = {
     // $FlowFixMe[incompatible-use] we can't define a type with a Symbol-keyed field in flow
@@ -108,15 +105,20 @@ function reportException(
     // we feed back into console.error, to make sure any methods that are
     // monkey patched on top of console.error are called when coming from
     // handleException
-    console.error(data.message);
+    console.error(e);
   }
 
   if (__DEV__) {
-    const LogBox = require('../LogBox/LogBox').default;
-    LogBox.addException({
-      ...data,
-      isComponentError: !!e.isComponentError,
-    });
+    // reportToConsole is only true when coming from handleException,
+    // and the error has not yet been logged. If it's false, then it was
+    // reported to LogBox in reactConsoleErrorHandler, and we don't need to.
+    if (reportToConsole) {
+      const LogBox = require('../LogBox/LogBox').default;
+      LogBox.addException({
+        ...data,
+        isComponentError: !!e.isComponentError,
+      });
+    }
   } else if (isFatal || e.type !== 'warn') {
     const NativeExceptionsManager =
       require('./NativeExceptionsManager').default;
@@ -223,12 +225,6 @@ function reactConsoleErrorHandler(...args) {
     error = firstArg;
   } else {
     const stringifySafe = require('../Utilities/stringifySafe').default;
-    if (typeof firstArg === 'string' && firstArg.startsWith('Warning: ')) {
-      // React warnings use console.error so that a stack trace is shown, but
-      // we don't (currently) want these to show a redbox
-      // (Note: Logic duplicated in polyfills/console.js.)
-      return;
-    }
     const message = args
       .map(arg => (typeof arg === 'string' ? arg : stringifySafe(arg)))
       .join(' ');
@@ -243,6 +239,23 @@ function reactConsoleErrorHandler(...args) {
     !global.RN$handleException ||
     !global.RN$handleException(error, isFatal, reportToConsole)
   ) {
+    if (__DEV__) {
+      // If we're not reporting to the console in reportException,
+      // we need to report it as a console.error here.
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
+      if (!reportToConsole) {
+        require('../LogBox/LogBox').default.addConsoleLog('error', ...args);
+      }
+    }
+    if (error.message.startsWith('Warning: ')) {
+      // React warnings use console.error so that a stack trace is shown, but
+      // we don't (currently) want these to report to native.
+      // Note: We can probably remove this, but would be a breaking change
+      // if the warning module is still used somewhere.
+      // Logic duplicated in polyfills/console.js
+      return;
+    }
     reportException(
       /* $FlowFixMe[class-object-subtyping] added when improving typing for this
        * parameters */

package/Libraries/Core/NativeExceptionsManager.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeExceptionsManager';
 import NativeExceptionsManager from '../../src/private/specs_DEPRECATED/modules/NativeExceptionsManager';
+
 export default NativeExceptionsManager;

package/Libraries/Core/ReactNativeVersion.js

@@ -18,5 +18,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 81,
   patch: 0,
-  prerelease: 'nightly-20250604-1a6d466f1',
+  prerelease: 'nightly-20250709-6892dde36',
 };

package/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js

@@ -10,4 +10,5 @@
 
 export * from '../../../src/private/specs_DEPRECATED/modules/NativeSegmentFetcher';
 import NativeSegmentFetcher from '../../../src/private/specs_DEPRECATED/modules/NativeSegmentFetcher';
+
 export default NativeSegmentFetcher;

package/Libraries/Core/Timers/NativeTiming.js

@@ -10,4 +10,5 @@
 
 export * from '../../../src/private/specs_DEPRECATED/modules/NativeTiming';
 import NativeTiming from '../../../src/private/specs_DEPRECATED/modules/NativeTiming';
+
 export default NativeTiming;

package/Libraries/Core/checkNativeVersion.js

@@ -15,4 +15,5 @@
  * You can use this module directly, or just require InitializeCore.
  */
 const ReactNativeVersionCheck = require('./ReactNativeVersionCheck');
+
 ReactNativeVersionCheck.checkVersions();

package/Libraries/Core/setUpReactDevTools.js

@@ -143,10 +143,7 @@ if (__DEV__) {
       // Get hostname from development server (packager)
       const devServer = getDevServer();
       const host = devServer.bundleLoadedFromServer
-        ? devServer.url
-            .replace(/https?:\/\//, '')
-            .replace(/\/$/, '')
-            .split(':')[0]
+        ? guessHostFromDevServerUrl(devServer.url)
         : 'localhost';
 
       // Read the optional global variable for backward compatibility.
@@ -259,3 +256,23 @@ function readReloadAndProfileConfig(
     onReloadAndProfileFlagsReset,
   };
 }
+
+/**
+ * This is a bad, no good, broken hack to get the host from a dev server URL for the purposes
+ * of connecting to the legacy React DevTools socket (for the standalone react-devtools package).
+ * It has too many bugs to list. Please don't use it in new code.
+ *
+ * The correct implementation would just be `return new URL(url).host`, but React Native does not
+ * ship with a spec-compliant `URL` class yet. Alternatively, this can be deleted when we delete
+ * `connectToWSBasedReactDevToolsFrontend`.
+ */
+function guessHostFromDevServerUrl(url: string): string {
+  const hopefullyHostAndPort = url
+    .replace(/https?:\/\//, '')
+    .replace(/\/$/, '');
+  // IPv6 addresses contain colons, so the split(':') below will return garbage.
+  if (hopefullyHostAndPort.includes(']')) {
+    return hopefullyHostAndPort.split(']')[0] + ']';
+  }
+  return hopefullyHostAndPort.split(':')[0];
+}

package/Libraries/Debugging/DebuggingOverlayNativeComponent.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent';
 import DebuggingOverlayNativeComponent from '../../src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent';
+
 export default DebuggingOverlayNativeComponent;

package/Libraries/EventEmitter/NativeEventEmitter.js

@@ -32,7 +32,7 @@ export type {EventSubscription, EmitterSubscription};
 export type NativeEventSubscription = EventSubscription;
 
 // $FlowFixMe[unclear-type] unclear type of events
-type UnsafeObject = Object;
+type UnsafeNativeEventObject = Object;
 
 /**
  * `NativeEventEmitter` is intended for use by Native Modules to emit events to
@@ -46,8 +46,8 @@ type UnsafeObject = Object;
  */
 export default class NativeEventEmitter<
   TEventToArgsMap: $ReadOnly<
-    Record<string, $ReadOnlyArray<UnsafeObject>>,
-  > = $ReadOnly<Record<string, $ReadOnlyArray<UnsafeObject>>>,
+    Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>,
+  > = $ReadOnly<Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>>,
 > implements IEventEmitter<TEventToArgsMap>
 {
   _nativeModule: ?NativeModule;

package/Libraries/Image/Image.android.js

@@ -16,7 +16,7 @@ import type {AbstractImageAndroid, ImageAndroid} from './ImageTypes.flow';
 
 import flattenStyle from '../StyleSheet/flattenStyle';
 import StyleSheet from '../StyleSheet/StyleSheet';
-import TextAncestor from '../Text/TextAncestor';
+import TextAncestorContext from '../Text/TextAncestorContext';
 import ImageAnalyticsTagContext from './ImageAnalyticsTagContext';
 import {
   unstable_getImageComponentDecorator,
@@ -222,7 +222,7 @@ let BaseImage: AbstractImageAndroid = ({
               }
             : nativeProps;
         return (
-          <TextAncestor.Consumer>
+          <TextAncestorContext.Consumer>
             {hasTextAncestor => {
               if (hasTextAncestor) {
                 return (
@@ -245,7 +245,7 @@ let BaseImage: AbstractImageAndroid = ({
                 />
               );
             }}
-          </TextAncestor.Consumer>
+          </TextAncestorContext.Consumer>
         );
       }}
     </ImageAnalyticsTagContext.Consumer>

package/Libraries/Image/ImageSource.d.ts

@@ -72,3 +72,8 @@ export interface ImageURISource {
 }
 
 export type ImageRequireSource = number;
+
+export type ImageSource =
+  | ImageRequireSource
+  | ImageURISource
+  | ReadonlyArray<ImageURISource>;

package/Libraries/Image/ImageViewNativeComponent.js

@@ -26,7 +26,7 @@ import {ConditionallyIgnoredEventHandlers} from '../NativeComponent/ViewConfigIg
 import codegenNativeCommands from '../Utilities/codegenNativeCommands';
 import Platform from '../Utilities/Platform';
 
-type Props = $ReadOnly<{
+type ImageHostComponentProps = $ReadOnly<{
   ...ImageProps,
   ...ViewProps,
 
@@ -162,8 +162,8 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig =
         },
       };
 
-const ImageViewNativeComponent: HostComponent<Props> =
-  NativeComponentRegistry.get<Props>(
+const ImageViewNativeComponent: HostComponent<ImageHostComponentProps> =
+  NativeComponentRegistry.get<ImageHostComponentProps>(
     'RCTImageView',
     () => __INTERNAL_VIEW_CONFIG,
   );

package/Libraries/Image/NativeImageEditor.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeImageEditor';
 import NativeImageEditor from '../../src/private/specs_DEPRECATED/modules/NativeImageEditor';
+
 export default NativeImageEditor;

package/Libraries/Image/NativeImageLoaderAndroid.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderAndroid';
 import NativeImageLoaderAndroid from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderAndroid';
+
 export default NativeImageLoaderAndroid;

package/Libraries/Image/NativeImageLoaderIOS.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderIOS';
 import NativeImageLoaderIOS from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderIOS';
+
 export default NativeImageLoaderIOS;

package/Libraries/Image/NativeImageLoaderWin32.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderWin32';
 import NativeImageLoaderWin32 from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderWin32';
+
 export default NativeImageLoaderWin32;

package/Libraries/Image/NativeImageStoreAndroid.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreAndroid';
 import NativeImageStoreAndroid from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreAndroid';
+
 export default NativeImageStoreAndroid;

package/Libraries/Image/NativeImageStoreIOS.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreIOS';
 import NativeImageStoreIOS from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreIOS';
+
 export default NativeImageStoreIOS;

package/Libraries/Image/RelativeImageStub.js

@@ -27,5 +27,5 @@ const RelativeImageStub = (AssetRegistry.registerAsset({
   type: 'png',
 }): number);
 
-// eslint-disable-next-line lint/no-commonjs-exports
+// eslint-disable-next-line @react-native/monorepo/no-commonjs-exports
 module.exports = RelativeImageStub;

package/Libraries/Image/TextInlineImageNativeComponent.js

@@ -18,7 +18,7 @@ import type {ImageResizeMode} from './ImageResizeMode';
 
 import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
 
-type NativeProps = $ReadOnly<{
+type RCTTextInlineImageNativeProps = $ReadOnly<{
   ...ViewProps,
   resizeMode?: ?ImageResizeMode,
   src?: ?$ReadOnlyArray<?$ReadOnly<{uri?: ?string, ...}>>,
@@ -40,8 +40,8 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
   },
 };
 
-const TextInlineImage: HostComponent<NativeProps> =
-  NativeComponentRegistry.get<NativeProps>(
+const TextInlineImage: HostComponent<RCTTextInlineImageNativeProps> =
+  NativeComponentRegistry.get<RCTTextInlineImageNativeProps>(
     'RCTTextInlineImage',
     () => __INTERNAL_VIEW_CONFIG,
   );

package/Libraries/Interaction/InteractionManager.js

@@ -73,6 +73,8 @@ const InteractionManagerImpl = {
    * Notify manager that an interaction has started.
    */
   createInteractionHandle(): Handle {
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     DEBUG && console.log('InteractionManager: create interaction handle');
     _scheduleUpdate();
     const handle = ++_inc;
@@ -84,6 +86,8 @@ const InteractionManagerImpl = {
    * Notify manager that an interaction has completed.
    */
   clearInteractionHandle(handle: Handle) {
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     DEBUG && console.log('InteractionManager: clear interaction handle');
     invariant(!!handle, 'InteractionManager: Must provide a handle to clear.');
     _scheduleUpdate();
@@ -229,7 +233,8 @@ function _processUpdate() {
  */
 const InteractionManager = (
   ReactNativeFeatureFlags.disableInteractionManager()
-    ? require('./InteractionManagerStub').default
+    ? // $FlowFixMe[incompatible-variance]
+      require('./InteractionManagerStub').default
     : InteractionManagerImpl
 ) as typeof InteractionManagerImpl;
 

package/Libraries/Interaction/NativeFrameRateLogger.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeFrameRateLogger';
 import NativeFrameRateLogger from '../../src/private/specs_DEPRECATED/modules/NativeFrameRateLogger';
+
 export default NativeFrameRateLogger;

package/Libraries/Interaction/TaskQueue.js

@@ -99,9 +99,13 @@ class TaskQueue {
       const task = queue.shift();
       try {
         if (typeof task === 'object' && task.gen) {
+          /* $FlowFixMe[constant-condition] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
           DEBUG && console.log('TaskQueue: genPromise for task ' + task.name);
           this._genPromise(task);
         } else if (typeof task === 'object' && task.run) {
+          /* $FlowFixMe[constant-condition] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
           DEBUG && console.log('TaskQueue: run task ' + task.name);
           task.run();
         } else {
@@ -110,6 +114,8 @@ class TaskQueue {
             'Expected Function, SimpleTask, or PromiseTask, but got:\n' +
               JSON.stringify(task, null, 2),
           );
+          /* $FlowFixMe[constant-condition] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
           DEBUG && console.log('TaskQueue: run anonymous task');
           task();
         }
@@ -139,6 +145,8 @@ class TaskQueue {
       this._queueStack.length > 1
     ) {
       this._queueStack.pop();
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       DEBUG &&
         console.log('TaskQueue: popped queue: ', {
           stackIdx,
@@ -158,11 +166,17 @@ class TaskQueue {
     this._queueStack.push({tasks: [], popable: false});
     const stackIdx = this._queueStack.length - 1;
     const stackItem = this._queueStack[stackIdx];
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     DEBUG && console.log('TaskQueue: push new queue: ', {stackIdx});
+    /* $FlowFixMe[constant-condition] Error discovered during Constant
+     * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
     DEBUG && console.log('TaskQueue: exec gen task ' + task.name);
     task
       .gen()
       .then(() => {
+        /* $FlowFixMe[constant-condition] Error discovered during Constant
+         * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
         DEBUG &&
           console.log('TaskQueue: onThen for gen task ' + task.name, {
             stackIdx,

package/Libraries/LayoutAnimation/LayoutAnimation.js

@@ -11,7 +11,7 @@
 'use strict';
 
 import type {
-  LayoutAnimationConfig as LayoutAnimationConfig_,
+  LayoutAnimationConfig,
   LayoutAnimationProperty,
   LayoutAnimationType,
 } from '../Renderer/shims/ReactNativeTypes';
@@ -29,7 +29,7 @@ export type {
 } from '../Renderer/shims/ReactNativeTypes';
 
 // Reexport type
-export type LayoutAnimationConfig = LayoutAnimationConfig_;
+export type {LayoutAnimationConfig} from '../Renderer/shims/ReactNativeTypes';
 
 export type LayoutAnimationTypes = $ReadOnly<{
   [type in LayoutAnimationType]: type,
@@ -45,7 +45,7 @@ type OnAnimationDidFailCallback = () => void;
 let isLayoutAnimationEnabled: boolean =
   ReactNativeFeatureFlags.isLayoutAnimationEnabled();
 
-function setEnabled(value: boolean) {
+function setLayoutAnimationEnabled(value: boolean) {
   isLayoutAnimationEnabled = isLayoutAnimationEnabled;
 }
 
@@ -115,7 +115,7 @@ function configureNext(
   }
 }
 
-function create(
+function createLayoutAnimation(
   duration: number,
   type?: LayoutAnimationType,
   property?: LayoutAnimationProperty,
@@ -129,12 +129,16 @@ function create(
 }
 
 const Presets = {
-  easeInEaseOut: (create(
+  easeInEaseOut: (createLayoutAnimation(
     300,
     'easeInEaseOut',
     'opacity',
   ): LayoutAnimationConfig),
-  linear: (create(500, 'linear', 'opacity'): LayoutAnimationConfig),
+  linear: (createLayoutAnimation(
+    500,
+    'linear',
+    'opacity',
+  ): LayoutAnimationConfig),
   spring: ({
     duration: 700,
     create: {
@@ -180,7 +184,7 @@ const LayoutAnimation = {
   /**
    * Helper for creating a config for `configureNext`.
    */
-  create,
+  create: createLayoutAnimation,
   Types: Object.freeze({
     spring: 'spring',
     linear: 'linear',
@@ -208,7 +212,7 @@ const LayoutAnimation = {
   spring: (configureNext.bind(null, Presets.spring): (
     onAnimationDidEnd?: OnAnimationDidEndCallback,
   ) => void),
-  setEnabled,
+  setEnabled: setLayoutAnimationEnabled,
 };
 
 export default LayoutAnimation;

package/Libraries/Linking/NativeIntentAndroid.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeIntentAndroid';
 import NativeIntentAndroid from '../../src/private/specs_DEPRECATED/modules/NativeIntentAndroid';
+
 export default NativeIntentAndroid;

package/Libraries/Linking/NativeLinkingManager.js

@@ -10,4 +10,5 @@
 
 export * from '../../src/private/specs_DEPRECATED/modules/NativeLinkingManager';
 import NativeLinkingManager from '../../src/private/specs_DEPRECATED/modules/NativeLinkingManager';
+
 export default NativeLinkingManager;

package/Libraries/Lists/FlatList.js

@@ -15,6 +15,7 @@ import type {
   ListRenderItemInfo,
   ViewabilityConfigCallbackPair,
   ViewToken,
+  VirtualizedListProps,
 } from '@react-native/virtualized-lists';
 
 import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
@@ -32,14 +33,14 @@ const invariant = require('invariant');
 const VirtualizedList = VirtualizedLists.VirtualizedList;
 const defaultKeyExtractor = VirtualizedLists.keyExtractor;
 
-type RequiredProps<ItemT> = {
+type RequiredFlatListProps<ItemT> = {
   /**
    * An array (or array-like list) of items to render. Other data types can be
    * used by targeting VirtualizedList directly.
    */
   data: ?$ReadOnly<$ArrayLike<ItemT>>,
 };
-type OptionalProps<ItemT> = {
+type OptionalFlatListProps<ItemT> = {
   /**
    * Takes an item from `data` and renders it into the list. Example usage:
    *
@@ -177,12 +178,10 @@ function isArrayLike(data: mixed): boolean {
 }
 
 type FlatListBaseProps<ItemT> = {
-  ...RequiredProps<ItemT>,
-  ...OptionalProps<ItemT>,
+  ...RequiredFlatListProps<ItemT>,
+  ...OptionalFlatListProps<ItemT>,
 };
 
-type VirtualizedListProps = React.ElementConfig<typeof VirtualizedList>;
-
 export type FlatListProps<ItemT> = {
   ...Omit<
     VirtualizedListProps,

package/Libraries/Lists/SectionList.js

@@ -39,7 +39,7 @@ export type {
   ScrollToLocationParamsType as SectionListScrollParams,
 };
 
-type RequiredProps<ItemT, SectionT = DefaultSectionT> = {
+type RequiredSectionListProps<ItemT, SectionT = DefaultSectionT> = {
   /**
    * The actual data to render, akin to the `data` prop in [`<FlatList>`](https://reactnative.dev/docs/flatlist).
    *
@@ -64,7 +64,7 @@ export type SectionListRenderItem<ItemT, SectionT = DefaultSectionT> = (
   info: SectionListRenderItemInfo<ItemT, SectionT>,
 ) => React.Node | null;
 
-type OptionalProps<ItemT, SectionT = DefaultSectionT> = {
+type OptionalSectionListProps<ItemT, SectionT = DefaultSectionT> = {
   /**
    * Default renderer for every item in every section. Can be over-ridden on a per-section basis.
    */
@@ -110,8 +110,8 @@ export type SectionListProps<ItemT, SectionT = DefaultSectionT> = {
     VirtualizedSectionListProps<ItemT, SectionT>,
     'getItem' | 'getItemCount' | 'renderItem' | 'keyExtractor',
   >,
-  ...RequiredProps<ItemT, SectionT>,
-  ...OptionalProps<ItemT, SectionT>,
+  ...RequiredSectionListProps<ItemT, SectionT>,
+  ...OptionalSectionListProps<ItemT, SectionT>,
 };
 
 /**

package/Libraries/Lists/VirtualizedList.js

@@ -13,7 +13,8 @@
 import VirtualizedLists from '@react-native/virtualized-lists';
 
 type VirtualizedListType = typeof VirtualizedLists.VirtualizedList;
-const VirtualizedList: VirtualizedListType = VirtualizedLists.VirtualizedList;
+const VirtualizedListComponent: VirtualizedListType =
+  VirtualizedLists.VirtualizedList;
 
 export type {
   ListRenderItemInfo,
@@ -21,4 +22,4 @@ export type {
   Separators,
   VirtualizedListProps,
 } from '@react-native/virtualized-lists';
-export default VirtualizedList;
+export default VirtualizedListComponent;

package/Libraries/LogBox/Data/LogBoxData.js

@@ -413,8 +413,8 @@ export function observe(observer: Observer): Subscription {
   };
 }
 
-type Props = $ReadOnly<{}>;
-type State = $ReadOnly<{
+type LogBoxStateSubscriptionProps = $ReadOnly<{}>;
+type LogBoxStateSubscriptionState = $ReadOnly<{
   logs: LogBoxLogs,
   isDisabled: boolean,
   hasError: boolean,
@@ -432,7 +432,10 @@ type SubscribedComponent = React.ComponentType<
 export function withSubscription(
   WrappedComponent: SubscribedComponent,
 ): React.ComponentType<{}> {
-  class LogBoxStateSubscription extends React.Component<Props, State> {
+  class LogBoxStateSubscription extends React.Component<
+    LogBoxStateSubscriptionProps,
+    LogBoxStateSubscriptionState,
+  > {
     static getDerivedStateFromError(): {hasError: boolean} {
       return {hasError: true};
     }
@@ -446,7 +449,7 @@ export function withSubscription(
 
     _subscription: ?Subscription;
 
-    state: State = {
+    state: LogBoxStateSubscriptionState = {
       logs: new Set(),
       isDisabled: false,
       hasError: false,