react-native 0.84.0-nightly-20251117-d52b9d2f8 → 0.84.0-nightly-20251119-79b09ce9c

package/Libraries/Animated/createAnimatedComponent.js

@@ -8,6 +8,7 @@
  * @format
  */
 
+import type {NativeColorValue} from '../StyleSheet/StyleSheetTypes';
 import type AnimatedAddition from './nodes/AnimatedAddition';
 import type AnimatedDiffClamp from './nodes/AnimatedDiffClamp';
 import type AnimatedDivision from './nodes/AnimatedDivision';
@@ -46,6 +47,7 @@ export type WithAnimatedValue<+T> = T extends Builtin | Nullable
         | AnimatedInterpolation<number | string>
         | AnimatedInterpolation<number>
         | AnimatedInterpolation<string>
+        | AnimatedInterpolation<NativeColorValue>
     : T extends $ReadOnlyArray<infer P>
       ? $ReadOnlyArray<WithAnimatedValue<P>>
       : T extends {...}

package/Libraries/Animated/nodes/AnimatedInterpolation.js

@@ -12,6 +12,7 @@
 
 'use strict';
 
+import type {NativeColorValue} from '../../StyleSheet/StyleSheetTypes';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type AnimatedNode from './AnimatedNode';
 import type {AnimatedNodeConfig} from './AnimatedNode';
@@ -26,7 +27,14 @@ import invariant from 'invariant';
 
 type ExtrapolateType = 'extend' | 'identity' | 'clamp';
 
