Merge pull request #816 from amgleitman/amgleitman/0.64-merge-2020-06-30

Merge from upstream through 2020-06-30

Author: amgleitman

.flowconfig

@@ -86,4 +86,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.126.1
+^0.127.0

.flowconfig.android

@@ -89,4 +89,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.126.1
+^0.127.0

.flowconfig.macos

@@ -59,10 +59,6 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_macos\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_macos\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
 experimental.well_formed_exports=true
 experimental.types_first=true
 experimental.abstract_locations=true
@@ -89,4 +85,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.126.1
+^0.127.0

IntegrationTests/AccessibilityManagerTest.js

@@ -10,13 +10,12 @@
 
 'use strict';
 
-const React = require('react');
-const ReactNative = require('react-native');
-const {View} = ReactNative;
-const RCTDeviceEventEmitter = require('react-native/Libraries/EventEmitter/RCTDeviceEventEmitter');
-const {TestModule} = ReactNative.NativeModules;
-import NativeAccessibilityManager from 'react-native/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager';
 import invariant from 'invariant';
+import NativeAccessibilityManager from 'react-native/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager';
+import {DeviceEventEmitter, NativeModules, View} from 'react-native';
+import * as React from 'react';
+
+const {TestModule} = NativeModules;
 
 class AccessibilityManagerTest extends React.Component<{...}> {
   componentDidMount() {
@@ -39,7 +38,7 @@ class AccessibilityManagerTest extends React.Component<{...}> {
       accessibilityExtraExtraLarge: 11.0,
       accessibilityExtraExtraExtraLarge: 12.0,
     });
-    RCTDeviceEventEmitter.addListener('didUpdateDimensions', update => {
+    DeviceEventEmitter.addListener('didUpdateDimensions', update => {
       TestModule.markTestPassed(update.window.fontScale === 4.0);
     });
   }

IntegrationTests/ReactContentSizeUpdateTest.js

@@ -17,7 +17,7 @@ const ReactNative = require('react-native');
 const {View} = ReactNative;
 
 const {TestModule} = ReactNative.NativeModules;
-import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/EmitterSubscription';
+import {type EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 
 const reactViewWidth = 101;
 const reactViewHeight = 102;
@@ -33,7 +33,7 @@ type State = {|
 
 class ReactContentSizeUpdateTest extends React.Component<Props, State> {
   _timeoutID: ?TimeoutID = null;
-  _subscription: ?EmitterSubscription = null;
+  _subscription: ?EventSubscription = null;
 
   state: State = {
     height: reactViewHeight,

IntegrationTests/SizeFlexibilityUpdateTest.js

@@ -16,7 +16,7 @@ const ReactNative = require('react-native');
 const {View} = ReactNative;
 
 const {TestModule} = ReactNative.NativeModules;
-import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/EmitterSubscription';
+import {type EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 
 const reactViewWidth = 111;
 const reactViewHeight = 222;
@@ -31,7 +31,7 @@ type Props = $ReadOnly<{|
 |}>;
 
 class SizeFlexibilityUpdateTest extends React.Component<Props> {
-  _subscription: ?EmitterSubscription = null;
+  _subscription: ?EventSubscription = null;
 
   UNSAFE_componentWillMount() {
     this._subscription = RCTNativeAppEventEmitter.addListener(

Libraries/Alert/NativeAlertManager.js

@@ -17,7 +17,7 @@ import type {DefaultInputsArray} from './AlertMacOS'; // TODO(macOS GH#774)
 export type Args = {|
   title?: string,
   message?: string,
-  buttons?: Array<Object>, // TODO: have a better type
+  buttons?: Array<Object>, // TODO(T67565166): have a better type
   type?: string,
   defaultValue?: string,
   cancelButtonKey?: string,

Libraries/Animated/src/NativeAnimatedHelper.js

@@ -38,6 +38,15 @@ const API = {
   enableQueue: function(): void {
     queueConnections = true;
   },
+  getValue: function(
+    tag: number,
+    saveValueCallback: (value: number) => void,
+  ): void {
+    invariant(NativeAnimatedModule, 'Native animated module is not available');
+    if (NativeAnimatedModule.getValue) {
+      NativeAnimatedModule.getValue(tag, saveValueCallback);
+    }
+  },
   disableQueue: function(): void {
     invariant(NativeAnimatedModule, 'Native animated module is not available');
     queueConnections = false;

Libraries/Animated/src/NativeAnimatedModule.js

@@ -15,6 +15,7 @@ import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry';
 
 type EndResult = {finished: boolean, ...};
 type EndCallback = (result: EndResult) => void;
+type SaveValueCallback = (value: number) => void;
 
 export type EventMapping = {|
   nativeEventPath: Array<string>,
@@ -28,6 +29,7 @@ export type AnimatingNodeConfig = Object;
 
 export interface Spec extends TurboModule {
   +createAnimatedNode: (tag: number, config: AnimatedNodeConfig) => void;
+  +getValue: (tag: number, saveValueCallback: SaveValueCallback) => void;
   +startListeningToAnimatedNodeValue: (tag: number) => void;
   +stopListeningToAnimatedNodeValue: (tag: number) => void;
   +connectAnimatedNodes: (parentTag: number, childTag: number) => void;

Libraries/Animated/src/__tests__/AnimatedNative-test.js

@@ -36,6 +36,7 @@ describe('Native Animated', () => {
 
   beforeEach(() => {
     Object.assign(NativeAnimatedModule, {
+      getValue: jest.fn(),
       addAnimatedEventToView: jest.fn(),
       connectAnimatedNodes: jest.fn(),
       connectAnimatedNodeToView: jest.fn(),
@@ -115,6 +116,26 @@ describe('Native Animated', () => {
       );
     });
 
+    it('should save value on unmount', () => {
+      NativeAnimatedModule.getValue = jest.fn((tag, saveCallback) => {
+        saveCallback(1);
+      });
+      const opacity = new Animated.Value(0);
+
+      opacity.__makeNative();
+
+      const root = TestRenderer.create(<Animated.View style={{opacity}} />);
+      const tag = opacity.__getNativeTag();
+
+      root.unmount();
+
+      expect(NativeAnimatedModule.getValue).toBeCalledWith(
+        tag,
+        expect.any(Function),
+      );
+      expect(opacity.__getValue()).toBe(1);
+    });
+
     it('should extract offset', () => {
       const opacity = new Animated.Value(0);
       opacity.__makeNative();