Clean-up $TEMPORARY$object in xplat/js/react-native-github

Reviewed By: panagosg7 Differential Revision: D16931667 fbshipit-source-id: d87e5ed02bf7f95005cf0f36c3cd127026189058
zain148 · Aug 21, 2019 · 92073d4 · 92073d4
1 parent 219e197
commit 92073d4
Show file tree

Hide file tree

Showing 30 changed files with 54 additions and 68 deletions.
diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js
@@ -172,7 +172,7 @@ function testOptimizedMultiGet() {
 }
 
 class AsyncStorageTest extends React.Component<{}, $FlowFixMeState> {
-  state: any | $TEMPORARY$object<{|done: boolean, messages: string|}> = {
+  state: any | {|done: boolean, messages: string|} = {
     messages: 'Initializing...',
     done: false,
   };

diff --git a/IntegrationTests/ImageCachePolicyTest.js b/IntegrationTests/ImageCachePolicyTest.js
@@ -36,7 +36,7 @@ type State = {
 };
 
 class ImageCachePolicyTest extends React.Component<Props, $FlowFixMeState> {
-  state: $FlowFixMe | $TEMPORARY$object<{||}> = {};
+  state: $FlowFixMe | {...} = {};
 
   shouldComponentUpdate(nextProps: Props, nextState: State): boolean {
     const results: Array<?boolean> = TESTS.map(x => nextState[x]);

diff --git a/Libraries/Animated/src/AnimatedEvent.js b/Libraries/Animated/src/AnimatedEvent.js
@@ -27,7 +27,7 @@ function attachNativeEvent(
   viewRef: any,
   eventName: string,
   argMapping: Array<?Mapping>,
-): $TEMPORARY$object<{|detach: () => void|}> {
+): {|detach: () => void|} {
   // Find animated values in `argMapping` and create an array representing their
   // key path inside the `nativeEvent` object. Ex.: ['contentOffset', 'x'].
   const eventMappings = [];

diff --git a/Libraries/Animated/src/animations/DecayAnimation.js b/Libraries/Animated/src/animations/DecayAnimation.js
@@ -45,12 +45,12 @@ class DecayAnimation extends Animation {
     this.__iterations = config.iterations ?? 1;
   }
 
-  __getNativeAnimationConfig(): $TEMPORARY$object<{|
+  __getNativeAnimationConfig(): {|
     deceleration: number,
     iterations: number,
     type: $TEMPORARY$string<'decay'>,
     velocity: number,
-  |}> {
+  |} {
     return {
       type: 'decay',
       deceleration: this._deceleration,

diff --git a/Libraries/Animated/src/animations/SpringAnimation.js b/Libraries/Animated/src/animations/SpringAnimation.js
@@ -138,7 +138,7 @@ class SpringAnimation extends Animation {
     invariant(this._mass > 0, 'Mass value must be greater than 0');
   }
 
-  __getNativeAnimationConfig(): $TEMPORARY$object<{|
+  __getNativeAnimationConfig(): {|
     damping: number,
     initialVelocity: number,
     iterations: number,
@@ -149,7 +149,7 @@ class SpringAnimation extends Animation {
     stiffness: number,
     toValue: any,
     type: $TEMPORARY$string<'spring'>,
-  |}> {
+  |} {
     return {
       type: 'spring',
       overshootClamping: this._overshootClamping,

diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -112,9 +112,7 @@ type Props = $ReadOnly<{|
  * source of truth.
  */
 class DatePickerIOS extends React.Component<Props> {
-  static DefaultProps: $TEMPORARY$object<{|
-    mode: $TEMPORARY$string<'datetime'>,
-  |}> = {
+  static DefaultProps: {|mode: $TEMPORARY$string<'datetime'>|} = {
     mode: 'datetime',
   };
 

diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js
@@ -111,7 +111,7 @@ type KeyboardEventListener = (e: KeyboardEvent) => void;
 
 let Keyboard:
   | NativeEventEmitter
-  | $TEMPORARY$object<{|
+  | {|
       addListener: (
         eventName: KeyboardEventName,
         callback: KeyboardEventListener,
@@ -123,7 +123,7 @@ let Keyboard:
         callback: KeyboardEventListener,
       ) => $FlowFixMe,
       scheduleLayoutAnimation: (event: KeyboardEvent) => $FlowFixMe,
-    |}> = {
+    |} = {
   /**
    * The `addListener` function connects a JavaScript function to an identified native
    * keyboard notification event.

diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -61,10 +61,7 @@ type State = {|
  * adjusting its height, position, or bottom padding.
  */
 class KeyboardAvoidingView extends React.Component<Props, State> {
-  static defaultProps: $TEMPORARY$object<{|
-    enabled: boolean,
-    keyboardVerticalOffset: number,
-  |}> = {
+  static defaultProps: {|enabled: boolean, keyboardVerticalOffset: number|} = {
     enabled: true,
     keyboardVerticalOffset: 0,
   };

diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
@@ -130,9 +130,7 @@ class Picker extends React.Component<PickerProps> {
 
   static Item: typeof PickerItem = PickerItem;
 
-  static defaultProps: $TEMPORARY$object<{|
-    mode: $TEMPORARY$string<'dialog'>,
-  |}> = {
+  static defaultProps: {|mode: $TEMPORARY$string<'dialog'>|} = {
     mode: MODE_DIALOG,
   };
 

diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js
@@ -376,10 +376,10 @@ class StatusBar extends React.Component<Props> {
     return newEntry;
   }
 
-  static defaultProps: $TEMPORARY$object<{|
+  static defaultProps: {|
     animated: boolean,
     showHideTransition: $TEMPORARY$string<'fade'>,
-  |}> = {
+  |} = {
     animated: false,
     showHideTransition: 'fade',
   };

diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js
@@ -15,8 +15,8 @@ const ReactNativeViewConfig = {
   uiViewClassName: 'RCTView',
   baseModuleName: null,
   Manager: 'ViewManager',
-  Commands: ({}: $TEMPORARY$object<{||}>),
-  Constants: ({}: $TEMPORARY$object<{||}>),
+  Commands: ({}: {...}),
+  Constants: ({}: {...}),
   bubblingEventTypes: {
     ...ReactNativeViewViewConfigAndroid.bubblingEventTypes,
     topBlur: {

diff --git a/Libraries/Components/View/ViewNativeComponent.js b/Libraries/Components/View/ViewNativeComponent.js
@@ -25,8 +25,8 @@ export type ViewNativeComponentType = Class<
 
 let NativeViewComponent;
 let viewConfig:
-  | $TEMPORARY$object<{||}>
-  | $TEMPORARY$object<{|
+  | {...}
+  | {|
       bubblingEventTypes?: $ReadOnly<{
         [eventName: string]: $ReadOnly<{|
           phasedRegistrationNames: $ReadOnly<{|
@@ -47,7 +47,7 @@ let viewConfig:
               process?: (arg1: any) => any,
             |}>,
       },
-    |}>;
+    |};
 
 // Only use the JS view config in DEV
 if (__DEV__) {

diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
@@ -497,7 +497,7 @@ function setSendIdleEvents(sendIdleEvents: boolean): void {
   NativeTiming.setSendIdleEvents(sendIdleEvents);
 }
 
-let ExportedJSTimers: $TEMPORARY$object<{|
+let ExportedJSTimers: {|
   callIdleCallbacks: (frameTime: number) => any | void,
   callImmediates: () => void,
   callTimers: (timersToCall: Array<number>) => any | void,
@@ -512,7 +512,7 @@ let ExportedJSTimers: $TEMPORARY$object<{|
   setImmediate: (func: any, ...args: any) => number,
   setInterval: (func: any, duration: number, ...args: any) => number,
   setTimeout: (func: any, duration: number, ...args: any) => number,
-|}>;
+|};
 if (!NativeTiming) {
   console.warn("Timing native module is not available, can't set timers.");
   // $FlowFixMe: we can assume timers are generally available

diff --git a/Libraries/Experimental/Incremental.js b/Libraries/Experimental/Incremental.js
@@ -103,16 +103,16 @@ class Incremental extends React.Component<Props, State> {
   _mounted: boolean;
   _rendered: boolean;
 
-  static defaultProps: $TEMPORARY$object<{|name: string|}> = {
+  static defaultProps: {|name: string|} = {
     name: '',
   };
 
   static contextTypes:
     | any
-    | $TEMPORARY$object<{|
+    | {|
         incrementalGroup: React$PropType$Primitive<any>,
         incrementalGroupEnabled: React$PropType$Primitive<boolean>,
-      |}> = {
+      |} = {
     incrementalGroup: PropTypes.object,
     incrementalGroupEnabled: PropTypes.bool,
   };

diff --git a/Libraries/Experimental/IncrementalPresenter.js b/Libraries/Experimental/IncrementalPresenter.js
@@ -46,10 +46,10 @@ class IncrementalPresenter extends React.Component<Props> {
 
   static contextTypes:
     | any
-    | $TEMPORARY$object<{|
+    | {|
         incrementalGroup: React$PropType$Primitive<any>,
         incrementalGroupEnabled: React$PropType$Primitive<boolean>,
-      |}> = {
+      |} = {
     incrementalGroup: PropTypes.object,
     incrementalGroupEnabled: PropTypes.bool,
   };

diff --git a/Libraries/Experimental/WindowedListView.js b/Libraries/Experimental/WindowedListView.js
@@ -170,15 +170,15 @@ class WindowedListView extends React.Component<Props, State> {
   _scrollRef: ?ScrollView;
   _viewabilityHelper: ViewabilityHelper;
 
-  static defaultProps: $TEMPORARY$object<{|
+  static defaultProps: {|
     disableIncrementalRendering: boolean,
     initialNumToRender: number,
     maxNumToRender: number,
     numToRenderAhead: number,
     recomputeRowsBatchingPeriod: number,
     renderScrollComponent: (props: any) => React.Node,
     viewablePercentThreshold: number,
-  |}> = {
+  |} = {
     initialNumToRender: 10,
     maxNumToRender: 30,
     numToRenderAhead: 10,

diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
@@ -137,17 +137,12 @@ export type Props = $ReadOnly<{|
 |}>;
 
 class Modal extends React.Component<Props> {
-  static defaultProps: $TEMPORARY$object<{|
-    hardwareAccelerated: boolean,
-    visible: boolean,
-  |}> = {
+  static defaultProps: {|hardwareAccelerated: boolean, visible: boolean|} = {
     visible: true,
     hardwareAccelerated: false,
   };
 
-  static contextTypes:
-    | any
-    | $TEMPORARY$object<{|rootTag: React$PropType$Primitive<number>|}> = {
+  static contextTypes: any | {|rootTag: React$PropType$Primitive<number>|} = {
     rootTag: PropTypes.number,
   };
 
@@ -162,11 +157,11 @@ class Modal extends React.Component<Props> {
 
   static childContextTypes:
     | any
-    | $TEMPORARY$object<{|virtualizedList: React$PropType$Primitive<any>|}> = {
+    | {|virtualizedList: React$PropType$Primitive<any>|} = {
     virtualizedList: PropTypes.object,
   };
 
-  getChildContext(): $TEMPORARY$object<{|virtualizedList: null|}> {
+  getChildContext(): {|virtualizedList: null|} {
     // Reset the context so VirtualizedList doesn't get confused by nesting
     // in the React tree that doesn't reflect the native component hierarchy.
     return {

diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
@@ -44,7 +44,7 @@ class AppContainer extends React.Component<Props, State> {
 
   static childContextTypes:
     | any
-    | $TEMPORARY$object<{|rootTag: React$PropType$Primitive<number>|}> = {
+    | {|rootTag: React$PropType$Primitive<number>|} = {
     rootTag: PropTypes.number,
   };
 

diff --git a/Libraries/ReactNative/DummyUIManager.js b/Libraries/ReactNative/DummyUIManager.js
@@ -16,7 +16,7 @@ module.exports = {
     );
     return null;
   },
-  getConstants: (): $TEMPORARY$object<{||}> => ({}),
+  getConstants: (): {...} => ({}),
   getConstantsForViewManager: (viewManagerName: string) => {},
   getDefaultEventTypes: (): Array<$FlowFixMe> => [],
   playTouchSound: () => {},

diff --git a/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js b/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
@@ -12,16 +12,16 @@
 
 'use strict';
 
+const invariant = require('invariant');
+
 import type {
   ReactNativeBaseComponentViewConfig,
   ViewConfigGetter,
 } from './ReactNativeTypes';
 
-const invariant = require('invariant');
-
 // Event configs
-const customBubblingEventTypes: $TEMPORARY$object<{||}> = {};
-const customDirectEventTypes: $TEMPORARY$object<{||}> = {};
+const customBubblingEventTypes: {...} = {};
+const customDirectEventTypes: {...} = {};
 
 exports.customBubblingEventTypes = customBubblingEventTypes;
 exports.customDirectEventTypes = customDirectEventTypes;

diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
@@ -19,7 +19,7 @@ const deepFreezeAndThrowOnMutationInDev = require('./Utilities/deepFreezeAndThro
  *  - Source code should be limitted to ASCII.
  *  - Less chance of typos.
  */
-const UTFSequence: $TEMPORARY$object<{|
+const UTFSequence: {|
   BOM: string,
   BULLET: string,
   BULLET_SP: string,
@@ -34,7 +34,7 @@ const UTFSequence: $TEMPORARY$object<{|
   PIZZA: string,
   TRIANGLE_LEFT: string,
   TRIANGLE_RIGHT: string,
-|}> = deepFreezeAndThrowOnMutationInDev({
+|} = deepFreezeAndThrowOnMutationInDev({
   BOM: '\ufeff', // byte order mark
   BULLET: '\u2022', // bullet: &#8226;
   BULLET_SP: '\u00A0\u2022\u00A0', // &nbsp;&#8226;&nbsp;

diff --git a/Libraries/Utilities/verifyComponentAttributeEquivalence.js b/Libraries/Utilities/verifyComponentAttributeEquivalence.js
@@ -105,7 +105,7 @@ export function lefthandObjectDiff(leftObj: Object, rightObj: Object): Object {
 export function getConfigWithoutViewProps(
   viewConfig: ReactNativeBaseComponentViewConfig<>,
   propName: string,
-): $TEMPORARY$object<{||}> {
+): {...} {
   if (!viewConfig[propName]) {
     return {};
   }

diff --git a/Libraries/YellowBox/UI/YellowBoxPressable.js b/Libraries/YellowBox/UI/YellowBoxPressable.js
@@ -36,9 +36,9 @@ type State = {|
 |};
 
 class YellowBoxPressable extends React.Component<Props, State> {
-  static defaultProps: $TEMPORARY$object<{|
-    backgroundColor: $TEMPORARY$object<{|default: string, pressed: string|}>,
-  |}> = {
+  static defaultProps: {|
+    backgroundColor: {|default: string, pressed: string|},
+  |} = {
     backgroundColor: {
       default: YellowBoxStyle.getBackgroundColor(0.95),
       pressed: YellowBoxStyle.getHighlightColor(1),

diff --git a/Libraries/vendor/emitter/EventHolder.js b/Libraries/vendor/emitter/EventHolder.js
@@ -45,7 +45,7 @@ class EventHolder {
   holdEvent(
     eventType: string,
     ...args: any
-  ): $TEMPORARY$object<{|eventType: string, index: $FlowFixMeEmpty|}> {
+  ): {|eventType: string, index: $FlowFixMeEmpty|} {
     this._heldEvents[eventType] = this._heldEvents[eventType] || [];
     const eventsOfType = this._heldEvents[eventType];
     const key = {

diff --git a/RNTester/js/components/ListExampleShared.js b/RNTester/js/components/ListExampleShared.js
@@ -219,7 +219,7 @@ function getItemLayout(
   data: any,
   index: number,
   horizontal?: boolean,
-): $TEMPORARY$object<{|index: number, length: number, offset: number|}> {
+): {|index: number, length: number, offset: number|} {
   const [length, separator, header] = horizontal
     ? [HORIZ_WIDTH, 0, HEADER.width]
     : [ITEM_HEIGHT, SEPARATOR_HEIGHT, HEADER.height];

diff --git a/RNTester/js/components/TextLegend.js b/RNTester/js/components/TextLegend.js
@@ -15,12 +15,12 @@ const React = require('react');
 const {Picker, Text, View} = require('react-native');
 
 class TextLegend extends React.Component<*, *> {
-  state: $TEMPORARY$object<{|
+  state: {|
     alignment: $TEMPORARY$string<'left'>,
     fontSize: number,
     language: $TEMPORARY$string<'english'>,
     textMetrics: Array<any>,
-  |}> = {
+  |} = {
     textMetrics: [],
     language: 'english',
     alignment: 'left',

diff --git a/RNTester/js/examples/MultiColumn/MultiColumnExample.js b/RNTester/js/examples/MultiColumn/MultiColumnExample.js
@@ -35,14 +35,14 @@ class MultiColumnExample extends React.PureComponent<
 > {
   state:
     | any
-    | $TEMPORARY$object<{|
+    | {|
         data: Array<Item>,
         filterText: string,
         fixedHeight: boolean,
         logViewable: boolean,
         numColumns: number,
         virtualized: boolean,
-      |}> = {
+      |} = {
     data: genItemData(1000),
     filterText: '',
     fixedHeight: true,