-export type InterpolationConfigType<OutputT: number | string> = $ReadOnly<{
+export type InterpolationConfigSupportedOutputType =
+  | number
+  | string
+  | NativeColorValue;
+
+export type InterpolationConfigType<
+  OutputT: InterpolationConfigSupportedOutputType,
+> = $ReadOnly<{
   ...AnimatedNodeConfig,
   inputRange: $ReadOnlyArray<number>,
   outputRange: $ReadOnlyArray<OutputT>,
@@ -82,6 +90,28 @@ function createNumericInterpolation(
   };
 }
 
+function createPlatformColorInterpolation(
+  config: InterpolationConfigType<NativeColorValue>,
+): (input: number) => NativeColorValue {
+  const outputRange = config.outputRange;
+  const outputRangeIndices = Array.from(Array(outputRange.length).keys());
+  const interpolateIndex = createNumericInterpolation({
+    ...config,
+    inputRange: config.inputRange,
+    outputRange: outputRangeIndices,
+  });
+
+  return input => {
+    const interpolateResult = interpolateIndex(input);
+    if (!Number.isInteger(interpolateResult)) {
+      console.warn(
+        'PlatformColor interpolation should happen natively, here we fallback to the closest color',
+      );
+    }
+    return outputRange[Math.floor(interpolateResult)];
+  };
+}
+
 function interpolate(
   input: number,
   inputMin: number,
@@ -277,7 +307,7 @@ function findRange(input: number, inputRange: $ReadOnlyArray<number>) {
   return i - 1;
 }
 
-function checkValidRanges<OutputT: number | string>(
+function checkValidRanges<OutputT: InterpolationConfigSupportedOutputType>(
   inputRange: $ReadOnlyArray<number>,
   outputRange: $ReadOnlyArray<OutputT>,
 ) {
@@ -304,7 +334,7 @@ function checkValidInputRange(arr: $ReadOnlyArray<number>) {
   }
 }
 
-function checkInfiniteRange<OutputT: number | string>(
+function checkInfiniteRange<OutputT: InterpolationConfigSupportedOutputType>(
   name: string,
   arr: $ReadOnlyArray<OutputT>,
 ) {
@@ -322,7 +352,7 @@ function checkInfiniteRange<OutputT: number | string>(
 }
 
 export default class AnimatedInterpolation<
-  OutputT: number | string,
+  OutputT: InterpolationConfigSupportedOutputType,
 > extends AnimatedWithChildren {
   _parent: AnimatedNode;
   _config: InterpolationConfigType<OutputT>;
@@ -347,6 +377,10 @@ export default class AnimatedInterpolation<
       const config = this._config;
       if (config.outputRange && typeof config.outputRange[0] === 'string') {
         this._interpolation = (createStringInterpolation((config: any)): any);
+      } else if (typeof config.outputRange[0] === 'object') {
+        this._interpolation = (createPlatformColorInterpolation(
+          (config: any),
+        ): any);
       } else {
         this._interpolation = (createNumericInterpolation((config: any)): any);
       }
@@ -403,6 +437,8 @@ export default class AnimatedInterpolation<
           return NativeAnimatedHelper.transformDataType(value);
         }
       }): any);
+    } else if (typeof outputRange[0] === 'object') {
+      outputType = 'platform_color';
     }
 
     return {

package/Libraries/Animated/nodes/AnimatedValue.js

@@ -12,7 +12,10 @@ import type {EventSubscription} from '../../vendor/emitter/EventEmitter';
 import type {PlatformConfig} from '../AnimatedPlatformConfig';
 import type Animation from '../animations/Animation';
 import type {EndCallback} from '../animations/Animation';
-import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type {
+  InterpolationConfigSupportedOutputType,
+  InterpolationConfigType,
+} from './AnimatedInterpolation';
 import type AnimatedNode from './AnimatedNode';
 import type {AnimatedNodeConfig} from './AnimatedNode';
 import type AnimatedTracking from './AnimatedTracking';
@@ -298,7 +301,7 @@ export default class AnimatedValue extends AnimatedWithChildren {
    * Interpolates the value before updating the property, e.g. mapping 0-1 to
    * 0-10.
    */
-  interpolate<OutputT: number | string>(
+  interpolate<OutputT: InterpolationConfigSupportedOutputType>(
     config: InterpolationConfigType<OutputT>,
   ): AnimatedInterpolation<OutputT> {
     return new AnimatedInterpolation(this, config);

package/Libraries/Components/View/ViewPropTypes.js

@@ -16,6 +16,8 @@ import type {
   BlurEvent,
   FocusEvent,
   GestureResponderEvent,
+  KeyDownEvent,
+  KeyUpEvent,
   LayoutChangeEvent,
   LayoutRectangle,
   MouseEvent,
@@ -115,6 +117,13 @@ type FocusEventProps = $ReadOnly<{
   onFocusCapture?: ?(event: FocusEvent) => void,
 }>;
 
+type KeyEventProps = $ReadOnly<{
+  onKeyDown?: ?(event: KeyDownEvent) => void,
+  onKeyDownCapture?: ?(event: KeyDownEvent) => void,
+  onKeyUp?: ?(event: KeyUpEvent) => void,
+  onKeyUpCapture?: ?(event: KeyUpEvent) => void,
+}>;
+
 type TouchEventProps = $ReadOnly<{
   onTouchCancel?: ?(e: GestureResponderEvent) => void,
   onTouchCancelCapture?: ?(e: GestureResponderEvent) => void,
@@ -505,6 +514,7 @@ export type ViewProps = $ReadOnly<{
   ...MouseEventProps,
   ...PointerEventProps,
   ...FocusEventProps,
+  ...KeyEventProps,
   ...TouchEventProps,
   ...ViewPropsAndroid,
   ...ViewPropsIOS,

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 84;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20251117-d52b9d2f8';
+  static prerelease: string | null = 'nightly-20251119-79b09ce9c';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/NativeComponent/BaseViewConfig.android.js

@@ -122,6 +122,18 @@ const bubblingEventTypes = {
       bubbled: 'onFocus',
     },
   },
+  topKeyDown: {
+    phasedRegistrationNames: {
+      captured: 'onKeyDownCapture',
+      bubbled: 'onKeyDown',
+    },
+  },
+  topKeyUp: {
+    phasedRegistrationNames: {
+      captured: 'onKeyUpCapture',
+      bubbled: 'onKeyUp',
+    },
+  },
 };
 
 const directEventTypes = {

package/Libraries/Types/CoreEventTypes.js

@@ -322,3 +322,34 @@ export type MouseEvent = NativeSyntheticEvent<
     timestamp: number,
   }>,
 >;
+
+export type KeyEvent = $ReadOnly<{
+  /**
+   * The actual key that was pressed. For example, F would be "f" or "F" depending on the shift key.
+   * @see https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key
+   */
+  key: string,
+  /**
+   * The key code of the key that was pressed. For example, F would be "KeyF"
+   * @see https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code
+   */
+  code: string,
+  altKey: boolean,
+  ctrlKey: boolean,
+  metaKey: boolean,
+  shiftKey: boolean,
+  /**
+   * A boolean value that is true if the given key is being held down such that it is automatically repeating.
+   * @see https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
+   */
+  repeat?: boolean,
+  /**
+   * Returns a boolean value indicating if the event is fired within a composition session
+   * @see https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent/isComposing
+   */
+  isComposing?: boolean,
+}>;
+
+export type KeyUpEvent = NativeSyntheticEvent<KeyEvent>;
+
+export type KeyDownEvent = NativeSyntheticEvent<KeyEvent>;

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(84),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20251117-d52b9d2f8",
+                  RCTVersionPrerelease: @"nightly-20251119-79b09ce9c",
                   };
   });
   return __rnVersion;

package/React/CoreModules/RCTExceptionsManager.mm

@@ -77,8 +77,11 @@ RCT_EXPORT_MODULE()
     RCTTriggerReloadCommandListeners(@"JS Crash Reload");
   } else if (!RCT_DEV) {
     NSString *description = [@"Unhandled JS Exception: " stringByAppendingString:message];
-    NSDictionary *errorInfo =
-        @{NSLocalizedDescriptionKey : description, RCTJSStackTraceKey : stack, RCTJSExtraDataKey : extraDataAsJSON};
+    NSDictionary *errorInfo = @{
+      NSLocalizedDescriptionKey : description,
+      RCTJSStackTraceKey : stack == nil ? (id)kCFNull : stack,
+      RCTJSExtraDataKey : extraDataAsJSON == nil ? (id)kCFNull : extraDataAsJSON
+    };
     RCTFatal([NSError errorWithDomain:RCTErrorDomain code:0 userInfo:errorInfo]);
   }
 }

package/React/CxxModule/RCTCxxUtils.mm

@@ -68,7 +68,7 @@ NSError *tryAndReturnError(const std::function<void()> &func)
       return nil;
     } @catch (NSException *exception) {
       return RCTErrorWithNSException(exception);
-    } @catch (id exception) {
+    } @catch (id) {
       // This will catch any other ObjC exception, but no C++ exceptions
       return RCTErrorWithMessage(@"non-std ObjC Exception");
     }

