Deduplicate several JavaScript files (#327)

tom-un · web-flow · commit cf0bd0b2dfb0 · 2020-04-29T14:38:58.000-07:00
* Update scripts to publish react-native-macos-init * Clean up merge markers * Restored ios:macos RNTester parity except for InputAccessoryView. * Revert "Restored ios:macos RNTester parity except for InputAccessoryView." This reverts commit 5a67ae0. * Dedup files from upstream.
diff --git a/Libraries/Components/CheckBox/CheckBox.macos.js b/Libraries/Components/CheckBox/CheckBox.macos.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc.
+ * 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.
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.macos.js b/Libraries/Components/DatePicker/DatePickerIOS.macos.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * 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.
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.macos.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.macos.js
@@ -1,32 +1,15 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * 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.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
 // TODO(macOS ISS#2323203)
 
-'use strict';
-
-import type {Options, DatePickerOpenAction} from './DatePickerAndroidTypes';
-
-class DatePickerAndroid {
-  static async open(options: ?Options): Promise<DatePickerOpenAction> {
-    throw new Error('DatePickerAndroid is not supported on this platform.');
-  }
-
-  /**
-   * A date has been selected.
-   */
-  static +dateSetAction: 'dateSetAction' = 'dateSetAction';
-  /**
-   * The dialog has been dismissed.
-   */
-  static +dismissedAction: 'dismissedAction' = 'dismissedAction';
-}
-
+/* $FlowFixMe allow macOS to share iOS file */
+const DatePickerAndroid = require('./DatePickerAndroid.ios');
 module.exports = DatePickerAndroid;
diff --git a/Libraries/Components/Picker/PickerAndroid.macos.js b/Libraries/Components/Picker/PickerAndroid.macos.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * 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.
diff --git a/Libraries/Components/Picker/PickerIOS.macos.js b/Libraries/Components/Picker/PickerIOS.macos.js
@@ -8,9 +8,11 @@
  * This is a controlled component version of RCTPickerIOS
  *
  * @format
+ * @flow
  */
 
 // TODO(macOS ISS#2323203)
 
+/* $FlowFixMe allow macOS to share iOS file */
 const PickerIOS = require('./PickerIOS.ios');
 module.exports = PickerIOS;
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.macos.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.macos.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * 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.
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.macos.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.macos.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * 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.
@@ -10,73 +10,6 @@
 
 // TODO(macOS ISS#2323203)
 
-'use strict';
-
-const React = require('react');
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-
-import RCTProgressViewNativeComponent from './RCTProgressViewNativeComponent';
-import type {ImageSource} from '../../Image/ImageSource';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
-import type {ViewProps} from '../View/ViewPropTypes';
-
-type Props = $ReadOnly<{|
-  ...ViewProps,
-
-  /**
-   * The progress bar style.
-   */
-  progressViewStyle?: ?('default' | 'bar'),
-
-  /**
-   * The progress value (between 0 and 1).
-   */
-  progress?: ?number,
-
-  /**
-   * The tint color of the progress bar itself.
-   */
-  progressTintColor?: ?ColorValue,
-
-  /**
-   * The tint color of the progress bar track.
-   */
-  trackTintColor?: ?ColorValue,
-
-  /**
-   * A stretchable image to display as the progress bar.
-   */
-  progressImage?: ?ImageSource,
-
-  /**
-   * A stretchable image to display behind the progress bar.
-   */
-  trackImage?: ?ImageSource,
-|}>;
-
-/**
- * Use `ProgressViewIOS` to render a UIProgressView on iOS.
- */
-const ProgressViewIOS = (
-  props: Props,
-  forwardedRef?: ?React.Ref<typeof RCTProgressViewNativeComponent>,
-) => (
-  <RCTProgressViewNativeComponent
-    {...props}
-    style={[styles.progressView, props.style]}
-    ref={forwardedRef}
-  />
-);
-
-const styles = StyleSheet.create({
-  progressView: {
-    height: 2,
-  },
-});
-
-const ProgressViewIOSWithRef = React.forwardRef(ProgressViewIOS);
-
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
-module.exports = (ProgressViewIOSWithRef: typeof RCTProgressViewNativeComponent);
+/* $FlowFixMe allow macOS to share iOS file */
+const ProgressViewIOSWithRef = require('./ProgressViewIOS.ios');
+module.exports = ProgressViewIOSWithRef;
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.macos.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.macos.js
@@ -10,117 +10,6 @@
 
 // TODO(macOS ISS#2323203)
 
-'use strict';
-
-import * as React from 'react';
-import StyleSheet from '../../StyleSheet/StyleSheet';
-import type {OnChangeEvent} from './RCTSegmentedControlNativeComponent';
-import type {ViewProps} from '../View/ViewPropTypes';
-import RCTSegmentedControlNativeComponent from './RCTSegmentedControlNativeComponent';
-import type {SyntheticEvent} from 'react-native/Libraries/Types/CoreEventTypes';
-
-type SegmentedControlIOSProps = $ReadOnly<{|
-  ...ViewProps,
-  /**
-   * The labels for the control's segment buttons, in order.
-   */
-  values?: $ReadOnlyArray<string>,
-  /**
-   * The index in `props.values` of the segment to be (pre)selected.
-   */
-  selectedIndex?: ?number,
-  /**
-   * If false the user won't be able to interact with the control.
-   * Default value is true.
-   */
-  enabled?: boolean,
-  /**
-   * Accent color of the control.
-   */
-  tintColor?: ?string,
-  /**
-   * If true, then selecting a segment won't persist visually.
-   * The `onValueChange` callback will still work as expected.
-   */
-  momentary?: ?boolean,
-  /**
-   * Callback that is called when the user taps a segment
-   */
-  onChange?: ?(event: SyntheticEvent<OnChangeEvent>) => void,
-  /**
-   * Callback that is called when the user taps a segment;
-   * passes the segment's value as an argument
-   */
-  onValueChange?: ?(value: number) => mixed,
-|}>;
-
-type Props = $ReadOnly<{|
-  ...SegmentedControlIOSProps,
-  forwardedRef: ?React.Ref<typeof RCTSegmentedControlNativeComponent>,
-|}>;
-
-/**
- * Use `SegmentedControlIOS` to render a UISegmentedControl iOS.
- *
- * #### Programmatically changing selected index
- *
- * The selected index can be changed on the fly by assigning the
- * selectedIndex prop to a state variable, then changing that variable.
- * Note that the state variable would need to be updated as the user
- * selects a value and changes the index, as shown in the example below.
- *
- * ````
- * <SegmentedControlIOS
- *   values={['One', 'Two']}
- *   selectedIndex={this.state.selectedIndex}
- *   onChange={(event) => {
- *     this.setState({selectedIndex: event.nativeEvent.selectedSegmentIndex});
- *   }}
- * />
- * ````
- */
-
-class SegmentedControlIOS extends React.Component<Props> {
-  static defaultProps = {
-    values: [],
-    enabled: true,
-  };
-
-  _onChange = (event: SyntheticEvent<OnChangeEvent>) => {
-    this.props.onChange && this.props.onChange(event);
-    this.props.onValueChange &&
-      this.props.onValueChange(event.nativeEvent.value);
-  };
-
-  render() {
-    const {forwardedRef, onValueChange, style, ...props} = this.props;
-    return (
-      <RCTSegmentedControlNativeComponent
-        {...props}
-        ref={forwardedRef}
-        style={[styles.segmentedControl, style]}
-        onChange={this._onChange}
-      />
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  segmentedControl: {
-    height: 28,
-  },
-});
-
-const SegmentedControlIOSWithRef = React.forwardRef(
-  (
-    props: SegmentedControlIOSProps,
-    forwardedRef: ?React.Ref<typeof RCTSegmentedControlNativeComponent>,
-  ) => {
-    return <SegmentedControlIOS {...props} forwardedRef={forwardedRef} />;
-  },
-);
-
-/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
- * error found when Flow v0.89 was deployed. To see the error, delete this
- * comment and run Flow. */
-module.exports = (SegmentedControlIOSWithRef: NativeSegmentedControlIOS);
+/* $FlowFixMe allow macOS to share iOS file */
+const SegmentedControlIOSWithRef = require('./SegmentedControlIOS.ios');
+module.exports = SegmentedControlIOSWithRef;
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.macos.js b/Libraries/Components/StatusBar/StatusBarIOS.macos.js
@@ -10,14 +10,6 @@
 
 // TODO(macOS ISS#2323203)
 
-'use strict';
-
-const NativeEventEmitter = require('../../EventEmitter/NativeEventEmitter');
-const {StatusBarManager} = require('../../BatchedBridge/NativeModules');
-
-/**
- * Use `StatusBar` for mutating the status bar.
- */
-class StatusBarIOS extends NativeEventEmitter {}
-
-module.exports = new StatusBarIOS(StatusBarManager);
+/* $FlowFixMe allow macOS to share iOS file */
+const StatusBarIOS = require('./StatusBarIOS.ios');
+module.exports = StatusBarIOS;
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.macos.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.macos.js
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.macos.js b/Libraries/Components/ToastAndroid/ToastAndroid.macos.js
@@ -10,14 +10,5 @@
 
 // TODO(macOS ISS#2323203)
 
-'use strict';
-
-const warning = require('fbjs/lib/warning');
-
-const ToastAndroid = {
-  show: function(message: string, duration: number): void {
-    warning(false, 'ToastAndroid is not supported on this platform.');
-  },
-};
-
+const ToastAndroid = require('./ToastAndroid.ios');
 module.exports = ToastAndroid;
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
@@ -7,8 +7,6 @@
  * @format
  */
 
-// TODO(macOS ISS#2323203) TODO(windows ISS): this file is TouchableNativeFeedback.ios.js in facebook's repo.  Renamed to TouchableNativeFeedback.js since it is shared here between ios, macos, and windows.
-
 'use strict';
 
 const React = require('react');
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.macos.js b/Libraries/Components/Touchable/TouchableNativeFeedback.macos.js
@@ -0,0 +1,11 @@
+/**
+ * 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.
+ *
+ * @format
+ */
+
+const DummyTouchableNativeFeedback = require('./TouchableNativeFeedback.ios');
+module.exports = DummyTouchableNativeFeedback;
diff --git a/Libraries/Components/View/PlatformViewPropTypes.macos.js b/Libraries/Components/View/PlatformViewPropTypes.macos.js
@@ -1,9 +1,11 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * 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.
  *
+ * @providesModule PlatformViewPropTypes
+ * @format
  * @flow
  */
 
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
@@ -7,9 +7,6 @@
  * @flow
  * @format
  */
-
-// TODO(macOS ISS#2323203) TODO(windows ISS): this file is Image.ios.js in facebook's repo.  Renamed to Image.js since it is shared here between ios, macos, and windows.
-
 'use strict';
 
 const DeprecatedImagePropType = require('../DeprecatedPropTypes/DeprecatedImagePropType');
diff --git a/Libraries/Image/Image.macos.js b/Libraries/Image/Image.macos.js
diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js
diff --git a/Libraries/Network/RCTNetworking.macos.js b/Libraries/Network/RCTNetworking.macos.js
diff --git a/Libraries/Settings/Settings.macos.js b/Libraries/Settings/Settings.macos.js
diff --git a/Libraries/Utilities/BackHandler.macos.js b/Libraries/Utilities/BackHandler.macos.js
diff --git a/Libraries/Utilities/LoadingView.macos.js b/Libraries/Utilities/LoadingView.macos.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright (c) 2017-present, Facebook, Inc.`
	`2`	`+ * Copyright (c) Facebook, Inc. and its affiliates.`
`3`	`3`	`*`
`4`	`4`	`* This source code is licensed under the MIT license found in the`
`5`	`5`	`* LICENSE file in the root directory of this source tree.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright (c) 2015-present, Facebook, Inc.`
	`2`	`+ * Copyright (c) Facebook, Inc. and its affiliates.`
`3`	`3`	`*`
`4`	`4`	`* This source code is licensed under the MIT license found in the`
`5`	`5`	`* LICENSE file in the root directory of this source tree.`