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

package/Libraries/NativeComponent/BaseViewConfig.ios.js

@@ -225,7 +225,22 @@ const validAttributesForNonEventProps = {
   transformOrigin: true,
   accessibilityRole: true,
   accessibilityState: true,
+  'aria-busy': true,
+  'aria-checked': true,
+  'aria-disabled': true,
+  'aria-expanded': true,
+  'aria-hidden': true,
+  'aria-label': true,
+  'aria-labelledby': true,
+  'aria-live': true,
+  'aria-selected': true,
+  'aria-valuemax': true,
+  'aria-valuemin': true,
+  'aria-valuenow': true,
+  'aria-valuetext': true,
+  tabIndex: true,
   nativeID: true,
+  id: true,
   pointerEvents: true,
   removeClippedSubviews: true,
   role: true,
@@ -364,6 +379,8 @@ const validAttributesForNonEventProps = {
 
   direction: true,
 
+  focusable: true,
+
   style: ReactNativeStyleAttributes,
 } as const;
 

package/Libraries/NativeComponent/NativeComponentRegistry.js

@@ -48,7 +48,7 @@ export function setRuntimeConfigProvider(
  * The supplied `viewConfigProvider` may or may not be invoked and utilized,
  * depending on how `setRuntimeConfigProvider` is configured.
  */
-export function get<Config: {...}>(
+export function get<Config extends {...}>(
   name: string,
   viewConfigProvider: () => PartialViewConfig,
 ): HostComponent<Config> {
@@ -121,7 +121,7 @@ export function get<Config: {...}>(
  * that the return value of this is not `HostComponent` because the returned
  * component instance is not guaranteed to have native methods.
  */
-export function getWithFallback_DEPRECATED<Config: {...}>(
+export function getWithFallback_DEPRECATED<Config extends {...}>(
   name: string,
   viewConfigProvider: () => PartialViewConfig,
 ): React.ComponentType<Config> {

package/Libraries/NativeComponent/ViewConfigIgnore.js

@@ -16,7 +16,9 @@ const ignoredViewConfigProps = new WeakSet<{...}>();
  * Decorates ViewConfig values that are dynamically injected by the library,
  * react-native-gesture-handler. (T45765076)
  */
-export function DynamicallyInjectedByGestureHandler<T: {...}>(object: T): T {
+export function DynamicallyInjectedByGestureHandler<T extends {...}>(
+  object: T,
+): T {
   ignoredViewConfigProps.add(object);
   return object;
 }
@@ -35,7 +37,7 @@ export function DynamicallyInjectedByGestureHandler<T: {...}>(object: T): T {
  * TODO(T110872225): Remove this logic, after achieving platform-consistency
  */
 export function ConditionallyIgnoredEventHandlers<
-  const T: {+[name: string]: true},
+  const T extends {+[name: string]: true},
 >(value: T): T | void {
   if (Platform.OS === 'ios') {
     return value;

package/Libraries/Network/RCTNetworking.android.js

@@ -48,7 +48,7 @@ const emitter = new NativeEventEmitter<$FlowFixMe>(
  * requestId to each network request that can be used to abort that request later on.
  */
 const RCTNetworking = {
-  addListener<K: keyof RCTNetworkingEventDefinitions>(
+  addListener<K extends keyof RCTNetworkingEventDefinitions>(
     eventType: K,
     listener: (...RCTNetworkingEventDefinitions[K]) => unknown,
     context?: unknown,

package/Libraries/Network/RCTNetworking.ios.js

@@ -18,7 +18,7 @@ import {type RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinition
 import {type NativeResponseType} from './XMLHttpRequest';
 
 const RCTNetworking = {
-  addListener<K: keyof RCTNetworkingEventDefinitions>(
+  addListener<K extends keyof RCTNetworkingEventDefinitions>(
     eventType: K,
     listener: (...RCTNetworkingEventDefinitions[K]) => unknown,
     context?: unknown,

package/Libraries/Network/RCTNetworking.js.flow

@@ -16,7 +16,7 @@ import type {RCTNetworkingEventDefinitions} from './RCTNetworkingEventDefinition
 import type {NativeResponseType} from './XMLHttpRequest';
 
 declare const RCTNetworking: interface {
-  addListener<K: keyof RCTNetworkingEventDefinitions>(
+  addListener<K extends keyof RCTNetworkingEventDefinitions>(
     eventType: K,
     // $FlowFixMe[invalid-computed-prop]
     listener: (...RCTNetworkingEventDefinitions[K]) => unknown,

package/Libraries/Network/RCTNetworking.mm

@@ -162,7 +162,6 @@ static NSString *RCTGenerateFormBoundary()
   NSMutableArray<id<RCTNetworkingRequestHandler>> *_requestHandlers;
   NSMutableArray<id<RCTNetworkingResponseHandler>> *_responseHandlers;
   NSMutableArray<id<RCTNetworkingTextResponseHandler>> *_textResponseHandlers;
-  dispatch_queue_t _requestQueue;
 }
 
 @synthesize methodQueue = _methodQueue;
@@ -319,7 +318,7 @@ RCT_EXPORT_MODULE()
   request.HTTPMethod = [RCTConvert NSString:RCTNilIfNull(query[@"method"])].uppercaseString ?: @"GET";
   request.HTTPShouldHandleCookies = [RCTConvert BOOL:query[@"withCredentials"]];
 
-  if (request.HTTPShouldHandleCookies == YES) {
+  if (request.HTTPShouldHandleCookies) {
     // Load and set the cookie header.
     NSArray<NSHTTPCookie *> *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:URL];
     request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];

package/Libraries/Network/XMLHttpRequest.js

@@ -14,7 +14,6 @@ import type {
   EventCallback,
   EventListener,
 } from '../../src/private/webapis/dom/events/EventTarget';
-import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 
 import Event from '../../src/private/webapis/dom/events/Event';
 import {
@@ -27,8 +26,6 @@ import ProgressEvent from '../../src/private/webapis/xhr/events/ProgressEvent';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
 
 const BlobManager = require('../Blob/BlobManager').default;
-const GlobalPerformanceLogger =
-  require('../Utilities/GlobalPerformanceLogger').default;
 const RCTNetworking = require('./RCTNetworking').default;
 const base64 = require('base64-js');
 const invariant = require('invariant');
@@ -58,6 +55,17 @@ type XHRInterceptor = interface {
   loadingFailed(id: number, error: string): void,
 };
 
+/**
+ * Minimal contract for the optional performance logger that callers may attach
+ * via `setPerformanceLogger(...)`. Defined locally so this module stays
+ * self-contained and does not depend on any specific logger implementation.
+ * Any object satisfying these two methods structurally is accepted.
+ */
+type XHRPerformanceLogger = interface {
+  startTimespan(key: string): void,
+  stopTimespan(key: string): void,
+};
+
 // The native blob module is optional so inject it here if available.
 if (BlobManager.isAvailable) {
   BlobManager.addNetworkingHandler();
@@ -167,8 +175,7 @@ class XMLHttpRequest extends EventTarget {
   _timedOut: boolean = false;
   _trackingName: ?string;
   _incrementalEvents: boolean = false;
-  _startTime: ?number = null;
-  _performanceLogger: IPerformanceLogger = GlobalPerformanceLogger;
+  _performanceLogger: ?XHRPerformanceLogger = null;
 
   static __setInterceptor_DO_NOT_USE(interceptor: ?XHRInterceptor) {
     XMLHttpRequest._interceptor = interceptor;
@@ -334,8 +341,10 @@ class XMLHttpRequest extends EventTarget {
     responseURL: ?string,
   ): void {
     if (requestId === this._requestId) {
-      this._perfKey != null &&
-        this._performanceLogger.stopTimespan(this._perfKey);
+      const performanceLogger = this._performanceLogger;
+      if (this._perfKey != null && performanceLogger != null) {
+        performanceLogger.stopTimespan(this._perfKey);
+      }
       this.status = status;
       this.setResponseHeaders(responseHeaders);
       this.setReadyState(this.HEADERS_RECEIVED);
@@ -521,9 +530,15 @@ class XMLHttpRequest extends EventTarget {
   }
 
   /**
-   * Custom extension for setting a custom performance logger
+   * Custom extension that lets callers attach a performance logger receiving
+   * a `network_XMLHttpRequest_<friendlyName>` start/stop timespan around each
+   * dispatched request. The logger only needs to implement
+   * `startTimespan(key)` / `stopTimespan(key)` (see the `XHRPerformanceLogger`
+   * interface above). When no logger is set the timespan is not emitted.
    */
-  setPerformanceLogger(performanceLogger: IPerformanceLogger): XMLHttpRequest {
+  setPerformanceLogger(
+    performanceLogger: XHRPerformanceLogger,
+  ): XMLHttpRequest {
     this._performanceLogger = performanceLogger;
     return this;
   }
@@ -598,9 +613,11 @@ class XMLHttpRequest extends EventTarget {
 
     const doSend = () => {
       const friendlyName = this._trackingName ?? this._url;
-      this._perfKey = 'network_XMLHttpRequest_' + String(friendlyName);
-      this._performanceLogger.startTimespan(this._perfKey);
-      this._startTime = performance.now();
+      const performanceLogger = this._performanceLogger;
+      if (performanceLogger != null) {
+        this._perfKey = 'network_XMLHttpRequest_' + String(friendlyName);
+        performanceLogger.startTimespan(this._perfKey);
+      }
       invariant(
         this._method,
         'XMLHttpRequest method needs to be defined (%s).',

package/Libraries/Pressability/Pressability.js

@@ -627,8 +627,8 @@ export default class Pressability {
       ReactNativeFeatureFlags.shouldPressibilityUseW3CPointerEventsForHover()
     ) {
       const hoverPointerEvents = {
-        onPointerEnter: (undefined: void | (PointerEvent => void)),
-        onPointerLeave: (undefined: void | (PointerEvent => void)),
+        onPointerEnter: undefined as void | (PointerEvent => void),
+        onPointerLeave: undefined as void | (PointerEvent => void),
       };
       const {onHoverIn, onHoverOut} = this._config;
       if (onHoverIn != null) {

package/Libraries/ReactNative/AppContainer-dev.js

@@ -32,7 +32,7 @@ import {useRef} from 'react';
 
 const {useEffect, useState, useCallback} = React;
 
-const reactDevToolsHook: ReactDevToolsGlobalHook = (window: $FlowFixMe)
+const reactDevToolsHook: ReactDevToolsGlobalHook = (window as $FlowFixMe)
   .__REACT_DEVTOOLS_GLOBAL_HOOK__;
 
 // Required for React DevTools to view / edit React Native styles in Flipper.
@@ -103,7 +103,6 @@ const ReactDevToolsOverlayDeferred = ({
 
 const AppContainer = ({
   children,
-  fabric,
   initialProps,
   internal_excludeInspector = false,
   internal_excludeLogBox = false,
@@ -170,7 +169,7 @@ const AppContainer = ({
 
   if (WrapperComponent != null) {
     innerView = (
-      <WrapperComponent initialProps={initialProps} fabric={fabric === true}>
+      <WrapperComponent initialProps={initialProps}>
         {innerView}
       </WrapperComponent>
     );

package/Libraries/ReactNative/AppContainer-prod.js

@@ -17,7 +17,6 @@ import * as React from 'react';
 
 const AppContainer = ({
   children,
-  fabric,
   initialProps,
   rootTag,
   WrapperComponent,
@@ -27,7 +26,7 @@ const AppContainer = ({
 
   if (WrapperComponent != null) {
     innerView = (
-      <WrapperComponent initialProps={initialProps} fabric={fabric === true}>
+      <WrapperComponent initialProps={initialProps}>
         {innerView}
       </WrapperComponent>
     );

package/Libraries/ReactNative/AppContainer.js

@@ -15,7 +15,6 @@ import * as React from 'react';
 
 export type Props = Readonly<{
   children?: React.Node,
-  fabric?: boolean,
   rootTag: number | RootTag,
   initialProps?: {...},
   WrapperComponent?: ?React.ComponentType<any>,

package/Libraries/ReactNative/AppRegistry.d.ts

@@ -8,8 +8,8 @@
  */
 
 import type * as React from 'react';
-import type {IPerformanceLogger} from '../Utilities/IPerformanceLogger';
 import type {ViewStyle} from '../StyleSheet/StyleSheetTypes';
+import type {IPerformanceLogger} from './IPerformanceLogger';
 
 type Task = (taskData: any) => Promise<void>;
 type TaskProvider = () => Task;

package/Libraries/ReactNative/AppRegistry.flow.js

@@ -10,8 +10,8 @@
 
 import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 import type {RootTag} from '../Types/RootTagTypes';
-import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
 import type {DisplayModeType} from './DisplayMode';
+import type {IPerformanceLogger} from './IPerformanceLogger.flow';
 
 type HeadlessTask = (taskData: any) => Promise<void>;
 export type TaskProvider = () => HeadlessTask;
@@ -31,7 +31,6 @@ export type AppConfig = {
 export type AppParameters = {
   initialProps: Readonly<{[string]: unknown, ...}>,
   rootTag: RootTag,
-  fabric?: boolean,
 };
 export type Runnable = (
   appParameters: AppParameters,

package/Libraries/ReactNative/AppRegistryImpl.js

@@ -22,11 +22,10 @@ import type {
   WrapperComponentProvider,
 } from './AppRegistry.flow';
 
-import createPerformanceLogger from '../Utilities/createPerformanceLogger';
 import SceneTracker from '../Utilities/SceneTracker';
+import DeprecatedPerformanceLoggerStub from './DeprecatedPerformanceLoggerStub';
 import {coerceDisplayMode} from './DisplayMode';
 import HeadlessJsTaskError from './HeadlessJsTaskError';
-import {unmountComponentAtNodeAndRemoveContainer} from './RendererProxy';
 import invariant from 'invariant';
 
 type TaskCanceller = () => void;
@@ -82,24 +81,23 @@ export function registerComponent(
   componentProvider: ComponentProvider,
   section?: boolean,
 ): string {
-  const scopedPerformanceLogger = createPerformanceLogger();
   runnables[appKey] = (appParameters, displayMode) => {
     const renderApplication = require('./renderApplication').default;
-    renderApplication(
-      componentProviderInstrumentationHook(
+    renderApplication({
+      RootComponent: componentProviderInstrumentationHook(
         componentProvider,
-        scopedPerformanceLogger,
+        DeprecatedPerformanceLoggerStub,
       ),
-      appParameters.initialProps,
-      appParameters.rootTag,
-      wrapperComponentProvider && wrapperComponentProvider(appParameters),
-      rootViewStyleProvider && rootViewStyleProvider(appParameters),
-      appParameters.fabric,
-      scopedPerformanceLogger,
-      appKey === 'LogBox', // is logbox
-      appKey,
+      initialProps: appParameters.initialProps,
+      rootTag: appParameters.rootTag,
+      WrapperComponent:
+        wrapperComponentProvider && wrapperComponentProvider(appParameters),
+      rootViewStyle:
+        rootViewStyleProvider && rootViewStyleProvider(appParameters),
+      isLogBox: appKey === 'LogBox',
+      debugName: appKey,
       displayMode,
-    );
+    });
   };
   if (section) {
     sections[appKey] = runnables[appKey];
@@ -210,7 +208,9 @@ export function setSurfaceProps(
  * See https://reactnative.dev/docs/appregistry#unmountapplicationcomponentatroottag
  */
 export function unmountApplicationComponentAtRootTag(rootTag: RootTag): void {
-  unmountComponentAtNodeAndRemoveContainer(rootTag);
+  console.error(
+    'Unexpected call to unmountApplicationComponentAtRootTag in Fabric.',
+  );
 }
 
 /**

package/Libraries/ReactNative/DeprecatedPerformanceLoggerStub.js

@@ -0,0 +1,83 @@
+/**
+ * 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 {IPerformanceLogger} from './IPerformanceLogger.flow';
+
+let didWarn: boolean = false;
+function warnDeprecated(): void {
+  if (didWarn) {
+    return;
+  }
+  didWarn = true;
+  console.warn(
+    'The default `IPerformanceLogger` provided by `react-native` (the ' +
+      "`'GlobalPerformanceLogger'` callable native module and the " +
+      '`scopedPerformanceLogger` argument passed to the hook registered with ' +
+      '`AppRegistry.setComponentProviderInstrumentationHook`) is deprecated and ' +
+      'will be removed in a future release. The instance supplied today is a ' +
+      'no-op stub. Embedders that need a per-app performance logger should ' +
+      'attach their own implementation.',
+  );
+}
+
+/**
+ * @deprecated The `react-native` package no longer ships a real
+ * `IPerformanceLogger`. This stub is exposed to keep existing extension points
+ * (the `'GlobalPerformanceLogger'` callable native module and the second
+ * argument of `AppRegistry.setComponentProviderInstrumentationHook`'s hook)
+ * source-compatible for embedders. Every method is a no-op that emits a
+ * one-time deprecation warning on first use.
+ */
+const DeprecatedPerformanceLoggerStub: IPerformanceLogger = {
+  addTimespan: () => warnDeprecated(),
+  append: () => warnDeprecated(),
+  clear: () => warnDeprecated(),
+  clearCompleted: () => warnDeprecated(),
+  close: () => warnDeprecated(),
+  currentTimestamp: () => {
+    warnDeprecated();
+    return 0;
+  },
+  getExtras: () => {
+    warnDeprecated();
+    return {};
+  },
+  getPoints: () => {
+    warnDeprecated();
+    return {};
+  },
+  getPointExtras: () => {
+    warnDeprecated();
+    return {};
+  },
+  getTimespans: () => {
+    warnDeprecated();
+    return {};
+  },
+  hasTimespan: () => {
+    warnDeprecated();
+    return false;
+  },
+  isClosed: () => {
+    warnDeprecated();
+    return false;
+  },
+  logEverything: () => warnDeprecated(),
+  markPoint: () => warnDeprecated(),
+  removeExtra: () => {
+    warnDeprecated();
+    return undefined;
+  },
+  setExtra: () => warnDeprecated(),
+  startTimespan: () => warnDeprecated(),
+  stopTimespan: () => warnDeprecated(),
+};
+
+export default DeprecatedPerformanceLoggerStub;

package/Libraries/ReactNative/FabricUIManager.js

@@ -92,6 +92,11 @@ export interface Spec {
     /* width: */ number,
     /* height: */ number,
   ];
+  +setIsJSResponder: (
+    node: Node | NativeElementReference,
+    isJSResponder: boolean,
+    blockNativeResponder: boolean,
+  ) => void;
   +unstable_DefaultEventPriority: number;
   +unstable_DiscreteEventPriority: number;
   +unstable_ContinuousEventPriority: number;
@@ -124,6 +129,7 @@ const CACHED_PROPERTIES = [
   'dispatchCommand',
   'compareDocumentPosition',
   'getBoundingClientRect',
+  'setIsJSResponder',
   'unstable_DefaultEventPriority',
   'unstable_DiscreteEventPriority',
   'unstable_ContinuousEventPriority',

package/Libraries/{Utilities → ReactNative}/IPerformanceLogger.d.ts

@@ -7,6 +7,8 @@
  * @format
  */
 
+export type ExtraValue = number | string | boolean;
+export type Extras = {[key: string]: ExtraValue};
 export type Timespan = {
   startTime: number;
   endTime?: number | undefined;
@@ -15,11 +17,12 @@ export type Timespan = {
   endExtras?: Extras | undefined;
 };
 
-// Extra values should be serializable primitives
-export type ExtraValue = number | string | boolean;
-
-export type Extras = {[key: string]: ExtraValue};
-
+/**
+ * @deprecated The scoped performance logger argument passed to the
+ * `componentProviderInstrumentationHook` is no longer used by `react-native`
+ * itself and will be removed in a future release. The instance supplied today
+ * is a no-op stub.
+ */
 export interface IPerformanceLogger {
   addTimespan(
     key: string,

package/Libraries/{Utilities/IPerformanceLogger.js → ReactNative/IPerformanceLogger.flow.js}

@@ -8,6 +8,8 @@
  * @format
  */
 
+export type ExtraValue = number | string | boolean;
+export type Extras = {[key: string]: ExtraValue};
 export type Timespan = {
   startTime: number,
   endTime?: number,
@@ -16,11 +18,12 @@ export type Timespan = {
   endExtras?: Extras,
 };
 
-// Extra values should be serializable primitives
-export type ExtraValue = number | string | boolean;
-
-export type Extras = {[key: string]: ExtraValue};
-
+/**
+ * @deprecated The scoped performance logger argument passed to the
+ * `componentProviderInstrumentationHook` is no longer used by `react-native`
+ * itself and will be removed in a future release. The instance supplied today
+ * is a no-op stub.
+ */
 export interface IPerformanceLogger {
   addTimespan(
     key: string,
@@ -34,10 +37,10 @@ export interface IPerformanceLogger {
   clearCompleted(): void;
   close(): void;
   currentTimestamp(): number;
-  getExtras(): Readonly<{[key: string]: ?ExtraValue, ...}>;
-  getPoints(): Readonly<{[key: string]: ?number, ...}>;
-  getPointExtras(): Readonly<{[key: string]: ?Extras, ...}>;
-  getTimespans(): Readonly<{[key: string]: ?Timespan, ...}>;
+  getExtras(): Readonly<{[key: string]: ?ExtraValue}>;
+  getPoints(): Readonly<{[key: string]: ?number}>;
+  getPointExtras(): Readonly<{[key: string]: ?Extras}>;
+  getTimespans(): Readonly<{[key: string]: ?Timespan}>;
   hasTimespan(key: string): boolean;
   isClosed(): boolean;
   logEverything(): void;

package/Libraries/ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload.js

@@ -258,11 +258,11 @@ function diffProperties(
       if (!attributeConfigHasProcess) {
         // functions are converted to booleans as markers that the associated
         // events should be sent from native.
-        nextProp = (true: any);
+        nextProp = true as any;
         // If nextProp is not a function, then don't bother changing prevProp
         // since nextProp will win and go into the updatePayload regardless.
         if (typeof prevProp === 'function') {
-          prevProp = (true: any);
+          prevProp = true as any;
         }
       }
     }
@@ -270,9 +270,9 @@ function diffProperties(
     // An explicit value of undefined is treated as a null because it overrides
     // any other preceding value.
     if (typeof nextProp === 'undefined') {
-      nextProp = (null: any);
+      nextProp = null as any;
       if (typeof prevProp === 'undefined') {
-        prevProp = (null: any);
+        prevProp = null as any;
       }
     }
 
@@ -313,7 +313,7 @@ function diffProperties(
       // case: !Object is the default case
       if (defaultDiffer(prevProp, nextProp)) {
         // a normal leaf has changed
-        (updatePayload || (updatePayload = ({}: {[string]: $FlowFixMe})))[
+        (updatePayload || (updatePayload = {} as {[string]: $FlowFixMe}))[
           propKey
         ] = nextProp;
       }
@@ -333,7 +333,7 @@ function diffProperties(
             ? // $FlowFixMe[incompatible-use] found when upgrading Flow
               attributeConfig.process(nextProp)
             : nextProp;
-        (updatePayload || (updatePayload = ({}: {[string]: $FlowFixMe})))[
+        (updatePayload || (updatePayload = {} as {[string]: $FlowFixMe}))[
           propKey
         ] = nextValue;
       }
@@ -347,13 +347,13 @@ function diffProperties(
         updatePayload,
         prevProp,
         nextProp,
-        ((attributeConfig: any): AttributeConfiguration),
+        attributeConfig as any as AttributeConfiguration,
       );
       if (removedKeyCount > 0 && updatePayload) {
         restoreDeletedValuesInNestedArray(
           updatePayload,
           nextProp,
-          ((attributeConfig: any): AttributeConfiguration),
+          attributeConfig as any as AttributeConfiguration,
         );
         removedKeys = null;
       }
@@ -389,11 +389,11 @@ function diffProperties(
     ) {
       // case: CustomAttributeConfiguration | !Object
       // Flag the leaf property for removal by sending a sentinel.
-      (updatePayload || (updatePayload = ({}: {[string]: $FlowFixMe})))[
+      (updatePayload || (updatePayload = {} as {[string]: $FlowFixMe}))[
         propKey
       ] = null;
       if (!removedKeys) {
-        removedKeys = ({}: {[string]: boolean});
+        removedKeys = {} as {[string]: boolean};
       }
       if (!removedKeys[propKey]) {
         removedKeys[propKey] = true;
@@ -406,7 +406,7 @@ function diffProperties(
       updatePayload = clearNestedProperty(
         updatePayload,
         prevProp,
-        ((attributeConfig: any): AttributeConfiguration),
+        attributeConfig as any as AttributeConfiguration,
       );
     }
   }
@@ -429,9 +429,9 @@ function addNestedProperty(
   for (const propKey in props) {
     const prop = props[propKey];
 
-    const attributeConfig = ((validAttributes[
+    const attributeConfig = validAttributes[
       propKey
-    ]: any): AttributeConfiguration);
+    ] as any as AttributeConfiguration;
 
     if (attributeConfig == null) {
       continue;
@@ -466,7 +466,7 @@ function addNestedProperty(
 
     if (newValue !== undefined) {
       if (!payload) {
-        payload = ({}: {[string]: $FlowFixMe});
+        payload = {} as {[string]: $FlowFixMe};
       }
       payload[propKey] = newValue;
       continue;