package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.h

@@ -75,6 +75,8 @@ static inline std::string toString(const ActivityIndicatorViewSize &value) {
   switch (value) {
     case ActivityIndicatorViewSize::Small: return "small";
     case ActivityIndicatorViewSize::Large: return "large";
+    default:
+      abort();
   }
 }
 
@@ -120,6 +122,8 @@ static inline std::string toString(const AndroidDrawerLayoutKeyboardDismissMode
   switch (value) {
     case AndroidDrawerLayoutKeyboardDismissMode::None: return "none";
     case AndroidDrawerLayoutKeyboardDismissMode::OnDrag: return "on-drag";
+    default:
+      abort();
   }
 }
 
@@ -141,6 +145,8 @@ static inline std::string toString(const AndroidDrawerLayoutDrawerPosition &valu
   switch (value) {
     case AndroidDrawerLayoutDrawerPosition::Left: return "left";
     case AndroidDrawerLayoutDrawerPosition::Right: return "right";
+    default:
+      abort();
   }
 }
 
@@ -164,6 +170,8 @@ static inline std::string toString(const AndroidDrawerLayoutDrawerLockMode &valu
     case AndroidDrawerLayoutDrawerLockMode::Unlocked: return "unlocked";
     case AndroidDrawerLayoutDrawerLockMode::LockedClosed: return "locked-closed";
     case AndroidDrawerLayoutDrawerLockMode::LockedOpen: return "locked-open";
+    default:
+      abort();
   }
 }
 
@@ -231,6 +239,8 @@ static inline std::string toString(const AndroidSwipeRefreshLayoutSize &value) {
   switch (value) {
     case AndroidSwipeRefreshLayoutSize::Default: return "default";
     case AndroidSwipeRefreshLayoutSize::Large: return "large";
+    default:
+      abort();
   }
 }
 
