@office-iss/react-native-win32 0.0.0-canary.292 → 0.0.0-canary.293

package/.flowconfig

@@ -167,4 +167,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.267.0
+^0.268.0

package/CHANGELOG.json

@@ -2,7 +2,34 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Thu, 03 Jul 2025 05:23:40 GMT",
+      "date": "Thu, 17 Jul 2025 05:25:18 GMT",
+      "version": "0.0.0-canary.293",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.293",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "10109130+sharath2727@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "b4ad43a0d79d39aae1c1ecf91d3a0089c0e334ec",
+            "comment": "Integrate RN Nightly Build 0.80.0-nightly-20250428-9efcdc091"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/just-task to v2.3.54",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump react-native-platform-override to v1.9.56",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 03 Jul 2025 05:24:24 GMT",
       "version": "0.0.0-canary.292",
       "tag": "@office-iss/react-native-win32_v0.0.0-canary.292",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,27 @@
 # Change Log - @office-iss/react-native-win32
 
-<!-- This log was last generated on Thu, 03 Jul 2025 05:23:40 GMT and should not be manually modified. -->
+<!-- This log was last generated on Thu, 17 Jul 2025 05:25:18 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
-## 0.0.0-canary.292
+## 0.0.0-canary.293
 
-Thu, 03 Jul 2025 05:23:40 GMT
+Thu, 17 Jul 2025 05:25:18 GMT
 
 ### Changes
 
-- intergrate rn 0.80.0-nightly-20250414-70cdf12c4 (satkh@microsoft.com)
+- Integrate RN Nightly Build 0.80.0-nightly-20250428-9efcdc091 (10109130+sharath2727@users.noreply.github.com)
+- Bump @rnw-scripts/just-task to v2.3.54
+- Bump react-native-platform-override to v1.9.56
 
+## 0.0.0-canary.292
+
+Thu, 03 Jul 2025 05:24:24 GMT
+
+### Changes
+
+- intergrate rn 0.80.0-nightly-20250414-70cdf12c4 (satkh@microsoft.com)
+
 ## 0.0.0-canary.291
 
 Sat, 21 Jun 2025 05:21:48 GMT

package/Libraries/Blob/URL.js

