@office-iss/react-native-win32 0.72.8 → 0.73.0-preview.2

package/Libraries/BatchedBridge/MessageQueue.js

@@ -388,10 +388,13 @@ class MessageQueue {
 
   __callReactNativeMicrotasks() {
     Systrace.beginEvent('JSTimers.callReactNativeMicrotasks()');
-    if (this._reactNativeMicrotasksCallback != null) {
-      this._reactNativeMicrotasksCallback();
+    try {
+      if (this._reactNativeMicrotasksCallback != null) {
+        this._reactNativeMicrotasksCallback();
+      }
+    } finally {
+      Systrace.endEvent();
     }
-    Systrace.endEvent();
   }
 
   __callFunction(module: string, method: string, args: mixed[]): void {
@@ -402,31 +405,35 @@ class MessageQueue {
     } else {
       Systrace.beginEvent(`${module}.${method}(...)`);
     }
-    if (this.__spy) {
-      this.__spy({type: TO_JS, module, method, args});
-    }
-    const moduleMethods = this.getCallableModule(module);
-    if (!moduleMethods) {
-      const callableModuleNames = Object.keys(this._lazyCallableModules);
-      const n = callableModuleNames.length;
-      const callableModuleNameList = callableModuleNames.join(', ');
-
-      // TODO(T122225939): Remove after investigation: Why are we getting to this line in bridgeless mode?
-      const isBridgelessMode = global.RN$Bridgeless === true ? 'true' : 'false';
-      invariant(
-        false,
-        `Failed to call into JavaScript module method ${module}.${method}(). Module has not been registered as callable. Bridgeless Mode: ${isBridgelessMode}. Registered callable JavaScript modules (n = ${n}): ${callableModuleNameList}.
-        A frequent cause of the error is that the application entry file path is incorrect. This can also happen when the JS bundle is corrupt or there is an early initialization error when loading React Native.`,
-      );
-    }
-    if (!moduleMethods[method]) {
-      invariant(
-        false,
-        `Failed to call into JavaScript module method ${module}.${method}(). Module exists, but the method is undefined.`,
-      );
+    try {
+      if (this.__spy) {
+        this.__spy({type: TO_JS, module, method, args});
+      }
+      const moduleMethods = this.getCallableModule(module);
+      if (!moduleMethods) {
+        const callableModuleNames = Object.keys(this._lazyCallableModules);
+        const n = callableModuleNames.length;
+        const callableModuleNameList = callableModuleNames.join(', ');
+
+        // TODO(T122225939): Remove after investigation: Why are we getting to this line in bridgeless mode?
+        const isBridgelessMode =
+          global.RN$Bridgeless === true ? 'true' : 'false';
+        invariant(
+          false,
+          `Failed to call into JavaScript module method ${module}.${method}(). Module has not been registered as callable. Bridgeless Mode: ${isBridgelessMode}. Registered callable JavaScript modules (n = ${n}): ${callableModuleNameList}.
+          A frequent cause of the error is that the application entry file path is incorrect. This can also happen when the JS bundle is corrupt or there is an early initialization error when loading React Native.`,
+        );
+      }
+      if (!moduleMethods[method]) {
+        invariant(
+          false,
+          `Failed to call into JavaScript module method ${module}.${method}(). Module exists, but the method is undefined.`,
+        );
+      }
+      moduleMethods[method].apply(moduleMethods, args);
+    } finally {
+      Systrace.endEvent();
     }
-    moduleMethods[method].apply(moduleMethods, args);
-    Systrace.endEvent();
   }
 
   __invokeCallback(cbID: number, args: mixed[]): void {
@@ -465,16 +472,18 @@ class MessageQueue {
       );
     }
 
-    if (!callback) {
-      return;
-    }
-
-    this._successCallbacks.delete(callID);
-    this._failureCallbacks.delete(callID);
-    callback(...args);
+    try {
+      if (!callback) {
+        return;
+      }
 
-    if (__DEV__) {
-      Systrace.endEvent();
+      this._successCallbacks.delete(callID);
+      this._failureCallbacks.delete(callID);
+      callback(...args);
+    } finally {
+      if (__DEV__) {
+        Systrace.endEvent();
+      }
     }
   }
 }

package/Libraries/Blob/Blob.js

@@ -57,7 +57,10 @@ class Blob {
    * Currently we only support creating Blobs from other Blobs.
    * Reference: https://developer.mozilla.org/en-US/docs/Web/API/Blob/Blob
    */
-  constructor(parts: Array<Blob | string> = [], options?: BlobOptions) {
+  constructor(
+    parts: Array<$ArrayBufferView | ArrayBuffer | Blob | string> = [],
+    options?: BlobOptions,
+  ) {
     const BlobManager = require('./BlobManager');
     this.data = BlobManager.createFromParts(parts, options).data;
   }
@@ -81,7 +84,7 @@ class Blob {
     return this._data;
   }
 
-  slice(start?: number, end?: number): Blob {
+  slice(start?: number, end?: number, contentType: string = ''): Blob {
     const BlobManager = require('./BlobManager');
     let {offset, size} = this.data;
 
@@ -109,6 +112,7 @@ class Blob {
       blobId: this.data.blobId,
       offset,
       size,
+      type: contentType,
       /* Since `blob.slice()` creates a new view onto the same binary
        * data as the original blob, we should re-use the same collector
        * object so that the underlying resource gets deallocated when

package/Libraries/Blob/BlobManager.js

@@ -11,6 +11,7 @@
 import type {BlobCollector, BlobData, BlobOptions} from './BlobTypes';
 
 import NativeBlobModule from './NativeBlobModule';
+import {fromByteArray} from 'base64-js';
 import invariant from 'invariant';
 
 const Blob = require('./Blob');
@@ -59,22 +60,20 @@ class BlobManager {
    * Create blob from existing array of blobs.
    */
   static createFromParts(
-    parts: Array<Blob | string>,
+    parts: Array<$ArrayBufferView | ArrayBuffer | Blob | string>,
     options?: BlobOptions,
   ): Blob {
     invariant(NativeBlobModule, 'NativeBlobModule is available.');
 
     const blobId = uuidv4();
     const items = parts.map(part => {
-      if (
-        part instanceof ArrayBuffer ||
-        (global.ArrayBufferView && part instanceof global.ArrayBufferView)
-      ) {
-        throw new Error(
-          "Creating blobs from 'ArrayBuffer' and 'ArrayBufferView' are not supported",
-        );
-      }
-      if (part instanceof Blob) {
+      if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
+        return {
+          // $FlowFixMe[incompatible-cast]
+          data: fromByteArray(new Uint8Array((part: ArrayBuffer))),
+          type: 'string',
+        };
+      } else if (part instanceof Blob) {
         return {
           data: part.data,
           type: 'blob',

package/Libraries/Blob/BlobRegistry.js

@@ -8,27 +8,32 @@
  * @format
  */
 
-const registry: {[key: string]: number, ...} = {};
+const registry: Map<string, number> = new Map();
 
 const register = (id: string) => {
-  if (registry[id]) {
-    registry[id]++;
+  const used = registry.get(id);
+
+  if (used != null) {
+    registry.set(id, used + 1);
   } else {
-    registry[id] = 1;
+    registry.set(id, 1);
   }
 };
 
 const unregister = (id: string) => {
-  if (registry[id]) {
-    registry[id]--;
-    if (registry[id] <= 0) {
-      delete registry[id];
+  const used = registry.get(id);
+
+  if (used != null) {
+    if (used <= 1) {
+      registry.delete(id);
+    } else {
+      registry.set(id, used - 1);
     }
   }
 };
 
 const has = (id: string): number | boolean => {
-  return registry[id] && registry[id] > 0;
+  return registry.get(id) || false;
 };
 
 module.exports = {

package/Libraries/Blob/File.js

@@ -23,7 +23,7 @@ class File extends Blob {
    * Constructor for JS consumers.
    */
   constructor(
-    parts: Array<Blob | string>,
+    parts: Array<$ArrayBufferView | ArrayBuffer | Blob | string>,
     name: string,
     options?: BlobOptions,
   ) {

package/Libraries/Blob/FileReader.js

@@ -12,8 +12,7 @@ import type Blob from './Blob';
 
 import NativeFileReaderModule from './NativeFileReaderModule';
 import {toByteArray} from 'base64-js';
-
-const EventTarget = require('event-target-shim');
+import EventTarget from 'event-target-shim';
 
 type ReadyState =
   | 0 // EMPTY

package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts

@@ -134,14 +134,10 @@ export interface AccessibilityInfoStatic {
    * - `announcement`: The string announced by the screen reader.
    * - `options`: An object that configures the reading options.
    *   - `queue`: The announcement will be queued behind existing announcements. iOS only.
-   *   - `nativeID`: The nativeID of the element to send the announcement from. win32 only.
    */
   announceForAccessibilityWithOptions(
     announcement: string,
-    options: {
-      queue?: boolean | undefined;
-      nativeID?: string | undefined; // win32
-    },
+    options: {queue?: boolean | undefined},
   ): void;
 
   /**

package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js

@@ -17,7 +17,6 @@ import {sendAccessibilityEvent} from '../../ReactNative/RendererProxy';
 import Platform from '../../Utilities/Platform';
 import legacySendAccessibilityEvent from './legacySendAccessibilityEvent';
 import NativeAccessibilityInfo from './NativeAccessibilityInfo';
-import NativeAccessibilityInfoWin32 from './NativeAccessibilityInfoWin32';
 import NativeAccessibilityManagerIOS from './NativeAccessibilityManager';
 
 // Events that are only supported on Android.
@@ -167,18 +166,12 @@ const AccessibilityInfo = {
    */
   isReduceMotionEnabled(): Promise<boolean> {
     return new Promise((resolve, reject) => {
-      if (Platform.OS === 'android') {
+      if (Platform.OS === 'android' || Platform.OS === 'win32') {
         if (NativeAccessibilityInfo != null) {
           NativeAccessibilityInfo.isReduceMotionEnabled(resolve);
         } else {
           reject(null);
         }
-      } else if (Platform.OS === 'win32') {
-        if (NativeAccessibilityInfoWin32 != null) {
-          NativeAccessibilityInfoWin32.isReduceMotionEnabled(resolve);
-        } else {
-          reject(null);
-        }
       } else {
         if (NativeAccessibilityManagerIOS != null) {
           NativeAccessibilityManagerIOS.getCurrentReduceMotionState(
@@ -255,18 +248,12 @@ const AccessibilityInfo = {
    */
   isScreenReaderEnabled(): Promise<boolean> {
     return new Promise((resolve, reject) => {
-      if (Platform.OS === 'android') {
+      if (Platform.OS === 'android' || Platform.OS === 'win32') {
         if (NativeAccessibilityInfo != null) {
           NativeAccessibilityInfo.isTouchExplorationEnabled(resolve);
         } else {
           reject(null);
         }
-      } else if (Platform.OS === 'win32') {
-        if (NativeAccessibilityInfoWin32 != null) {
-          NativeAccessibilityInfoWin32.isTouchExplorationEnabled(resolve);
-        } else {
-          reject(null);
-        }
       } else {
         if (NativeAccessibilityManagerIOS != null) {
           NativeAccessibilityManagerIOS.getCurrentVoiceOverState(
@@ -383,10 +370,8 @@ const AccessibilityInfo = {
    * See https://reactnative.dev/docs/accessibilityinfo#announceforaccessibility
    */
   announceForAccessibility(announcement: string): void {
-    if (Platform.OS === 'android') {
+    if (Platform.OS === 'android' || Platform.OS === 'win32') {
       NativeAccessibilityInfo?.announceForAccessibility(announcement);
-    } else if (Platform.OS === 'win32') {
-      NativeAccessibilityInfoWin32?.announceForAccessibility(announcement);
     } else {
       NativeAccessibilityManagerIOS?.announceForAccessibility(announcement);
     }
@@ -397,33 +382,18 @@ const AccessibilityInfo = {
    * - `announcement`: The string announced by the screen reader.
    * - `options`: An object that configures the reading options.
    *   - `queue`: The announcement will be queued behind existing announcements. iOS only.
-   *   - `nativeID`: The nativeID of the element to send the announcement from. win32 only.
    */
   announceForAccessibilityWithOptions(
     announcement: string,
-    options: {
-      queue?: boolean,
-      nativeID?: string, // win32
-    },
+    options: {queue?: boolean},
   ): void {
-    if (Platform.OS === 'android') {
+    if (Platform.OS === 'android' || Platform.OS === 'win32') {
       NativeAccessibilityInfo?.announceForAccessibility(announcement);
-    } else if (Platform.OS === 'win32') {
-      if (NativeAccessibilityInfoWin32?.announceForAccessibilityWithOptions) {
-        NativeAccessibilityInfoWin32?.announceForAccessibilityWithOptions(
-          announcement,
-          options,
-        );
-      } else {
-        NativeAccessibilityInfoWin32?.announceForAccessibility(announcement);
-      }
     } else {
       if (NativeAccessibilityManagerIOS?.announceForAccessibilityWithOptions) {
-        const {nativeID: _, ...iosOptions} = options;
-        // $FlowFixMe[prop-missing]
         NativeAccessibilityManagerIOS?.announceForAccessibilityWithOptions(
           announcement,
-          iosOptions,
+          options,
         );
       } else {
         NativeAccessibilityManagerIOS?.announceForAccessibility(announcement);
@@ -437,7 +407,7 @@ const AccessibilityInfo = {
    * See https://reactnative.dev/docs/accessibilityinfo#getrecommendedtimeoutmillis
    */
   getRecommendedTimeoutMillis(originalTimeout: number): Promise<number> {
-    if (Platform.OS === 'android') {
+    if (Platform.OS === 'android' || Platform.OS === 'win32') {
       return new Promise((resolve, reject) => {
         if (NativeAccessibilityInfo?.getRecommendedTimeoutMillis) {
           NativeAccessibilityInfo.getRecommendedTimeoutMillis(
@@ -448,17 +418,6 @@ const AccessibilityInfo = {
           resolve(originalTimeout);
         }
       });
-    } else if (Platform.OS === 'win32') {
-      return new Promise((resolve, reject) => {
-        if (NativeAccessibilityInfoWin32?.getRecommendedTimeoutMillis) {
-          NativeAccessibilityInfoWin32.getRecommendedTimeoutMillis(
-            originalTimeout,
-            resolve,
-          );
-        } else {
-          resolve(originalTimeout);
-        }
-      });
     } else {
       return Promise.resolve(originalTimeout);
     }

package/Libraries/Components/Button/ButtonWin32.Props.d.ts

@@ -5,7 +5,7 @@ export interface IButtonWin32Style extends Omit<RN.TextStyle, ButtonWin32OmitSty
 }
 export interface IButtonWin32Props extends RN.ButtonProps {
     /**
-     * Style information which controls the visual appearence of the button.
+     * Style information which controls the visual appearance of the button.
      */
     style?: RN.StyleProp<IButtonWin32Style>;
     /**

package/Libraries/Components/Button/ButtonWin32.Props.js.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonWin32.Props.js","sourceRoot":"","sources":["../../../src/Libraries/Components/Button/ButtonWin32.Props.ts"],"names":[],"mappings":"","sourcesContent":["import RN = require('react-native');\n\n// removes from interface T the members of interface K\ntype Omit<T, K> = Pick<T, Exclude<keyof T, keyof K>>;\n\nexport type ButtonWin32OmitStyles = RN.TextStyleIOS & RN.TextStyleAndroid;\n\nexport interface IButtonWin32Style extends Omit<RN.TextStyle, ButtonWin32OmitStyles> {}\n\nexport interface IButtonWin32Props extends RN.ButtonProps {\n  /**\n   * Style information which controls the visual appearence of the button.\n   */\n  style?: RN.StyleProp<IButtonWin32Style>;\n\n  /**\n   * Blur event. Called when focus is lost.\n   */\n  onBlur?: () => void;\n\n  /**\n   * Focus event. Called when focus is acquired.\n   */\n  onFocus?: () => void;\n\n  /**\n   * Mouse-enter event. Called when mouse is moved on to the control.\n   */\n  onMouseEnter?: () => void;\n\n  /**\n   * Mouse-leave event. Called when mouse is moved off of the control.\n   */\n  onMouseLeave?: () => void;\n\n  /**\n   * Touch-start event. Called when the user begins touching the control.\n   */\n  onTouchStart?: (event: RN.GestureResponderEvent) => void;\n\n  /**\n   * Touch-end event. Called when the user stops touching the control.\n   */\n  onTouchEnd?: (event: RN.GestureResponderEvent) => void;\n}\n"]}
+{"version":3,"file":"ButtonWin32.Props.js","sourceRoot":"","sources":["../../../src/Libraries/Components/Button/ButtonWin32.Props.ts"],"names":[],"mappings":"","sourcesContent":["import RN = require('react-native');\n\n// removes from interface T the members of interface K\ntype Omit<T, K> = Pick<T, Exclude<keyof T, keyof K>>;\n\nexport type ButtonWin32OmitStyles = RN.TextStyleIOS & RN.TextStyleAndroid;\n\nexport interface IButtonWin32Style extends Omit<RN.TextStyle, ButtonWin32OmitStyles> {}\n\nexport interface IButtonWin32Props extends RN.ButtonProps {\n  /**\n   * Style information which controls the visual appearance of the button.\n   */\n  style?: RN.StyleProp<IButtonWin32Style>;\n\n  /**\n   * Blur event. Called when focus is lost.\n   */\n  onBlur?: () => void;\n\n  /**\n   * Focus event. Called when focus is acquired.\n   */\n  onFocus?: () => void;\n\n  /**\n   * Mouse-enter event. Called when mouse is moved on to the control.\n   */\n  onMouseEnter?: () => void;\n\n  /**\n   * Mouse-leave event. Called when mouse is moved off of the control.\n   */\n  onMouseLeave?: () => void;\n\n  /**\n   * Touch-start event. Called when the user begins touching the control.\n   */\n  onTouchStart?: (event: RN.GestureResponderEvent) => void;\n\n  /**\n   * Touch-end event. Called when the user stops touching the control.\n   */\n  onTouchEnd?: (event: RN.GestureResponderEvent) => void;\n}\n"]}

package/Libraries/Components/Button/ButtonWin32.d.ts

@@ -9,7 +9,7 @@ interface IButtonWin32State {
  */
 export declare class ButtonWin32 extends React.Component<IButtonWin32Props, IButtonWin32State> {
     constructor(props: IButtonWin32Props);
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private readonly _makeState;
     private readonly _setState;
     private readonly _onFocus;

package/Libraries/Components/Button/ButtonWin32.js

@@ -64,7 +64,6 @@ class ButtonWin32 extends react_1.default.Component {
             onBlur: this._onBlur,
             onMouseEnter: this.props.onMouseEnter,
             onMouseLeave: this.props.onMouseLeave,
-            // @ts-ignore
             onTouchStart: this.props.onTouchStart,
             onTouchEnd: this._onTouchEnd,
             testID: this.props.testID,
@@ -76,9 +75,7 @@ class ButtonWin32 extends react_1.default.Component {
         if (this.props.color) {
             textProps.style = { color: this.props.color };
         }
-        return (
-        // @ts-ignore
-        react_1.default.createElement(RN.ViewWin32, { ...viewProps },
+        return (react_1.default.createElement(RN.ViewWin32, { ...viewProps },
             react_1.default.createElement(RN.TextWin32, { ...textProps }, this.props.title)));
     }
 }

package/Libraries/Components/Button/ButtonWin32.js.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonWin32.js","sourceRoot":"","sources":["../../../src/Libraries/Components/Button/ButtonWin32.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from 'react'\nimport RN = require('react-native');\nimport type { IViewWin32Props } from '../View/ViewPropTypes';\nimport type { ITextWin32Props } from '../Text/TextWin32.Props';\nimport type { IButtonWin32Props } from './ButtonWin32.Props';\n\nconst enum SelectState {\n  NotSelected,\n  Selected\n}\n\ninterface IButtonWin32State {\n  accessibilityState: RN.AccessibilityState;\n}\n\n/**\n * React-native <Button> control with additional Win32-specific functionality.\n */\nexport class ButtonWin32 extends React.Component<IButtonWin32Props, IButtonWin32State> {\n  constructor(props: IButtonWin32Props) {\n    super(props);\n    this.state = this._makeState(SelectState.NotSelected);\n  }\n\n  public render() {\n    const viewProps: IViewWin32Props = {\n      accessible: true,\n      accessibilityLabel: this.props.accessibilityLabel || this.props.title,\n      accessibilityRole: 'button',\n      accessibilityState: this.state.accessibilityState,\n      focusable: true,\n      onFocus: this._onFocus,\n      onBlur: this._onBlur,\n      onMouseEnter: this.props.onMouseEnter,\n      onMouseLeave: this.props.onMouseLeave,\n      // @ts-ignore\n      onTouchStart: this.props.onTouchStart,\n      onTouchEnd: this._onTouchEnd,\n      testID: this.props.testID,\n      style: this.props.style as RN.StyleProp<RN.ViewStyle>,\n    };\n\n    const textProps: ITextWin32Props = {\n      textStyle: 'None',\n    };\n    if (this.props.color) {\n      textProps.style = { color: this.props.color };\n    }\n\n    return (\n      // @ts-ignore\n      <RN.ViewWin32 {...viewProps}>\n        <RN.TextWin32 {...textProps}>{this.props.title}</RN.TextWin32>\n      </RN.ViewWin32>\n    );\n  }\n\n  private readonly _makeState = (select: SelectState): IButtonWin32State => {\n    return {\n      accessibilityState: {\n        disabled: this.props.disabled,\n        selected: select === SelectState.Selected,\n      },\n    };\n  };\n\n  private readonly _setState = (select: SelectState): void => {\n    const state = this._makeState(select);\n    this.setState(state);\n  };\n\n  private readonly _onFocus = (): void => {\n    this._setState(SelectState.Selected);\n    if (this.props.onFocus) {\n      this.props.onFocus();\n    }\n  };\n\n  private readonly _onBlur = (): void => {\n    this._setState(SelectState.NotSelected);\n    if (this.props.onBlur) {\n      this.props.onBlur();\n    }\n  };\n\n  private readonly _onTouchEnd = (event: RN.GestureResponderEvent): void => {\n    if (!this.props.disabled) {\n      if (this.props.onPress) {\n        this.props.onPress(event);\n      }\n    }\n    if (this.props.onTouchEnd) {\n      this.props.onTouchEnd(event);\n    }\n  };\n}\n"]}
+{"version":3,"file":"ButtonWin32.js","sourceRoot":"","sources":["../../../src/Libraries/Components/Button/ButtonWin32.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from 'react'\nimport RN = require('react-native');\nimport type { IViewWin32Props } from '../View/ViewPropTypes';\nimport type { ITextWin32Props } from '../Text/TextWin32.Props';\nimport type { IButtonWin32Props } from './ButtonWin32.Props';\n\nconst enum SelectState {\n  NotSelected,\n  Selected\n}\n\ninterface IButtonWin32State {\n  accessibilityState: RN.AccessibilityState;\n}\n\n/**\n * React-native <Button> control with additional Win32-specific functionality.\n */\nexport class ButtonWin32 extends React.Component<IButtonWin32Props, IButtonWin32State> {\n  constructor(props: IButtonWin32Props) {\n    super(props);\n    this.state = this._makeState(SelectState.NotSelected);\n  }\n\n  public render() {\n    const viewProps: IViewWin32Props = {\n      accessible: true,\n      accessibilityLabel: this.props.accessibilityLabel || this.props.title,\n      accessibilityRole: 'button',\n      accessibilityState: this.state.accessibilityState,\n      focusable: true,\n      onFocus: this._onFocus,\n      onBlur: this._onBlur,\n      onMouseEnter: this.props.onMouseEnter,\n      onMouseLeave: this.props.onMouseLeave,\n      onTouchStart: this.props.onTouchStart,\n      onTouchEnd: this._onTouchEnd,\n      testID: this.props.testID,\n      style: this.props.style as RN.StyleProp<RN.ViewStyle>,\n    };\n\n    const textProps: ITextWin32Props = {\n      textStyle: 'None',\n    };\n    if (this.props.color) {\n      textProps.style = { color: this.props.color };\n    }\n\n    return (\n      <RN.ViewWin32 {...viewProps}>\n        <RN.TextWin32 {...textProps}>{this.props.title}</RN.TextWin32>\n      </RN.ViewWin32>\n    );\n  }\n\n  private readonly _makeState = (select: SelectState): IButtonWin32State => {\n    return {\n      accessibilityState: {\n        disabled: this.props.disabled,\n        selected: select === SelectState.Selected,\n      },\n    };\n  };\n\n  private readonly _setState = (select: SelectState): void => {\n    const state = this._makeState(select);\n    this.setState(state);\n  };\n\n  private readonly _onFocus = (): void => {\n    this._setState(SelectState.Selected);\n    if (this.props.onFocus) {\n      this.props.onFocus();\n    }\n  };\n\n  private readonly _onBlur = (): void => {\n    this._setState(SelectState.NotSelected);\n    if (this.props.onBlur) {\n      this.props.onBlur();\n    }\n  };\n\n  private readonly _onTouchEnd = (event: RN.GestureResponderEvent): void => {\n    if (!this.props.disabled) {\n      if (this.props.onPress) {\n        this.props.onPress(event);\n      }\n    }\n    if (this.props.onTouchEnd) {\n      this.props.onTouchEnd(event);\n    }\n  };\n}\n"]}

package/Libraries/Components/Clipboard/Clipboard.d.ts

@@ -14,15 +14,15 @@ export interface ClipboardStatic {
 
 /**
  * Clipboard has been extracted from react-native core and will be removed in a future release.
- * It can now be installed and imported from `@react-native-community/clipboard` instead of 'react-native'.
- * @see https://github.com/react-native-community/clipboard
+ * It can now be installed and imported from `@react-native-clipboard/clipboard` instead of 'react-native'.
+ * @see https://github.com/react-native-clipboard/clipboard
  * @deprecated
  */
 export const Clipboard: ClipboardStatic;
 /**
  * Clipboard has been extracted from react-native core and will be removed in a future release.
- * It can now be installed and imported from `@react-native-community/clipboard` instead of 'react-native'.
- * @see https://github.com/react-native-community/clipboard
+ * It can now be installed and imported from `@react-native-clipboard/clipboard` instead of 'react-native'.
+ * @see https://github.com/react-native-clipboard/clipboard
  * @deprecated
  */
 export type Clipboard = ClipboardStatic;

package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js

@@ -181,7 +181,9 @@ class DrawerLayoutAndroid extends React.Component<Props, State> {
       ...props
     } = this.props;
     const drawStatusBar =
-      Platform.Version >= 21 && this.props.statusBarBackgroundColor != null;
+      Platform.OS === 'android' &&
+      Platform.Version >= 21 &&
+      this.props.statusBarBackgroundColor != null;
     const drawerViewWrapper = (
       <View
         style={[

package/Libraries/Components/EnterString.win32.d.ts

@@ -7,6 +7,6 @@ export interface IEnterStringProps {
 }
 export default class EnterString extends React.Component<IEnterStringProps, {}> {
     static DefaultProps: IEnterStringProps;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private _onChangedNative;
 }

package/Libraries/Components/Keyboard/KeyboardAvoidingView.js

@@ -65,6 +65,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   _subscriptions: Array<EventSubscription> = [];
   viewRef: {current: React.ElementRef<typeof View> | null, ...};
   _initialFrameHeight: number = 0;
+  _bottom: number = 0;
 
   constructor(props: Props) {
     super(props);
@@ -112,14 +113,15 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   };
 
   _onLayout = async (event: ViewLayoutEvent) => {
-    const wasFrameNull = this._frame == null;
+    const oldFrame = this._frame;
     this._frame = event.nativeEvent.layout;
     if (!this._initialFrameHeight) {
       // save the initial frame height, before the keyboard is visible
       this._initialFrameHeight = this._frame.height;
     }
 
-    if (wasFrameNull) {
+    // update bottom height for the first time or when the height is changed
+    if (!oldFrame || oldFrame.height !== this._frame.height) {
       await this._updateBottomIfNecessary();
     }
 
@@ -128,20 +130,32 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     }
   };
 
+  // Avoid unnecessary renders if the KeyboardAvoidingView is disabled.
+  _setBottom = (value: number) => {
+    const enabled = this.props.enabled ?? true;
+    this._bottom = value;
+    if (enabled) {
+      this.setState({bottom: value});
+    }
+  };
+
   _updateBottomIfNecessary = async () => {
     if (this._keyboardEvent == null) {
-      this.setState({bottom: 0});
+      this._setBottom(0);
       return;
     }
 
     const {duration, easing, endCoordinates} = this._keyboardEvent;
     const height = await this._relativeKeyboardHeight(endCoordinates);
 
-    if (this.state.bottom === height) {
+    if (this._bottom === height) {
       return;
     }
 
-    if (duration && easing) {
+    this._setBottom(height);
+
+    const enabled = this.props.enabled ?? true;
+    if (enabled && duration && easing) {
       LayoutAnimation.configureNext({
         // We have to pass the duration equal to minimal accepted duration defined here: RCTLayoutAnimation.m
         duration: duration > 10 ? duration : 10,
@@ -151,9 +165,15 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
         },
       });
     }
-    this.setState({bottom: height});
   };
 
+  componentDidUpdate(_: Props, prevState: State): void {
+    const enabled = this.props.enabled ?? true;
+    if (enabled && this._bottom !== prevState.bottom) {
+      this.setState({bottom: this._bottom});
+    }
+  }
+
   componentDidMount(): void {
     if (Platform.OS === 'ios') {
       this._subscriptions = [

package/Libraries/Components/Pressable/Pressable.js

@@ -24,6 +24,7 @@ import type {
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import usePressability from '../../Pressability/usePressability';
 import {type RectOrSize} from '../../StyleSheet/Rect';
+import useMergeRefs from '../../Utilities/useMergeRefs';
 import View from '../View/View';
 import useAndroidRippleForView, {
   type RippleConfig,
@@ -235,7 +236,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
   } = props;
 
   const viewRef = useRef<React.ElementRef<typeof View> | null>(null);
-  useImperativeHandle(forwardedRef, () => viewRef.current);
+  const mergedRef = useMergeRefs(forwardedRef, viewRef);
 
   const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);
 
@@ -338,7 +339,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
     <View
       {...restPropsWithDefaults}
       {...eventHandlers}
-      ref={viewRef}
+      ref={mergedRef}
       style={typeof style === 'function' ? style({pressed}) : style}
       collapsable={false}>
       {typeof children === 'function' ? children({pressed}) : children}

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

@@ -28,6 +28,7 @@ import type {
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import usePressability from '../../Pressability/usePressability';
 import {type RectOrSize} from '../../StyleSheet/Rect';
+import useMergeRefs from '../../Utilities/useMergeRefs';
 import useAndroidRippleForView, {
   type RippleConfig,
 } from './useAndroidRippleForView';
@@ -235,7 +236,7 @@ type Props = $ReadOnly<{|
    */
   unstable_pressDelay?: ?number,
   /**
-   * Web to Native Accessibilty props
+   * Web to Native Accessibility props
    * https://github.com/facebook/react-native/issues/34424
    */
   'aria-label'?: ?string,
@@ -290,7 +291,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
   } = props;
 
   const viewRef = useRef<React.ElementRef<typeof View> | null>(null);
-  useImperativeHandle(forwardedRef, () => viewRef.current);
+  const mergedRef = useMergeRefs(forwardedRef, viewRef);
 
   const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);
 
@@ -407,7 +408,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
     <View
       {...restPropsWithDefaults}
       {...eventHandlers}
-      ref={viewRef}
+      ref={mergedRef}
       style={typeof style === 'function' ? style({pressed}) : style}>
       {typeof children === 'function' ? children({pressed}) : children}
       {__DEV__ ? <PressabilityDebugView color="red" hitSlop={hitSlop} /> : null}

package/Libraries/Components/Pressable/useAndroidRippleForView.js

@@ -71,7 +71,7 @@ export default function useAndroidRippleForView(
 
       return {
         viewProps:
-          foreground === true
+          foreground === true && Platform.Version >= 23
             ? {nativeForegroundAndroid: nativeRippleValue}
             : {nativeBackgroundAndroid: nativeRippleValue},
         onPressIn(event: PressEvent): void {