@@ -398,6 +408,8 @@ static inline std::string toString(const ModalHostViewAnimationType &value) {
     case ModalHostViewAnimationType::None: return "none";
     case ModalHostViewAnimationType::Slide: return "slide";
     case ModalHostViewAnimationType::Fade: return "fade";
+    default:
+      abort();
   }
 }
 
@@ -423,6 +435,8 @@ static inline std::string toString(const ModalHostViewPresentationStyle &value)
     case ModalHostViewPresentationStyle::PageSheet: return "pageSheet";
     case ModalHostViewPresentationStyle::FormSheet: return "formSheet";
     case ModalHostViewPresentationStyle::OverFullScreen: return "overFullScreen";
+    default:
+      abort();
   }
 }
 

package/ReactAndroid/api/ReactAndroid.api

@@ -296,7 +296,6 @@ public final class com/facebook/react/ReactInstanceManagerBuilder {
 	public final fun addPackages (Ljava/util/List;)Lcom/facebook/react/ReactInstanceManagerBuilder;
 	public final fun build ()Lcom/facebook/react/ReactInstanceManager;
 	public final fun setApplication (Landroid/app/Application;)Lcom/facebook/react/ReactInstanceManagerBuilder;
-	public final fun setBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)Lcom/facebook/react/ReactInstanceManagerBuilder;
 	public final fun setBundleAssetName (Ljava/lang/String;)Lcom/facebook/react/ReactInstanceManagerBuilder;
 	public final fun setChoreographerProvider (Lcom/facebook/react/internal/ChoreographerProvider;)Lcom/facebook/react/ReactInstanceManagerBuilder;
 	public final fun setCurrentActivity (Landroid/app/Activity;)Lcom/facebook/react/ReactInstanceManagerBuilder;
@@ -381,6 +380,7 @@ public class com/facebook/react/ReactRootView : android/widget/FrameLayout, com/
 	public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;)V
 	public fun <init> (Landroid/content/Context;Landroid/util/AttributeSet;I)V
 	protected fun dispatchDraw (Landroid/graphics/Canvas;)V
+	protected fun dispatchJSKeyEvent (Landroid/view/KeyEvent;)V
 	protected fun dispatchJSPointerEvent (Landroid/view/MotionEvent;Z)V
 	protected fun dispatchJSTouchEvent (Landroid/view/MotionEvent;)V
 	public fun dispatchKeyEvent (Landroid/view/KeyEvent;)Z
@@ -583,7 +583,6 @@ public abstract interface class com/facebook/react/bridge/Callback {
 }
 
 public abstract interface class com/facebook/react/bridge/CatalystInstance : com/facebook/react/bridge/JSBundleLoaderDelegate, com/facebook/react/bridge/JSInstance, com/facebook/react/bridge/MemoryPressureListener {
-	public abstract fun addBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)V
 	public abstract fun callFunction (Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/NativeArray;)V
 	public abstract fun destroy ()V
 	public abstract fun extendNativeModules (Lcom/facebook/react/bridge/NativeModuleRegistry;)V
@@ -605,7 +604,6 @@ public abstract interface class com/facebook/react/bridge/CatalystInstance : com
 	public abstract fun invokeCallback (ILcom/facebook/react/bridge/NativeArrayInterface;)V
 	public abstract fun isDestroyed ()Z
 	public abstract fun registerSegment (ILjava/lang/String;)V
-	public abstract fun removeBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)V
 	public abstract fun runJSBundle ()V
 	public abstract fun setFabricUIManager (Lcom/facebook/react/bridge/UIManager;)V
 	public abstract fun setGlobalVariable (Ljava/lang/String;Ljava/lang/String;)V
@@ -613,7 +611,6 @@ public abstract interface class com/facebook/react/bridge/CatalystInstance : com
 }
 
 public class com/facebook/react/bridge/CatalystInstanceImpl : com/facebook/react/bridge/CatalystInstance {
-	public fun addBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)V
 	public fun callFunction (Lcom/facebook/react/bridge/CatalystInstanceImpl$PendingJSCall;)V
 	public fun callFunction (Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/NativeArray;)V
 	public fun destroy ()V