@@ -81,7 +81,19 @@ export class URL {
     let baseUrl = null;
     if (!base || validateBaseUrl(url)) {
       this._url = url;
-      if (!this._url.endsWith('/')) {
+      if (this._url.includes('#')) {
+        const split = this._url.split('#');
+        const beforeHash = split[0];
+        const website = beforeHash.split('://')[1];
+        if (!website.includes('/')) {
+          this._url = split.join('/#');
+        }
+      }
+
+      if (
+        !this._url.endsWith('/') &&
+        !(this._url.includes('?') || this._url.includes('#'))
+      ) {
         this._url += '/';
       }
     } else {

package/Libraries/Components/Pressable/Pressable.js

@@ -152,7 +152,10 @@ type PressableBaseProps = $ReadOnly<{
 }>;
 
 export type PressableProps = $ReadOnly<{
-  ...ViewProps,
+  // Pressability may override `onMouseEnter` and `onMouseLeave` to
+  // implement `onHoverIn` and `onHoverOut` in a platform-agnostic way.
+  // Hover events should be used instead of mouse events.
+  ...Omit<ViewProps, 'onMouseEnter' | 'onMouseLeave'>,
   ...PressableBaseProps,
 }>;
 

package/Libraries/Components/Pressable/Pressable.win32.js

@@ -198,7 +198,10 @@ type PressableBaseProps = $ReadOnly<{
 }>;
 
 export type PressableProps = $ReadOnly<{
-  ...ViewProps,
+  // Pressability may override `onMouseEnter` and `onMouseLeave` to
+  // implement `onHoverIn` and `onHoverOut` in a platform-agnostic way.
+  // Hover events should be used instead of mouse events.
+  ...Omit<ViewProps, 'onMouseEnter' | 'onMouseLeave'>,
   ...PressableBaseProps,
 }>;
 

package/Libraries/Components/ScrollView/ScrollView.d.ts

@@ -869,7 +869,7 @@ export class ScrollView extends ScrollViewBase {
    * This function sends props straight to native. They will not participate in
    * future diff process - this means that if you do not include them in the
    * next render, they will remain active (see [Direct
-   * Manipulation](https://reactnative.dev/docs/direct-manipulation)).
+   * Manipulation](https://reactnative.dev/docs/the-new-architecture/direct-manipulation-new-architecture)).
    */
   setNativeProps(nativeProps: object): void;
 }

package/Libraries/Components/Switch/Switch.js

@@ -22,6 +22,7 @@ import SwitchNativeComponent, {
   Commands as SwitchCommands,
 } from './SwitchNativeComponent';
 import * as React from 'react';
+import {useLayoutEffect, useRef, useState} from 'react';
 
 export type SwitchPropsIOS = {
   /**
@@ -179,13 +180,16 @@ const Switch: component(
   const trackColorForFalse = trackColor?.false;
   const trackColorForTrue = trackColor?.true;
 
-  const nativeSwitchRef = React.useRef<React.ElementRef<
+  const nativeSwitchRef = useRef<React.ElementRef<
     typeof SwitchNativeComponent | typeof AndroidSwitchNativeComponent,
   > | null>(null);
 
   const ref = useMergeRefs(nativeSwitchRef, forwardedRef);
 
-  const [native, setNative] = React.useState({value: (null: ?boolean)});
+  // We wrap the native state in an object to force the layout-effect
+  // below to re-run whenever we get an update from native, even if it's
+  // not different from the previous native state.
+  const [native, setNative] = useState({value: (null: ?boolean)});
 
   const handleChange = (event: SwitchChangeEvent) => {
     // $FlowFixMe[unused-promise]
@@ -195,7 +199,7 @@ const Switch: component(
     setNative({value: event.nativeEvent.value});
   };
 
-  React.useLayoutEffect(() => {
+  useLayoutEffect(() => {
     // This is necessary in case native updates the switch and JS decides
     // that the update should be ignored and we should stick with the value
     // that we have in JS.

package/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js

@@ -658,6 +658,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
     },
   },
   validAttributes: {
+    acceptDragAndDropTypes: true,
     maxFontSizeMultiplier: true,
     adjustsFontSizeToFit: true,
     minimumFontScale: true,

package/Libraries/Components/TextInput/RCTTextInputViewConfig.js

@@ -90,6 +90,7 @@ const RCTTextInputViewConfig = {
     },
   },
   validAttributes: {
+    acceptDragAndDropTypes: true,
     dynamicTypeRamp: true,
     fontSize: true,
     fontWeight: true,

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

@@ -514,6 +514,26 @@ export type TextInputAndroidProps = $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.
+   * An empty array will accept no drag and drop events.
+   * Defaults to null.
+   *
+   * On Android, types must correspond to MIME types from ClipData:
+   * https://developer.android.com/reference/android/content/ClipData
+   * (e.g. "text/plain" or "image/*")
+   *
+   * On iOS, types must correspond to UTIs:
+   * https://developer.apple.com/documentation/uniformtypeidentifiers
+   * (e.g. "public.plain-text" or "public.image")
+   *
+   * *NOTE*: This prop is experimental and its API may change in the future. Use at your own risk.
+   *
+   * @see https://developer.android.com/reference/android/content/ClipData for more information on MIME types
+   */
+  experimental_acceptDragAndDropTypes?: ?$ReadOnlyArray<string>,
+
   /**
    * Can tell `TextInput` to automatically capitalize certain characters.
    *
@@ -1005,6 +1025,11 @@ type TextInputBaseProps = $ReadOnly<{
    * unwanted edits without flicker.
    */
   value?: ?Stringish,
+
+  /**
+   * Align the input text to the left, center, or right sides of the input field.
+   */
+  textAlign?: ?('left' | 'center' | 'right'),
 }>;
 
 export type TextInputProps = $ReadOnly<{

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

@@ -540,6 +540,25 @@ export type TextInputWindowsProps = $ReadOnly<{|
 // Windows]
 
 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.
+   * An empty array will accept no drag and drop events.
+   * Defaults to null.
+   *
+   * On Android, types must correspond to MIME types from ClipData:
+   * https://developer.android.com/reference/android/content/ClipData
+   * (e.g. "text/plain" or "image/*")
+   *
+   * On iOS, types must correspond to UTIs:
+   * https://developer.apple.com/documentation/uniformtypeidentifiers
+   * (e.g. "public.plain-text" or "public.image")
+   *
+   * *NOTE*: This prop is experimental and its API may change in the future. Use at your own risk.
+   *
+   * @see https://developer.android.com/reference/android/content/ClipData for more information on MIME types
+   */
+  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
@@ -1039,10 +1058,15 @@ type TextInputBaseProps = $ReadOnly<{
    * unwanted edits without flicker.
    */
   value?: ?Stringish,
+
+  /**
+   * Align the input text to the left, center, or right sides of the input field.
+   */
+  textAlign?: ?('left' | 'center' | 'right'),
 }>;
 
 export type TextInputProps = $ReadOnly<{
-  ...$Diff<ViewProps, $ReadOnly<{style: ?ViewStyleProp}>>,
+  ...Omit<ViewProps, 'style'>,
   ...TextInputIOSProps,
   ...TextInputAndroidProps,
   ...TextInputBaseProps,

package/Libraries/Components/TextInput/TextInput.js

@@ -675,6 +675,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
         ref={(ref: $FlowFixMe)}
         {...otherProps}
         {...eventHandlers}
+        acceptDragAndDropTypes={props.experimental_acceptDragAndDropTypes}
         accessibilityState={_accessibilityState}
         accessible={accessible}
         submitBehavior={submitBehavior}
@@ -741,6 +742,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
         accessibilityState={_accessibilityState}
         accessibilityLabelledBy={_accessibilityLabelledBy}
         accessible={accessible}
+        acceptDragAndDropTypes={props.experimental_acceptDragAndDropTypes}
         autoCapitalize={autoCapitalize}
         submitBehavior={submitBehavior}
         caretHidden={caretHidden}

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

@@ -758,6 +758,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
         ref={(ref: $FlowFixMe)}
         {...otherProps}
         {...eventHandlers}
+        acceptDragAndDropTypes={props.experimental_acceptDragAndDropTypes}
         accessibilityErrorMessage={accessibilityErrorMessage}
         accessibilityState={_accessibilityState}
         accessible={accessible}
@@ -826,6 +827,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
         accessibilityState={_accessibilityState}
         accessibilityLabelledBy={_accessibilityLabelledBy}
         accessible={accessible}
+        acceptDragAndDropTypes={props.experimental_acceptDragAndDropTypes}
         autoCapitalize={autoCapitalize}
         submitBehavior={submitBehavior}
         caretHidden={caretHidden}

package/Libraries/Components/View/View.js

@@ -61,38 +61,35 @@ const View: component(
     const _accessibilityLabelledBy =
       ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy;
 
-    let _accessibilityState;
-    if (
+    const _accessibilityState =
       accessibilityState != null ||
       ariaBusy != null ||
       ariaChecked != null ||
       ariaDisabled != null ||
       ariaExpanded != null ||
       ariaSelected != null
-    ) {
-      _accessibilityState = {
-        busy: ariaBusy ?? accessibilityState?.busy,
-        checked: ariaChecked ?? accessibilityState?.checked,
-        disabled: ariaDisabled ?? accessibilityState?.disabled,
-        expanded: ariaExpanded ?? accessibilityState?.expanded,
-        selected: ariaSelected ?? accessibilityState?.selected,
-      };
-    }
-    let _accessibilityValue;
-    if (
+        ? {
+            busy: ariaBusy ?? accessibilityState?.busy,
+            checked: ariaChecked ?? accessibilityState?.checked,
+            disabled: ariaDisabled ?? accessibilityState?.disabled,
+            expanded: ariaExpanded ?? accessibilityState?.expanded,
+            selected: ariaSelected ?? accessibilityState?.selected,
+          }
+        : undefined;
+
+    const _accessibilityValue =
       accessibilityValue != null ||
       ariaValueMax != null ||
       ariaValueMin != null ||
       ariaValueNow != null ||
       ariaValueText != null
-    ) {
-      _accessibilityValue = {
-        max: ariaValueMax ?? accessibilityValue?.max,
-        min: ariaValueMin ?? accessibilityValue?.min,
-        now: ariaValueNow ?? accessibilityValue?.now,
-        text: ariaValueText ?? accessibilityValue?.text,
-      };
-    }
+        ? {
+            max: ariaValueMax ?? accessibilityValue?.max,
+            min: ariaValueMin ?? accessibilityValue?.min,
+            now: ariaValueNow ?? accessibilityValue?.now,
+            text: ariaValueText ?? accessibilityValue?.text,
+          }
+        : undefined;
 
     const actualView = (
       <ViewNativeComponent

package/Libraries/Components/View/View.win32.js

@@ -78,8 +78,7 @@ const View: component(
     const _accessibilityLabelledBy =
       ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy;
 
-    let _accessibilityState;
-    if (
+    const _accessibilityState =
       accessibilityState != null ||
       ariaBusy != null ||
       ariaChecked != null ||
@@ -88,33 +87,31 @@ const View: component(
       ariaMultiselectable != null ||
       ariaRequired != null ||
       ariaSelected != null
-    ) {
-      _accessibilityState = {
-        busy: ariaBusy ?? accessibilityState?.busy,
-        checked: ariaChecked ?? accessibilityState?.checked,
-        disabled: ariaDisabled ?? accessibilityState?.disabled,
-        expanded: ariaExpanded ?? accessibilityState?.expanded,
-        multiselectable:
-          ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32
-        required: ariaRequired ?? accessibilityState?.required, // Win32
-        selected: ariaSelected ?? accessibilityState?.selected,
-      };
-    }
-    let _accessibilityValue;
-    if (
+        ? {
+            busy: ariaBusy ?? accessibilityState?.busy,
+            checked: ariaChecked ?? accessibilityState?.checked,
+            disabled: ariaDisabled ?? accessibilityState?.disabled,
+            expanded: ariaExpanded ?? accessibilityState?.expanded,
+            multiselectable:
+              ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32
+            required: ariaRequired ?? accessibilityState?.required, // Win32
+            selected: ariaSelected ?? accessibilityState?.selected,
+          }
+        : undefined;
+
+    const _accessibilityValue =
       accessibilityValue != null ||
       ariaValueMax != null ||
       ariaValueMin != null ||
       ariaValueNow != null ||
       ariaValueText != null
-    ) {
-      _accessibilityValue = {
-        max: ariaValueMax ?? accessibilityValue?.max,
-        min: ariaValueMin ?? accessibilityValue?.min,
-        now: ariaValueNow ?? accessibilityValue?.now,
-        text: ariaValueText ?? accessibilityValue?.text,
-      };
-    }
+        ? {
+            max: ariaValueMax ?? accessibilityValue?.max,
+            min: ariaValueMin ?? accessibilityValue?.min,
+            now: ariaValueNow ?? accessibilityValue?.now,
+            text: ariaValueText ?? accessibilityValue?.text,
+          }
+        : undefined;
 
     const _keyDown = (event: KeyEvent) => {
       if (otherProps.keyDownEvents && event.isPropagationStopped() !== true) {

package/Libraries/Core/ReactNativeVersion.js

@@ -17,5 +17,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 80,
   patch: 0,
-  prerelease: 'nightly-20250414-70cdf12c4',
+  prerelease: 'nightly-20250428-9efcdc091',
 };

package/Libraries/Core/setUpReactDevTools.js

@@ -10,8 +10,8 @@
 
 'use strict';
 
-import type {Domain} from '../../src/private/debugging/setUpFuseboxReactDevToolsDispatcher';
-import type {Spec as NativeReactDevToolsRuntimeSettingsModuleSpec} from '../../src/private/fusebox/specs/NativeReactDevToolsRuntimeSettingsModule';
+import type {Domain} from '../../src/private/devsupport/rndevtools/setUpFuseboxReactDevToolsDispatcher';
+import type {Spec as NativeReactDevToolsRuntimeSettingsModuleSpec} from '../../src/private/devsupport/rndevtools/specs/NativeReactDevToolsRuntimeSettingsModule';
 
 if (__DEV__) {
   if (typeof global.queueMicrotask !== 'function') {
@@ -31,18 +31,18 @@ if (__DEV__) {
 
 if (__DEV__) {
   // Register dispatcher on global, which can be used later by Chrome DevTools frontend
-  require('../../src/private/debugging/setUpFuseboxReactDevToolsDispatcher');
+  require('../../src/private/devsupport/rndevtools/setUpFuseboxReactDevToolsDispatcher');
   const {
     initialize,
     connectToDevTools,
     connectWithCustomMessagingProtocol,
   } = require('react-devtools-core');
 
-  const reactDevToolsSettingsManager = require('../../src/private/debugging/ReactDevToolsSettingsManager');
+  const reactDevToolsSettingsManager = require('../../src/private/devsupport/rndevtools/ReactDevToolsSettingsManager');
   const serializedHookSettings =
     reactDevToolsSettingsManager.getGlobalHookSettings();
   const maybeReactDevToolsRuntimeSettingsModuleModule =
-    require('../../src/private/fusebox/specs/NativeReactDevToolsRuntimeSettingsModule').default;
+    require('../../src/private/devsupport/rndevtools/specs/NativeReactDevToolsRuntimeSettingsModule').default;
 
   let hookSettings = null;
   if (serializedHookSettings != null) {

package/Libraries/Image/ImageProps.js

@@ -21,10 +21,9 @@ import type {
   LayoutChangeEvent,
   NativeSyntheticEvent,
 } from '../Types/CoreEventTypes';
-import type {ImageType} from './ImageTypes.flow';
 import type {ImageResizeMode} from './ImageResizeMode';
 import type {ImageSource, ImageURISource} from './ImageSource';
-import type {ElementRef, RefSetter} from 'react';
+import type {ImageType} from './ImageTypes.flow';
 
 import * as React from 'react';
 
@@ -368,5 +367,5 @@ export type ImageBackgroundProps = $ReadOnly<{
    *
    * See https://reactnative.dev/docs/imagebackground#imageref
    */
-  imageRef?: RefSetter<ElementRef<ImageType>>,
+  imageRef?: React.RefSetter<React.ElementRef<ImageType>>,
 }>;

package/Libraries/Image/ImageSource.js

@@ -82,8 +82,10 @@ export interface ImageURISource {
   +scale?: ?number;
 }
 
+export type ImageRequireSource = number;
+
 export type ImageSource =
-  | number
+  | ImageRequireSource
   | ImageURISource
   | $ReadOnlyArray<ImageURISource>;
 

package/Libraries/Image/ImageSourceUtils.js

@@ -52,14 +52,14 @@ export function getImageSourcesFromImageProps(
           // 1x scale is provided in `srcSet` prop so ignore the `src` prop if provided.
           shouldUseSrcForDefaultScale =
             scale === 1 ? false : shouldUseSrcForDefaultScale;
-          sourceList.push({headers: headers, scale, uri, width, height});
+          sourceList.push({headers, scale, uri, width, height});
         }
       }
     });
 
     if (shouldUseSrcForDefaultScale && src != null) {
       sourceList.push({
-        headers: headers,
+        headers,
         scale: 1,
         uri: src,
         width,
@@ -73,6 +73,8 @@ export function getImageSourcesFromImageProps(
     sources = sourceList;
   } else if (src != null) {
     sources = [{uri: src, headers: headers, width, height}];
+  } else if (source != null && source.uri && Object.keys(headers).length > 0) {
+    sources = [{...source, headers}];
   } else {
     sources = source;
   }

package/Libraries/Lists/FlatList.d.ts

@@ -228,8 +228,8 @@ export abstract class FlatListComponent<
    * Provides a reference to the underlying host component
    */
   getNativeScrollRef: () =>
-    | React.ElementRef<typeof View>
-    | React.ElementRef<typeof ScrollViewComponent>
+    | React.ComponentRef<typeof View>
+    | React.ComponentRef<typeof ScrollViewComponent>
     | null
     | undefined;
 

package/Libraries/Lists/SectionListModern.js

@@ -17,7 +17,6 @@ import type {
   SectionData,
   VirtualizedSectionListProps,
 } from '@react-native/virtualized-lists';
-import type {ElementRef} from 'react';
 
 import Platform from '../Utilities/Platform';
 import VirtualizedLists from '@react-native/virtualized-lists';
@@ -175,7 +174,7 @@ const SectionList: component(
     ...props,
   };
 
-  const wrapperRef = useRef<?ElementRef<typeof VirtualizedSectionList>>();
+  const wrapperRef = useRef<?React.ElementRef<typeof VirtualizedSectionList>>();
 
   useImperativeHandle(
     ref,

package/Libraries/LogBox/Data/LogBoxData.js

@@ -18,7 +18,7 @@ import type {
   Message,
 } from './parseLogBoxLog';
 
-import DebuggerSessionObserver from '../../../src/private/debugging/FuseboxSessionObserver';
+import DebuggerSessionObserver from '../../../src/private/devsupport/rndevtools/FuseboxSessionObserver';
 import parseErrorStack from '../../Core/Devtools/parseErrorStack';
 import NativeDevSettings from '../../NativeModules/specs/NativeDevSettings';
 import NativeLogBox from '../../NativeModules/specs/NativeLogBox';

package/Libraries/NativeModules/specs/NativeDevMenu.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../../src/private/specs_DEPRECATED/modules/NativeDevMenu';
-import NativeDevMenu from '../../../src/private/specs_DEPRECATED/modules/NativeDevMenu';
+export * from '../../../src/private/devsupport/devmenu/specs/NativeDevMenu';
+import NativeDevMenu from '../../../src/private/devsupport/devmenu/specs/NativeDevMenu';
 export default NativeDevMenu;

package/Libraries/ReactNative/AppContainer-dev.js

@@ -53,7 +53,8 @@ const InspectorDeferred = ({
 }: InspectorDeferredProps) => {
   // D39382967 adds a require cycle: InitializeCore -> AppContainer -> Inspector -> InspectorPanel -> ScrollView -> InitializeCore
   // We can't remove it yet, fallback to dynamic require for now. This is the only reason why this logic is in a separate function.
-  const Inspector = require('../../src/private/inspector/Inspector').default;
+  const Inspector =
+    require('../../src/private/devsupport/devmenu/elementinspector/Inspector').default;
 
   return (
     <Inspector
@@ -74,7 +75,7 @@ const ReactDevToolsOverlayDeferred = ({
   reactDevToolsAgent,
 }: ReactDevToolsOverlayDeferredProps) => {
   const ReactDevToolsOverlay =
-    require('../../src/private/inspector/ReactDevToolsOverlay').default;
+    require('../../src/private/devsupport/devmenu/elementinspector/ReactDevToolsOverlay').default;
 
   return (
     <ReactDevToolsOverlay

package/Libraries/ReactNative/RendererImplementation.js

@@ -13,7 +13,6 @@ import type {
   InternalInstanceHandle,
   Node,
 } from '../Renderer/shims/ReactNativeTypes';
-import type {ElementRef, ElementType} from 'react';
 
 import {
   onCaughtError,
@@ -21,6 +20,8 @@ import {
   onUncaughtError,
 } from '../../src/private/renderer/errorhandling/ErrorHandlers';
 import {type RootTag} from './RootTag';
+import * as React from 'react';
+
 export function renderElement({
   element,
   rootTag,
@@ -58,9 +59,9 @@ export function renderElement({
   }
 }
 
-export function findHostInstance_DEPRECATED<TElementType: ElementType>(
+export function findHostInstance_DEPRECATED<TElementType: React.ElementType>(
   // $FlowFixMe[incompatible-call]
-  componentOrHandle: ?(ElementRef<TElementType> | number),
+  componentOrHandle: ?(React.ElementRef<TElementType> | number),
 ): ?HostInstance {
   return require('../Renderer/shims/ReactNative').default.findHostInstance_DEPRECATED(
     // $FlowFixMe[incompatible-call]
@@ -68,9 +69,9 @@ export function findHostInstance_DEPRECATED<TElementType: ElementType>(
   );
 }
 
-export function findNodeHandle<TElementType: ElementType>(
+export function findNodeHandle<TElementType: React.ElementType>(
   // $FlowFixMe[incompatible-call]
-  componentOrHandle: ?(ElementRef<TElementType> | number),
+  componentOrHandle: ?(React.ElementRef<TElementType> | number),
 ): ?number {
   return require('../Renderer/shims/ReactNative').default.findNodeHandle(
     // $FlowFixMe[incompatible-call]