react-native-tvos 0.85.3-1 → 0.86.0-0

package/src/private/specs_DEPRECATED/modules/NativeFrameRateLogger.js

@@ -19,4 +19,4 @@ export interface Spec extends TurboModule {
   +endScroll: () => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('FrameRateLogger'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('FrameRateLogger') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeHeadlessJsTaskSupport.js

@@ -17,4 +17,4 @@ export interface Spec extends TurboModule {
   +notifyTaskRetry: (taskId: number) => Promise<boolean>;
 }
 
-export default (TurboModuleRegistry.get<Spec>('HeadlessJsTaskSupport'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('HeadlessJsTaskSupport') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeI18nManager.js

@@ -25,4 +25,4 @@ export interface Spec extends TurboModule {
   swapLeftAndRightInRTL: (flipStyles: boolean) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('I18nManager'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('I18nManager') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeImageEditor.js

@@ -47,6 +47,6 @@ export interface Spec extends TurboModule {
   ) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'ImageEditingManager',
-): Spec);
+) as Spec;

package/src/private/specs_DEPRECATED/modules/NativeImageLoaderAndroid.js

@@ -27,4 +27,4 @@ export interface Spec extends TurboModule {
   +queryCache: (uris: Array<string>) => Promise<Object>;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('ImageLoader'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('ImageLoader') as Spec;

package/src/private/specs_DEPRECATED/modules/NativeImageLoaderIOS.js

@@ -34,4 +34,4 @@ export interface Spec extends TurboModule {
   +queryCache: (uris: Array<string>) => Promise<Object>;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('ImageLoader'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('ImageLoader') as Spec;

package/src/private/specs_DEPRECATED/modules/NativeImageStoreAndroid.js

@@ -21,6 +21,6 @@ export interface Spec extends TurboModule {
   ) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'ImageStoreManager',
-): Spec);
+) as Spec;

package/src/private/specs_DEPRECATED/modules/NativeImageStoreIOS.js

@@ -28,6 +28,6 @@ export interface Spec extends TurboModule {
   ) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'ImageStoreManager',
-): Spec);
+) as Spec;

package/src/private/specs_DEPRECATED/modules/NativeIntentAndroid.js

@@ -27,4 +27,4 @@ export interface Spec extends TurboModule {
   ) => Promise<void>;
 }
 
