react-native-windows 0.84.0-preview.9 → 0.85.0-preview.1

package/Libraries/Components/View/ViewPropTypes.js

@@ -33,7 +33,7 @@ import * as React from 'react';
 export type ViewLayout = LayoutRectangle;
 export type ViewLayoutEvent = LayoutChangeEvent;
 
-type DirectEventProps = $ReadOnly<{
+type DirectEventProps = Readonly<{
   /**
    * When `accessible` is true, the system will try to invoke this function
    * when the user performs an accessibility custom action.
@@ -79,13 +79,13 @@ type DirectEventProps = $ReadOnly<{
   onAccessibilityEscape?: ?() => unknown,
 }>;
 
-type MouseEventProps = $ReadOnly<{
+type MouseEventProps = Readonly<{
   onMouseEnter?: ?(event: MouseEvent) => void,
   onMouseLeave?: ?(event: MouseEvent) => void,
 }>;
 
 // Experimental/Work in Progress Pointer Event Callbacks (not yet ready for use)
-type PointerEventProps = $ReadOnly<{
+type PointerEventProps = Readonly<{
   onClick?: ?(event: PointerEvent) => void,
   onClickCapture?: ?(event: PointerEvent) => void,
   onPointerEnter?: ?(event: PointerEvent) => void,
@@ -110,21 +110,21 @@ type PointerEventProps = $ReadOnly<{
   onLostPointerCaptureCapture?: ?(e: PointerEvent) => void,
 }>;
 
-type FocusEventProps = $ReadOnly<{
+type FocusEventProps = Readonly<{
   onBlur?: ?(event: BlurEvent) => void,
   onBlurCapture?: ?(event: BlurEvent) => void,
   onFocus?: ?(event: FocusEvent) => void,
   onFocusCapture?: ?(event: FocusEvent) => void,
 }>;
 
-type KeyEventProps = $ReadOnly<{
+type KeyEventProps = Readonly<{
   onKeyDown?: ?(event: KeyDownEvent) => void,
   onKeyDownCapture?: ?(event: KeyDownEvent) => void,
   onKeyUp?: ?(event: KeyUpEvent) => void,
   onKeyUpCapture?: ?(event: KeyUpEvent) => void,
 }>;
 
-type TouchEventProps = $ReadOnly<{
+type TouchEventProps = Readonly<{
   onTouchCancel?: ?(e: GestureResponderEvent) => void,
   onTouchCancelCapture?: ?(e: GestureResponderEvent) => void,
   onTouchEnd?: ?(e: GestureResponderEvent) => void,
@@ -140,7 +140,7 @@ type TouchEventProps = $ReadOnly<{
  * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
  * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
  */
-export type GestureResponderHandlers = $ReadOnly<{
+export type GestureResponderHandlers = Readonly<{
   /**
    * Does this view want to "claim" touch responsiveness? This is called for
    * every touch move on the `View` when it is not the responder.
@@ -257,12 +257,12 @@ export type GestureResponderHandlers = $ReadOnly<{
   onStartShouldSetResponderCapture?: ?(e: GestureResponderEvent) => boolean,
 }>;
 
-type AndroidDrawableThemeAttr = $ReadOnly<{
+type AndroidDrawableThemeAttr = Readonly<{
   type: 'ThemeAttrAndroid',
   attribute: string,
 }>;
 
-type AndroidDrawableRipple = $ReadOnly<{
+type AndroidDrawableRipple = Readonly<{
   type: 'RippleAndroid',
   color?: ?number,
   borderless?: ?boolean,
@@ -271,7 +271,7 @@ type AndroidDrawableRipple = $ReadOnly<{
 
 type AndroidDrawable = AndroidDrawableThemeAttr | AndroidDrawableRipple;
 
-export type ViewPropsAndroid = $ReadOnly<{
+export type ViewPropsAndroid = Readonly<{
   nativeBackgroundAndroid?: ?AndroidDrawable,
   nativeForegroundAndroid?: ?AndroidDrawable,
 
@@ -356,7 +356,7 @@ export type ViewPropsAndroid = $ReadOnly<{
   onClick?: ?(event: GestureResponderEvent) => unknown,
 }>;
 
-export type TVViewPropsIOS = $ReadOnly<{
+export type TVViewPropsIOS = Readonly<{
   /**
    * *(Apple TV only)* When set to true, this view will be focusable
    * and navigable using the Apple TV remote.
@@ -401,7 +401,7 @@ export type TVViewPropsIOS = $ReadOnly<{
   tvParallaxMagnification?: number,
 }>;
 
-export type ViewPropsIOS = $ReadOnly<{
+export type ViewPropsIOS = Readonly<{
   /**
    * Whether this `View` should be rendered as a bitmap before compositing.
    *
@@ -412,7 +412,7 @@ export type ViewPropsIOS = $ReadOnly<{
   shouldRasterizeIOS?: ?boolean,
 }>;
 
-type ViewBaseProps = $ReadOnly<{
+type ViewBaseProps = Readonly<{
   children?: React.Node,
   style?: ?ViewStyleProp,
 
@@ -508,7 +508,7 @@ type ViewBaseProps = $ReadOnly<{
   experimental_accessibilityOrder?: ?Array<string>,
 }>;
 
-export type ViewProps = $ReadOnly<{
+export type ViewProps = Readonly<{
   ...DirectEventProps,
   ...GestureResponderHandlers,
   ...MouseEventProps,

package/Libraries/Components/View/ViewPropTypes.windows.js

@@ -34,7 +34,7 @@ import * as React from 'react';
 export type ViewLayout = LayoutRectangle;
 export type ViewLayoutEvent = LayoutChangeEvent;
 
-type DirectEventProps = $ReadOnly<{
+type DirectEventProps = Readonly<{
   /**
    * When `accessible` is true, the system will try to invoke this function
    * when the user performs an accessibility custom action.
@@ -80,13 +80,15 @@ type DirectEventProps = $ReadOnly<{
   onAccessibilityEscape?: ?() => unknown,
 }>;
 
-type MouseEventProps = $ReadOnly<{
+type MouseEventProps = Readonly<{
   onMouseEnter?: ?(event: MouseEvent) => void,
   onMouseLeave?: ?(event: MouseEvent) => void,
 }>;
 
 // Experimental/Work in Progress Pointer Event Callbacks (not yet ready for use)
-type PointerEventProps = $ReadOnly<{
+type PointerEventProps = Readonly<{
+  onAuxClick?: ?(event: PointerEvent) => void, // [Windows]
+  onAuxClickCapture?: ?(event: PointerEvent) => void, // [Windows]
   onClick?: ?(event: PointerEvent) => void,
   onClickCapture?: ?(event: PointerEvent) => void,
   onPointerEnter?: ?(event: PointerEvent) => void,
@@ -111,21 +113,21 @@ type PointerEventProps = $ReadOnly<{
   onLostPointerCaptureCapture?: ?(e: PointerEvent) => void,
 }>;
 
-type FocusEventProps = $ReadOnly<{
+type FocusEventProps = Readonly<{
   onBlur?: ?(event: BlurEvent) => void,
   onBlurCapture?: ?(event: BlurEvent) => void,
   onFocus?: ?(event: FocusEvent) => void,
   onFocusCapture?: ?(event: FocusEvent) => void,
 }>;
 
-type KeyEventProps = $ReadOnly<{
+type KeyEventProps = Readonly<{
   onKeyDown?: ?(event: KeyDownEvent) => void,
   onKeyDownCapture?: ?(event: KeyDownEvent) => void,
   onKeyUp?: ?(event: KeyUpEvent) => void,
   onKeyUpCapture?: ?(event: KeyUpEvent) => void,
 }>;
 
-type TouchEventProps = $ReadOnly<{
+type TouchEventProps = Readonly<{
   onTouchCancel?: ?(e: GestureResponderEvent) => void,
   onTouchCancelCapture?: ?(e: GestureResponderEvent) => void,
   onTouchEnd?: ?(e: GestureResponderEvent) => void,
@@ -141,7 +143,7 @@ type TouchEventProps = $ReadOnly<{
  * `TouchableHighlight` or `TouchableOpacity`. Check out `Touchable.js`,
  * `ScrollResponder.js` and `ResponderEventPlugin.js` for more discussion.
  */
-export type GestureResponderHandlers = $ReadOnly<{
+export type GestureResponderHandlers = Readonly<{
   /**
    * Does this view want to "claim" touch responsiveness? This is called for
    * every touch move on the `View` when it is not the responder.
@@ -258,12 +260,12 @@ export type GestureResponderHandlers = $ReadOnly<{
   onStartShouldSetResponderCapture?: ?(e: GestureResponderEvent) => boolean,
 }>;
 
-type AndroidDrawableThemeAttr = $ReadOnly<{
+type AndroidDrawableThemeAttr = Readonly<{
   type: 'ThemeAttrAndroid',
   attribute: string,
 }>;
 
-type AndroidDrawableRipple = $ReadOnly<{
+type AndroidDrawableRipple = Readonly<{
   type: 'RippleAndroid',
   color?: ?number,
   borderless?: ?boolean,
@@ -272,7 +274,7 @@ type AndroidDrawableRipple = $ReadOnly<{
 
 type AndroidDrawable = AndroidDrawableThemeAttr | AndroidDrawableRipple;
 
-export type ViewPropsAndroid = $ReadOnly<{
+export type ViewPropsAndroid = Readonly<{
   nativeBackgroundAndroid?: ?AndroidDrawable,
   nativeForegroundAndroid?: ?AndroidDrawable,
 
@@ -357,7 +359,7 @@ export type ViewPropsAndroid = $ReadOnly<{
   onClick?: ?(event: GestureResponderEvent) => unknown,
 }>;
 
-export type TVViewPropsIOS = $ReadOnly<{
+export type TVViewPropsIOS = Readonly<{
   /**
    * *(Apple TV only)* When set to true, this view will be focusable
    * and navigable using the Apple TV remote.
@@ -402,7 +404,7 @@ export type TVViewPropsIOS = $ReadOnly<{
   tvParallaxMagnification?: number,
 }>;
 
-export type ViewPropsIOS = $ReadOnly<{
+export type ViewPropsIOS = Readonly<{
   /**
    * Whether this `View` should be rendered as a bitmap before compositing.
    *
@@ -426,7 +428,7 @@ export const HandledEventPhase = {
   Bubbling: EventPhase.Bubbling,
 };
 
-export type HandledKeyboardEvent = $ReadOnly<{|
+export type HandledKeyboardEvent = Readonly<{|
   altKey?: ?boolean,
   ctrlKey?: ?boolean,
   metaKey?: ?boolean,
@@ -435,7 +437,7 @@ export type HandledKeyboardEvent = $ReadOnly<{|
   handledEventPhase?: number,
 |}>;
 
-type ViewPropsWindows = $ReadOnly<{|
+type ViewPropsWindows = Readonly<{|
   /**
    * Key up event
    *
@@ -479,7 +481,7 @@ type ViewPropsWindows = $ReadOnly<{|
 |}>;
 // Windows]
 
-type ViewBaseProps = $ReadOnly<{
+type ViewBaseProps = Readonly<{
   children?: React.Node,
   style?: ?ViewStyleProp,
 
@@ -580,7 +582,7 @@ type ViewBaseProps = $ReadOnly<{
   'aria-required'?: ?boolean, // [Windows]
 }>;
 
-export type ViewProps = $ReadOnly<{
+export type ViewProps = Readonly<{
   ...DirectEventProps,
   ...GestureResponderHandlers,
   ...MouseEventProps,

package/Libraries/Core/Devtools/parseHermesStack.js

@@ -10,25 +10,25 @@
 
 'use strict';
 
-type HermesStackLocationNative = $ReadOnly<{
+type HermesStackLocationNative = Readonly<{
   type: 'NATIVE',
 }>;
 
-type HermesStackLocationSource = $ReadOnly<{
+type HermesStackLocationSource = Readonly<{
   type: 'SOURCE',
   sourceUrl: string,
   line1Based: number,
   column1Based: number,
 }>;
 
-type HermesStackLocationInternalBytecode = $ReadOnly<{
+type HermesStackLocationInternalBytecode = Readonly<{
   type: 'INTERNAL_BYTECODE',
   sourceUrl: string,
   line1Based: number,
   virtualOffset0Based: number,
 }>;
 
-type HermesStackLocationBytecode = $ReadOnly<{
+type HermesStackLocationBytecode = Readonly<{
   type: 'BYTECODE',
   sourceUrl: string,
   line1Based: number,
@@ -41,22 +41,22 @@ type HermesStackLocation =
   | HermesStackLocationInternalBytecode
   | HermesStackLocationBytecode;
 
-type HermesStackEntryFrame = $ReadOnly<{
+type HermesStackEntryFrame = Readonly<{
   type: 'FRAME',
   location: HermesStackLocation,
   functionName: string,
 }>;
 
-type HermesStackEntrySkipped = $ReadOnly<{
+type HermesStackEntrySkipped = Readonly<{
   type: 'SKIPPED',
   count: number,
 }>;
 
 type HermesStackEntry = HermesStackEntryFrame | HermesStackEntrySkipped;
 
-export type HermesParsedStack = $ReadOnly<{
+export type HermesParsedStack = Readonly<{
   message: string,
-  entries: $ReadOnlyArray<HermesStackEntry>,
+  entries: ReadonlyArray<HermesStackEntry>,
 }>;
 
 // Capturing groups:

package/Libraries/Core/Devtools/symbolicateStackTrace.js

@@ -14,7 +14,7 @@ import type {StackFrame} from '../NativeExceptionsManager';
 
 const getDevServer = require('./getDevServer').default;
 
-export type CodeFrame = $ReadOnly<{
+export type CodeFrame = Readonly<{
   content: string,
   location: ?{
     row: number,
@@ -24,7 +24,7 @@ export type CodeFrame = $ReadOnly<{
   fileName: string,
 }>;
 
-export type SymbolicatedStackTrace = $ReadOnly<{
+export type SymbolicatedStackTrace = Readonly<{
   stack: Array<StackFrame>,
   codeFrame: ?CodeFrame,
 }>;

package/Libraries/Core/ExceptionsManager.js

@@ -135,8 +135,8 @@ function reportException(
 }
 
 declare var console: {
-  error: (...data: $ReadOnlyArray<unknown>) => void,
-  _errorOriginal: (...data: $ReadOnlyArray<unknown>) => void,
+  error: (...data: ReadonlyArray<unknown>) => void,
+  _errorOriginal: (...data: ReadonlyArray<unknown>) => void,
   reportErrorsAsExceptions: boolean,
   ...
 };

package/Libraries/Core/ExtendedError.js

@@ -24,10 +24,10 @@ export type ExtendedError = Error &
       name: string,
       message: string,
       // $FlowFixMe[unclear-type]
-      stackElements?: $ReadOnlyArray<Object>,
+      stackElements?: ReadonlyArray<Object>,
       // $FlowFixMe[unclear-type]
-      stackSymbols?: $ReadOnlyArray<Object>,
+      stackSymbols?: ReadonlyArray<Object>,
       // $FlowFixMe[unclear-type]
-      stackReturnAddresses?: $ReadOnlyArray<Object>,
+      stackReturnAddresses?: ReadonlyArray<Object>,
     },
   };

package/Libraries/Core/RawEventEmitter.js

@@ -12,7 +12,7 @@ import type {IEventEmitter} from '../vendor/emitter/EventEmitter';
 
 import EventEmitter from '../vendor/emitter/EventEmitter';
 
-export type RawEventEmitterEvent = $ReadOnly<{
+export type RawEventEmitterEvent = Readonly<{
   eventName: string,
   // We expect, but do not/cannot require, that nativeEvent is an object
   // with the properties: key, elementType (string), type (string), tag (numeric),

package/Libraries/Core/ReactNativeVersion.js

@@ -27,8 +27,8 @@
  */
 export default class ReactNativeVersion {
   static major: number = 0;
-  static minor: number = 84;
-  static patch: number = 1;
+  static minor: number = 85;
+  static patch: number = 3;
   static prerelease: string | null = null;
 
   static getVersionString(): string {

package/Libraries/Core/Timers/JSTimers.js

@@ -11,6 +11,7 @@
 
 import NativeTiming from './NativeTiming';
 
+const toError = require('../../../src/private/utilities/toError').default;
 const BatchedBridge = require('../../BatchedBridge/BatchedBridge').default;
 const Systrace = require('../../Performance/Systrace');
 const invariant = require('invariant');
@@ -129,9 +130,9 @@ function _callTimer(timerID: number, frameTime: number, didTimeout: ?boolean) {
     } else {
       console.error('Tried to call a callback with invalid type: ' + type);
     }
-  } catch (e) {
+  } catch (e: unknown) {
     // Don't rethrow so that we can run all timers.
-    errors.push(e);
+    errors.push(toError(e));
   }
 
   if (__DEV__) {

package/Libraries/Core/setUpDeveloperTools.js

@@ -37,7 +37,7 @@ if (__DEV__) {
         ] as const
       ).forEach(level => {
         const originalFunction = console[level];
-        console[level] = function (...args: $ReadOnlyArray<unknown>) {
+        console[level] = function (...args: ReadonlyArray<unknown>) {
           HMRClient.log(level, args);
           originalFunction.apply(console, args);
         };

package/Libraries/Core/setUpErrorHandling.js

@@ -16,6 +16,7 @@ if (global.RN$useAlwaysAvailableJSErrorHandling !== true) {
    * You can use this module directly, or just require InitializeCore.
    */
   const ExceptionsManager = require('./ExceptionsManager').default;
+  const toError = require('../../src/private/utilities/toError').default;
   ExceptionsManager.installConsoleErrorReporter();
 
   // Set up error handler
@@ -23,8 +24,9 @@ if (global.RN$useAlwaysAvailableJSErrorHandling !== true) {
     const handleError = (e: unknown, isFatal: boolean) => {
       try {
         ExceptionsManager.handleException(e, isFatal);
-      } catch (ee) {
-        console.log('Failed to print error: ', ee.message);
+      } catch (ee: unknown) {
+        const error = toError(ee);
+        console.log('Failed to print error: ', error.message);
         throw e;
       }
     };

package/Libraries/Core/setUpReactDevTools.js

@@ -146,17 +146,34 @@ if (__DEV__) {
         ? guessHostFromDevServerUrl(devServer.url)
         : 'localhost';
 
-      // Read the optional global variable for backward compatibility.
-      // It was added in https://github.com/facebook/react-native/commit/bf2b435322e89d0aeee8792b1c6e04656c2719a0.
-      const port =
+      // Derive scheme and port from the dev server URL when possible,
+      // falling back to ws://host:8097 for local development.
+      let wsScheme = 'ws';
+      let port = 8097;
+
+      if (
         // $FlowFixMe[prop-missing]
         // $FlowFixMe[incompatible-use]
         window.__REACT_DEVTOOLS_PORT__ != null
-          ? window.__REACT_DEVTOOLS_PORT__
-          : 8097;
+      ) {
+        // $FlowFixMe[prop-missing]
+        port = window.__REACT_DEVTOOLS_PORT__;
+      } else if (devServer.bundleLoadedFromServer) {
+        try {
+          const devUrl = new URL(devServer.url);
+          if (devUrl.protocol === 'https:') {
+            wsScheme = 'wss';
+          }
+          if (devUrl.port) {
+            port = parseInt(devUrl.port, 10);
+          } else if (devUrl.protocol === 'https:') {
+            port = 443;
+          }
+        } catch (e) {}
+      }
 
       const WebSocket = require('../WebSocket/WebSocket').default;
-      ws = new WebSocket('ws://' + host + ':' + port);
+      ws = new WebSocket(wsScheme + '://' + host + ':' + port);
       ws.addEventListener('close', event => {
         isWebSocketOpen = false;
       });

package/Libraries/Core/setUpSegmentFetcher.js

@@ -19,7 +19,7 @@ export type FetchSegmentFunction = typeof __fetchSegment;
 
 function __fetchSegment(
   segmentId: number,
-  options: $ReadOnly<{
+  options: Readonly<{
     otaBuildNumber: ?string,
     requestedModuleName: string,
     segmentHash: string,

package/Libraries/Debugging/DebuggingOverlay.js

@@ -26,8 +26,8 @@ const isNativeComponentReady =
   UIManager.hasViewManagerConfig('DebuggingOverlay');
 
 type DebuggingOverlayHandle = {
-  highlightTraceUpdates(updates: $ReadOnlyArray<TraceUpdate>): void,
-  highlightElements(elements: $ReadOnlyArray<ElementRectangle>): void,
+  highlightTraceUpdates(updates: ReadonlyArray<TraceUpdate>): void,
+  highlightElements(elements: ReadonlyArray<ElementRectangle>): void,
   clearElementsHighlight(): void,
 };
 

package/Libraries/EventEmitter/NativeEventEmitter.js

@@ -45,9 +45,9 @@ type UnsafeNativeEventObject = Object;
  * can theoretically listen to `RCTDeviceEventEmitter` (although discouraged).
  */
 export default class NativeEventEmitter<
-  TEventToArgsMap: $ReadOnly<
-    Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>,
-  > = $ReadOnly<Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>>,
+  TEventToArgsMap: Readonly<
+    Record<string, ReadonlyArray<UnsafeNativeEventObject>>,
+  > = Readonly<Record<string, ReadonlyArray<UnsafeNativeEventObject>>>,
 > implements IEventEmitter<TEventToArgsMap>
 {
   _nativeModule: ?NativeModule;
@@ -83,7 +83,7 @@ export default class NativeEventEmitter<
     }
   }
 
-  addListener<TEvent: $Keys<TEventToArgsMap>>(
+  addListener<TEvent: keyof TEventToArgsMap>(
     eventType: TEvent,
     listener: (...args: TEventToArgsMap[TEvent]) => unknown,
     context?: unknown,
@@ -107,7 +107,7 @@ export default class NativeEventEmitter<
     };
   }
 
-  emit<TEvent: $Keys<TEventToArgsMap>>(
+  emit<TEvent: keyof TEventToArgsMap>(
     eventType: TEvent,
     ...args: TEventToArgsMap[TEvent]
   ): void {
@@ -116,9 +116,7 @@ export default class NativeEventEmitter<
     RCTDeviceEventEmitter.emit(eventType, ...args);
   }
 
-  removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(
-    eventType?: ?TEvent,
-  ): void {
+  removeAllListeners<TEvent: keyof TEventToArgsMap>(eventType?: ?TEvent): void {
     invariant(
       eventType != null,
       '`NativeEventEmitter.removeAllListener()` requires a non-null argument.',
@@ -127,7 +125,7 @@ export default class NativeEventEmitter<
     RCTDeviceEventEmitter.removeAllListeners(eventType);
   }
 
-  listenerCount<TEvent: $Keys<TEventToArgsMap>>(eventType: TEvent): number {
+  listenerCount<TEvent: keyof TEventToArgsMap>(eventType: TEvent): number {
     return RCTDeviceEventEmitter.listenerCount(eventType);
   }
 }

package/Libraries/EventEmitter/RCTDeviceEventEmitter.js

@@ -25,7 +25,7 @@ type RCTDeviceEventDefinitions = {[name: string]: Array<any>};
  */
 class RCTDeviceEventEmitterImpl extends EventEmitter<RCTDeviceEventDefinitions> {
   // Add systrace to RCTDeviceEventEmitter.emit method for debugging
-  emit<TEvent: $Keys<RCTDeviceEventDefinitions>>(
+  emit<TEvent: keyof RCTDeviceEventDefinitions>(
     eventType: TEvent,
     ...args: RCTDeviceEventDefinitions[TEvent]
   ): void {

package/Libraries/Image/AssetSourceResolver.js

@@ -22,7 +22,7 @@ export type ResolvedAssetSource = {
 type AssetDestPathResolver = 'android' | 'generic';
 
 // From @react-native/assets-registry
-type PackagerAsset = $ReadOnly<{
+type PackagerAsset = Readonly<{
   __packager_asset: boolean,
   fileSystemLocation: string,
   httpServerLocation: string,

package/Libraries/Image/AssetSourceResolver.windows.js

@@ -22,7 +22,7 @@ export type ResolvedAssetSource = {
 type AssetDestPathResolver = 'android' | 'generic';
 
 // From @react-native/assets-registry
-type PackagerAsset = $ReadOnly<{
+type PackagerAsset = Readonly<{
   __packager_asset: boolean,
   fileSystemLocation: string,
   httpServerLocation: string,