@@ -641,7 +638,6 @@ public class com/facebook/react/bridge/CatalystInstanceImpl : com/facebook/react
 	public fun loadScriptFromFile (Ljava/lang/String;Ljava/lang/String;Z)V
 	public fun loadSplitBundleFromFile (Ljava/lang/String;Ljava/lang/String;)V
 	public fun registerSegment (ILjava/lang/String;)V
-	public fun removeBridgeIdleDebugListener (Lcom/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener;)V
 	public fun runJSBundle ()V
 	public fun setFabricUIManager (Lcom/facebook/react/bridge/UIManager;)V
 	public fun setGlobalVariable (Ljava/lang/String;Ljava/lang/String;)V
@@ -970,12 +966,6 @@ public final class com/facebook/react/bridge/NoSuchKeyException : java/lang/Runt
 	public fun <init> (Ljava/lang/String;)V
 }
 
-public abstract interface class com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener {
-	public abstract fun onBridgeDestroyed ()V
-	public abstract fun onTransitionToBridgeBusy ()V
-	public abstract fun onTransitionToBridgeIdle ()V
-}
-
 public abstract interface class com/facebook/react/bridge/PerformanceCounter {
 	public abstract fun getPerformanceCounters ()Ljava/util/Map;
 	public abstract fun profileNextBatch ()V
@@ -3132,6 +3122,7 @@ public final class com/facebook/react/runtime/ReactSurfaceView : com/facebook/re
 	public fun isViewAttachedToReactInstance ()Z
 	public fun onChildEndedNativeGesture (Landroid/view/View;Landroid/view/MotionEvent;)V
 	public fun onChildStartedNativeGesture (Landroid/view/View;Landroid/view/MotionEvent;)V
+	public fun requestChildFocus (Landroid/view/View;Landroid/view/View;)V
 	public fun requestDisallowInterceptTouchEvent (Z)V
 	public fun setIsFabric (Z)V
 }