-export default (TurboModuleRegistry.get<Spec>('IntentAndroid'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('IntentAndroid') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeJSCHeapCapture.js

@@ -16,4 +16,4 @@ export interface Spec extends TurboModule {
   +captureComplete: (path: string, error: ?string) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('JSCHeapCapture'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('JSCHeapCapture') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeKeyboardObserver.js

@@ -17,4 +17,4 @@ export interface Spec extends TurboModule {
   +removeListeners: (count: number) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('KeyboardObserver'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('KeyboardObserver') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeLinkingManager.js

@@ -24,4 +24,4 @@ export interface Spec extends TurboModule {
   +removeListeners: (count: number) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('LinkingManager'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('LinkingManager') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeLogBox.js

@@ -17,4 +17,4 @@ export interface Spec extends TurboModule {
   +hide: () => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('LogBox'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('LogBox') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeModalManager.js

@@ -18,4 +18,4 @@ export interface Spec extends TurboModule {
   +removeListeners: (count: number) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('ModalManager'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('ModalManager') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeNetworkingAndroid.js

@@ -34,4 +34,4 @@ export interface Spec extends TurboModule {
   +removeListeners: (count: number) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('Networking'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('Networking') as Spec;

package/src/private/specs_DEPRECATED/modules/NativeNetworkingIOS.js

@@ -35,4 +35,4 @@ export interface Spec extends TurboModule {
   +removeListeners: (count: number) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('Networking'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('Networking') as Spec;

package/src/private/specs_DEPRECATED/modules/NativePermissionsAndroid.js

@@ -75,4 +75,4 @@ export interface Spec extends TurboModule {
   ) => Promise<{[permission: PermissionType]: PermissionStatus, ...}>;
 }
 
-export default (TurboModuleRegistry.get<Spec>('PermissionsAndroid'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('PermissionsAndroid') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativePlatformConstantsAndroid.js

@@ -39,6 +39,6 @@ export interface Spec extends TurboModule {
   +getAndroidID: () => string;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'PlatformConstants',
-): Spec);
+) as Spec;

package/src/private/specs_DEPRECATED/modules/NativePlatformConstantsIOS.js

@@ -32,6 +32,6 @@ export interface Spec extends TurboModule {
   +getConstants: () => PlatformConstantsIOS;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'PlatformConstants',
-): Spec);
+) as Spec;

package/src/private/specs_DEPRECATED/modules/NativePushNotificationManagerIOS.js

@@ -98,6 +98,6 @@ export interface Spec extends TurboModule {
   +removeListeners: (count: number) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>(
+export default TurboModuleRegistry.get<Spec>(
   'PushNotificationManager',
-): ?Spec);
+) as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeRedBox.js

@@ -17,4 +17,4 @@ export interface Spec extends TurboModule {
   +dismiss: () => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('RedBox'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('RedBox') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeSampleTurboModule.js

@@ -64,6 +64,6 @@ export interface Spec extends TurboModule {
   +getImageUrl?: () => Promise<string | null>;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'SampleTurboModule',
-): Spec);
+) as Spec;

package/src/private/specs_DEPRECATED/modules/NativeSegmentFetcher.js

@@ -25,4 +25,4 @@ export interface Spec extends TurboModule {
   ) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('SegmentFetcher'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('SegmentFetcher') as Spec;

package/src/private/specs_DEPRECATED/modules/NativeSettingsManager.js

@@ -20,6 +20,6 @@ export interface Spec extends TurboModule {
   +deleteValues: (values: Array<string>) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'SettingsManager',
-): Spec);
+) as Spec;

package/src/private/specs_DEPRECATED/modules/NativeShareModule.js

@@ -20,4 +20,4 @@ export interface Spec extends TurboModule {
   ) => Promise<{action: string}>;
 }
 
-export default (TurboModuleRegistry.get<Spec>('ShareModule'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('ShareModule') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeSoundManager.js

@@ -19,4 +19,4 @@ export interface Spec extends TurboModule {
   +playTouchSound: () => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('SoundManager'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('SoundManager') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeTiming.js

@@ -24,4 +24,4 @@ export interface Spec extends TurboModule {
   +setSendIdleEvents: (sendIdleEvents: boolean) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('Timing'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('Timing') as ?Spec;

package/src/private/specs_DEPRECATED/modules/NativeToastAndroid.js

@@ -35,4 +35,4 @@ export interface Spec extends TurboModule {
   ) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('ToastAndroid'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('ToastAndroid') as Spec;

package/src/private/specs_DEPRECATED/modules/NativeUIManager.js

@@ -184,4 +184,4 @@ export interface Spec extends TurboModule {
   +blur?: (reactTag: number) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('UIManager'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('UIManager') as Spec;

package/src/private/specs_DEPRECATED/modules/NativeVibration.js

@@ -21,4 +21,4 @@ export interface Spec extends TurboModule {
   +cancel: () => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>('Vibration'): Spec);
+export default TurboModuleRegistry.getEnforcing<Spec>('Vibration') as Spec;

package/src/private/specs_DEPRECATED/modules/NativeWebSocketModule.js

@@ -29,6 +29,6 @@ export interface Spec extends TurboModule {
   +removeListeners: (count: number) => void;
 }
 
-export default (TurboModuleRegistry.getEnforcing<Spec>(
+export default TurboModuleRegistry.getEnforcing<Spec>(
   'WebSocketModule',
-): Spec);
+) as Spec;

package/src/private/styles/composeStyles.js

@@ -13,7 +13,7 @@
  * If either style is null or undefined, the other one is returned without
  * allocating an array, saving allocations and enabling memoization.
  */
-export default function composeStyles<T, U: T, V: T>(
+export default function composeStyles<T, U extends T, V extends T>(
   style1: ?U,
   style2: ?V,
 ): ?(T | ReadonlyArray<T>) {

package/src/private/types/HostComponent.js

@@ -10,7 +10,7 @@
 
 import type {HostInstance} from './HostInstance';
 
-export type HostComponent<Config: {...}> = component(
+export type HostComponent<Config extends {...}> = component(
   ref?: React.RefSetter<HostInstance>,
   ...Config
 );

package/src/private/utilities/toExtendedError.js

@@ -26,5 +26,5 @@ export default function toExtendedError(value: unknown): ExtendedError {
   const error = toError(value);
   // ExtendedError extends Error, so this cast is safe for the LogBox system
   // $FlowFixMe[incompatible-type] ExtendedError extends Error, this cast is safe
-  return (error: ExtendedError);
+  return error as ExtendedError;
 }

package/src/private/viewtransition/specs/NativeViewTransition.js

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {TurboModule} from '../../../../Libraries/TurboModule/RCTExport';
+
+import * as TurboModuleRegistry from '../../../../Libraries/TurboModule/TurboModuleRegistry';
+
+export interface Spec extends TurboModule {
+  +getViewTransitionInstance: (
+    name: string,
+    pseudo: string,
+  ) => ?{
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+    nativeTag: number,
+  };
+  +findPseudoElementShadowNodeByTag: (reactTag: number) => ?unknown /* Node */;
+  +waitForTransitionAnimation: (animationId: number) => void;
+  +transitionAnimationFinished: (animationId: number) => void;
+}
+
+export default TurboModuleRegistry.get<Spec>(
+  'NativeViewTransitionCxx',
+) as ?Spec;

package/src/private/webapis/dom/events/Event.js

@@ -21,6 +21,7 @@ import {setPlatformObject} from '../../webidl/PlatformObjects';
 import {
   COMPOSED_PATH_KEY,
   CURRENT_TARGET_KEY,
+  EVENT_INIT_TIMESTAMP_KEY,
   EVENT_PHASE_KEY,
   IN_PASSIVE_LISTENER_FLAG_KEY,
   IS_TRUSTED_KEY,
@@ -60,7 +61,7 @@ export default class Event {
   _type: string;
 
   _defaultPrevented: boolean = false;
-  _timeStamp: number = performance.now();
+  _timeStamp: number;
 
   // $FlowExpectedError[unsupported-syntax]
   [COMPOSED_PATH_KEY]: boolean = [];
@@ -109,6 +110,14 @@ export default class Event {
     this._bubbles = Boolean(options?.bubbles);
     this._cancelable = Boolean(options?.cancelable);
     this._composed = Boolean(options?.composed);
+
+    // For internal construction of events using a custom timestamp (instead of
+    // event object creation), for use cases like dispatching events from the
+    // host platform using the original timestamps.
+    // $FlowExpectedError[prop-missing]
+    const initTimestamp: number | void = options?.[EVENT_INIT_TIMESTAMP_KEY];
+    this._timeStamp =
+      initTimestamp !== undefined ? initTimestamp : performance.now();
   }
 
   get bubbles(): boolean {

package/src/private/webapis/dom/events/EventTarget.js

@@ -15,6 +15,7 @@
 
 import type {EventPhase} from './Event';
 
+import * as ReactNativeFeatureFlags from '../../../featureflags/ReactNativeFeatureFlags';
 import {setPlatformObject} from '../../webidl/PlatformObjects';
 import Event from './Event';
 import {
@@ -30,6 +31,7 @@ import {
   setTarget,
 } from './internals/EventInternals';
 import {
+  EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY,
   EVENT_TARGET_GET_THE_PARENT_KEY,
   INTERNAL_DISPATCH_METHOD_KEY,
 } from './internals/EventTargetInternals';
@@ -209,6 +211,21 @@ export default class EventTarget {
     return !event.defaultPrevented;
   }
 
+  /**
+   * This a "protected" method to be overridden by a subclass to provide
+   * an additional event listener extracted from props.
+   *
+   * Called during event dispatch before explicitly registered listeners.
+   * Return a callback to be invoked as an event listener, or null.
+   */
+  // $FlowExpectedError[unsupported-syntax]
+  [EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY](
+    eventType: string,
+    isCapture: boolean,
+  ): EventCallback | null {
+    return null;
+  }
+
   /**
    * This a "protected" method to be overridden by a subclass to allow event
    * propagation.
@@ -333,24 +350,53 @@ function invoke(
   event: Event,
   eventPhase: EventPhase,
 ) {
-  const listenersByType = getListenersForPhase(
-    eventTarget,
-    eventPhase === Event.CAPTURING_PHASE,
-  );
+  const isCapture = eventPhase === Event.CAPTURING_PHASE;
 
   setCurrentTarget(event, eventTarget);
 
-  const maybeListeners = listenersByType?.get(event.type);
-  if (maybeListeners == null) {
-    return;
-  }
+  // Build the list of listeners to invoke:
+  // When the flag is enabled, prop-based listeners fire first, then
+  // explicitly registered addEventListener listeners.
+  // When disabled, only addEventListener listeners are used (legacy path).
+  let listeners: Array<EventListenerRegistration>;
+
+  if (ReactNativeFeatureFlags.enableNativeEventTargetEventDispatching()) {
+    // $FlowExpectedError[prop-missing]
+    const propListener: EventCallback | null = eventTarget[
+      EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY
+    ](event.type, isCapture);
 
-  // This is a copy so listeners added during dispatch are NOT executed.
-  // Note that `maybeListeners.values()` is a live view of the map instead of an
-  // immutable copy.
-  const listeners = Array.from(maybeListeners.values());
+    const listenersByType = getListenersForPhase(eventTarget, isCapture);
+    const maybeListeners = listenersByType?.get(event.type);
 
-  setCurrentTarget(event, eventTarget);
+    if (propListener == null && maybeListeners == null) {
+      return;
+    }
+
+    listeners = [];
+
+    if (propListener != null) {
+      listeners.push({
+        callback: propListener,
+        passive: false,
+        once: false,
+        removed: false,
+      });
+    }
+
+    if (maybeListeners != null) {
+      for (const registration of maybeListeners.values()) {
+        listeners.push(registration);
+      }
+    }
+  } else {
+    const listenersByType = getListenersForPhase(eventTarget, isCapture);
+    const maybeListeners = listenersByType?.get(event.type);
+    if (maybeListeners == null) {
+      return;
+    }
+    listeners = Array.from(maybeListeners.values());
+  }
 
   for (const listener of listeners) {
     if (listener.removed) {
@@ -358,11 +404,7 @@ function invoke(
     }
 
     if (listener.once) {
-      eventTarget.removeEventListener(
-        event.type,
-        listener.callback,
-        eventPhase === Event.CAPTURING_PHASE,
-      );
+      eventTarget.removeEventListener(event.type, listener.callback, isCapture);
     }
 
     if (listener.passive) {

package/src/private/webapis/dom/events/internals/EventInternals.js

@@ -14,7 +14,7 @@
  * (only with public exports).
  */
 
-import type Event, {EventPhase} from '../Event';
+import type Event, {EventInit, EventPhase} from '../Event';
 import type EventTarget from '../EventTarget';
 
 export const COMPOSED_PATH_KEY: symbol = Symbol('composedPath');
@@ -30,6 +30,11 @@ export const STOP_IMMEDIATE_PROPAGATION_FLAG_KEY: symbol = Symbol(
 export const STOP_PROPAGATION_FLAG_KEY: symbol = Symbol('stopPropagationFlag');
 export const TARGET_KEY: symbol = Symbol('target');
 
+// For internal construction of events using a custom timestamp (instead of
+// event object creation), for use cases like dispatching events from the host
+// platform using the original timestamps.
+export const EVENT_INIT_TIMESTAMP_KEY: symbol = Symbol('eventInitTimestamp');
+
 export function getCurrentTarget(event: Event): EventTarget | null {
   // $FlowExpectedError[prop-missing]
   return event[CURRENT_TARGET_KEY];
@@ -118,3 +123,15 @@ export function setTarget(event: Event, target: EventTarget | null): void {
   // $FlowExpectedError[prop-missing]
   event[TARGET_KEY] = target;
 }
+
+export function setEventInitTimeStamp(
+  eventInit: EventInit,
+  timeStamp: number,
+): void {
+  if (typeof timeStamp !== 'number') {
+    return;
+  }
+  // $FlowExpectedError[prop-missing]
+  // $FlowExpectedError[invalid-computed-prop]
+  eventInit[EVENT_INIT_TIMESTAMP_KEY] = timeStamp;
+}

package/src/private/webapis/dom/events/internals/EventTargetInternals.js

@@ -27,6 +27,18 @@ export const EVENT_TARGET_GET_THE_PARENT_KEY: symbol = Symbol(
   'EventTarget[get the parent]',
 );
 
+/**
+ * Use this symbol as key for a method to provide an additional event listener
+ * from props in an `EventTarget` subclass.
+ *
+ * During event dispatch, this method is called before processing explicitly
+ * registered `addEventListener` listeners. If it returns a non-null callback,
+ * that callback is invoked as an event listener.
+ */
+export const EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY: symbol = Symbol(
+  'EventTarget[get listener from props]',
+);
+
 /**
  * This is only exposed to implement the method in `EventTarget`.
  * Do NOT use this directly (use the `dispatchTrustedEvent` method instead).

package/src/private/webapis/dom/nodes/ReactNativeElement.js

@@ -29,7 +29,10 @@ import {Commands as ViewCommands} from '../../../../../Libraries/Components/View
 import {create as createAttributePayload} from '../../../../../Libraries/ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload';
 import warnForStyleProps from '../../../../../Libraries/ReactNative/ReactFabricPublicInstance/warnForStyleProps';
 import * as ReactNativeFeatureFlags from '../../../featureflags/ReactNativeFeatureFlags';
+import {getEventTypePropName} from '../../../renderer/events/ReactNativeEventTypeMapping';
+import {EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY} from '../events/internals/EventTargetInternals';
 import {
+  getCurrentProps,
   getNativeElementReference,
   getPublicInstanceFromInstanceHandle,
   setInstanceHandle,
@@ -215,6 +218,27 @@ class ReactNativeElement extends ReadOnlyElement implements NativeMethods {
       NativeDOM.setNativeProps(node, updatePayload);
     }
   }
+
+  // Provide event listeners from React props during EventTarget dispatch.
+  // This is called by EventTarget.invoke() before explicit addEventListener
+  // listeners, allowing prop-based handlers to be resolved at dispatch time
+  // without registering them via addEventListener during commit.
+  // $FlowExpectedError[unsupported-syntax]
+  [EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY](
+    eventType: string,
+    isCapture: boolean,
+  ): ((event: Event) => void) | null {
+    const currentProps = getCurrentProps(this);
+    if (currentProps == null) {
+      return null;
+    }
+    const propName = getEventTypePropName(eventType, isCapture);
+    if (propName == null) {
+      return null;
+    }
+    const handler = currentProps[propName];
+    return typeof handler === 'function' ? handler : null;
+  }
 }
 
 type ReactNativeElementT = ReactNativeElement;

package/src/private/webapis/dom/nodes/ReadOnlyElement.js

@@ -15,7 +15,7 @@ import type HTMLCollection from '../oldstylecollections/HTMLCollection';
 import DOMRect from '../../geometry/DOMRect';
 import {createHTMLCollection} from '../oldstylecollections/HTMLCollection';
 import {
-  getInstanceHandle,
+  getCurrentProps,
   getNativeElementReference,
 } from './internals/NodeInternals';
 import {getElementSibling} from './internals/Traversal';
@@ -86,11 +86,9 @@ export default class ReadOnlyElement extends ReadOnlyNode {
   }
 
   get id(): string {
-    const instanceHandle = getInstanceHandle(this);
-    // TODO: migrate off this private React API
-    // $FlowExpectedError[incompatible-use]
-    const props = instanceHandle?.stateNode?.canonical?.currentProps;
-    return props?.id ?? props?.nativeID ?? '';
+    const props = getCurrentProps(this);
+    const id = props.id ?? props.nativeID;
+    return typeof id === 'string' ? id : '';
   }
 
   get lastElementChild(): ReadOnlyElement | null {