react-native 0.0.0-201c10733 → 0.0.0-268efb102

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -10,15 +10,13 @@
 
 /* eslint-env jest */
 
-'use strict';
-
 const React = require('react');
 
 const ReactTestRenderer = require('react-test-renderer');
 const ShallowRenderer = require('react-shallow-renderer');
-/* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.125.1 was deployed. To see the error, delete this comment
- * and run Flow. */
+/* $FlowFixMe[not-a-function] (>=0.125.1 site=react_native_fb) This comment
+ * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
+ * delete this comment and run Flow. */
 const shallowRenderer = new ShallowRenderer();
 
 import type {ReactTestRenderer as ReactTestRendererType} from 'react-test-renderer';
@@ -29,9 +27,12 @@ export type ReactTestInstance = $PropertyType<ReactTestRendererType, 'root'>;
 export type Predicate = (node: ReactTestInstance) => boolean;
 
 type $ReturnType<Fn> = $Call<<Ret, A>((...A) => Ret) => Ret, Fn>;
-/* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an error
- * found when Flow v0.125.1 was deployed. To see the error, delete this comment
- * and run Flow. */
+/* $FlowFixMe[prop-missing] (>=0.125.1 site=react_native_fb) This comment
+ * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
+ * delete this comment and run Flow. */
+/* $FlowFixMe[value-as-type] (>=0.125.1 site=react_native_fb) This comment
+ * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
+ * delete this comment and run Flow. */
 export type ReactTestRendererJSON = $ReturnType<ReactTestRenderer.create.toJSON>;
 
 const {
@@ -57,13 +58,8 @@ function byClickable(): Predicate {
       // HACK: Find components that use `Pressability`.
       node.instance?.state?.pressability != null ||
       // TODO: Remove this after deleting `Touchable`.
-      /* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an
-       * error found when Flow v0.125.1 was deployed. To see the error, delete
-       * this comment and run Flow. */
-      (node.instance &&
-        /* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses
-         * an error found when Flow v0.125.1 was deployed. To see the error,
-         * delete this comment and run Flow. */
+      (node.instance != null &&
+        // $FlowFixMe[prop-missing]
         typeof node.instance.touchableHandlePress === 'function'),
     'is clickable',
   );
@@ -78,10 +74,7 @@ function byTestID(testID: string): Predicate {
 
 function byTextMatching(regex: RegExp): Predicate {
   return withMessage(
-    /* $FlowFixMe(>=0.125.1 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.125.1 was deployed. To see the error, delete
-     * this comment and run Flow. */
-    node => node.props && regex.exec(node.props.children),
+    node => node.props != null && regex.exec(node.props.children) !== null,
     `text content matches ${regex.toString()}`,
   );
 }

package/Libraries/Utilities/codegenNativeCommands.js

@@ -8,15 +8,13 @@
  * @flow
  */
 
-'use strict';
-
 import {dispatchCommand} from '../../Libraries/Renderer/shims/ReactNative';
 
 type Options<T = string> = $ReadOnly<{|
   supportedCommands: $ReadOnlyArray<T>,
 |}>;
 
-function codegenNativeCommands<T: {...}>(options: Options<$Keys<T>>): T {
+function codegenNativeCommands<T: interface {}>(options: Options<$Keys<T>>): T {
   const commandObj = {};
 
   options.supportedCommands.forEach(command => {

package/Libraries/Utilities/codegenNativeComponent.js

@@ -10,8 +10,6 @@
 
 // TODO: move this file to shims/ReactNative (requires React update and sync)
 
-'use strict';
-
 import requireNativeComponent from '../../Libraries/ReactNative/requireNativeComponent';
 import type {HostComponent} from '../../Libraries/Renderer/shims/ReactNativeTypes';
 import UIManager from '../ReactNative/UIManager';

package/Libraries/Utilities/createPerformanceLogger.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 const Systrace = require('../Performance/Systrace');
 
 const infoLog = require('./infoLog');

package/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js

@@ -42,6 +42,7 @@ function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<mixed>>(
 
     // $FlowFixMe[not-an-object] `object` can be an array, but Object.keys works with arrays too
     const keys = Object.keys((object: {...} | Array<mixed>));
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const hasOwnProperty = Object.prototype.hasOwnProperty;
 
     for (let i = 0; i < keys.length; i++) {

package/Libraries/Utilities/defineLazyObjectProperty.js

@@ -14,7 +14,7 @@
  * Defines a lazily evaluated property on the supplied `object`.
  */
 function defineLazyObjectProperty<T>(
-  object: {...},
+  object: interface {},
   name: string,
   descriptor: {
     get: () => T,

package/Libraries/Utilities/deprecatedPropType.js

@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import UIManager from '../ReactNative/UIManager';
 
 /**
@@ -22,8 +20,8 @@ function deprecatedPropType(
   return function validate(props, propName, componentName, ...rest) {
     // Don't warn for native components.
     if (
-      !global.RN$Bridgeless &&
-      UIManager.hasViewManagerConfig(componentName) &&
+      global.RN$Bridgeless !== true &&
+      !UIManager.hasViewManagerConfig(componentName) &&
       props[propName] !== undefined
     ) {
       console.warn(

package/Libraries/Utilities/stringifySafe.js

@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import invariant from 'invariant';
 
 /**
@@ -101,7 +99,7 @@ export function createStringifySafeWithLimits(limits: {|
       } catch (e) {
         if (typeof arg.toString === 'function') {
           try {
-            // $FlowFixMe: toString shouldn't take any arguments in general.
+            // $FlowFixMe[incompatible-use] : toString shouldn't take any arguments in general.
             return arg.toString();
           } catch (E) {}
         }

package/Libraries/Utilities/useColorScheme.js

@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import {useMemo} from 'react';
 import {useSubscription} from 'use-subscription';
 import Appearance from './Appearance';
@@ -20,8 +18,10 @@ export default function useColorScheme(): ?ColorSchemeName {
     () => ({
       getCurrentValue: () => Appearance.getColorScheme(),
       subscribe: callback => {
-        Appearance.addChangeListener(callback);
-        return () => Appearance.removeChangeListener(callback);
+        const appearanceSubscription = Appearance.addChangeListener(callback);
+        return () => {
+          appearanceSubscription.remove();
+        };
       },
     }),
     [],

package/Libraries/Utilities/useMergeRefs.js

@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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
+ * @format
+ */
+
+import {useCallback} from 'react';
+
+type CallbackRef<T> = T => mixed;
+type ObjectRef<T> = {current: T, ...};
+
+type Ref<T> = CallbackRef<T> | ObjectRef<T>;
+
+/**
+ * Constructs a new ref that forwards new values to each of the given refs. The
+ * given refs will always be invoked in the order that they are supplied.
+ *
+ * WARNING: A known problem of merging refs using this approach is that if any
+ * of the given refs change, the returned callback ref will also be changed. If
+ * the returned callback ref is supplied as a `ref` to a React element, this may
+ * lead to problems with the given refs being invoked more times than desired.
+ */
+export default function useMergeRefs<T>(
+  ...refs: $ReadOnlyArray<?Ref<T>>
+): CallbackRef<T> {
+  return useCallback(
+    (current: T) => {
+      for (const ref of refs) {
+        if (ref != null) {
+          if (typeof ref === 'function') {
+            ref(current);
+          } else {
+            ref.current = current;
+          }
+        }
+      }
+    },
+    [...refs], // eslint-disable-line react-hooks/exhaustive-deps
+  );
+}

package/Libraries/Utilities/useRefEffect.js

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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
+ * @format
+ */
+
+import {useCallback, useRef} from 'react';
+
+type CallbackRef<T> = T => mixed;
+
+/**
+ * Constructs a callback ref that provides similar semantics as `useEffect`. The
+ * supplied `effect` callback will be called with non-null component instances.
+ * The `effect` callback can also optionally return a cleanup function.
+ *
+ * When a component is updated or unmounted, the cleanup function is called. The
+ * `effect` callback will then be called again, if applicable.
+ *
+ * When a new `effect` callback is supplied, the previously returned cleanup
+ * function will be called before the new `effect` callback is called with the
+ * same instance.
+ *
+ * WARNING: The `effect` callback should be stable (e.g. using `useCallback`).
+ */
+export default function useRefEffect<TInstance>(
+  effect: TInstance => (() => void) | void,
+): CallbackRef<TInstance | null> {
+  const cleanupRef = useRef<(() => void) | void>(undefined);
+  return useCallback(
+    instance => {
+      if (cleanupRef.current) {
+        cleanupRef.current();
+        cleanupRef.current = undefined;
+      }
+      if (instance != null) {
+        cleanupRef.current = effect(instance);
+      }
+    },
+    [effect],
+  );
+}

package/Libraries/Utilities/useWindowDimensions.js

@@ -8,13 +8,16 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import Dimensions from './Dimensions';
-import {type DisplayMetrics} from './NativeDeviceInfo';
+import {
+  type DisplayMetrics,
+  type DisplayMetricsAndroid,
+} from './NativeDeviceInfo';
 import {useEffect, useState} from 'react';
 
-export default function useWindowDimensions(): DisplayMetrics {
+export default function useWindowDimensions():
+  | DisplayMetrics
+  | DisplayMetricsAndroid {
   const [dimensions, setDimensions] = useState(() => Dimensions.get('window'));
   useEffect(() => {
     function handleChange({window}) {
@@ -27,13 +30,13 @@ export default function useWindowDimensions(): DisplayMetrics {
         setDimensions(window);
       }
     }
-    Dimensions.addEventListener('change', handleChange);
+    const subscription = Dimensions.addEventListener('change', handleChange);
     // We might have missed an update between calling `get` in render and
     // `addEventListener` in this handler, so we set it here. If there was
     // no change, React will filter out this update as a no-op.
     handleChange({window: Dimensions.get('window')});
     return () => {
-      Dimensions.removeEventListener('change', handleChange);
+      subscription.remove();
     };
   }, [dimensions]);
   return dimensions;

package/Libraries/Utilities/verifyComponentAttributeEquivalence.js

@@ -8,8 +8,6 @@
  * @flow
  */
 
-'use strict';
-
 import ReactNativeViewViewConfig from '../Components/View/ReactNativeViewViewConfig';
 import {type ViewConfig} from '../Renderer/shims/ReactNativeTypes';
 

package/Libraries/Vibration/NativeVibration.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 

package/Libraries/Vibration/RCTVibrationPlugins.mm

@@ -17,12 +17,13 @@
 #import <unordered_map>
 
 Class RCTVibrationClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"Vibration", RCTVibrationCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }

package/Libraries/Vibration/React-RCTVibration.podspec

@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTVibration"

package/Libraries/Vibration/Vibration.js

@@ -9,8 +9,6 @@
  * @jsdoc
  */
 
-'use strict';
-
 import NativeVibration from './NativeVibration';
 const Platform = require('../Utilities/Platform');
 

package/Libraries/WebSocket/NativeWebSocketModule.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 

package/Libraries/WebSocket/WebSocket.js

@@ -8,13 +8,12 @@
  * @flow
  */
 
-'use strict';
-
 import Blob from '../Blob/Blob';
 import type {BlobData} from '../Blob/BlobTypes';
 import BlobManager from '../Blob/BlobManager';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import binaryToBase64 from '../Utilities/binaryToBase64';
+import Platform from '../Utilities/Platform';
 import type {EventSubscription} from '../vendor/emitter/EventEmitter';
 import NativeWebSocketModule from './NativeWebSocketModule';
 import WebSocketEvent from './WebSocketEvent';
@@ -105,20 +104,17 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
     const {headers = {}, ...unrecognized} = options || {};
 
     // Preserve deprecated backwards compatibility for the 'origin' option
-    /* $FlowFixMe(>=0.68.0 site=react_native_fb) This comment suppresses an
-     * error found when Flow v0.68 was deployed. To see the error delete this
-     * comment and run Flow. */
     if (unrecognized && typeof unrecognized.origin === 'string') {
       console.warn(
         'Specifying `origin` as a WebSocket connection option is deprecated. Include it under `headers` instead.',
       );
-      /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
-       * comment suppresses an error found when Flow v0.54 was deployed. To see
-       * the error delete this comment and run Flow. */
+      /* $FlowFixMe[prop-missing] (>=0.54.0 site=react_native_fb,react_native_
+       * oss) This comment suppresses an error found when Flow v0.54 was
+       * deployed. To see the error delete this comment and run Flow. */
       headers.origin = unrecognized.origin;
-      /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This
-       * comment suppresses an error found when Flow v0.54 was deployed. To see
-       * the error delete this comment and run Flow. */
+      /* $FlowFixMe[prop-missing] (>=0.54.0 site=react_native_fb,react_native_
+       * oss) This comment suppresses an error found when Flow v0.54 was
+       * deployed. To see the error delete this comment and run Flow. */
       delete unrecognized.origin;
     }
 
@@ -136,7 +132,11 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
       protocols = null;
     }
 
-    this._eventEmitter = new NativeEventEmitter(NativeWebSocketModule);
+    this._eventEmitter = new NativeEventEmitter(
+      // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+      // If you want to use the native module on other platforms, please remove this condition and test its behavior
+      Platform.OS !== 'ios' ? null : NativeWebSocketModule,
+    );
     this._socketId = nextWebSocketId++;
     this._registerEvents();
     NativeWebSocketModule.connect(url, protocols, {headers}, this._socketId);

package/Libraries/WebSocket/WebSocketInterceptor.js

@@ -7,10 +7,9 @@
  * @format
  */
 
-'use strict';
-
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import NativeWebSocketModule from './NativeWebSocketModule';
+import Platform from '../Utilities/Platform';
 import base64 from 'base64-js';
 
 const originalRCTWebSocketConnect = NativeWebSocketModule.connect;
@@ -133,7 +132,11 @@ const WebSocketInterceptor = {
     if (isInterceptorEnabled) {
       return;
     }
-    eventEmitter = new NativeEventEmitter(NativeWebSocketModule);
+    eventEmitter = new NativeEventEmitter(
+      // T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
+      // If you want to use the native module on other platforms, please remove this condition and test its behavior
+      Platform.OS !== 'ios' ? null : NativeWebSocketModule,
+    );
     WebSocketInterceptor._registerEvents();
 
     // Override `connect` method for all RCTWebSocketModule requests

package/Libraries/YellowBox/YellowBoxDeprecated.js

@@ -67,6 +67,7 @@ if (__DEV__) {
   };
 }
 
+// $FlowFixMe[method-unbinding]
 module.exports = (YellowBox: Class<React.Component<Props>> & {
   ignoreWarnings($ReadOnlyArray<IgnorePattern>): void,
   install(): void,

package/Libraries/__flowtests__/ReactNativeTypes-flowtest.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-'use strict';
-
 import * as React from 'react';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 

package/Libraries/promiseRejectionTrackingOptions.js

@@ -8,8 +8,6 @@
  * @flow strict
  */
 
-'use strict';
-
 import typeof {enable} from 'promise/setimmediate/rejection-tracking';
 
 type ExtractOptionsType = <P>((options?: ?P) => void) => P;
@@ -20,8 +18,10 @@ let rejectionTrackingOptions: $Call<ExtractOptionsType, enable> = {
     let message: string;
     let stack: ?string;
 
+    // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const stringValue = Object.prototype.toString.call(rejection);
     if (stringValue === '[object Error]') {
+      // $FlowFixMe[method-unbinding] added when improving typing for this parameters
       message = Error.prototype.toString.call(rejection);
       const error: Error = (rejection: $FlowFixMe);
       stack = error.stack;

package/Libraries/vendor/emitter/EventEmitter.js

@@ -12,8 +12,42 @@
 
 const EventEmitter = require('./_EventEmitter');
 
+import type {EventSubscription} from './EventSubscription';
+
 export default EventEmitter;
 
-export interface EventSubscription {
-  remove(): void;
+export type {EventSubscription};
+
+/**
+ * Essential interface for an EventEmitter.
+ */
+export interface IEventEmitter<TEventToArgsMap: {...}> {
+  /**
+   * Registers a listener that is called when the supplied event is emitted.
+   * Returns a subscription that has a `remove` method to undo registration.
+   */
+  addListener<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+    context?: mixed,
+  ): EventSubscription;
+
+  /**
+   * Emits the supplied event. Additional arguments supplied to `emit` will be
+   * passed through to each of the registered listeners.
+   */
+  emit<TEvent: $Keys<TEventToArgsMap>>(
+    eventType: TEvent,
+    ...args: $ElementType<TEventToArgsMap, TEvent>
+  ): void;
+
+  /**
+   * Removes all registered listeners.
+   */
+  removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(eventType?: ?TEvent): void;
+
+  /**
+   * Returns the number of registered listeners for the supplied event.
+   */
+  listenerCount<TEvent: $Keys<TEventToArgsMap>>(eventType: TEvent): number;
 }

package/Libraries/vendor/emitter/EventSubscription.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Facebook, Inc. and its 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
+ * @format
+ */
+
+'use strict';
+
+// This exists as a separate file only to avoid circular dependencies from
+// using this in `_EmitterSubscription`. Combine this back into `EventEmitter`
+// after migration and cleanup is done.
+
+export interface EventSubscription {
+  remove(): void;
+}

package/Libraries/vendor/emitter/_EmitterSubscription.js

@@ -11,16 +11,16 @@
 'use strict';
 
 import type EventEmitter from './EventEmitter';
-import EventSubscription from './_EventSubscription';
+import _EventSubscription from './_EventSubscription';
 import type EventSubscriptionVendor from './_EventSubscriptionVendor';
+import {type EventSubscription} from './EventSubscription';
 
 /**
  * EmitterSubscription represents a subscription with listener and context data.
  */
-class EmitterSubscription<
-  EventDefinitions: {...},
-  K: $Keys<EventDefinitions>,
-> extends EventSubscription<EventDefinitions, K> {
+class EmitterSubscription<EventDefinitions: {...}, K: $Keys<EventDefinitions>>
+  extends _EventSubscription<EventDefinitions, K>
+  implements EventSubscription {
   emitter: EventEmitter<EventDefinitions>;
   listener: ?(...$ElementType<EventDefinitions, K>) => mixed;
   context: ?$FlowFixMe;
@@ -49,12 +49,12 @@ class EmitterSubscription<
 
   /**
    * Removes this subscription from the emitter that registered it.
-   * Note: we're overriding the `remove()` method of EventSubscription here
+   * Note: we're overriding the `remove()` method of _EventSubscription here
    * but deliberately not calling `super.remove()` as the responsibility
    * for removing the subscription lies with the EventEmitter.
    */
   remove(): void {
-    this.emitter.removeSubscription(this);
+    this.emitter.__removeSubscription(this);
   }
 }