@@ -4328,7 +4319,6 @@ public class com/facebook/react/uimanager/UIImplementation {
 	public fun setJSResponder (IZ)V
 	public fun setLayoutAnimationEnabledExperimental (Z)V
 	public fun setLayoutUpdateListener (Lcom/facebook/react/uimanager/UIImplementation$LayoutUpdateListener;)V
-	public fun setViewHierarchyUpdateDebugListener (Lcom/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener;)V
 	public fun setViewLocalData (ILjava/lang/Object;)V
 	public fun synchronouslyUpdateViewOnUIThread (ILcom/facebook/react/uimanager/ReactStylesDiffMap;)V
 	public fun updateInsetsPadding (IIIII)V
@@ -4412,7 +4402,6 @@ public class com/facebook/react/uimanager/UIManagerModule : com/facebook/react/b
 	public fun setChildren (ILcom/facebook/react/bridge/ReadableArray;)V
 	public fun setJSResponder (IZ)V
 	public fun setLayoutAnimationEnabledExperimental (Z)V
-	public fun setViewHierarchyUpdateDebugListener (Lcom/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener;)V
 	public fun setViewLocalData (ILjava/lang/Object;)V
 	public fun startSurface (Landroid/view/View;Ljava/lang/String;Lcom/facebook/react/bridge/WritableMap;II)I
 	public fun stopSurface (I)V
@@ -4460,7 +4449,6 @@ public class com/facebook/react/uimanager/UIViewOperationQueue {
 	public fun isEmpty ()Z
 	public fun prependUIBlock (Lcom/facebook/react/uimanager/UIBlock;)V
 	public fun profileNextBatch ()V
-	public fun setViewHierarchyUpdateDebugListener (Lcom/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener;)V
 }
 
 public abstract interface class com/facebook/react/uimanager/UIViewOperationQueue$UIOperation {

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.84.0-nightly-20251117-d52b9d2f8
+VERSION_NAME=0.84.0-nightly-20251119-79b09ce9c
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -57,7 +57,6 @@ import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModuleRegistry;
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactCxxErrorHandler;
@@ -183,7 +182,6 @@ public class ReactInstanceManager {
   private final boolean mUseDeveloperSupport;
   private final boolean mRequireActivity;
   private final boolean mKeepActivity;
-  private final @Nullable NotThreadSafeBridgeIdleDebugListener mBridgeIdleDebugListener;
   private final Object mReactContextLock = new Object();
   private @Nullable volatile ReactContext mCurrentReactContext;
   private final Context mApplicationContext;
@@ -246,7 +244,6 @@ public class ReactInstanceManager {
       DevSupportManagerFactory devSupportManagerFactory,
       boolean requireActivity,
       boolean keepActivity,
-      @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
       LifecycleState initialLifecycleState,
       JSExceptionHandler jSExceptionHandler,
       @Nullable RedBoxHandler redBoxHandler,
@@ -292,7 +289,6 @@ public class ReactInstanceManager {
             devLoadingViewManager,
             pausedInDebuggerOverlayManager);
     Systrace.endSection(TRACE_TAG_REACT);
-    mBridgeIdleDebugListener = bridgeIdleDebugListener;
     mLifecycleState = initialLifecycleState;
     mMemoryPressureRouter = new MemoryPressureRouter(applicationContext);
     mJSExceptionHandler = jSExceptionHandler;
@@ -1517,9 +1513,6 @@ public class ReactInstanceManager {
         catalystInstance.setFabricUIManager(uiManager);
       }
     }
-    if (mBridgeIdleDebugListener != null) {
-      catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener);
-    }
     if (BuildConfig.ENABLE_PERFETTO || Systrace.isTracing(TRACE_TAG_REACT)) {
       catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true");
     }

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.kt

@@ -19,7 +19,6 @@ import com.facebook.react.ReactInstanceManager.initializeSoLoaderIfNecessary
 import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.bridge.JSExceptionHandler
 import com.facebook.react.bridge.JavaScriptExecutorFactory
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
 import com.facebook.react.bridge.UIManagerProvider
 import com.facebook.react.common.LifecycleState
 import com.facebook.react.common.SurfaceDelegateFactory
@@ -49,7 +48,6 @@ public class ReactInstanceManagerBuilder {
   private var jsBundleAssetUrl: String? = null
   private var jsBundleLoader: JSBundleLoader? = null
   private var jsMainModulePath: String? = null
-  private var bridgeIdleDebugListener: NotThreadSafeBridgeIdleDebugListener? = null
   private var application: Application? = null
   private var useDeveloperSupport = false
   private var devSupportManagerFactory: DevSupportManagerFactory? = null
@@ -145,13 +143,6 @@ public class ReactInstanceManagerBuilder {
     return this
   }
 
-  public fun setBridgeIdleDebugListener(
-      bridgeIdleDebugListener: NotThreadSafeBridgeIdleDebugListener
-  ): ReactInstanceManagerBuilder {
-    this.bridgeIdleDebugListener = bridgeIdleDebugListener
-    return this
-  }
-
   /** Required. This must be your `Application` instance. */
   public fun setApplication(application: Application): ReactInstanceManagerBuilder {
     this.application = application
@@ -359,7 +350,6 @@ public class ReactInstanceManagerBuilder {
         devSupportManagerFactory ?: DefaultDevSupportManagerFactory(),
         requireActivity,
         keepActivity,
-        bridgeIdleDebugListener,
         checkNotNull(initialLifecycleState) { "Initial lifecycle state was not set" },
         jsExceptionHandler,
         redBoxHandler,

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -57,6 +57,7 @@ import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.IllegalViewOperationException;
+import com.facebook.react.uimanager.JSKeyDispatcher;
 import com.facebook.react.uimanager.JSPointerDispatcher;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.PixelUtil;
@@ -105,6 +106,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   private boolean mShouldLogContentAppeared;
   private @Nullable JSTouchDispatcher mJSTouchDispatcher;
   private @Nullable JSPointerDispatcher mJSPointerDispatcher;
+  private @Nullable JSKeyDispatcher mJSKeyDispatcher;
   private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper =
       new ReactAndroidHWInputDeviceHelper();
   private boolean mWasMeasured = false;
@@ -333,10 +335,17 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       FLog.w(TAG, "Unable to handle key event as the catalyst instance has not been attached");
       return super.dispatchKeyEvent(ev);
     }
+
     ReactContext context = getCurrentReactContext();
-    if (context != null) {
-      mAndroidHWInputDeviceHelper.handleKeyEvent(ev, context);
+    if (context == null) {
+      return super.dispatchKeyEvent(ev);
     }
+
+    mAndroidHWInputDeviceHelper.handleKeyEvent(ev, context);
+
+    // Dispatch during the capture phase before children handle the event as the focus could shift
+    dispatchJSKeyEvent(ev);
+
     return super.dispatchKeyEvent(ev);
   }
 
@@ -352,6 +361,17 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     ReactContext context = getCurrentReactContext();
     if (context != null) {
       mAndroidHWInputDeviceHelper.clearFocus(context);
+
+      if (mJSKeyDispatcher != null && ReactNativeFeatureFlags.enableKeyEvents()) {
+        if (gainFocus) {
+          @Nullable View focusedChild = getFocusedChild();
+          if (focusedChild != null) {
+            mJSKeyDispatcher.setFocusedView(focusedChild.getId());
+          }
+        } else {
+          mJSKeyDispatcher.clearFocus();
+        }
+      }
     }
     super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
   }
@@ -369,6 +389,10 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     ReactContext context = getCurrentReactContext();
     if (context != null) {
       mAndroidHWInputDeviceHelper.onFocusChanged(focused, context);
+
+      if (mJSKeyDispatcher != null && ReactNativeFeatureFlags.enableKeyEvents()) {
+        mJSKeyDispatcher.setFocusedView(focused.getId());
+      }
     }
     super.requestChildFocus(child, focused);
   }
@@ -410,6 +434,31 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     }
   }
 
