From 0afd71a18d19edef3d6603cabd2672ffde5ba30e Mon Sep 17 00:00:00 2001 From: Kacie Bawiec Date: Mon, 26 Apr 2021 12:49:37 -0700 Subject: [PATCH] Convert require to import in Libraries/Components Summary: Changelog: [General][Changed] Convert require statements to use import from in Libraries/Components Reviewed By: lunaleaps Differential Revision: D27921557 fbshipit-source-id: 3f1618455a47a56c4a090f3ececfef88476c0b8a --- .../ActivityIndicator/ActivityIndicator.js | 10 +++--- Libraries/Components/Button.js | 17 +++++----- .../DatePicker/DatePickerIOS.android.js | 9 +++-- .../DatePicker/DatePickerIOS.ios.js | 9 +++-- Libraries/Components/Keyboard/Keyboard.js | 2 +- .../MaskedView/MaskedViewIOS.ios.js | 6 ++-- Libraries/Components/Picker/Picker.js | 13 ++++--- Libraries/Components/Picker/PickerIOS.ios.js | 19 ++++++----- .../ProgressViewIOS.android.js | 9 +++-- .../ProgressViewIOS/ProgressViewIOS.ios.js | 5 ++- .../__mocks__/RefreshControlMock.js | 5 ++- ...roidHorizontalScrollViewNativeComponent.js | 4 +-- .../ScrollContentViewNativeComponent.js | 4 +-- .../ScrollView/ScrollViewNativeComponent.js | 4 +-- .../SegmentedControlIOS.android.js | 9 +++-- Libraries/Components/Slider/Slider.js | 11 +++--- Libraries/Components/StatusBar/StatusBar.js | 9 +++-- .../AndroidTextInputNativeComponent.js | 7 ++-- .../TextInput/AndroidTextInputViewConfig.js | 2 +- .../TextInput/InputAccessoryView.js | 12 +++---- .../RCTMultilineTextInputNativeComponent.js | 2 +- .../RCTSingelineTextInputNativeComponent.js | 2 +- .../TextInput/RCTTextInputViewConfig.js | 2 +- Libraries/Components/TextInput/TextInput.js | 34 +++++++++++-------- .../Touchable/BoundingDimensions.js | 3 +- Libraries/Components/Touchable/PooledClass.js | 3 +- Libraries/Components/Touchable/Position.js | 3 +- Libraries/Components/Touchable/Touchable.js | 12 +++---- .../Touchable/ensurePositiveDelayProps.js | 3 +- .../UnimplementedViews/UnimplementedView.js | 5 ++- .../View/ReactNativeStyleAttributes.js | 14 ++++---- .../View/ReactNativeViewAttributes.js | 3 +- .../View/ReactNativeViewViewConfig.js | 2 +- 33 files changed, 123 insertions(+), 131 deletions(-) diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js index 6202d610d95..9100cf6483d 100644 --- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js +++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js @@ -10,14 +10,12 @@ */ 'use strict'; - -const Platform = require('../../Utilities/Platform'); -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const View = require('../View/View'); +import * as React from 'react'; +import Platform from '../../Utilities/Platform'; +import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet'; +import View from '../View/View'; import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import type {ViewProps} from '../View/ViewPropTypes'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; const PlatformActivityIndicator = Platform.OS === 'android' diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js index a235b375d02..c1f1987f4a5 100644 --- a/Libraries/Components/Button.js +++ b/Libraries/Components/Button.js @@ -11,18 +11,17 @@ 'use strict'; -const Platform = require('../Utilities/Platform'); -const React = require('react'); -const StyleSheet = require('../StyleSheet/StyleSheet'); -const Text = require('../Text/Text'); -const TouchableNativeFeedback = require('./Touchable/TouchableNativeFeedback'); -const TouchableOpacity = require('./Touchable/TouchableOpacity'); -const View = require('./View/View'); -const invariant = require('invariant'); +import * as React from 'react'; +import Platform from '../Utilities/Platform'; +import StyleSheet, {type ColorValue} from '../StyleSheet/StyleSheet'; +import Text from '../Text/Text'; +import TouchableNativeFeedback from './Touchable/TouchableNativeFeedback'; +import TouchableOpacity from './Touchable/TouchableOpacity'; +import View from './View/View'; +import invariant from 'invariant'; import type {AccessibilityState} from './View/ViewAccessibility'; import type {PressEvent} from '../Types/CoreEventTypes'; -import type {ColorValue} from '../StyleSheet/StyleSheet'; type ButtonProps = $ReadOnly<{| /** diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js index 4c26ab96285..a3531c770b4 100644 --- a/Libraries/Components/DatePicker/DatePickerIOS.android.js +++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js @@ -8,11 +8,10 @@ */ 'use strict'; - -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const Text = require('../../Text/Text'); -const View = require('../View/View'); +import * as React from 'react'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import View from '../View/View'; class DummyDatePickerIOS extends React.Component { render() { diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js index a501a0eccc8..30cc13ad55f 100644 --- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js +++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js @@ -10,14 +10,13 @@ // This is a controlled component version of RCTDatePickerIOS. +import * as React from 'react'; import RCTDatePickerNativeComponent, { Commands as DatePickerCommands, } from './RCTDatePickerNativeComponent'; -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const View = require('../View/View'); - -const invariant = require('invariant'); +import StyleSheet from '../../StyleSheet/StyleSheet'; +import View from '../View/View'; +import invariant from 'invariant'; import type {SyntheticEvent} from '../../Types/CoreEventTypes'; import type {ViewProps} from '../View/ViewPropTypes'; diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js index 6227b975adf..fec163cd284 100644 --- a/Libraries/Components/Keyboard/Keyboard.js +++ b/Libraries/Components/Keyboard/Keyboard.js @@ -13,7 +13,7 @@ import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation'; import dismissKeyboard from '../../Utilities/dismissKeyboard'; import Platform from '../../Utilities/Platform'; import NativeKeyboardObserver from './NativeKeyboardObserver'; -import {type EventSubscription} from '../../vendor/emitter/EventEmitter'; +import type {EventSubscription} from '../../vendor/emitter/EventEmitter'; export type KeyboardEventName = $Keys; diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js index 4a32d29836f..eb69fc4233a 100644 --- a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js +++ b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js @@ -8,9 +8,9 @@ * @flow */ -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const View = require('../View/View'); +import * as React from 'react'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import View from '../View/View'; import type {ViewProps} from '../View/ViewPropTypes'; import RCTMaskedViewNativeComponent from './RCTMaskedViewNativeComponent'; diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js index 7a733f32637..0a3ac3bd3d9 100644 --- a/Libraries/Components/Picker/Picker.js +++ b/Libraries/Components/Picker/Picker.js @@ -10,14 +10,13 @@ 'use strict'; -const PickerAndroid = require('./PickerAndroid'); -const PickerIOS = require('./PickerIOS'); -const Platform = require('../../Utilities/Platform'); -const React = require('react'); -const UnimplementedView = require('../UnimplementedViews/UnimplementedView'); +import * as React from 'react'; +import PickerAndroid from './PickerAndroid'; +import PickerIOS from './PickerIOS'; +import Platform from '../../Utilities/Platform'; +import UnimplementedView from '../UnimplementedViews/UnimplementedView'; -import type {TextStyleProp} from '../../StyleSheet/StyleSheet'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; +import type {TextStyleProp, ColorValue} from '../../StyleSheet/StyleSheet'; const MODE_DIALOG = 'dialog'; const MODE_DROPDOWN = 'dropdown'; diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js index fcdecf2f593..93c1c4821cf 100644 --- a/Libraries/Components/Picker/PickerIOS.ios.js +++ b/Libraries/Components/Picker/PickerIOS.ios.js @@ -10,19 +10,20 @@ // This is a controlled component version of RCTPickerIOS. -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const View = require('../View/View'); - -const invariant = require('invariant'); -const processColor = require('../../StyleSheet/processColor'); +import * as React from 'react'; +import StyleSheet, { + type TextStyleProp, + type ColorValue, +} from '../../StyleSheet/StyleSheet'; +import View from '../View/View'; +import invariant from 'invariant'; +import processColor, { + type ProcessedColorValue, +} from '../../StyleSheet/processColor'; import RCTPickerNativeComponent, { Commands as PickerCommands, } from './RCTPickerNativeComponent'; -import type {TextStyleProp} from '../../StyleSheet/StyleSheet'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; -import type {ProcessedColorValue} from '../../StyleSheet/processColor'; import type {SyntheticEvent} from '../../Types/CoreEventTypes'; import type {ViewProps} from '../View/ViewPropTypes'; diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js index 8396ac4e879..d642a6545ab 100644 --- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js +++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js @@ -8,11 +8,10 @@ */ 'use strict'; - -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const Text = require('../../Text/Text'); -const View = require('../View/View'); +import * as React from 'react'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import View from '../View/View'; class DummyProgressViewIOS extends React.Component { render() { diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js index c3f5352e687..d465440d174 100644 --- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js +++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js @@ -8,12 +8,11 @@ * @flow strict-local */ -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); +import * as React from 'react'; +import StyleSheet, {type ColorValue} from '../../StyleSheet/StyleSheet'; import RCTProgressViewNativeComponent from './RCTProgressViewNativeComponent'; import type {ImageSource} from '../../Image/ImageSource'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; import type {ViewProps} from '../View/ViewPropTypes'; type Props = $ReadOnly<{| diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js index 40d41abbdc6..696eaa37ae7 100644 --- a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js +++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js @@ -9,10 +9,9 @@ */ 'use strict'; +import * as React from 'react'; -const React = require('react'); - -const requireNativeComponent = require('../../../ReactNative/requireNativeComponent'); +import requireNativeComponent from '../../../ReactNative/requireNativeComponent'; import type {HostComponent} from '../../../Renderer/shims/ReactNativeTypes'; diff --git a/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js b/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js index 6c68faf202a..05f629e01a1 100644 --- a/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js +++ b/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js @@ -8,8 +8,8 @@ * @format */ -import {type ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType'; -import {type HostComponent} from '../../Renderer/shims/ReactNativeTypes'; +import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType'; +import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry'; const AndroidHorizontalScrollViewNativeComponent: HostComponent = NativeComponentRegistry.get( diff --git a/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js b/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js index 702900a3b89..4e3174044df 100644 --- a/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js +++ b/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js @@ -8,9 +8,9 @@ * @flow */ -import {type HostComponent} from '../../Renderer/shims/ReactNativeTypes'; +import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry'; -import {type ViewProps as Props} from '../View/ViewPropTypes'; +import type {ViewProps as Props} from '../View/ViewPropTypes'; const ScrollContentViewNativeComponent: HostComponent = NativeComponentRegistry.get( 'RCTScrollContentView', diff --git a/Libraries/Components/ScrollView/ScrollViewNativeComponent.js b/Libraries/Components/ScrollView/ScrollViewNativeComponent.js index e74fb870e34..f5433a0b25e 100644 --- a/Libraries/Components/ScrollView/ScrollViewNativeComponent.js +++ b/Libraries/Components/ScrollView/ScrollViewNativeComponent.js @@ -8,8 +8,8 @@ * @format */ -import {type ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType'; -import {type HostComponent} from '../../Renderer/shims/ReactNativeTypes'; +import type {ScrollViewNativeProps as Props} from './ScrollViewNativeComponentType'; +import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import * as NativeComponentRegistry from '../../NativeComponent/NativeComponentRegistry'; const ScrollViewNativeComponent: HostComponent = NativeComponentRegistry.get( diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js index a5f56f2f7a7..a4cbc5e9842 100644 --- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js +++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js @@ -8,11 +8,10 @@ */ 'use strict'; - -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const Text = require('../../Text/Text'); -const View = require('../View/View'); +import * as React from 'react'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import View from '../View/View'; class DummySegmentedControlIOS extends React.Component { render() { diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js index 90bbfbf6fee..74221175de5 100644 --- a/Libraries/Components/Slider/Slider.js +++ b/Libraries/Components/Slider/Slider.js @@ -8,14 +8,15 @@ * @flow strict-local */ -const Platform = require('../../Utilities/Platform'); +import * as React from 'react'; +import Platform from '../../Utilities/Platform'; import SliderNativeComponent from './SliderNativeComponent'; -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); +import StyleSheet, { + type ViewStyleProp, + type ColorValue, +} from '../../StyleSheet/StyleSheet'; import type {ImageSource} from '../../Image/ImageSource'; -import type {ViewStyleProp} from '../../StyleSheet/StyleSheet'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; import type {ViewProps} from '../View/ViewPropTypes'; import type {SyntheticEvent} from '../../Types/CoreEventTypes'; diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js index 5c242786943..4ba35f0f461 100644 --- a/Libraries/Components/StatusBar/StatusBar.js +++ b/Libraries/Components/StatusBar/StatusBar.js @@ -8,11 +8,10 @@ * @flow */ -const Platform = require('../../Utilities/Platform'); -const React = require('react'); - -const invariant = require('invariant'); -const processColor = require('../../StyleSheet/processColor'); +import * as React from 'react'; +import Platform from '../../Utilities/Platform'; +import invariant from 'invariant'; +import processColor from '../../StyleSheet/processColor'; import type {ColorValue} from '../../StyleSheet/StyleSheet'; import NativeStatusBarManagerAndroid from './NativeStatusBarManagerAndroid'; diff --git a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js index e96df0585ae..b8d559a2954 100644 --- a/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js +++ b/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js @@ -18,8 +18,11 @@ import type { WithDefault, } from '../../Types/CodegenTypes'; import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; -import type {TextStyleProp, ViewStyleProp} from '../../StyleSheet/StyleSheet'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; +import type { + TextStyleProp, + ViewStyleProp, + ColorValue, +} from '../../StyleSheet/StyleSheet'; import requireNativeComponent from '../../ReactNative/requireNativeComponent'; import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; import type {TextInputNativeCommands} from './TextInputNativeCommands'; diff --git a/Libraries/Components/TextInput/AndroidTextInputViewConfig.js b/Libraries/Components/TextInput/AndroidTextInputViewConfig.js index d1f922dccbe..e1a693d5f70 100644 --- a/Libraries/Components/TextInput/AndroidTextInputViewConfig.js +++ b/Libraries/Components/TextInput/AndroidTextInputViewConfig.js @@ -9,7 +9,7 @@ */ import ReactNativeViewViewConfig from '../../Components/View/ReactNativeViewViewConfig'; -import {type PartialViewConfig} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes'; +import type {PartialViewConfig} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes'; const AndroidTextInputViewConfig = { uiViewClassName: 'AndroidTextInput', diff --git a/Libraries/Components/TextInput/InputAccessoryView.js b/Libraries/Components/TextInput/InputAccessoryView.js index 0da3ed3d332..eb83a9ca0e7 100644 --- a/Libraries/Components/TextInput/InputAccessoryView.js +++ b/Libraries/Components/TextInput/InputAccessoryView.js @@ -8,15 +8,15 @@ * @format */ -const Platform = require('../../Utilities/Platform'); -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); +import * as React from 'react'; +import Platform from '../../Utilities/Platform'; +import StyleSheet, { + type ViewStyleProp, + type ColorValue, +} from '../../StyleSheet/StyleSheet'; import RCTInputAccessoryViewNativeComponent from './RCTInputAccessoryViewNativeComponent'; -import type {ViewStyleProp} from '../../StyleSheet/StyleSheet'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; - /** * Note: iOS only * diff --git a/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js b/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js index bd43ced4b65..18662d32933 100644 --- a/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js +++ b/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js @@ -13,7 +13,7 @@ import requireNativeComponent from '../../ReactNative/requireNativeComponent'; import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; import type {TextInputNativeCommands} from './TextInputNativeCommands'; import RCTTextInputViewConfig from './RCTTextInputViewConfig'; -const ReactNativeViewConfigRegistry = require('../../Renderer/shims/ReactNativeViewConfigRegistry'); +import ReactNativeViewConfigRegistry from '../../Renderer/shims/ReactNativeViewConfigRegistry'; type NativeType = HostComponent; diff --git a/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js b/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js index d6b14eef521..eb5105537f7 100644 --- a/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js +++ b/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js @@ -13,7 +13,7 @@ import requireNativeComponent from '../../ReactNative/requireNativeComponent'; import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; import type {TextInputNativeCommands} from './TextInputNativeCommands'; import RCTTextInputViewConfig from './RCTTextInputViewConfig'; -const ReactNativeViewConfigRegistry = require('../../Renderer/shims/ReactNativeViewConfigRegistry'); +import ReactNativeViewConfigRegistry from '../../Renderer/shims/ReactNativeViewConfigRegistry'; type NativeType = HostComponent; diff --git a/Libraries/Components/TextInput/RCTTextInputViewConfig.js b/Libraries/Components/TextInput/RCTTextInputViewConfig.js index aa06ae9fe38..8545091c89e 100644 --- a/Libraries/Components/TextInput/RCTTextInputViewConfig.js +++ b/Libraries/Components/TextInput/RCTTextInputViewConfig.js @@ -9,7 +9,7 @@ */ import ReactNativeViewViewConfig from '../../Components/View/ReactNativeViewViewConfig'; -import {type ViewConfig} from '../../Renderer/shims/ReactNativeTypes'; +import type {ViewConfig} from '../../Renderer/shims/ReactNativeTypes'; const RCTTextInputViewConfig = { uiViewClassName: 'RCTSinglelineTextInputView', diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js index 5bad7e6cf84..30e87a6de92 100644 --- a/Libraries/Components/TextInput/TextInput.js +++ b/Libraries/Components/TextInput/TextInput.js @@ -8,25 +8,31 @@ * @format */ -const DeprecatedTextInputPropTypes = require('../../DeprecatedPropTypes/DeprecatedTextInputPropTypes'); -const Platform = require('../../Utilities/Platform'); -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); -const Text = require('../../Text/Text'); -const TextAncestor = require('../../Text/TextAncestor'); -const TextInputState = require('./TextInputState'); +import * as React from 'react'; -const invariant = require('invariant'); -const nullthrows = require('nullthrows'); -const setAndForwardRef = require('../../Utilities/setAndForwardRef'); +import DeprecatedTextInputPropTypes from '../../DeprecatedPropTypes/DeprecatedTextInputPropTypes'; + +import Platform from '../../Utilities/Platform'; +import StyleSheet, { + type TextStyleProp, + type ViewStyleProp, + type ColorValue, +} from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import TextAncestor from '../../Text/TextAncestor'; +import TextInputState from './TextInputState'; +import invariant from 'invariant'; +import nullthrows from 'nullthrows'; +import setAndForwardRef from '../../Utilities/setAndForwardRef'; import usePressability from '../../Pressability/usePressability'; -import type {TextStyleProp, ViewStyleProp} from '../../StyleSheet/StyleSheet'; -import type {ColorValue} from '../../StyleSheet/StyleSheet'; import type {ViewProps} from '../View/ViewPropTypes'; -import type {SyntheticEvent, ScrollEvent} from '../../Types/CoreEventTypes'; -import type {PressEvent} from '../../Types/CoreEventTypes'; +import type { + SyntheticEvent, + ScrollEvent, + PressEvent, +} from '../../Types/CoreEventTypes'; import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import type {TextInputNativeCommands} from './TextInputNativeCommands'; diff --git a/Libraries/Components/Touchable/BoundingDimensions.js b/Libraries/Components/Touchable/BoundingDimensions.js index b0a48d0eccd..114b950733d 100644 --- a/Libraries/Components/Touchable/BoundingDimensions.js +++ b/Libraries/Components/Touchable/BoundingDimensions.js @@ -8,8 +8,7 @@ */ 'use strict'; - -const PooledClass = require('./PooledClass'); +import PooledClass from './PooledClass'; const twoArgumentPooler = PooledClass.twoArgumentPooler; diff --git a/Libraries/Components/Touchable/PooledClass.js b/Libraries/Components/Touchable/PooledClass.js index 4aee28a81c5..1c9e940bd53 100644 --- a/Libraries/Components/Touchable/PooledClass.js +++ b/Libraries/Components/Touchable/PooledClass.js @@ -9,8 +9,7 @@ */ 'use strict'; - -const invariant = require('invariant'); +import invariant from 'invariant'; /** * Static poolers. Several custom versions for each potential number of diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js index 37c9738dd4b..5656bf9aaab 100644 --- a/Libraries/Components/Touchable/Position.js +++ b/Libraries/Components/Touchable/Position.js @@ -8,8 +8,7 @@ */ 'use strict'; - -const PooledClass = require('./PooledClass'); +import PooledClass from './PooledClass'; const twoArgumentPooler = PooledClass.twoArgumentPooler; diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js index 53c821ebc08..f59ba3ad495 100644 --- a/Libraries/Components/Touchable/Touchable.js +++ b/Libraries/Components/Touchable/Touchable.js @@ -8,12 +8,12 @@ * @format */ -const BoundingDimensions = require('./BoundingDimensions'); -const Platform = require('../../Utilities/Platform'); -const Position = require('./Position'); -const React = require('react'); -const UIManager = require('../../ReactNative/UIManager'); -const SoundManager = require('../Sound/SoundManager'); +import * as React from 'react'; +import BoundingDimensions from './BoundingDimensions'; +import Platform from '../../Utilities/Platform'; +import Position from './Position'; +import UIManager from '../../ReactNative/UIManager'; +import SoundManager from '../Sound/SoundManager'; import {PressabilityDebugView} from '../../Pressability/PressabilityDebug'; diff --git a/Libraries/Components/Touchable/ensurePositiveDelayProps.js b/Libraries/Components/Touchable/ensurePositiveDelayProps.js index 69dad5539fa..bd9b3028399 100644 --- a/Libraries/Components/Touchable/ensurePositiveDelayProps.js +++ b/Libraries/Components/Touchable/ensurePositiveDelayProps.js @@ -9,8 +9,7 @@ */ 'use strict'; - -const invariant = require('invariant'); +import invariant from 'invariant'; const ensurePositiveDelayProps = function(props: any) { invariant( diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js index 58804b7a772..4bbb41060ff 100644 --- a/Libraries/Components/UnimplementedViews/UnimplementedView.js +++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js @@ -9,9 +9,8 @@ */ 'use strict'; - -const React = require('react'); -const StyleSheet = require('../../StyleSheet/StyleSheet'); +import * as React from 'react'; +import StyleSheet from '../../StyleSheet/StyleSheet'; /** * Common implementation for a simple stubbed view. Simply applies the view's styles to the inner diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js index ebd3c63df56..7ddf41e8352 100644 --- a/Libraries/Components/View/ReactNativeStyleAttributes.js +++ b/Libraries/Components/View/ReactNativeStyleAttributes.js @@ -9,14 +9,12 @@ */ 'use strict'; - -const DeprecatedImageStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedImageStylePropTypes'); -const DeprecatedTextStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedTextStylePropTypes'); -const DeprecatedViewStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedViewStylePropTypes'); - -const processColor = require('../../StyleSheet/processColor'); -const processTransform = require('../../StyleSheet/processTransform'); -const sizesDiffer = require('../../Utilities/differ/sizesDiffer'); +import DeprecatedImageStylePropTypes from '../../DeprecatedPropTypes/DeprecatedImageStylePropTypes'; +import DeprecatedTextStylePropTypes from '../../DeprecatedPropTypes/DeprecatedTextStylePropTypes'; +import DeprecatedViewStylePropTypes from '../../DeprecatedPropTypes/DeprecatedViewStylePropTypes'; +import processColor from '../../StyleSheet/processColor'; +import processTransform from '../../StyleSheet/processTransform'; +import sizesDiffer from '../../Utilities/differ/sizesDiffer'; type ReturnBoolType = (V) => true; type BoolifiedDeprecatedViewStylePropTypes = $ObjMap< diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js index 50438910f24..da38aeef790 100644 --- a/Libraries/Components/View/ReactNativeViewAttributes.js +++ b/Libraries/Components/View/ReactNativeViewAttributes.js @@ -9,8 +9,7 @@ */ 'use strict'; - -const ReactNativeStyleAttributes = require('./ReactNativeStyleAttributes'); +import ReactNativeStyleAttributes from './ReactNativeStyleAttributes'; const UIView = { pointerEvents: true, diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js index 63fbe0fbeba..ff0b6d837e1 100644 --- a/Libraries/Components/View/ReactNativeViewViewConfig.js +++ b/Libraries/Components/View/ReactNativeViewViewConfig.js @@ -8,7 +8,7 @@ * @format */ -import {type ViewConfig} from '../../Renderer/shims/ReactNativeTypes'; +import type {ViewConfig} from '../../Renderer/shims/ReactNativeTypes'; import ReactNativeViewViewConfigAndroid from './ReactNativeViewViewConfigAndroid'; import {Platform} from 'react-native';