+  protected void dispatchJSKeyEvent(KeyEvent ev) {
+    if (!ReactNativeFeatureFlags.enableKeyEvents()) {
+      // Silently return early if key events are disabled
+      return;
+    }
+    if (!hasActiveReactContext() || !isViewAttachedToReactInstance()) {
+      FLog.w(
+          TAG, "Unable to dispatch key event to JS as the catalyst instance has not been attached");
+      return;
+    }
+    if (mJSKeyDispatcher == null) {
+      FLog.w(TAG, "Unable to dispatch key event to JS before the dispatcher is available");
+      return;
+    }
+    ReactContext context = getCurrentReactContext();
+    if (context != null) {
+      EventDispatcher eventDispatcher =
+          UIManagerHelper.getEventDispatcher(context, getUIManagerType());
+      int surfaceId = UIManagerHelper.getSurfaceId(context);
+      if (eventDispatcher != null) {
+        mJSKeyDispatcher.handleKeyEvent(ev, eventDispatcher, surfaceId);
+      }
+    }
+  }
+
   @Override
   public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
     // Override in order to still receive events to onInterceptTouchEvent even when some other
@@ -666,6 +715,10 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       mJSPointerDispatcher = new JSPointerDispatcher(this);
     }
 
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      mJSKeyDispatcher = new JSKeyDispatcher();
+    }
+
     if (mRootViewEventListener != null) {
       mRootViewEventListener.onAttachedToReactInstance(this);
     }
@@ -744,6 +797,9 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     if (ReactFeatureFlags.dispatchPointerEvents) {
       mJSPointerDispatcher = new JSPointerDispatcher(this);
     }
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      mJSKeyDispatcher = new JSKeyDispatcher();
+    }
   }
 
   @VisibleForTesting

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt

@@ -75,24 +75,6 @@ public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundle
    */
   public fun extendNativeModules(modules: NativeModuleRegistry)
 
-  /**
-   * Adds a idle listener for this Catalyst instance. The listener will receive notifications
-   * whenever the bridge transitions from idle to busy and vice-versa, where the busy state is
-   * defined as there being some non-zero number of calls to JS that haven't resolved via a
-   * onBatchCompleted call. The listener should be purely passive and not affect application logic.
-   */
-  public fun addBridgeIdleDebugListener(
-      @Suppress("DEPRECATION") listener: NotThreadSafeBridgeIdleDebugListener
-  )
-
-  /**
-   * Removes a NotThreadSafeBridgeIdleDebugListener previously added with
-   * [addBridgeIdleDebugListener]
-   */
-  public fun removeBridgeIdleDebugListener(
-      @Suppress("DEPRECATION") listener: NotThreadSafeBridgeIdleDebugListener
-  )
-
   /** This method registers the file path of an additional JS segment by its ID. */
   public fun registerSegment(segmentId: Int, path: String)