From 87fdd6c73bf7365fd8f22acb619b71373a6deea7 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Mon, 1 Jan 2018 14:12:30 -0800 Subject: [PATCH] [change] 'react-native-web' module organization and exports The patch reorganizes the top-level module division of the 'react-native-web' project. Previously, the package's exported modules were found in: apis/*/index.js components/*/index.js components/*/*.js modules/*/index.js propTypes/*.js Now, each part of the exported API is found in: exports/*/index.js And anything not directly part of the exported API is found in: modules/*/index.js vendor/*/index.js Close #748 --- .../__snapshots__/index-test.js.snap | 52 +++---- .../src/index.js | 88 +----------- .../src/components/FlatList/index.js | 2 - .../src/components/Modal/index.js | 2 - .../src/components/SectionList/index.js | 2 - .../src/components/Slider/index.js | 2 - .../Touchable/__tests__/index-test.js | 5 - .../src/components/VirtualizedList/index.js | 2 - .../src/{components => exports}/ART/index.js | 0 .../__snapshots__/index-test.js.snap | 0 .../ActivityIndicator/__tests__/index-test.js | 0 .../ActivityIndicator/index.js | 4 +- .../src/{apis => exports}/Animated/index.js | 8 +- .../AppRegistry/AppContainer.js | 2 +- .../renderApplication-test.js.snap | 0 .../__tests__/renderApplication-test.js | 0 .../{apis => exports}/AppRegistry/index.js | 2 +- .../AppRegistry/renderApplication.js | 4 +- .../AppState/__tests__/index-test.js | 0 .../src/{apis => exports}/AppState/index.js | 0 .../__snapshots__/index-test.js.snap | 0 .../AsyncStorage/__tests__/index-test.js | 0 .../{apis => exports}/AsyncStorage/index.js | 0 .../{apis => exports}/BackHandler/index.js | 0 .../Button/__tests__/index-test.js | 0 .../{components => exports}/Button/index.js | 6 +- .../CheckBox/__tests__/index-test.js | 0 .../{components => exports}/CheckBox/index.js | 10 +- .../src/{apis => exports}/Clipboard/index.js | 0 .../ColorPropType/index.js} | 0 .../__snapshots__/index-test.js.snap | 0 .../Dimensions/__tests__/index-test.js | 0 .../src/{apis => exports}/Dimensions/index.js | 0 .../src/{apis => exports}/Easing/index.js | 0 .../EdgeInsetsPropType/index.js} | 2 +- .../src/exports/FlatList/index.js | 2 + .../I18nManager/__tests__/index-test.js | 0 .../{apis => exports}/I18nManager/index.js | 0 .../Image/ImageResizeMode.js | 0 .../Image/ImageStylePropTypes.js | 10 +- .../Image/ImageUriCache.js | 0 .../__snapshots__/index-test.js.snap | 0 .../Image/__tests__/index-test.js | 0 .../{components => exports}/Image/index.js | 8 +- .../ImageBackground/__tests__/index.js} | 4 +- .../ImageBackground/index.js} | 8 +- .../InteractionManager/index.js | 0 .../src/{apis => exports}/Keyboard/index.js | 0 .../KeyboardAvoidingView/index.js | 2 +- .../src/{apis => exports}/Linking/index.js | 0 .../ListView/ListViewDataSource.js | 0 .../ListView/ListViewPropTypes.js | 0 .../ListView/__tests__/index-test.js | 0 .../{components => exports}/ListView/index.js | 2 +- .../src/exports/Modal/index.js | 2 + .../NativeModules/index.js | 0 .../NetInfo/__tests__/index-test.js | 0 .../src/{apis => exports}/NetInfo/index.js | 0 .../{apis => exports}/PanResponder/index.js | 0 .../src/exports/Picker/PickerItem.js | 25 ++++ .../Picker/PickerItemPropType.js | 0 .../Picker/PickerStylePropTypes.js | 2 +- .../__snapshots__/index-test.js.snap | 0 .../Picker/__tests__/index-test.js | 0 .../{components => exports}/Picker/index.js | 34 +---- .../PixelRatio/__tests__/index-test.js | 0 .../src/{apis => exports}/PixelRatio/index.js | 0 .../src/{apis => exports}/Platform/index.js | 0 .../PointPropType/index.js} | 2 +- .../ProgressBar/__tests__/index-test.js | 0 .../ProgressBar/index.js | 6 +- .../RefreshControl/index.js | 4 +- .../SafeAreaView/index.js | 0 .../ScrollView/ScrollViewBase.js | 4 +- .../ScrollView/__tests__/index-test.js | 0 .../ScrollView/index.js | 12 +- .../src/exports/SectionList/index.js | 2 + .../src/exports/Slider/index.js | 2 + .../StatusBar/index.js | 0 .../StyleSheet/StyleManager.js | 0 .../StyleSheet/StyleRegistry.js | 0 .../StyleSheet/StyleSheetValidation.js | 8 +- .../StyleSheet/__tests__/StyleManager-test.js | 0 .../__tests__/StyleRegistry-test.js | 0 .../__snapshots__/StyleManager-test.js.snap | 0 .../__snapshots__/StyleRegistry-test.js.snap | 0 .../createReactDOMStyle-test.js.snap | 0 .../__snapshots__/flattenStyle-test.js.snap | 0 .../__snapshots__/generateCss-test.js.snap | 0 .../__snapshots__/i18nStyle-test.js.snap | 0 .../__snapshots__/index-test.js.snap | 0 .../__tests__/createReactDOMStyle-test.js | 0 .../StyleSheet/__tests__/flattenStyle-test.js | 0 .../StyleSheet/__tests__/generateCss-test.js | 0 .../StyleSheet/__tests__/i18nStyle-test.js | 0 .../StyleSheet/__tests__/index-test.js | 0 .../__tests__/normalizeValue-test.js | 0 .../StyleSheet/createReactDOMStyle.js | 2 +- .../StyleSheet/flattenStyle.js | 0 .../StyleSheet/generateCss.js | 0 .../StyleSheet/getHairlineWidth.js | 0 .../{apis => exports}/StyleSheet/i18nStyle.js | 0 .../src/{apis => exports}/StyleSheet/index.js | 0 .../StyleSheet/normalizeValue.js | 0 .../{apis => exports}/StyleSheet/registry.js | 0 .../{apis => exports}/StyleSheet/staticCss.js | 0 .../Switch/__tests__/index-test.js | 0 .../{components => exports}/Switch/index.js | 10 +- .../Text/TextPropTypes.js | 15 +- .../Text/TextStylePropTypes.js | 2 +- .../__snapshots__/index-test.js.snap | 0 .../Text/__tests__/index-test.js | 0 .../src/{components => exports}/Text/index.js | 4 +- .../TextInput/TextInputStylePropTypes.js | 0 .../TextInput/__tests__/index-test.js | 0 .../TextInput/index.js | 14 +- .../src/exports/TextPropTypes/index.js | 2 + .../Touchable/BoundingDimensions.js | 0 .../Touchable/Position.js | 0 .../Touchable/ensurePositiveDelayProps.js | 0 .../Touchable/index.js} | 6 +- .../TouchableHighlight/index.js} | 14 +- .../TouchableNativeFeedback/index.js} | 2 +- .../TouchableOpacity/index.js} | 8 +- .../TouchableWithoutFeedback/index.js} | 16 +-- .../UIManager/__tests__/index-test.js | 0 .../src/{apis => exports}/UIManager/index.js | 0 .../src/{apis => exports}/Vibration/index.js | 0 .../View/ViewPropTypes.js | 18 ++- .../View/ViewStylePropTypes.js | 12 +- .../__snapshots__/index-test.js.snap | 0 .../View/__tests__/index-test.js | 0 .../src/{components => exports}/View/index.js | 9 +- .../src/exports/ViewPropTypes/index.js | 7 + .../src/exports/VirtualizedList/index.js | 2 + .../__snapshots__/index-test.js.snap | 0 .../createElement/__tests__/index-test.js | 0 .../createElement/index.js | 8 +- .../findNodeHandle/index.js | 0 .../processColor/__tests__/index-test.js | 0 .../processColor/index.js | 0 .../src/{modules => exports}/render/index.js | 0 .../unmountComponentAtNode/index.js | 0 packages/react-native-web/src/index.js | 136 +++++++++--------- .../AnimationPropTypes/index.js} | 0 .../BorderPropTypes/index.js} | 2 +- .../LayoutPropTypes/index.js} | 0 .../src/modules/NativeMethodsMixin/index.js | 8 +- .../src/modules/ScrollResponder/index.js | 10 +- .../ShadowPropTypes/index.js} | 2 +- .../StaticContainer/__tests__/index-test.js | 0 .../StaticContainer/index.js | 0 .../StaticRenderer/__tests__/index-test.js | 0 .../StaticRenderer/index.js | 0 .../StyleSheetPropType/index.js} | 4 +- .../TextInputState/index.js} | 2 +- .../TransformPropTypes/index.js} | 0 .../UnimplementedView/index.js | 2 +- .../src/modules/createDOMProps/index.js | 4 +- .../createStrictShapeTypeChecker/index.js} | 0 .../src/modules/dismissKeyboard/index.js | 2 +- .../ensureComponentIsNative/index.js} | 0 .../src/propTypes/BaseComponentPropTypes.js | 26 ---- .../src/vendor/Animated/AnimatedEvent.js | 2 +- .../vendor/Animated/NativeAnimatedHelper.js | 2 +- .../Animated/createAnimatedComponent.js | 2 +- .../vendor/Animated/nodes/AnimatedProps.js | 2 +- .../vendor/Animated/nodes/AnimatedStyle.js | 3 +- .../vendor/Animated/nodes/AnimatedValue.js | 2 +- .../src/vendor/PanResponder/index.js | 2 +- 170 files changed, 303 insertions(+), 393 deletions(-) delete mode 100644 packages/react-native-web/src/components/FlatList/index.js delete mode 100644 packages/react-native-web/src/components/Modal/index.js delete mode 100644 packages/react-native-web/src/components/SectionList/index.js delete mode 100644 packages/react-native-web/src/components/Slider/index.js delete mode 100644 packages/react-native-web/src/components/Touchable/__tests__/index-test.js delete mode 100644 packages/react-native-web/src/components/VirtualizedList/index.js rename packages/react-native-web/src/{components => exports}/ART/index.js (100%) rename packages/react-native-web/src/{components => exports}/ActivityIndicator/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{components => exports}/ActivityIndicator/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/ActivityIndicator/index.js (96%) rename packages/react-native-web/src/{apis => exports}/Animated/index.js (81%) rename packages/react-native-web/src/{apis => exports}/AppRegistry/AppContainer.js (96%) rename packages/react-native-web/src/{apis => exports}/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/AppRegistry/__tests__/renderApplication-test.js (100%) rename packages/react-native-web/src/{apis => exports}/AppRegistry/index.js (97%) rename packages/react-native-web/src/{apis => exports}/AppRegistry/renderApplication.js (93%) rename packages/react-native-web/src/{apis => exports}/AppState/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/AppState/index.js (100%) rename packages/react-native-web/src/{apis => exports}/AsyncStorage/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/AsyncStorage/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/AsyncStorage/index.js (100%) rename packages/react-native-web/src/{apis => exports}/BackHandler/index.js (100%) rename packages/react-native-web/src/{components => exports}/Button/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/Button/index.js (90%) rename packages/react-native-web/src/{components => exports}/CheckBox/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/CheckBox/index.js (93%) rename packages/react-native-web/src/{apis => exports}/Clipboard/index.js (100%) rename packages/react-native-web/src/{propTypes/ColorPropType.js => exports/ColorPropType/index.js} (100%) rename packages/react-native-web/src/{apis => exports}/Dimensions/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/Dimensions/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/Dimensions/index.js (100%) rename packages/react-native-web/src/{apis => exports}/Easing/index.js (100%) rename packages/react-native-web/src/{propTypes/EdgeInsetsPropType.js => exports/EdgeInsetsPropType/index.js} (88%) create mode 100644 packages/react-native-web/src/exports/FlatList/index.js rename packages/react-native-web/src/{apis => exports}/I18nManager/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/I18nManager/index.js (100%) rename packages/react-native-web/src/{components => exports}/Image/ImageResizeMode.js (100%) rename packages/react-native-web/src/{components => exports}/Image/ImageStylePropTypes.js (62%) rename packages/react-native-web/src/{components => exports}/Image/ImageUriCache.js (100%) rename packages/react-native-web/src/{components => exports}/Image/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{components => exports}/Image/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/Image/index.js (97%) rename packages/react-native-web/src/{components/Image/__tests__/ImageBackground-test.js => exports/ImageBackground/__tests__/index.js} (93%) rename packages/react-native-web/src/{components/Image/ImageBackground.js => exports/ImageBackground/index.js} (91%) rename packages/react-native-web/src/{apis => exports}/InteractionManager/index.js (100%) rename packages/react-native-web/src/{apis => exports}/Keyboard/index.js (100%) rename packages/react-native-web/src/{components => exports}/KeyboardAvoidingView/index.js (98%) rename packages/react-native-web/src/{apis => exports}/Linking/index.js (100%) rename packages/react-native-web/src/{components => exports}/ListView/ListViewDataSource.js (100%) rename packages/react-native-web/src/{components => exports}/ListView/ListViewPropTypes.js (100%) rename packages/react-native-web/src/{components => exports}/ListView/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/ListView/index.js (99%) create mode 100644 packages/react-native-web/src/exports/Modal/index.js rename packages/react-native-web/src/{modules => exports}/NativeModules/index.js (100%) rename packages/react-native-web/src/{apis => exports}/NetInfo/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/NetInfo/index.js (100%) rename packages/react-native-web/src/{apis => exports}/PanResponder/index.js (100%) create mode 100644 packages/react-native-web/src/exports/Picker/PickerItem.js rename packages/react-native-web/src/{components => exports}/Picker/PickerItemPropType.js (100%) rename packages/react-native-web/src/{components => exports}/Picker/PickerStylePropTypes.js (88%) rename packages/react-native-web/src/{components => exports}/Picker/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{components => exports}/Picker/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/Picker/index.js (70%) rename packages/react-native-web/src/{apis => exports}/PixelRatio/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/PixelRatio/index.js (100%) rename packages/react-native-web/src/{apis => exports}/Platform/index.js (100%) rename packages/react-native-web/src/{propTypes/PointPropType.js => exports/PointPropType/index.js} (85%) rename packages/react-native-web/src/{components => exports}/ProgressBar/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/ProgressBar/index.js (93%) rename packages/react-native-web/src/{components => exports}/RefreshControl/index.js (91%) rename packages/react-native-web/src/{components => exports}/SafeAreaView/index.js (100%) rename packages/react-native-web/src/{components => exports}/ScrollView/ScrollViewBase.js (98%) rename packages/react-native-web/src/{components => exports}/ScrollView/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/ScrollView/index.js (95%) create mode 100644 packages/react-native-web/src/exports/SectionList/index.js create mode 100644 packages/react-native-web/src/exports/Slider/index.js rename packages/react-native-web/src/{components => exports}/StatusBar/index.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/StyleManager.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/StyleRegistry.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/StyleSheetValidation.js (90%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/StyleManager-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/StyleRegistry-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/__snapshots__/StyleManager-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/__snapshots__/StyleRegistry-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/__snapshots__/createReactDOMStyle-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/__snapshots__/flattenStyle-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/__snapshots__/generateCss-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/__snapshots__/i18nStyle-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/createReactDOMStyle-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/flattenStyle-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/generateCss-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/i18nStyle-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/__tests__/normalizeValue-test.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/createReactDOMStyle.js (99%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/flattenStyle.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/generateCss.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/getHairlineWidth.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/i18nStyle.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/index.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/normalizeValue.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/registry.js (100%) rename packages/react-native-web/src/{apis => exports}/StyleSheet/staticCss.js (100%) rename packages/react-native-web/src/{components => exports}/Switch/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/Switch/index.js (95%) rename packages/react-native-web/src/{components => exports}/Text/TextPropTypes.js (54%) rename packages/react-native-web/src/{components => exports}/Text/TextStylePropTypes.js (96%) rename packages/react-native-web/src/{components => exports}/Text/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{components => exports}/Text/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/Text/index.js (96%) rename packages/react-native-web/src/{components => exports}/TextInput/TextInputStylePropTypes.js (100%) rename packages/react-native-web/src/{components => exports}/TextInput/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/TextInput/index.js (96%) create mode 100644 packages/react-native-web/src/exports/TextPropTypes/index.js rename packages/react-native-web/src/{components => exports}/Touchable/BoundingDimensions.js (100%) rename packages/react-native-web/src/{components => exports}/Touchable/Position.js (100%) rename packages/react-native-web/src/{components => exports}/Touchable/ensurePositiveDelayProps.js (100%) rename packages/react-native-web/src/{components/Touchable/Touchable.js => exports/Touchable/index.js} (99%) rename packages/react-native-web/src/{components/Touchable/TouchableHighlight.js => exports/TouchableHighlight/index.js} (95%) rename packages/react-native-web/src/{components/Touchable/TouchableNativeFeedback.js => exports/TouchableNativeFeedback/index.js} (79%) rename packages/react-native-web/src/{components/Touchable/TouchableOpacity.js => exports/TouchableOpacity/index.js} (96%) rename packages/react-native-web/src/{components/Touchable/TouchableWithoutFeedback.js => exports/TouchableWithoutFeedback/index.js} (92%) rename packages/react-native-web/src/{apis => exports}/UIManager/__tests__/index-test.js (100%) rename packages/react-native-web/src/{apis => exports}/UIManager/index.js (100%) rename packages/react-native-web/src/{apis => exports}/Vibration/index.js (100%) rename packages/react-native-web/src/{components => exports}/View/ViewPropTypes.js (82%) rename packages/react-native-web/src/{components => exports}/View/ViewStylePropTypes.js (78%) rename packages/react-native-web/src/{components => exports}/View/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{components => exports}/View/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => exports}/View/index.js (91%) create mode 100644 packages/react-native-web/src/exports/ViewPropTypes/index.js create mode 100644 packages/react-native-web/src/exports/VirtualizedList/index.js rename packages/react-native-web/src/{modules => exports}/createElement/__tests__/__snapshots__/index-test.js.snap (100%) rename packages/react-native-web/src/{modules => exports}/createElement/__tests__/index-test.js (100%) rename packages/react-native-web/src/{modules => exports}/createElement/index.js (91%) rename packages/react-native-web/src/{modules => exports}/findNodeHandle/index.js (100%) rename packages/react-native-web/src/{modules => exports}/processColor/__tests__/index-test.js (100%) rename packages/react-native-web/src/{modules => exports}/processColor/index.js (100%) rename packages/react-native-web/src/{modules => exports}/render/index.js (100%) rename packages/react-native-web/src/{modules => exports}/unmountComponentAtNode/index.js (100%) rename packages/react-native-web/src/{propTypes/AnimationPropTypes.js => modules/AnimationPropTypes/index.js} (100%) rename packages/react-native-web/src/{propTypes/BorderPropTypes.js => modules/BorderPropTypes/index.js} (94%) rename packages/react-native-web/src/{propTypes/LayoutPropTypes.js => modules/LayoutPropTypes/index.js} (100%) rename packages/react-native-web/src/{propTypes/ShadowPropTypes.js => modules/ShadowPropTypes/index.js} (91%) rename packages/react-native-web/src/{components => modules}/StaticContainer/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => modules}/StaticContainer/index.js (100%) rename packages/react-native-web/src/{components => modules}/StaticRenderer/__tests__/index-test.js (100%) rename packages/react-native-web/src/{components => modules}/StaticRenderer/index.js (100%) rename packages/react-native-web/src/{propTypes/StyleSheetPropType.js => modules/StyleSheetPropType/index.js} (87%) rename packages/react-native-web/src/{components/TextInput/TextInputState.js => modules/TextInputState/index.js} (97%) rename packages/react-native-web/src/{propTypes/TransformPropTypes.js => modules/TransformPropTypes/index.js} (100%) rename packages/react-native-web/src/{components => modules}/UnimplementedView/index.js (96%) rename packages/react-native-web/src/{propTypes/createStrictShapeTypeChecker.js => modules/createStrictShapeTypeChecker/index.js} (100%) rename packages/react-native-web/src/{components/Touchable/ensureComponentIsNative.js => modules/ensureComponentIsNative/index.js} (100%) delete mode 100644 packages/react-native-web/src/propTypes/BaseComponentPropTypes.js diff --git a/packages/babel-plugin-react-native-web/src/__tests__/__snapshots__/index-test.js.snap b/packages/babel-plugin-react-native-web/src/__tests__/__snapshots__/index-test.js.snap index 308fbcc4..c498d9d5 100644 --- a/packages/babel-plugin-react-native-web/src/__tests__/__snapshots__/index-test.js.snap +++ b/packages/babel-plugin-react-native-web/src/__tests__/__snapshots__/index-test.js.snap @@ -7,11 +7,11 @@ export { ColorPropType, StyleSheet, Text, createElement } from 'react-native'; ↓ ↓ ↓ ↓ ↓ ↓ -export { default as View } from 'react-native-web/dist/components/View'; -export { default as ColorPropType } from 'react-native-web/dist/propTypes/ColorPropType'; -export { default as StyleSheet } from 'react-native-web/dist/apis/StyleSheet'; -export { default as Text } from 'react-native-web/dist/components/Text'; -export { default as createElement } from 'react-native-web/dist/modules/createElement'; +export { default as View } from 'react-native-web/dist/exports/View'; +export { default as ColorPropType } from 'react-native-web/dist/exports/ColorPropType'; +export { default as StyleSheet } from 'react-native-web/dist/exports/StyleSheet'; +export { default as Text } from 'react-native-web/dist/exports/Text'; +export { default as createElement } from 'react-native-web/dist/exports/createElement'; " `; @@ -22,11 +22,11 @@ export { ColorPropType, StyleSheet, Text, createElement } from 'react-native-web ↓ ↓ ↓ ↓ ↓ ↓ -export { default as View } from 'react-native-web/dist/components/View'; -export { default as ColorPropType } from 'react-native-web/dist/propTypes/ColorPropType'; -export { default as StyleSheet } from 'react-native-web/dist/apis/StyleSheet'; -export { default as Text } from 'react-native-web/dist/components/Text'; -export { default as createElement } from 'react-native-web/dist/modules/createElement'; +export { default as View } from 'react-native-web/dist/exports/View'; +export { default as ColorPropType } from 'react-native-web/dist/exports/ColorPropType'; +export { default as StyleSheet } from 'react-native-web/dist/exports/StyleSheet'; +export { default as Text } from 'react-native-web/dist/exports/Text'; +export { default as createElement } from 'react-native-web/dist/exports/createElement'; " `; @@ -40,10 +40,10 @@ import * as ReactNativeModules from 'react-native'; ↓ ↓ ↓ ↓ ↓ ↓ import ReactNative from 'react-native-web/dist/index'; -import View from 'react-native-web/dist/components/View'; -import { Invalid } from 'react-native-web/dist/index'; -import MyView from 'react-native-web/dist/components/View'; -import ViewPropTypes from 'react-native-web/dist/components/View/ViewPropTypes'; +import View from 'react-native-web/dist/exports/View'; +import Invalid from 'react-native-web/dist/exports/Invalid'; +import MyView from 'react-native-web/dist/exports/View'; +import ViewPropTypes from 'react-native-web/dist/exports/ViewPropTypes'; import * as ReactNativeModules from 'react-native-web/dist/index'; " `; @@ -56,12 +56,12 @@ import * as ReactNativeModules from 'react-native-web'; ↓ ↓ ↓ ↓ ↓ ↓ -import createElement from 'react-native-web/dist/modules/createElement'; -import ColorPropType from 'react-native-web/dist/propTypes/ColorPropType'; -import StyleSheet from 'react-native-web/dist/apis/StyleSheet'; -import View from 'react-native-web/dist/components/View'; -import TouchableOpacity from 'react-native-web/dist/components/Touchable/TouchableOpacity'; -import processColor from 'react-native-web/dist/modules/processColor'; +import createElement from 'react-native-web/dist/exports/createElement'; +import ColorPropType from 'react-native-web/dist/exports/ColorPropType'; +import StyleSheet from 'react-native-web/dist/exports/StyleSheet'; +import View from 'react-native-web/dist/exports/View'; +import TouchableOpacity from 'react-native-web/dist/exports/TouchableOpacity'; +import processColor from 'react-native-web/dist/exports/processColor'; import * as ReactNativeModules from 'react-native-web/dist/index'; " `; @@ -76,16 +76,16 @@ const { ColorPropType, StyleSheet, View, TouchableOpacity, processColor } = requ const ReactNative = require('react-native-web'); -const createElement = require('react-native-web/dist/modules/createElement'); +const createElement = require('react-native-web/dist/exports/createElement'); -const ColorPropType = require('react-native-web/dist/propTypes/ColorPropType'); +const ColorPropType = require('react-native-web/dist/exports/ColorPropType'); -const StyleSheet = require('react-native-web/dist/apis/StyleSheet'); +const StyleSheet = require('react-native-web/dist/exports/StyleSheet'); -const View = require('react-native-web/dist/components/View'); +const View = require('react-native-web/dist/exports/View'); -const TouchableOpacity = require('react-native-web/dist/components/Touchable/TouchableOpacity'); +const TouchableOpacity = require('react-native-web/dist/exports/TouchableOpacity'); -const processColor = require('react-native-web/dist/modules/processColor'); +const processColor = require('react-native-web/dist/exports/processColor'); " `; diff --git a/packages/babel-plugin-react-native-web/src/index.js b/packages/babel-plugin-react-native-web/src/index.js index 4200a0e2..dca14359 100644 --- a/packages/babel-plugin-react-native-web/src/index.js +++ b/packages/babel-plugin-react-native-web/src/index.js @@ -1,89 +1,5 @@ -const getDistLocation = importName => { - const root = 'react-native-web/dist'; - - switch (importName) { - // apis - case 'Animated': - case 'AppRegistry': - case 'AppState': - case 'AsyncStorage': - case 'BackHandler': - case 'Clipboard': - case 'Dimensions': - case 'Easing': - case 'I18nManager': - case 'InteractionManager': - case 'Keyboard': - case 'Linking': - case 'NetInfo': - case 'PanResponder': - case 'PixelRatio': - case 'Platform': - case 'StyleSheet': - case 'UIManager': - case 'Vibration': { - return `${root}/apis/${importName}`; - } - - // components - case 'ActivityIndicator': - case 'ART': - case 'Button': - case 'FlatList': - case 'Image': - case 'KeyboardAvoidingView': - case 'ListView': - case 'Modal': - case 'Picker': - case 'ProgressBar': - case 'RefreshControl': - case 'ScrollView': - case 'SectionList': - case 'Slider': - case 'StatusBar': - case 'Switch': - case 'Text': - case 'TextInput': - case 'View': - case 'VirtualizedList': { - return `${root}/components/${importName}`; - } - - case 'Touchable': - case 'TouchableHighlight': - case 'TouchableNativeFeedback': - case 'TouchableOpacity': - case 'TouchableWithoutFeedback': { - return `${root}/components/Touchable/${importName}`; - } - - // modules - case 'createElement': - case 'findNodeHandle': - case 'NativeModules': - case 'processColor': - case 'render': - case 'unmountComponentAtNode': { - return `${root}/modules/${importName}`; - } - - // propTypes - case 'ColorPropType': - case 'EdgeInsetsPropType': - case 'PointPropType': { - return `${root}/propTypes/${importName}`; - } - case 'TextPropTypes': { - return `${root}/components/Text/${importName}`; - } - case 'ViewPropTypes': { - return `${root}/components/View/${importName}`; - } - - default: - return; - } -}; +const getDistLocation = importName => + importName ? `react-native-web/dist/exports/${importName}` : undefined; const isReactNativeRequire = (t, node) => { const { declarations } = node; diff --git a/packages/react-native-web/src/components/FlatList/index.js b/packages/react-native-web/src/components/FlatList/index.js deleted file mode 100644 index 0a818b1a..00000000 --- a/packages/react-native-web/src/components/FlatList/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import UnimplementedView from '../UnimplementedView'; -export default UnimplementedView; diff --git a/packages/react-native-web/src/components/Modal/index.js b/packages/react-native-web/src/components/Modal/index.js deleted file mode 100644 index 0a818b1a..00000000 --- a/packages/react-native-web/src/components/Modal/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import UnimplementedView from '../UnimplementedView'; -export default UnimplementedView; diff --git a/packages/react-native-web/src/components/SectionList/index.js b/packages/react-native-web/src/components/SectionList/index.js deleted file mode 100644 index 0a818b1a..00000000 --- a/packages/react-native-web/src/components/SectionList/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import UnimplementedView from '../UnimplementedView'; -export default UnimplementedView; diff --git a/packages/react-native-web/src/components/Slider/index.js b/packages/react-native-web/src/components/Slider/index.js deleted file mode 100644 index 0a818b1a..00000000 --- a/packages/react-native-web/src/components/Slider/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import UnimplementedView from '../UnimplementedView'; -export default UnimplementedView; diff --git a/packages/react-native-web/src/components/Touchable/__tests__/index-test.js b/packages/react-native-web/src/components/Touchable/__tests__/index-test.js deleted file mode 100644 index 86f9185f..00000000 --- a/packages/react-native-web/src/components/Touchable/__tests__/index-test.js +++ /dev/null @@ -1,5 +0,0 @@ -/* eslint-env jasmine, jest */ - -describe('components/Touchable', () => { - test.skip('NO TEST COVERAGE', () => {}); -}); diff --git a/packages/react-native-web/src/components/VirtualizedList/index.js b/packages/react-native-web/src/components/VirtualizedList/index.js deleted file mode 100644 index 0a818b1a..00000000 --- a/packages/react-native-web/src/components/VirtualizedList/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import UnimplementedView from '../UnimplementedView'; -export default UnimplementedView; diff --git a/packages/react-native-web/src/components/ART/index.js b/packages/react-native-web/src/exports/ART/index.js similarity index 100% rename from packages/react-native-web/src/components/ART/index.js rename to packages/react-native-web/src/exports/ART/index.js diff --git a/packages/react-native-web/src/components/ActivityIndicator/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/ActivityIndicator/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/components/ActivityIndicator/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/ActivityIndicator/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/components/ActivityIndicator/__tests__/index-test.js b/packages/react-native-web/src/exports/ActivityIndicator/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/ActivityIndicator/__tests__/index-test.js rename to packages/react-native-web/src/exports/ActivityIndicator/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/ActivityIndicator/index.js b/packages/react-native-web/src/exports/ActivityIndicator/index.js similarity index 96% rename from packages/react-native-web/src/components/ActivityIndicator/index.js rename to packages/react-native-web/src/exports/ActivityIndicator/index.js index 135ac292..d94884c4 100644 --- a/packages/react-native-web/src/components/ActivityIndicator/index.js +++ b/packages/react-native-web/src/exports/ActivityIndicator/index.js @@ -11,9 +11,9 @@ */ import applyNativeMethods from '../../modules/applyNativeMethods'; -import StyleSheet from '../../apis/StyleSheet'; +import StyleSheet from '../StyleSheet'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import { bool, number, oneOf, oneOfType, string } from 'prop-types'; import React, { Component } from 'react'; diff --git a/packages/react-native-web/src/apis/Animated/index.js b/packages/react-native-web/src/exports/Animated/index.js similarity index 81% rename from packages/react-native-web/src/apis/Animated/index.js rename to packages/react-native-web/src/exports/Animated/index.js index 496b3cbe..06e7eb84 100644 --- a/packages/react-native-web/src/apis/Animated/index.js +++ b/packages/react-native-web/src/exports/Animated/index.js @@ -11,10 +11,10 @@ */ import AnimatedImplementation from '../../vendor/Animated/AnimatedImplementation'; -import Image from '../../components/Image'; -import ScrollView from '../../components/ScrollView'; -import Text from '../../components/Text'; -import View from '../../components/View'; +import Image from '../Image'; +import ScrollView from '../ScrollView'; +import Text from '../Text'; +import View from '../View'; const Animated = { ...AnimatedImplementation, diff --git a/packages/react-native-web/src/apis/AppRegistry/AppContainer.js b/packages/react-native-web/src/exports/AppRegistry/AppContainer.js similarity index 96% rename from packages/react-native-web/src/apis/AppRegistry/AppContainer.js rename to packages/react-native-web/src/exports/AppRegistry/AppContainer.js index 10d8bfc0..fe44e1de 100644 --- a/packages/react-native-web/src/apis/AppRegistry/AppContainer.js +++ b/packages/react-native-web/src/exports/AppRegistry/AppContainer.js @@ -10,7 +10,7 @@ */ import StyleSheet from '../StyleSheet'; -import View from '../../components/View'; +import View from '../View'; import { any, node } from 'prop-types'; import React, { Component } from 'react'; diff --git a/packages/react-native-web/src/apis/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap b/packages/react-native-web/src/exports/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap rename to packages/react-native-web/src/exports/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap diff --git a/packages/react-native-web/src/apis/AppRegistry/__tests__/renderApplication-test.js b/packages/react-native-web/src/exports/AppRegistry/__tests__/renderApplication-test.js similarity index 100% rename from packages/react-native-web/src/apis/AppRegistry/__tests__/renderApplication-test.js rename to packages/react-native-web/src/exports/AppRegistry/__tests__/renderApplication-test.js diff --git a/packages/react-native-web/src/apis/AppRegistry/index.js b/packages/react-native-web/src/exports/AppRegistry/index.js similarity index 97% rename from packages/react-native-web/src/apis/AppRegistry/index.js rename to packages/react-native-web/src/exports/AppRegistry/index.js index b060d84c..a90eb301 100644 --- a/packages/react-native-web/src/apis/AppRegistry/index.js +++ b/packages/react-native-web/src/exports/AppRegistry/index.js @@ -11,7 +11,7 @@ */ import invariant from 'fbjs/lib/invariant'; -import unmountComponentAtNode from '../../modules/unmountComponentAtNode'; +import unmountComponentAtNode from '../unmountComponentAtNode'; import renderApplication, { getApplication } from './renderApplication'; import type { ComponentType } from 'react'; diff --git a/packages/react-native-web/src/apis/AppRegistry/renderApplication.js b/packages/react-native-web/src/exports/AppRegistry/renderApplication.js similarity index 93% rename from packages/react-native-web/src/apis/AppRegistry/renderApplication.js rename to packages/react-native-web/src/exports/AppRegistry/renderApplication.js index f3ee075e..b0e5b5ac 100644 --- a/packages/react-native-web/src/apis/AppRegistry/renderApplication.js +++ b/packages/react-native-web/src/exports/AppRegistry/renderApplication.js @@ -12,8 +12,8 @@ import AppContainer from './AppContainer'; import invariant from 'fbjs/lib/invariant'; import hydrate from '../../modules/hydrate'; -import render from '../../modules/render'; -import StyleSheet from '../../apis/StyleSheet'; +import render from '../render'; +import StyleSheet from '../StyleSheet'; import React, { type ComponentType } from 'react'; const renderFn = process.env.NODE_ENV !== 'production' ? render : hydrate; diff --git a/packages/react-native-web/src/apis/AppState/__tests__/index-test.js b/packages/react-native-web/src/exports/AppState/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/AppState/__tests__/index-test.js rename to packages/react-native-web/src/exports/AppState/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/AppState/index.js b/packages/react-native-web/src/exports/AppState/index.js similarity index 100% rename from packages/react-native-web/src/apis/AppState/index.js rename to packages/react-native-web/src/exports/AppState/index.js diff --git a/packages/react-native-web/src/apis/AsyncStorage/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/AsyncStorage/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/AsyncStorage/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/AsyncStorage/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/apis/AsyncStorage/__tests__/index-test.js b/packages/react-native-web/src/exports/AsyncStorage/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/AsyncStorage/__tests__/index-test.js rename to packages/react-native-web/src/exports/AsyncStorage/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/AsyncStorage/index.js b/packages/react-native-web/src/exports/AsyncStorage/index.js similarity index 100% rename from packages/react-native-web/src/apis/AsyncStorage/index.js rename to packages/react-native-web/src/exports/AsyncStorage/index.js diff --git a/packages/react-native-web/src/apis/BackHandler/index.js b/packages/react-native-web/src/exports/BackHandler/index.js similarity index 100% rename from packages/react-native-web/src/apis/BackHandler/index.js rename to packages/react-native-web/src/exports/BackHandler/index.js diff --git a/packages/react-native-web/src/components/Button/__tests__/index-test.js b/packages/react-native-web/src/exports/Button/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/Button/__tests__/index-test.js rename to packages/react-native-web/src/exports/Button/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/Button/index.js b/packages/react-native-web/src/exports/Button/index.js similarity index 90% rename from packages/react-native-web/src/components/Button/index.js rename to packages/react-native-web/src/exports/Button/index.js index 967b02ad..0af6cd52 100644 --- a/packages/react-native-web/src/components/Button/index.js +++ b/packages/react-native-web/src/exports/Button/index.js @@ -10,9 +10,9 @@ * @flow */ -import ColorPropType from '../../propTypes/ColorPropType'; -import StyleSheet from '../../apis/StyleSheet'; -import TouchableOpacity from '../Touchable/TouchableOpacity'; +import ColorPropType from '../ColorPropType'; +import StyleSheet from '../StyleSheet'; +import TouchableOpacity from '../TouchableOpacity'; import Text from '../Text'; import { bool, func, string } from 'prop-types'; import React, { Component } from 'react'; diff --git a/packages/react-native-web/src/components/CheckBox/__tests__/index-test.js b/packages/react-native-web/src/exports/CheckBox/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/CheckBox/__tests__/index-test.js rename to packages/react-native-web/src/exports/CheckBox/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/CheckBox/index.js b/packages/react-native-web/src/exports/CheckBox/index.js similarity index 93% rename from packages/react-native-web/src/components/CheckBox/index.js rename to packages/react-native-web/src/exports/CheckBox/index.js index 81aed826..ffd6f5d2 100644 --- a/packages/react-native-web/src/components/CheckBox/index.js +++ b/packages/react-native-web/src/exports/CheckBox/index.js @@ -11,12 +11,12 @@ */ import applyNativeMethods from '../../modules/applyNativeMethods'; -import ColorPropType from '../../propTypes/ColorPropType'; -import createElement from '../../modules/createElement'; -import StyleSheet from '../../apis/StyleSheet'; -import UIManager from '../../apis/UIManager'; +import ColorPropType from '../ColorPropType'; +import createElement from '../createElement'; +import StyleSheet from '../StyleSheet'; +import UIManager from '../UIManager'; import View from '../View'; -import ViewPropTypes, { type ViewProps } from '../View/ViewPropTypes'; +import ViewPropTypes, { type ViewProps } from '../ViewPropTypes'; import React, { Component } from 'react'; import { bool, func } from 'prop-types'; diff --git a/packages/react-native-web/src/apis/Clipboard/index.js b/packages/react-native-web/src/exports/Clipboard/index.js similarity index 100% rename from packages/react-native-web/src/apis/Clipboard/index.js rename to packages/react-native-web/src/exports/Clipboard/index.js diff --git a/packages/react-native-web/src/propTypes/ColorPropType.js b/packages/react-native-web/src/exports/ColorPropType/index.js similarity index 100% rename from packages/react-native-web/src/propTypes/ColorPropType.js rename to packages/react-native-web/src/exports/ColorPropType/index.js diff --git a/packages/react-native-web/src/apis/Dimensions/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Dimensions/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/Dimensions/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/Dimensions/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/apis/Dimensions/__tests__/index-test.js b/packages/react-native-web/src/exports/Dimensions/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/Dimensions/__tests__/index-test.js rename to packages/react-native-web/src/exports/Dimensions/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/Dimensions/index.js b/packages/react-native-web/src/exports/Dimensions/index.js similarity index 100% rename from packages/react-native-web/src/apis/Dimensions/index.js rename to packages/react-native-web/src/exports/Dimensions/index.js diff --git a/packages/react-native-web/src/apis/Easing/index.js b/packages/react-native-web/src/exports/Easing/index.js similarity index 100% rename from packages/react-native-web/src/apis/Easing/index.js rename to packages/react-native-web/src/exports/Easing/index.js diff --git a/packages/react-native-web/src/propTypes/EdgeInsetsPropType.js b/packages/react-native-web/src/exports/EdgeInsetsPropType/index.js similarity index 88% rename from packages/react-native-web/src/propTypes/EdgeInsetsPropType.js rename to packages/react-native-web/src/exports/EdgeInsetsPropType/index.js index 3598e473..f0ef65e4 100644 --- a/packages/react-native-web/src/propTypes/EdgeInsetsPropType.js +++ b/packages/react-native-web/src/exports/EdgeInsetsPropType/index.js @@ -10,7 +10,7 @@ * @flow */ -import createStrictShapeTypeChecker from './createStrictShapeTypeChecker'; +import createStrictShapeTypeChecker from '../../modules/createStrictShapeTypeChecker'; import { number } from 'prop-types'; export type EdgeInsetsProp = { diff --git a/packages/react-native-web/src/exports/FlatList/index.js b/packages/react-native-web/src/exports/FlatList/index.js new file mode 100644 index 00000000..9cd4039d --- /dev/null +++ b/packages/react-native-web/src/exports/FlatList/index.js @@ -0,0 +1,2 @@ +import UnimplementedView from '../../modules/UnimplementedView'; +export default UnimplementedView; diff --git a/packages/react-native-web/src/apis/I18nManager/__tests__/index-test.js b/packages/react-native-web/src/exports/I18nManager/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/I18nManager/__tests__/index-test.js rename to packages/react-native-web/src/exports/I18nManager/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/I18nManager/index.js b/packages/react-native-web/src/exports/I18nManager/index.js similarity index 100% rename from packages/react-native-web/src/apis/I18nManager/index.js rename to packages/react-native-web/src/exports/I18nManager/index.js diff --git a/packages/react-native-web/src/components/Image/ImageResizeMode.js b/packages/react-native-web/src/exports/Image/ImageResizeMode.js similarity index 100% rename from packages/react-native-web/src/components/Image/ImageResizeMode.js rename to packages/react-native-web/src/exports/Image/ImageResizeMode.js diff --git a/packages/react-native-web/src/components/Image/ImageStylePropTypes.js b/packages/react-native-web/src/exports/Image/ImageStylePropTypes.js similarity index 62% rename from packages/react-native-web/src/components/Image/ImageStylePropTypes.js rename to packages/react-native-web/src/exports/Image/ImageStylePropTypes.js index 5af1bd40..877b7f6d 100644 --- a/packages/react-native-web/src/components/Image/ImageStylePropTypes.js +++ b/packages/react-native-web/src/exports/Image/ImageStylePropTypes.js @@ -2,12 +2,12 @@ * @flow */ -import BorderPropTypes from '../../propTypes/BorderPropTypes'; -import ColorPropType from '../../propTypes/ColorPropType'; +import BorderPropTypes from '../../modules/BorderPropTypes'; +import ColorPropType from '../ColorPropType'; import ImageResizeMode from './ImageResizeMode'; -import LayoutPropTypes from '../../propTypes/LayoutPropTypes'; -import ShadowPropTypes from '../../propTypes/ShadowPropTypes'; -import TransformPropTypes from '../../propTypes/TransformPropTypes'; +import LayoutPropTypes from '../../modules/LayoutPropTypes'; +import ShadowPropTypes from '../../modules/ShadowPropTypes'; +import TransformPropTypes from '../../modules/TransformPropTypes'; import { number, oneOf, string } from 'prop-types'; const ImageStylePropTypes = { diff --git a/packages/react-native-web/src/components/Image/ImageUriCache.js b/packages/react-native-web/src/exports/Image/ImageUriCache.js similarity index 100% rename from packages/react-native-web/src/components/Image/ImageUriCache.js rename to packages/react-native-web/src/exports/Image/ImageUriCache.js diff --git a/packages/react-native-web/src/components/Image/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Image/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/components/Image/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/Image/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/components/Image/__tests__/index-test.js b/packages/react-native-web/src/exports/Image/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/Image/__tests__/index-test.js rename to packages/react-native-web/src/exports/Image/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/Image/index.js b/packages/react-native-web/src/exports/Image/index.js similarity index 97% rename from packages/react-native-web/src/components/Image/index.js rename to packages/react-native-web/src/exports/Image/index.js index 465f9ea4..3a198106 100644 --- a/packages/react-native-web/src/components/Image/index.js +++ b/packages/react-native-web/src/exports/Image/index.js @@ -11,17 +11,17 @@ */ import applyNativeMethods from '../../modules/applyNativeMethods'; -import createElement from '../../modules/createElement'; +import createElement from '../createElement'; import { getAssetByID } from '../../modules/AssetRegistry'; import ImageLoader from '../../modules/ImageLoader'; import ImageResizeMode from './ImageResizeMode'; import ImageStylePropTypes from './ImageStylePropTypes'; import ImageUriCache from './ImageUriCache'; import requestIdleCallback, { cancelIdleCallback } from '../../modules/requestIdleCallback'; -import StyleSheet from '../../apis/StyleSheet'; -import StyleSheetPropType from '../../propTypes/StyleSheetPropType'; +import StyleSheet from '../StyleSheet'; +import StyleSheetPropType from '../../modules/StyleSheetPropType'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import { bool, func, number, oneOf, oneOfType, shape, string } from 'prop-types'; import React, { Component } from 'react'; diff --git a/packages/react-native-web/src/components/Image/__tests__/ImageBackground-test.js b/packages/react-native-web/src/exports/ImageBackground/__tests__/index.js similarity index 93% rename from packages/react-native-web/src/components/Image/__tests__/ImageBackground-test.js rename to packages/react-native-web/src/exports/ImageBackground/__tests__/index.js index 71550b30..30a61b4a 100644 --- a/packages/react-native-web/src/components/Image/__tests__/ImageBackground-test.js +++ b/packages/react-native-web/src/exports/ImageBackground/__tests__/index.js @@ -1,7 +1,7 @@ /* eslint-env jasmine, jest */ -import Image from '..'; -import ImageBackground from '../ImageBackground'; +import Image from '../../Image'; +import ImageBackground from '..'; import React from 'react'; import { shallow } from 'enzyme'; import Text from '../../Text'; diff --git a/packages/react-native-web/src/components/Image/ImageBackground.js b/packages/react-native-web/src/exports/ImageBackground/index.js similarity index 91% rename from packages/react-native-web/src/components/Image/ImageBackground.js rename to packages/react-native-web/src/exports/ImageBackground/index.js index 23ebd8b2..63d6d015 100644 --- a/packages/react-native-web/src/components/Image/ImageBackground.js +++ b/packages/react-native-web/src/exports/ImageBackground/index.js @@ -8,11 +8,11 @@ * * @flow */ -import ensureComponentIsNative from '../Touchable/ensureComponentIsNative'; -import Image from './'; -import StyleSheet from '../../apis/StyleSheet'; +import ensureComponentIsNative from '../../modules/ensureComponentIsNative'; +import Image from '../Image'; +import StyleSheet from '../StyleSheet'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import React, { Component } from 'react'; const emptyObject = {}; diff --git a/packages/react-native-web/src/apis/InteractionManager/index.js b/packages/react-native-web/src/exports/InteractionManager/index.js similarity index 100% rename from packages/react-native-web/src/apis/InteractionManager/index.js rename to packages/react-native-web/src/exports/InteractionManager/index.js diff --git a/packages/react-native-web/src/apis/Keyboard/index.js b/packages/react-native-web/src/exports/Keyboard/index.js similarity index 100% rename from packages/react-native-web/src/apis/Keyboard/index.js rename to packages/react-native-web/src/exports/Keyboard/index.js diff --git a/packages/react-native-web/src/components/KeyboardAvoidingView/index.js b/packages/react-native-web/src/exports/KeyboardAvoidingView/index.js similarity index 98% rename from packages/react-native-web/src/components/KeyboardAvoidingView/index.js rename to packages/react-native-web/src/exports/KeyboardAvoidingView/index.js index bef1a6fe..f45464eb 100644 --- a/packages/react-native-web/src/components/KeyboardAvoidingView/index.js +++ b/packages/react-native-web/src/exports/KeyboardAvoidingView/index.js @@ -13,7 +13,7 @@ import View from '../View'; import { number, oneOf } from 'prop-types'; import React, { Component } from 'react'; -import ViewPropTypes, { type ViewLayout, type ViewLayoutEvent } from '../View/ViewPropTypes'; +import ViewPropTypes, { type ViewLayout, type ViewLayoutEvent } from '../ViewPropTypes'; class KeyboardAvoidingView extends Component<*> { static propTypes = { diff --git a/packages/react-native-web/src/apis/Linking/index.js b/packages/react-native-web/src/exports/Linking/index.js similarity index 100% rename from packages/react-native-web/src/apis/Linking/index.js rename to packages/react-native-web/src/exports/Linking/index.js diff --git a/packages/react-native-web/src/components/ListView/ListViewDataSource.js b/packages/react-native-web/src/exports/ListView/ListViewDataSource.js similarity index 100% rename from packages/react-native-web/src/components/ListView/ListViewDataSource.js rename to packages/react-native-web/src/exports/ListView/ListViewDataSource.js diff --git a/packages/react-native-web/src/components/ListView/ListViewPropTypes.js b/packages/react-native-web/src/exports/ListView/ListViewPropTypes.js similarity index 100% rename from packages/react-native-web/src/components/ListView/ListViewPropTypes.js rename to packages/react-native-web/src/exports/ListView/ListViewPropTypes.js diff --git a/packages/react-native-web/src/components/ListView/__tests__/index-test.js b/packages/react-native-web/src/exports/ListView/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/ListView/__tests__/index-test.js rename to packages/react-native-web/src/exports/ListView/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/ListView/index.js b/packages/react-native-web/src/exports/ListView/index.js similarity index 99% rename from packages/react-native-web/src/components/ListView/index.js rename to packages/react-native-web/src/exports/ListView/index.js index 40845665..3ab42eed 100644 --- a/packages/react-native-web/src/components/ListView/index.js +++ b/packages/react-native-web/src/exports/ListView/index.js @@ -2,7 +2,7 @@ import applyNativeMethods from '../../modules/applyNativeMethods'; import ListViewDataSource from './ListViewDataSource'; import ListViewPropTypes from './ListViewPropTypes'; import ScrollView from '../ScrollView'; -import StaticRenderer from '../StaticRenderer'; +import StaticRenderer from '../../modules/StaticRenderer'; import React, { Component } from 'react'; import isEmpty from 'fbjs/lib/isEmpty'; import requestAnimationFrame from 'fbjs/lib/requestAnimationFrame'; diff --git a/packages/react-native-web/src/exports/Modal/index.js b/packages/react-native-web/src/exports/Modal/index.js new file mode 100644 index 00000000..9cd4039d --- /dev/null +++ b/packages/react-native-web/src/exports/Modal/index.js @@ -0,0 +1,2 @@ +import UnimplementedView from '../../modules/UnimplementedView'; +export default UnimplementedView; diff --git a/packages/react-native-web/src/modules/NativeModules/index.js b/packages/react-native-web/src/exports/NativeModules/index.js similarity index 100% rename from packages/react-native-web/src/modules/NativeModules/index.js rename to packages/react-native-web/src/exports/NativeModules/index.js diff --git a/packages/react-native-web/src/apis/NetInfo/__tests__/index-test.js b/packages/react-native-web/src/exports/NetInfo/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/NetInfo/__tests__/index-test.js rename to packages/react-native-web/src/exports/NetInfo/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/NetInfo/index.js b/packages/react-native-web/src/exports/NetInfo/index.js similarity index 100% rename from packages/react-native-web/src/apis/NetInfo/index.js rename to packages/react-native-web/src/exports/NetInfo/index.js diff --git a/packages/react-native-web/src/apis/PanResponder/index.js b/packages/react-native-web/src/exports/PanResponder/index.js similarity index 100% rename from packages/react-native-web/src/apis/PanResponder/index.js rename to packages/react-native-web/src/exports/PanResponder/index.js diff --git a/packages/react-native-web/src/exports/Picker/PickerItem.js b/packages/react-native-web/src/exports/Picker/PickerItem.js new file mode 100644 index 00000000..5a0fc1ef --- /dev/null +++ b/packages/react-native-web/src/exports/Picker/PickerItem.js @@ -0,0 +1,25 @@ +import ColorPropType from '../ColorPropType'; +import { Component } from 'react'; +import createElement from '../createElement'; +import { number, oneOfType, string } from 'prop-types'; + +type Props = { + color?: ColorPropType, + label: string, + testID?: string, + value?: number | string +}; + +export default class PickerItem extends Component { + static propTypes = { + color: ColorPropType, + label: string.isRequired, + testID: string, + value: oneOfType([number, string]) + }; + + render() { + const { label, testID, value } = this.props; + return createElement('option', { label, testID, value }); + } +} diff --git a/packages/react-native-web/src/components/Picker/PickerItemPropType.js b/packages/react-native-web/src/exports/Picker/PickerItemPropType.js similarity index 100% rename from packages/react-native-web/src/components/Picker/PickerItemPropType.js rename to packages/react-native-web/src/exports/Picker/PickerItemPropType.js diff --git a/packages/react-native-web/src/components/Picker/PickerStylePropTypes.js b/packages/react-native-web/src/exports/Picker/PickerStylePropTypes.js similarity index 88% rename from packages/react-native-web/src/components/Picker/PickerStylePropTypes.js rename to packages/react-native-web/src/exports/Picker/PickerStylePropTypes.js index 85f35f64..deb8c45d 100644 --- a/packages/react-native-web/src/components/Picker/PickerStylePropTypes.js +++ b/packages/react-native-web/src/exports/Picker/PickerStylePropTypes.js @@ -9,7 +9,7 @@ * @flow */ -import ColorPropType from '../../propTypes/ColorPropType'; +import ColorPropType from '../ColorPropType'; import ViewStylePropTypes from '../View/ViewStylePropTypes'; const PickerStylePropTypes = { diff --git a/packages/react-native-web/src/components/Picker/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Picker/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/components/Picker/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/Picker/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/components/Picker/__tests__/index-test.js b/packages/react-native-web/src/exports/Picker/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/Picker/__tests__/index-test.js rename to packages/react-native-web/src/exports/Picker/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/Picker/index.js b/packages/react-native-web/src/exports/Picker/index.js similarity index 70% rename from packages/react-native-web/src/components/Picker/index.js rename to packages/react-native-web/src/exports/Picker/index.js index f6c51d45..0b673098 100644 --- a/packages/react-native-web/src/components/Picker/index.js +++ b/packages/react-native-web/src/exports/Picker/index.js @@ -12,38 +12,16 @@ import applyNativeMethods from '../../modules/applyNativeMethods'; import { Component } from 'react'; -import ColorPropType from '../../propTypes/ColorPropType'; -import createElement from '../../modules/createElement'; +import createElement from '../createElement'; +import PickerItem from './PickerItem'; import PickerItemPropType from './PickerItemPropType'; import PickerStylePropTypes from './PickerStylePropTypes'; -import StyleSheetPropType from '../../propTypes/StyleSheetPropType'; -import StyleSheet from '../../apis/StyleSheet'; -import TextStylePropTypes from '../Text/TextStylePropTypes'; +import StyleSheetPropType from '../../modules/StyleSheetPropType'; +import StyleSheet from '../StyleSheet'; +import TextPropTypes from '../Text/TextPropTypes'; import { arrayOf, bool, func, number, oneOfType, string } from 'prop-types'; const pickerStyleType = StyleSheetPropType(PickerStylePropTypes); -const itemStylePropType = StyleSheetPropType(TextStylePropTypes); - -type ItemProps = { - color?: ColorPropType, - label: string, - testID?: string, - value?: number | string -}; - -class PickerItem extends Component { - static propTypes = { - color: ColorPropType, - label: string.isRequired, - testID: string, - value: oneOfType([number, string]) - }; - - render() { - const { label, testID, value } = this.props; - return createElement('option', { label, testID, value }); - } -} type Props = { children?: Array, @@ -53,7 +31,7 @@ type Props = { style?: pickerStyleType, testID?: string, /* compat */ - itemStyle?: itemStylePropType, + itemStyle?: TextPropTypes.style, mode?: string, prompt?: string }; diff --git a/packages/react-native-web/src/apis/PixelRatio/__tests__/index-test.js b/packages/react-native-web/src/exports/PixelRatio/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/PixelRatio/__tests__/index-test.js rename to packages/react-native-web/src/exports/PixelRatio/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/PixelRatio/index.js b/packages/react-native-web/src/exports/PixelRatio/index.js similarity index 100% rename from packages/react-native-web/src/apis/PixelRatio/index.js rename to packages/react-native-web/src/exports/PixelRatio/index.js diff --git a/packages/react-native-web/src/apis/Platform/index.js b/packages/react-native-web/src/exports/Platform/index.js similarity index 100% rename from packages/react-native-web/src/apis/Platform/index.js rename to packages/react-native-web/src/exports/Platform/index.js diff --git a/packages/react-native-web/src/propTypes/PointPropType.js b/packages/react-native-web/src/exports/PointPropType/index.js similarity index 85% rename from packages/react-native-web/src/propTypes/PointPropType.js rename to packages/react-native-web/src/exports/PointPropType/index.js index ae1814f3..9e4ac093 100644 --- a/packages/react-native-web/src/propTypes/PointPropType.js +++ b/packages/react-native-web/src/exports/PointPropType/index.js @@ -10,7 +10,7 @@ * @flow */ -import createStrictShapeTypeChecker from './createStrictShapeTypeChecker'; +import createStrictShapeTypeChecker from '../../modules/createStrictShapeTypeChecker'; import { number } from 'prop-types'; const PointPropType = createStrictShapeTypeChecker({ diff --git a/packages/react-native-web/src/components/ProgressBar/__tests__/index-test.js b/packages/react-native-web/src/exports/ProgressBar/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/ProgressBar/__tests__/index-test.js rename to packages/react-native-web/src/exports/ProgressBar/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/ProgressBar/index.js b/packages/react-native-web/src/exports/ProgressBar/index.js similarity index 93% rename from packages/react-native-web/src/components/ProgressBar/index.js rename to packages/react-native-web/src/exports/ProgressBar/index.js index f14bb463..1529c4dc 100644 --- a/packages/react-native-web/src/components/ProgressBar/index.js +++ b/packages/react-native-web/src/exports/ProgressBar/index.js @@ -10,10 +10,10 @@ */ import applyNativeMethods from '../../modules/applyNativeMethods'; -import ColorPropType from '../../propTypes/ColorPropType'; -import StyleSheet from '../../apis/StyleSheet'; +import ColorPropType from '../ColorPropType'; +import StyleSheet from '../StyleSheet'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import React, { Component } from 'react'; import { bool, number } from 'prop-types'; diff --git a/packages/react-native-web/src/components/RefreshControl/index.js b/packages/react-native-web/src/exports/RefreshControl/index.js similarity index 91% rename from packages/react-native-web/src/components/RefreshControl/index.js rename to packages/react-native-web/src/exports/RefreshControl/index.js index bd0f00b9..871b960b 100644 --- a/packages/react-native-web/src/components/RefreshControl/index.js +++ b/packages/react-native-web/src/exports/RefreshControl/index.js @@ -10,9 +10,9 @@ * @flow */ -import ColorPropType from '../../propTypes/ColorPropType'; +import ColorPropType from '../ColorPropType'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import { arrayOf, bool, func, number, oneOf, string } from 'prop-types'; import React, { Component } from 'react'; diff --git a/packages/react-native-web/src/components/SafeAreaView/index.js b/packages/react-native-web/src/exports/SafeAreaView/index.js similarity index 100% rename from packages/react-native-web/src/components/SafeAreaView/index.js rename to packages/react-native-web/src/exports/SafeAreaView/index.js diff --git a/packages/react-native-web/src/components/ScrollView/ScrollViewBase.js b/packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js similarity index 98% rename from packages/react-native-web/src/components/ScrollView/ScrollViewBase.js rename to packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js index 5ff0a723..b53ebcf5 100644 --- a/packages/react-native-web/src/components/ScrollView/ScrollViewBase.js +++ b/packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js @@ -9,9 +9,9 @@ */ import debounce from 'debounce'; -import StyleSheet from '../../apis/StyleSheet'; +import StyleSheet from '../StyleSheet'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import React, { Component } from 'react'; import { bool, func, number } from 'prop-types'; diff --git a/packages/react-native-web/src/components/ScrollView/__tests__/index-test.js b/packages/react-native-web/src/exports/ScrollView/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/ScrollView/__tests__/index-test.js rename to packages/react-native-web/src/exports/ScrollView/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/ScrollView/index.js b/packages/react-native-web/src/exports/ScrollView/index.js similarity index 95% rename from packages/react-native-web/src/components/ScrollView/index.js rename to packages/react-native-web/src/exports/ScrollView/index.js index ea3d5534..a29c775e 100644 --- a/packages/react-native-web/src/components/ScrollView/index.js +++ b/packages/react-native-web/src/exports/ScrollView/index.js @@ -12,15 +12,13 @@ import createReactClass from 'create-react-class'; import dismissKeyboard from '../../modules/dismissKeyboard'; -import findNodeHandle from '../../modules/findNodeHandle'; +import findNodeHandle from '../findNodeHandle'; import invariant from 'fbjs/lib/invariant'; import ScrollResponder from '../../modules/ScrollResponder'; import ScrollViewBase from './ScrollViewBase'; -import StyleSheet from '../../apis/StyleSheet'; -import StyleSheetPropType from '../../propTypes/StyleSheetPropType'; +import StyleSheet from '../StyleSheet'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; -import ViewStylePropTypes from '../View/ViewStylePropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import React from 'react'; import { bool, element, func, number, oneOf } from 'prop-types'; @@ -30,7 +28,7 @@ const emptyObject = {}; const ScrollView = createReactClass({ propTypes: { ...ViewPropTypes, - contentContainerStyle: StyleSheetPropType(ViewStylePropTypes), + contentContainerStyle: ViewPropTypes.style, horizontal: bool, keyboardDismissMode: oneOf(['none', 'interactive', 'on-drag']), onContentSizeChange: func, @@ -39,7 +37,7 @@ const ScrollView = createReactClass({ refreshControl: element, scrollEnabled: bool, scrollEventThrottle: number, - style: StyleSheetPropType(ViewStylePropTypes) + style: ViewPropTypes.style }, mixins: [ScrollResponder.Mixin], diff --git a/packages/react-native-web/src/exports/SectionList/index.js b/packages/react-native-web/src/exports/SectionList/index.js new file mode 100644 index 00000000..9cd4039d --- /dev/null +++ b/packages/react-native-web/src/exports/SectionList/index.js @@ -0,0 +1,2 @@ +import UnimplementedView from '../../modules/UnimplementedView'; +export default UnimplementedView; diff --git a/packages/react-native-web/src/exports/Slider/index.js b/packages/react-native-web/src/exports/Slider/index.js new file mode 100644 index 00000000..9cd4039d --- /dev/null +++ b/packages/react-native-web/src/exports/Slider/index.js @@ -0,0 +1,2 @@ +import UnimplementedView from '../../modules/UnimplementedView'; +export default UnimplementedView; diff --git a/packages/react-native-web/src/components/StatusBar/index.js b/packages/react-native-web/src/exports/StatusBar/index.js similarity index 100% rename from packages/react-native-web/src/components/StatusBar/index.js rename to packages/react-native-web/src/exports/StatusBar/index.js diff --git a/packages/react-native-web/src/apis/StyleSheet/StyleManager.js b/packages/react-native-web/src/exports/StyleSheet/StyleManager.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/StyleManager.js rename to packages/react-native-web/src/exports/StyleSheet/StyleManager.js diff --git a/packages/react-native-web/src/apis/StyleSheet/StyleRegistry.js b/packages/react-native-web/src/exports/StyleSheet/StyleRegistry.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/StyleRegistry.js rename to packages/react-native-web/src/exports/StyleSheet/StyleRegistry.js diff --git a/packages/react-native-web/src/apis/StyleSheet/StyleSheetValidation.js b/packages/react-native-web/src/exports/StyleSheet/StyleSheetValidation.js similarity index 90% rename from packages/react-native-web/src/apis/StyleSheet/StyleSheetValidation.js rename to packages/react-native-web/src/exports/StyleSheet/StyleSheetValidation.js index cbaa5cf4..56fed3fc 100644 --- a/packages/react-native-web/src/apis/StyleSheet/StyleSheetValidation.js +++ b/packages/react-native-web/src/exports/StyleSheet/StyleSheetValidation.js @@ -10,10 +10,10 @@ * @flow */ -import ImageStylePropTypes from '../../components/Image/ImageStylePropTypes'; -import TextInputStylePropTypes from '../../components/TextInput/TextInputStylePropTypes'; -import TextStylePropTypes from '../../components/Text/TextStylePropTypes'; -import ViewStylePropTypes from '../../components/View/ViewStylePropTypes'; +import ImageStylePropTypes from '../Image/ImageStylePropTypes'; +import TextInputStylePropTypes from '../TextInput/TextInputStylePropTypes'; +import TextStylePropTypes from '../Text/TextStylePropTypes'; +import ViewStylePropTypes from '../View/ViewStylePropTypes'; import warning from 'fbjs/lib/warning'; import { number, oneOf, string } from 'prop-types'; diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/StyleManager-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/StyleManager-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/StyleManager-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/StyleManager-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/StyleRegistry-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/StyleRegistry-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/StyleRegistry-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/StyleRegistry-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/StyleManager-test.js.snap b/packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/StyleManager-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/StyleManager-test.js.snap rename to packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/StyleManager-test.js.snap diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/StyleRegistry-test.js.snap b/packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/StyleRegistry-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/StyleRegistry-test.js.snap rename to packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/StyleRegistry-test.js.snap diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/createReactDOMStyle-test.js.snap b/packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/createReactDOMStyle-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/createReactDOMStyle-test.js.snap rename to packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/createReactDOMStyle-test.js.snap diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/flattenStyle-test.js.snap b/packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/flattenStyle-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/flattenStyle-test.js.snap rename to packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/flattenStyle-test.js.snap diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/generateCss-test.js.snap b/packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/generateCss-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/generateCss-test.js.snap rename to packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/generateCss-test.js.snap diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/i18nStyle-test.js.snap b/packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/i18nStyle-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/i18nStyle-test.js.snap rename to packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/i18nStyle-test.js.snap diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/StyleSheet/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/createReactDOMStyle-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/createReactDOMStyle-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/createReactDOMStyle-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/createReactDOMStyle-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/flattenStyle-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/flattenStyle-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/flattenStyle-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/flattenStyle-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/generateCss-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/generateCss-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/generateCss-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/generateCss-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/i18nStyle-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/i18nStyle-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/i18nStyle-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/i18nStyle-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/index-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/index-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/__tests__/normalizeValue-test.js b/packages/react-native-web/src/exports/StyleSheet/__tests__/normalizeValue-test.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/__tests__/normalizeValue-test.js rename to packages/react-native-web/src/exports/StyleSheet/__tests__/normalizeValue-test.js diff --git a/packages/react-native-web/src/apis/StyleSheet/createReactDOMStyle.js b/packages/react-native-web/src/exports/StyleSheet/createReactDOMStyle.js similarity index 99% rename from packages/react-native-web/src/apis/StyleSheet/createReactDOMStyle.js rename to packages/react-native-web/src/exports/StyleSheet/createReactDOMStyle.js index 8f5954ba..01493153 100644 --- a/packages/react-native-web/src/apis/StyleSheet/createReactDOMStyle.js +++ b/packages/react-native-web/src/exports/StyleSheet/createReactDOMStyle.js @@ -18,7 +18,7 @@ */ import normalizeValue from './normalizeValue'; -import processColor from '../../modules/processColor'; +import processColor from '../processColor'; const emptyObject = {}; const styleShortFormProperties = { diff --git a/packages/react-native-web/src/apis/StyleSheet/flattenStyle.js b/packages/react-native-web/src/exports/StyleSheet/flattenStyle.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/flattenStyle.js rename to packages/react-native-web/src/exports/StyleSheet/flattenStyle.js diff --git a/packages/react-native-web/src/apis/StyleSheet/generateCss.js b/packages/react-native-web/src/exports/StyleSheet/generateCss.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/generateCss.js rename to packages/react-native-web/src/exports/StyleSheet/generateCss.js diff --git a/packages/react-native-web/src/apis/StyleSheet/getHairlineWidth.js b/packages/react-native-web/src/exports/StyleSheet/getHairlineWidth.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/getHairlineWidth.js rename to packages/react-native-web/src/exports/StyleSheet/getHairlineWidth.js diff --git a/packages/react-native-web/src/apis/StyleSheet/i18nStyle.js b/packages/react-native-web/src/exports/StyleSheet/i18nStyle.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/i18nStyle.js rename to packages/react-native-web/src/exports/StyleSheet/i18nStyle.js diff --git a/packages/react-native-web/src/apis/StyleSheet/index.js b/packages/react-native-web/src/exports/StyleSheet/index.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/index.js rename to packages/react-native-web/src/exports/StyleSheet/index.js diff --git a/packages/react-native-web/src/apis/StyleSheet/normalizeValue.js b/packages/react-native-web/src/exports/StyleSheet/normalizeValue.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/normalizeValue.js rename to packages/react-native-web/src/exports/StyleSheet/normalizeValue.js diff --git a/packages/react-native-web/src/apis/StyleSheet/registry.js b/packages/react-native-web/src/exports/StyleSheet/registry.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/registry.js rename to packages/react-native-web/src/exports/StyleSheet/registry.js diff --git a/packages/react-native-web/src/apis/StyleSheet/staticCss.js b/packages/react-native-web/src/exports/StyleSheet/staticCss.js similarity index 100% rename from packages/react-native-web/src/apis/StyleSheet/staticCss.js rename to packages/react-native-web/src/exports/StyleSheet/staticCss.js diff --git a/packages/react-native-web/src/components/Switch/__tests__/index-test.js b/packages/react-native-web/src/exports/Switch/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/Switch/__tests__/index-test.js rename to packages/react-native-web/src/exports/Switch/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/Switch/index.js b/packages/react-native-web/src/exports/Switch/index.js similarity index 95% rename from packages/react-native-web/src/components/Switch/index.js rename to packages/react-native-web/src/exports/Switch/index.js index 5f304b55..8d7c060d 100644 --- a/packages/react-native-web/src/components/Switch/index.js +++ b/packages/react-native-web/src/exports/Switch/index.js @@ -10,13 +10,13 @@ */ import applyNativeMethods from '../../modules/applyNativeMethods'; -import ColorPropType from '../../propTypes/ColorPropType'; -import createElement from '../../modules/createElement'; +import ColorPropType from '../ColorPropType'; +import createElement from '../createElement'; import multiplyStyleLengthValue from '../../modules/multiplyStyleLengthValue'; -import StyleSheet from '../../apis/StyleSheet'; -import UIManager from '../../apis/UIManager'; +import StyleSheet from '../StyleSheet'; +import UIManager from '../UIManager'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import React, { Component } from 'react'; import { bool, func } from 'prop-types'; diff --git a/packages/react-native-web/src/components/Text/TextPropTypes.js b/packages/react-native-web/src/exports/Text/TextPropTypes.js similarity index 54% rename from packages/react-native-web/src/components/Text/TextPropTypes.js rename to packages/react-native-web/src/exports/Text/TextPropTypes.js index bfc70a1f..83f5fdd3 100644 --- a/packages/react-native-web/src/components/Text/TextPropTypes.js +++ b/packages/react-native-web/src/exports/Text/TextPropTypes.js @@ -10,20 +10,25 @@ * @flow */ -import BaseComponentPropTypes from '../../propTypes/BaseComponentPropTypes'; -import StyleSheetPropType from '../../propTypes/StyleSheetPropType'; +import StyleSheetPropType from '../../modules/StyleSheetPropType'; import TextStylePropTypes from './TextStylePropTypes'; -import { any, bool, func, number, oneOf } from 'prop-types'; +import { any, array, bool, func, number, oneOf, oneOfType, string } from 'prop-types'; const TextPropTypes = { - ...BaseComponentPropTypes, + accessibilityComponentType: string, + accessibilityLabel: string, + accessibilityLiveRegion: oneOf(['assertive', 'none', 'polite']), accessibilityRole: oneOf(['button', 'heading', 'label', 'link', 'listitem']), + accessibilityTraits: oneOfType([array, string]), + accessible: bool, children: any, + importantForAccessibility: oneOf(['auto', 'no', 'no-hide-descendants', 'yes']), numberOfLines: number, onLayout: func, onPress: func, selectable: bool, - style: StyleSheetPropType(TextStylePropTypes) + style: StyleSheetPropType(TextStylePropTypes), + testID: string }; export default TextPropTypes; diff --git a/packages/react-native-web/src/components/Text/TextStylePropTypes.js b/packages/react-native-web/src/exports/Text/TextStylePropTypes.js similarity index 96% rename from packages/react-native-web/src/components/Text/TextStylePropTypes.js rename to packages/react-native-web/src/exports/Text/TextStylePropTypes.js index db122180..5caa4ef8 100644 --- a/packages/react-native-web/src/components/Text/TextStylePropTypes.js +++ b/packages/react-native-web/src/exports/Text/TextStylePropTypes.js @@ -9,7 +9,7 @@ * @flow */ -import ColorPropType from '../../propTypes/ColorPropType'; +import ColorPropType from '../ColorPropType'; import ViewStylePropTypes from '../View/ViewStylePropTypes'; import { number, oneOf, oneOfType, shape, string } from 'prop-types'; diff --git a/packages/react-native-web/src/components/Text/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/components/Text/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/Text/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/components/Text/__tests__/index-test.js b/packages/react-native-web/src/exports/Text/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/Text/__tests__/index-test.js rename to packages/react-native-web/src/exports/Text/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/Text/index.js b/packages/react-native-web/src/exports/Text/index.js similarity index 96% rename from packages/react-native-web/src/components/Text/index.js rename to packages/react-native-web/src/exports/Text/index.js index b12d9e36..e86acf78 100644 --- a/packages/react-native-web/src/components/Text/index.js +++ b/packages/react-native-web/src/exports/Text/index.js @@ -14,8 +14,8 @@ import applyLayout from '../../modules/applyLayout'; import applyNativeMethods from '../../modules/applyNativeMethods'; import { bool } from 'prop-types'; import { Component } from 'react'; -import createElement from '../../modules/createElement'; -import StyleSheet from '../../apis/StyleSheet'; +import createElement from '../createElement'; +import StyleSheet from '../StyleSheet'; import TextPropTypes from './TextPropTypes'; class Text extends Component<*> { diff --git a/packages/react-native-web/src/components/TextInput/TextInputStylePropTypes.js b/packages/react-native-web/src/exports/TextInput/TextInputStylePropTypes.js similarity index 100% rename from packages/react-native-web/src/components/TextInput/TextInputStylePropTypes.js rename to packages/react-native-web/src/exports/TextInput/TextInputStylePropTypes.js diff --git a/packages/react-native-web/src/components/TextInput/__tests__/index-test.js b/packages/react-native-web/src/exports/TextInput/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/TextInput/__tests__/index-test.js rename to packages/react-native-web/src/exports/TextInput/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/TextInput/index.js b/packages/react-native-web/src/exports/TextInput/index.js similarity index 96% rename from packages/react-native-web/src/components/TextInput/index.js rename to packages/react-native-web/src/exports/TextInput/index.js index 4a6316f0..a31e6bcc 100644 --- a/packages/react-native-web/src/components/TextInput/index.js +++ b/packages/react-native-web/src/exports/TextInput/index.js @@ -14,14 +14,14 @@ import applyLayout from '../../modules/applyLayout'; import applyNativeMethods from '../../modules/applyNativeMethods'; import { canUseDOM } from 'fbjs/lib/ExecutionEnvironment'; import { Component } from 'react'; -import ColorPropType from '../../propTypes/ColorPropType'; -import createElement from '../../modules/createElement'; -import findNodeHandle from '../../modules/findNodeHandle'; -import StyleSheet from '../../apis/StyleSheet'; -import StyleSheetPropType from '../../propTypes/StyleSheetPropType'; +import ColorPropType from '../ColorPropType'; +import createElement from '../createElement'; +import findNodeHandle from '../findNodeHandle'; +import StyleSheet from '../StyleSheet'; +import StyleSheetPropType from '../../modules/StyleSheetPropType'; import TextInputStylePropTypes from './TextInputStylePropTypes'; -import TextInputState from './TextInputState'; -import ViewPropTypes from '../View/ViewPropTypes'; +import TextInputState from '../../modules/TextInputState'; +import ViewPropTypes from '../ViewPropTypes'; import { any, bool, func, number, oneOf, shape, string } from 'prop-types'; const isAndroid = canUseDOM && /Android/i.test(navigator && navigator.userAgent); diff --git a/packages/react-native-web/src/exports/TextPropTypes/index.js b/packages/react-native-web/src/exports/TextPropTypes/index.js new file mode 100644 index 00000000..8ec811db --- /dev/null +++ b/packages/react-native-web/src/exports/TextPropTypes/index.js @@ -0,0 +1,2 @@ +import TextPropTypes from '../Text/TextPropTypes'; +export default TextPropTypes; diff --git a/packages/react-native-web/src/components/Touchable/BoundingDimensions.js b/packages/react-native-web/src/exports/Touchable/BoundingDimensions.js similarity index 100% rename from packages/react-native-web/src/components/Touchable/BoundingDimensions.js rename to packages/react-native-web/src/exports/Touchable/BoundingDimensions.js diff --git a/packages/react-native-web/src/components/Touchable/Position.js b/packages/react-native-web/src/exports/Touchable/Position.js similarity index 100% rename from packages/react-native-web/src/components/Touchable/Position.js rename to packages/react-native-web/src/exports/Touchable/Position.js diff --git a/packages/react-native-web/src/components/Touchable/ensurePositiveDelayProps.js b/packages/react-native-web/src/exports/Touchable/ensurePositiveDelayProps.js similarity index 100% rename from packages/react-native-web/src/components/Touchable/ensurePositiveDelayProps.js rename to packages/react-native-web/src/exports/Touchable/ensurePositiveDelayProps.js diff --git a/packages/react-native-web/src/components/Touchable/Touchable.js b/packages/react-native-web/src/exports/Touchable/index.js similarity index 99% rename from packages/react-native-web/src/components/Touchable/Touchable.js rename to packages/react-native-web/src/exports/Touchable/index.js index 71762726..13ba5873 100644 --- a/packages/react-native-web/src/components/Touchable/Touchable.js +++ b/packages/react-native-web/src/exports/Touchable/index.js @@ -14,13 +14,13 @@ import AccessibilityUtil from '../../modules/AccessibilityUtil'; import BoundingDimensions from './BoundingDimensions'; -import findNodeHandle from '../../modules/findNodeHandle'; +import findNodeHandle from '../findNodeHandle'; import normalizeColor from 'normalize-css-color'; import Position from './Position'; import React from 'react'; import TouchEventUtils from 'fbjs/lib/TouchEventUtils'; -import UIManager from '../../apis/UIManager'; -import View from '../../components/View'; +import UIManager from '../UIManager'; +import View from '../View'; type Event = Object; diff --git a/packages/react-native-web/src/components/Touchable/TouchableHighlight.js b/packages/react-native-web/src/exports/TouchableHighlight/index.js similarity index 95% rename from packages/react-native-web/src/components/Touchable/TouchableHighlight.js rename to packages/react-native-web/src/exports/TouchableHighlight/index.js index 948e9646..5a9dea6f 100644 --- a/packages/react-native-web/src/components/Touchable/TouchableHighlight.js +++ b/packages/react-native-web/src/exports/TouchableHighlight/index.js @@ -11,17 +11,17 @@ */ import applyNativeMethods from '../../modules/applyNativeMethods'; -import ColorPropType from '../../propTypes/ColorPropType'; +import ColorPropType from '../ColorPropType'; import createReactClass from 'create-react-class'; -import ensureComponentIsNative from './ensureComponentIsNative'; -import ensurePositiveDelayProps from './ensurePositiveDelayProps'; +import ensureComponentIsNative from '../../modules/ensureComponentIsNative'; +import ensurePositiveDelayProps from '../Touchable/ensurePositiveDelayProps'; import React from 'react'; -import StyleSheet from '../../apis/StyleSheet'; +import StyleSheet from '../StyleSheet'; import TimerMixin from 'react-timer-mixin'; -import Touchable from './Touchable'; -import TouchableWithoutFeedback from './TouchableWithoutFeedback'; +import Touchable from '../Touchable'; +import TouchableWithoutFeedback from '../TouchableWithoutFeedback'; import View from '../View'; -import ViewPropTypes from '../View/ViewPropTypes'; +import ViewPropTypes from '../ViewPropTypes'; import { func, number } from 'prop-types'; type Event = Object; diff --git a/packages/react-native-web/src/components/Touchable/TouchableNativeFeedback.js b/packages/react-native-web/src/exports/TouchableNativeFeedback/index.js similarity index 79% rename from packages/react-native-web/src/components/Touchable/TouchableNativeFeedback.js rename to packages/react-native-web/src/exports/TouchableNativeFeedback/index.js index ff1004e2..8c1d99f9 100644 --- a/packages/react-native-web/src/components/Touchable/TouchableNativeFeedback.js +++ b/packages/react-native-web/src/exports/TouchableNativeFeedback/index.js @@ -8,5 +8,5 @@ * @flow */ -import UnimplementedView from '../UnimplementedView'; +import UnimplementedView from '../../modules/UnimplementedView'; export default UnimplementedView; diff --git a/packages/react-native-web/src/components/Touchable/TouchableOpacity.js b/packages/react-native-web/src/exports/TouchableOpacity/index.js similarity index 96% rename from packages/react-native-web/src/components/Touchable/TouchableOpacity.js rename to packages/react-native-web/src/exports/TouchableOpacity/index.js index 99a7a6ce..940ca76f 100644 --- a/packages/react-native-web/src/components/Touchable/TouchableOpacity.js +++ b/packages/react-native-web/src/exports/TouchableOpacity/index.js @@ -12,12 +12,12 @@ import applyNativeMethods from '../../modules/applyNativeMethods'; import createReactClass from 'create-react-class'; -import ensurePositiveDelayProps from './ensurePositiveDelayProps'; +import ensurePositiveDelayProps from '../Touchable/ensurePositiveDelayProps'; import { number } from 'prop-types'; import React from 'react'; -import StyleSheet from '../../apis/StyleSheet'; -import Touchable from './Touchable'; -import TouchableWithoutFeedback from './TouchableWithoutFeedback'; +import StyleSheet from '../StyleSheet'; +import Touchable from '../Touchable'; +import TouchableWithoutFeedback from '../TouchableWithoutFeedback'; import View from '../View'; const flattenStyle = StyleSheet.flatten; diff --git a/packages/react-native-web/src/components/Touchable/TouchableWithoutFeedback.js b/packages/react-native-web/src/exports/TouchableWithoutFeedback/index.js similarity index 92% rename from packages/react-native-web/src/components/Touchable/TouchableWithoutFeedback.js rename to packages/react-native-web/src/exports/TouchableWithoutFeedback/index.js index 45efd4f9..2d3d0072 100644 --- a/packages/react-native-web/src/components/Touchable/TouchableWithoutFeedback.js +++ b/packages/react-native-web/src/exports/TouchableWithoutFeedback/index.js @@ -10,14 +10,14 @@ * @flow */ -import BaseComponentPropTypes from '../../propTypes/BaseComponentPropTypes'; import createReactClass from 'create-react-class'; -import EdgeInsetsPropType from '../../propTypes/EdgeInsetsPropType'; -import ensurePositiveDelayProps from './ensurePositiveDelayProps'; +import EdgeInsetsPropType from '../EdgeInsetsPropType'; +import ensurePositiveDelayProps from '../Touchable/ensurePositiveDelayProps'; import React, { type Element } from 'react'; -import StyleSheet from '../../apis/StyleSheet'; +import StyleSheet from '../StyleSheet'; import TimerMixin from 'react-timer-mixin'; -import Touchable from './Touchable'; +import Touchable from '../Touchable'; +import ViewPropTypes from '../ViewPropTypes'; import warning from 'fbjs/lib/warning'; import { any, bool, func, number, string } from 'prop-types'; @@ -39,10 +39,10 @@ const TouchableWithoutFeedback = createReactClass({ mixins: [TimerMixin, Touchable.Mixin], propTypes: { - accessibilityComponentType: BaseComponentPropTypes.accessibilityComponentType, + accessibilityComponentType: ViewPropTypes.accessibilityComponentType, accessibilityLabel: string, - accessibilityRole: BaseComponentPropTypes.accessibilityRole, - accessibilityTraits: BaseComponentPropTypes.accessibilityTraits, + accessibilityRole: ViewPropTypes.accessibilityRole, + accessibilityTraits: ViewPropTypes.accessibilityTraits, accessible: bool, children: any, /** diff --git a/packages/react-native-web/src/apis/UIManager/__tests__/index-test.js b/packages/react-native-web/src/exports/UIManager/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/apis/UIManager/__tests__/index-test.js rename to packages/react-native-web/src/exports/UIManager/__tests__/index-test.js diff --git a/packages/react-native-web/src/apis/UIManager/index.js b/packages/react-native-web/src/exports/UIManager/index.js similarity index 100% rename from packages/react-native-web/src/apis/UIManager/index.js rename to packages/react-native-web/src/exports/UIManager/index.js diff --git a/packages/react-native-web/src/apis/Vibration/index.js b/packages/react-native-web/src/exports/Vibration/index.js similarity index 100% rename from packages/react-native-web/src/apis/Vibration/index.js rename to packages/react-native-web/src/exports/Vibration/index.js diff --git a/packages/react-native-web/src/components/View/ViewPropTypes.js b/packages/react-native-web/src/exports/View/ViewPropTypes.js similarity index 82% rename from packages/react-native-web/src/components/View/ViewPropTypes.js rename to packages/react-native-web/src/exports/View/ViewPropTypes.js index 923e145d..34ea7900 100644 --- a/packages/react-native-web/src/components/View/ViewPropTypes.js +++ b/packages/react-native-web/src/exports/View/ViewPropTypes.js @@ -10,11 +10,10 @@ * @flow */ -import BaseComponentPropTypes from '../../propTypes/BaseComponentPropTypes'; -import EdgeInsetsPropType, { type EdgeInsetsProp } from '../../propTypes/EdgeInsetsPropType'; -import StyleSheetPropType from '../../propTypes/StyleSheetPropType'; +import EdgeInsetsPropType, { type EdgeInsetsProp } from '../EdgeInsetsPropType'; +import StyleSheetPropType from '../../modules/StyleSheetPropType'; import ViewStylePropTypes from './ViewStylePropTypes'; -import { any, bool, func, oneOf } from 'prop-types'; +import { any, array, bool, func, oneOf, oneOfType, string } from 'prop-types'; const stylePropType = StyleSheetPropType(ViewStylePropTypes); @@ -72,10 +71,16 @@ export type ViewProps = { }; const ViewPropTypes = { - ...BaseComponentPropTypes, + accessibilityComponentType: string, + accessibilityLabel: string, + accessibilityLiveRegion: oneOf(['assertive', 'none', 'polite']), + accessibilityRole: string, + accessibilityTraits: oneOfType([array, string]), + accessible: bool, children: any, collapsable: bool, hitSlop: EdgeInsetsPropType, + importantForAccessibility: oneOf(['auto', 'no', 'no-hide-descendants', 'yes']), onClick: func, onClickCapture: func, onLayout: func, @@ -98,7 +103,8 @@ const ViewPropTypes = { onTouchStart: func, onTouchStartCapture: func, pointerEvents: oneOf(['auto', 'box-none', 'box-only', 'none']), - style: stylePropType + style: stylePropType, + testID: string }; export default ViewPropTypes; diff --git a/packages/react-native-web/src/components/View/ViewStylePropTypes.js b/packages/react-native-web/src/exports/View/ViewStylePropTypes.js similarity index 78% rename from packages/react-native-web/src/components/View/ViewStylePropTypes.js rename to packages/react-native-web/src/exports/View/ViewStylePropTypes.js index 438632f5..cc4aa371 100644 --- a/packages/react-native-web/src/components/View/ViewStylePropTypes.js +++ b/packages/react-native-web/src/exports/View/ViewStylePropTypes.js @@ -9,12 +9,12 @@ * @flow */ -import AnimationPropTypes from '../../propTypes/AnimationPropTypes'; -import BorderPropTypes from '../../propTypes/BorderPropTypes'; -import ColorPropType from '../../propTypes/ColorPropType'; -import LayoutPropTypes from '../../propTypes/LayoutPropTypes'; -import ShadowPropTypes from '../../propTypes/ShadowPropTypes'; -import TransformPropTypes from '../../propTypes/TransformPropTypes'; +import AnimationPropTypes from '../../modules/AnimationPropTypes'; +import BorderPropTypes from '../../modules/BorderPropTypes'; +import ColorPropType from '../ColorPropType'; +import LayoutPropTypes from '../../modules/LayoutPropTypes'; +import ShadowPropTypes from '../../modules/ShadowPropTypes'; +import TransformPropTypes from '../../modules/TransformPropTypes'; import { number, oneOf, oneOfType, string } from 'prop-types'; const ViewStylePropTypes = { diff --git a/packages/react-native-web/src/components/View/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/View/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/components/View/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/View/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/components/View/__tests__/index-test.js b/packages/react-native-web/src/exports/View/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/View/__tests__/index-test.js rename to packages/react-native-web/src/exports/View/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/View/index.js b/packages/react-native-web/src/exports/View/index.js similarity index 91% rename from packages/react-native-web/src/components/View/index.js rename to packages/react-native-web/src/exports/View/index.js index 657b0d0b..2b37b441 100644 --- a/packages/react-native-web/src/components/View/index.js +++ b/packages/react-native-web/src/exports/View/index.js @@ -10,9 +10,9 @@ import applyLayout from '../../modules/applyLayout'; import applyNativeMethods from '../../modules/applyNativeMethods'; import { bool } from 'prop-types'; -import createElement from '../../modules/createElement'; +import createElement from '../createElement'; import invariant from 'fbjs/lib/invariant'; -import StyleSheet from '../../apis/StyleSheet'; +import StyleSheet from '../StyleSheet'; import ViewPropTypes, { type ViewProps } from './ViewPropTypes'; import React, { Component } from 'react'; @@ -60,7 +60,10 @@ class View extends Component { const { isInAParentText } = this.context; - otherProps.style = [styles.initial, isInAParentText && styles.inline, this.props.style]; + otherProps.style = StyleSheet.compose( + styles.initial, + StyleSheet.compose(isInAParentText && styles.inline, this.props.style) + ); if (hitSlop) { const hitSlopStyle = calculateHitSlopStyle(hitSlop); diff --git a/packages/react-native-web/src/exports/ViewPropTypes/index.js b/packages/react-native-web/src/exports/ViewPropTypes/index.js new file mode 100644 index 00000000..b33cb585 --- /dev/null +++ b/packages/react-native-web/src/exports/ViewPropTypes/index.js @@ -0,0 +1,7 @@ +import ViewPropTypes, { + type ViewProps, + type ViewLayout, + type ViewLayoutEvent +} from '../View/ViewPropTypes'; +export type { ViewProps, ViewLayout, ViewLayoutEvent }; +export default ViewPropTypes; diff --git a/packages/react-native-web/src/exports/VirtualizedList/index.js b/packages/react-native-web/src/exports/VirtualizedList/index.js new file mode 100644 index 00000000..9cd4039d --- /dev/null +++ b/packages/react-native-web/src/exports/VirtualizedList/index.js @@ -0,0 +1,2 @@ +import UnimplementedView from '../../modules/UnimplementedView'; +export default UnimplementedView; diff --git a/packages/react-native-web/src/modules/createElement/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/createElement/__tests__/__snapshots__/index-test.js.snap similarity index 100% rename from packages/react-native-web/src/modules/createElement/__tests__/__snapshots__/index-test.js.snap rename to packages/react-native-web/src/exports/createElement/__tests__/__snapshots__/index-test.js.snap diff --git a/packages/react-native-web/src/modules/createElement/__tests__/index-test.js b/packages/react-native-web/src/exports/createElement/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/modules/createElement/__tests__/index-test.js rename to packages/react-native-web/src/exports/createElement/__tests__/index-test.js diff --git a/packages/react-native-web/src/modules/createElement/index.js b/packages/react-native-web/src/exports/createElement/index.js similarity index 91% rename from packages/react-native-web/src/modules/createElement/index.js rename to packages/react-native-web/src/exports/createElement/index.js index 44332c7c..72868a19 100644 --- a/packages/react-native-web/src/modules/createElement/index.js +++ b/packages/react-native-web/src/exports/createElement/index.js @@ -8,11 +8,11 @@ * @noflow */ -import '../injectResponderEventPlugin'; +import '../../modules/injectResponderEventPlugin'; -import AccessibilityUtil from '../AccessibilityUtil'; -import createDOMProps from '../createDOMProps'; -import normalizeNativeEvent from '../normalizeNativeEvent'; +import AccessibilityUtil from '../../modules/AccessibilityUtil'; +import createDOMProps from '../../modules/createDOMProps'; +import normalizeNativeEvent from '../../modules/normalizeNativeEvent'; import React from 'react'; /** diff --git a/packages/react-native-web/src/modules/findNodeHandle/index.js b/packages/react-native-web/src/exports/findNodeHandle/index.js similarity index 100% rename from packages/react-native-web/src/modules/findNodeHandle/index.js rename to packages/react-native-web/src/exports/findNodeHandle/index.js diff --git a/packages/react-native-web/src/modules/processColor/__tests__/index-test.js b/packages/react-native-web/src/exports/processColor/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/modules/processColor/__tests__/index-test.js rename to packages/react-native-web/src/exports/processColor/__tests__/index-test.js diff --git a/packages/react-native-web/src/modules/processColor/index.js b/packages/react-native-web/src/exports/processColor/index.js similarity index 100% rename from packages/react-native-web/src/modules/processColor/index.js rename to packages/react-native-web/src/exports/processColor/index.js diff --git a/packages/react-native-web/src/modules/render/index.js b/packages/react-native-web/src/exports/render/index.js similarity index 100% rename from packages/react-native-web/src/modules/render/index.js rename to packages/react-native-web/src/exports/render/index.js diff --git a/packages/react-native-web/src/modules/unmountComponentAtNode/index.js b/packages/react-native-web/src/exports/unmountComponentAtNode/index.js similarity index 100% rename from packages/react-native-web/src/modules/unmountComponentAtNode/index.js rename to packages/react-native-web/src/exports/unmountComponentAtNode/index.js diff --git a/packages/react-native-web/src/index.js b/packages/react-native-web/src/index.js index 0306dd63..e3e06ce9 100644 --- a/packages/react-native-web/src/index.js +++ b/packages/react-native-web/src/index.js @@ -1,77 +1,79 @@ -import createElement from './modules/createElement'; -import findNodeHandle from './modules/findNodeHandle'; -import NativeModules from './modules/NativeModules'; -import processColor from './modules/processColor'; -import render from './modules/render'; -import unmountComponentAtNode from './modules/unmountComponentAtNode'; +import createElement from './exports/createElement'; +import findNodeHandle from './exports/findNodeHandle'; +import processColor from './exports/processColor'; +import render from './exports/render'; +import unmountComponentAtNode from './exports/unmountComponentAtNode'; +import NativeModules from './exports/NativeModules'; +import TextPropTypes from './exports/TextPropTypes'; +import ViewPropTypes from './exports/ViewPropTypes'; // APIs -import Animated from './apis/Animated'; -import AppRegistry from './apis/AppRegistry'; -import AppState from './apis/AppState'; -import AsyncStorage from './apis/AsyncStorage'; -import BackHandler from './apis/BackHandler'; -import Clipboard from './apis/Clipboard'; -import Dimensions from './apis/Dimensions'; -import Easing from './apis/Easing'; -import I18nManager from './apis/I18nManager'; -import Keyboard from './apis/Keyboard'; -import InteractionManager from './apis/InteractionManager'; -import Linking from './apis/Linking'; -import NetInfo from './apis/NetInfo'; -import PanResponder from './apis/PanResponder'; -import PixelRatio from './apis/PixelRatio'; -import Platform from './apis/Platform'; -import StyleSheet from './apis/StyleSheet'; -import UIManager from './apis/UIManager'; -import Vibration from './apis/Vibration'; +import Animated from './exports/Animated'; +import AppRegistry from './exports/AppRegistry'; +import AppState from './exports/AppState'; +import AsyncStorage from './exports/AsyncStorage'; +import BackHandler from './exports/BackHandler'; +import Clipboard from './exports/Clipboard'; +import Dimensions from './exports/Dimensions'; +import Easing from './exports/Easing'; +import I18nManager from './exports/I18nManager'; +import Keyboard from './exports/Keyboard'; +import InteractionManager from './exports/InteractionManager'; +import Linking from './exports/Linking'; +import NetInfo from './exports/NetInfo'; +import PanResponder from './exports/PanResponder'; +import PixelRatio from './exports/PixelRatio'; +import Platform from './exports/Platform'; +import StyleSheet from './exports/StyleSheet'; +import UIManager from './exports/UIManager'; +import Vibration from './exports/Vibration'; // components -import ActivityIndicator from './components/ActivityIndicator'; -import ART from './components/ART'; -import Button from './components/Button'; -import CheckBox from './components/CheckBox'; -import FlatList from './components/FlatList'; -import Image from './components/Image'; -import ImageBackground from './components/Image/ImageBackground'; -import KeyboardAvoidingView from './components/KeyboardAvoidingView'; -import ListView from './components/ListView'; -import Modal from './components/Modal'; -import Picker from './components/Picker'; -import ProgressBar from './components/ProgressBar'; -import RefreshControl from './components/RefreshControl'; -import SafeAreaView from './components/SafeAreaView'; -import ScrollView from './components/ScrollView'; -import SectionList from './components/SectionList'; -import Slider from './components/Slider'; -import StatusBar from './components/StatusBar'; -import Switch from './components/Switch'; -import Text from './components/Text'; -import TextInput from './components/TextInput'; -import Touchable from './components/Touchable/Touchable'; -import TouchableHighlight from './components/Touchable/TouchableHighlight'; -import TouchableNativeFeedback from './components/Touchable/TouchableNativeFeedback'; -import TouchableOpacity from './components/Touchable/TouchableOpacity'; -import TouchableWithoutFeedback from './components/Touchable/TouchableWithoutFeedback'; -import View from './components/View'; -import VirtualizedList from './components/VirtualizedList'; +import ActivityIndicator from './exports/ActivityIndicator'; +import ART from './exports/ART'; +import Button from './exports/Button'; +import CheckBox from './exports/CheckBox'; +import FlatList from './exports/FlatList'; +import Image from './exports/Image'; +import ImageBackground from './exports/ImageBackground'; +import KeyboardAvoidingView from './exports/KeyboardAvoidingView'; +import ListView from './exports/ListView'; +import Modal from './exports/Modal'; +import Picker from './exports/Picker'; +import ProgressBar from './exports/ProgressBar'; +import RefreshControl from './exports/RefreshControl'; +import SafeAreaView from './exports/SafeAreaView'; +import ScrollView from './exports/ScrollView'; +import SectionList from './exports/SectionList'; +import Slider from './exports/Slider'; +import StatusBar from './exports/StatusBar'; +import Switch from './exports/Switch'; +import Text from './exports/Text'; +import TextInput from './exports/TextInput'; +import Touchable from './exports/Touchable'; +import TouchableHighlight from './exports/TouchableHighlight'; +import TouchableNativeFeedback from './exports/TouchableNativeFeedback'; +import TouchableOpacity from './exports/TouchableOpacity'; +import TouchableWithoutFeedback from './exports/TouchableWithoutFeedback'; +import View from './exports/View'; +import VirtualizedList from './exports/VirtualizedList'; // propTypes -import ColorPropType from './propTypes/ColorPropType'; -import EdgeInsetsPropType from './propTypes/EdgeInsetsPropType'; -import PointPropType from './propTypes/PointPropType'; -import TextPropTypes from './components/Text/TextPropTypes'; -import ViewPropTypes from './components/View/ViewPropTypes'; +import ColorPropType from './exports/ColorPropType'; +import EdgeInsetsPropType from './exports/EdgeInsetsPropType'; +import PointPropType from './exports/PointPropType'; export { // top-level API + createElement, findNodeHandle, render, unmountComponentAtNode, // modules - createElement, - NativeModules, processColor, + NativeModules, + TextPropTypes, + ViewPropTypes, // APIs Animated, AppRegistry, @@ -124,20 +126,20 @@ export { // propTypes ColorPropType, EdgeInsetsPropType, - PointPropType, - TextPropTypes, - ViewPropTypes + PointPropType }; const ReactNative = { // top-level API + createElement, findNodeHandle, render, unmountComponentAtNode, // modules - createElement, - NativeModules, processColor, + NativeModules, + TextPropTypes, + ViewPropTypes, // APIs Animated, AppRegistry, @@ -190,9 +192,7 @@ const ReactNative = { // propTypes ColorPropType, EdgeInsetsPropType, - PointPropType, - TextPropTypes, - ViewPropTypes + PointPropType }; export default ReactNative; diff --git a/packages/react-native-web/src/propTypes/AnimationPropTypes.js b/packages/react-native-web/src/modules/AnimationPropTypes/index.js similarity index 100% rename from packages/react-native-web/src/propTypes/AnimationPropTypes.js rename to packages/react-native-web/src/modules/AnimationPropTypes/index.js diff --git a/packages/react-native-web/src/propTypes/BorderPropTypes.js b/packages/react-native-web/src/modules/BorderPropTypes/index.js similarity index 94% rename from packages/react-native-web/src/propTypes/BorderPropTypes.js rename to packages/react-native-web/src/modules/BorderPropTypes/index.js index a7d7c247..1cab89d6 100644 --- a/packages/react-native-web/src/propTypes/BorderPropTypes.js +++ b/packages/react-native-web/src/modules/BorderPropTypes/index.js @@ -8,7 +8,7 @@ * @flow */ -import ColorPropType from './ColorPropType'; +import ColorPropType from '../../exports/ColorPropType'; import { number, oneOf, oneOfType, string } from 'prop-types'; const numberOrString = oneOfType([number, string]); diff --git a/packages/react-native-web/src/propTypes/LayoutPropTypes.js b/packages/react-native-web/src/modules/LayoutPropTypes/index.js similarity index 100% rename from packages/react-native-web/src/propTypes/LayoutPropTypes.js rename to packages/react-native-web/src/modules/LayoutPropTypes/index.js diff --git a/packages/react-native-web/src/modules/NativeMethodsMixin/index.js b/packages/react-native-web/src/modules/NativeMethodsMixin/index.js index 6b500e56..624ba991 100644 --- a/packages/react-native-web/src/modules/NativeMethodsMixin/index.js +++ b/packages/react-native-web/src/modules/NativeMethodsMixin/index.js @@ -11,10 +11,10 @@ */ import createDOMProps from '../createDOMProps'; -import findNodeHandle from '../findNodeHandle'; -import i18nStyle from '../../apis/StyleSheet/i18nStyle'; -import StyleRegistry from '../../apis/StyleSheet/registry'; -import UIManager from '../../apis/UIManager'; +import findNodeHandle from '../../exports/findNodeHandle'; +import i18nStyle from '../../exports/StyleSheet/i18nStyle'; +import StyleRegistry from '../../exports/StyleSheet/registry'; +import UIManager from '../../exports/UIManager'; const hyphenPattern = /-([a-z])/g; const toCamelCase = str => str.replace(hyphenPattern, m => m[1].toUpperCase()); diff --git a/packages/react-native-web/src/modules/ScrollResponder/index.js b/packages/react-native-web/src/modules/ScrollResponder/index.js index 72f02c44..46a319dc 100644 --- a/packages/react-native-web/src/modules/ScrollResponder/index.js +++ b/packages/react-native-web/src/modules/ScrollResponder/index.js @@ -10,12 +10,12 @@ * @flow */ -import Dimensions from '../../apis/Dimensions'; -import findNodeHandle from '../findNodeHandle'; +import Dimensions from '../../exports/Dimensions'; +import findNodeHandle from '../../exports/findNodeHandle'; import invariant from 'fbjs/lib/invariant'; -import Platform from '../../apis/Platform'; -import TextInputState from '../../components/TextInput/TextInputState'; -import UIManager from '../../apis/UIManager'; +import Platform from '../../exports/Platform'; +import TextInputState from '../TextInputState'; +import UIManager from '../../exports/UIManager'; import warning from 'fbjs/lib/warning'; /** diff --git a/packages/react-native-web/src/propTypes/ShadowPropTypes.js b/packages/react-native-web/src/modules/ShadowPropTypes/index.js similarity index 91% rename from packages/react-native-web/src/propTypes/ShadowPropTypes.js rename to packages/react-native-web/src/modules/ShadowPropTypes/index.js index 39070f5c..66e0f364 100644 --- a/packages/react-native-web/src/propTypes/ShadowPropTypes.js +++ b/packages/react-native-web/src/modules/ShadowPropTypes/index.js @@ -8,7 +8,7 @@ * @flow */ -import ColorPropType from './ColorPropType'; +import ColorPropType from '../../exports/ColorPropType'; import { number, oneOfType, shape, string } from 'prop-types'; const numberOrString = oneOfType([number, string]); diff --git a/packages/react-native-web/src/components/StaticContainer/__tests__/index-test.js b/packages/react-native-web/src/modules/StaticContainer/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/StaticContainer/__tests__/index-test.js rename to packages/react-native-web/src/modules/StaticContainer/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/StaticContainer/index.js b/packages/react-native-web/src/modules/StaticContainer/index.js similarity index 100% rename from packages/react-native-web/src/components/StaticContainer/index.js rename to packages/react-native-web/src/modules/StaticContainer/index.js diff --git a/packages/react-native-web/src/components/StaticRenderer/__tests__/index-test.js b/packages/react-native-web/src/modules/StaticRenderer/__tests__/index-test.js similarity index 100% rename from packages/react-native-web/src/components/StaticRenderer/__tests__/index-test.js rename to packages/react-native-web/src/modules/StaticRenderer/__tests__/index-test.js diff --git a/packages/react-native-web/src/components/StaticRenderer/index.js b/packages/react-native-web/src/modules/StaticRenderer/index.js similarity index 100% rename from packages/react-native-web/src/components/StaticRenderer/index.js rename to packages/react-native-web/src/modules/StaticRenderer/index.js diff --git a/packages/react-native-web/src/propTypes/StyleSheetPropType.js b/packages/react-native-web/src/modules/StyleSheetPropType/index.js similarity index 87% rename from packages/react-native-web/src/propTypes/StyleSheetPropType.js rename to packages/react-native-web/src/modules/StyleSheetPropType/index.js index 0e1b661e..4582e568 100644 --- a/packages/react-native-web/src/propTypes/StyleSheetPropType.js +++ b/packages/react-native-web/src/modules/StyleSheetPropType/index.js @@ -10,8 +10,8 @@ */ function StyleSheetPropType(shape: { [key: string]: ReactPropsCheckType }): ReactPropsCheckType { - const createStrictShapeTypeChecker = require('./createStrictShapeTypeChecker').default; - const StyleSheet = require('../apis/StyleSheet').default; + const createStrictShapeTypeChecker = require('../createStrictShapeTypeChecker').default; + const StyleSheet = require('../../exports/StyleSheet').default; const shapePropType = createStrictShapeTypeChecker(shape); return function(props, propName, componentName, location?, ...rest) { diff --git a/packages/react-native-web/src/components/TextInput/TextInputState.js b/packages/react-native-web/src/modules/TextInputState/index.js similarity index 97% rename from packages/react-native-web/src/components/TextInput/TextInputState.js rename to packages/react-native-web/src/modules/TextInputState/index.js index e0505fca..2f2b160d 100644 --- a/packages/react-native-web/src/components/TextInput/TextInputState.js +++ b/packages/react-native-web/src/modules/TextInputState/index.js @@ -10,7 +10,7 @@ * @flow */ -import UIManager from '../../apis/UIManager'; +import UIManager from '../../exports/UIManager'; /** * This class is responsible for coordinating the "focused" diff --git a/packages/react-native-web/src/propTypes/TransformPropTypes.js b/packages/react-native-web/src/modules/TransformPropTypes/index.js similarity index 100% rename from packages/react-native-web/src/propTypes/TransformPropTypes.js rename to packages/react-native-web/src/modules/TransformPropTypes/index.js diff --git a/packages/react-native-web/src/components/UnimplementedView/index.js b/packages/react-native-web/src/modules/UnimplementedView/index.js similarity index 96% rename from packages/react-native-web/src/components/UnimplementedView/index.js rename to packages/react-native-web/src/modules/UnimplementedView/index.js index bf5bd47c..2b44f8e9 100644 --- a/packages/react-native-web/src/components/UnimplementedView/index.js +++ b/packages/react-native-web/src/modules/UnimplementedView/index.js @@ -10,7 +10,7 @@ * @flow */ -import View from '../View'; +import View from '../../exports/View'; import React, { Component } from 'react'; /** diff --git a/packages/react-native-web/src/modules/createDOMProps/index.js b/packages/react-native-web/src/modules/createDOMProps/index.js index 4cfe53b2..de9da571 100644 --- a/packages/react-native-web/src/modules/createDOMProps/index.js +++ b/packages/react-native-web/src/modules/createDOMProps/index.js @@ -9,8 +9,8 @@ */ import AccessibilityUtil from '../AccessibilityUtil'; -import StyleSheet from '../../apis/StyleSheet'; -import StyleRegistry from '../../apis/StyleSheet/registry'; +import StyleSheet from '../../exports/StyleSheet'; +import StyleRegistry from '../../exports/StyleSheet/registry'; const emptyObject = {}; diff --git a/packages/react-native-web/src/propTypes/createStrictShapeTypeChecker.js b/packages/react-native-web/src/modules/createStrictShapeTypeChecker/index.js similarity index 100% rename from packages/react-native-web/src/propTypes/createStrictShapeTypeChecker.js rename to packages/react-native-web/src/modules/createStrictShapeTypeChecker/index.js diff --git a/packages/react-native-web/src/modules/dismissKeyboard/index.js b/packages/react-native-web/src/modules/dismissKeyboard/index.js index 0faed4d2..c527f503 100644 --- a/packages/react-native-web/src/modules/dismissKeyboard/index.js +++ b/packages/react-native-web/src/modules/dismissKeyboard/index.js @@ -9,7 +9,7 @@ * @flow */ -import TextInputState from '../../components/TextInput/TextInputState'; +import TextInputState from '../TextInputState'; const dismissKeyboard = () => { TextInputState.blurTextInput(TextInputState.currentlyFocusedField()); diff --git a/packages/react-native-web/src/components/Touchable/ensureComponentIsNative.js b/packages/react-native-web/src/modules/ensureComponentIsNative/index.js similarity index 100% rename from packages/react-native-web/src/components/Touchable/ensureComponentIsNative.js rename to packages/react-native-web/src/modules/ensureComponentIsNative/index.js diff --git a/packages/react-native-web/src/propTypes/BaseComponentPropTypes.js b/packages/react-native-web/src/propTypes/BaseComponentPropTypes.js deleted file mode 100644 index 9b0ab3a9..00000000 --- a/packages/react-native-web/src/propTypes/BaseComponentPropTypes.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) 2015-present, Nicolas Gallagher. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow - */ - -import { array, bool, number, object, oneOf, oneOfType, string } from 'prop-types'; - -const BaseComponentPropTypes = { - accessibilityLabel: string, - accessibilityLiveRegion: oneOf(['assertive', 'none', 'polite']), - accessibilityRole: string, - accessible: bool, - importantForAccessibility: oneOf(['auto', 'no', 'no-hide-descendants', 'yes']), - style: oneOfType([array, number, object]), - testID: string, - // compatibility with React Native - accessibilityComponentType: string, - accessibilityTraits: oneOfType([array, string]) -}; - -export default BaseComponentPropTypes; diff --git a/packages/react-native-web/src/vendor/Animated/AnimatedEvent.js b/packages/react-native-web/src/vendor/Animated/AnimatedEvent.js index 2521ee3c..126edf8d 100644 --- a/packages/react-native-web/src/vendor/Animated/AnimatedEvent.js +++ b/packages/react-native-web/src/vendor/Animated/AnimatedEvent.js @@ -14,7 +14,7 @@ const AnimatedValue = require('./nodes/AnimatedValue'); const NativeAnimatedHelper = require('./NativeAnimatedHelper'); -const findNodeHandle = require('../../modules/findNodeHandle').default; +const findNodeHandle = require('../../exports/findNodeHandle').default; const invariant = require('fbjs/lib/invariant'); const {shouldUseNativeDriver} = require('./NativeAnimatedHelper'); diff --git a/packages/react-native-web/src/vendor/Animated/NativeAnimatedHelper.js b/packages/react-native-web/src/vendor/Animated/NativeAnimatedHelper.js index 9ba6ab54..3e90cd3a 100644 --- a/packages/react-native-web/src/vendor/Animated/NativeAnimatedHelper.js +++ b/packages/react-native-web/src/vendor/Animated/NativeAnimatedHelper.js @@ -13,7 +13,7 @@ 'use strict'; const invariant = require('fbjs/lib/invariant'); -const NativeModules = require('../../modules/NativeModules'); +const NativeModules = require('../../exports/NativeModules'); const NativeEventEmitter = require('../../modules/NativeEventEmitter'); import type {AnimationConfig} from './animations/Animation'; diff --git a/packages/react-native-web/src/vendor/Animated/createAnimatedComponent.js b/packages/react-native-web/src/vendor/Animated/createAnimatedComponent.js index 6a424f2a..435b14b5 100644 --- a/packages/react-native-web/src/vendor/Animated/createAnimatedComponent.js +++ b/packages/react-native-web/src/vendor/Animated/createAnimatedComponent.js @@ -15,7 +15,7 @@ const {AnimatedEvent} = require('./AnimatedEvent'); const AnimatedProps = require('./nodes/AnimatedProps'); const React = require('react'); -const ViewStylePropTypes = require('../../components/View/ViewStylePropTypes').default; +const ViewStylePropTypes = require('../../exports/View/ViewStylePropTypes').default; function createAnimatedComponent(Component: any): any { class AnimatedComponent extends React.Component { diff --git a/packages/react-native-web/src/vendor/Animated/nodes/AnimatedProps.js b/packages/react-native-web/src/vendor/Animated/nodes/AnimatedProps.js index 6396d3a1..5d9c2b96 100644 --- a/packages/react-native-web/src/vendor/Animated/nodes/AnimatedProps.js +++ b/packages/react-native-web/src/vendor/Animated/nodes/AnimatedProps.js @@ -16,7 +16,7 @@ const {AnimatedEvent} = require('../AnimatedEvent'); const AnimatedNode = require('./AnimatedNode'); const AnimatedStyle = require('./AnimatedStyle'); const NativeAnimatedHelper = require('../NativeAnimatedHelper'); -const findNodeHandle = require('../../../modules/findNodeHandle').default; +const findNodeHandle = require('../../../exports/findNodeHandle').default; const invariant = require('fbjs/lib/invariant'); diff --git a/packages/react-native-web/src/vendor/Animated/nodes/AnimatedStyle.js b/packages/react-native-web/src/vendor/Animated/nodes/AnimatedStyle.js index 5e0fc354..a3c38cca 100644 --- a/packages/react-native-web/src/vendor/Animated/nodes/AnimatedStyle.js +++ b/packages/react-native-web/src/vendor/Animated/nodes/AnimatedStyle.js @@ -16,8 +16,9 @@ const AnimatedNode = require('./AnimatedNode'); const AnimatedTransform = require('./AnimatedTransform'); const AnimatedWithChildren = require('./AnimatedWithChildren'); const NativeAnimatedHelper = require('../NativeAnimatedHelper'); +const StyleSheet = require('../../../exports/StyleSheet').default; -const flattenStyle = require('../../../apis/StyleSheet/flattenStyle').default; +const flattenStyle = StyleSheet.flatten; class AnimatedStyle extends AnimatedWithChildren { _style: Object; diff --git a/packages/react-native-web/src/vendor/Animated/nodes/AnimatedValue.js b/packages/react-native-web/src/vendor/Animated/nodes/AnimatedValue.js index b0e9e0c5..afe92adf 100644 --- a/packages/react-native-web/src/vendor/Animated/nodes/AnimatedValue.js +++ b/packages/react-native-web/src/vendor/Animated/nodes/AnimatedValue.js @@ -15,7 +15,7 @@ const AnimatedInterpolation = require('./AnimatedInterpolation'); const AnimatedNode = require('./AnimatedNode'); const AnimatedWithChildren = require('./AnimatedWithChildren'); -const InteractionManager = require('../../../apis/InteractionManager').default; +const InteractionManager = require('../../../exports/InteractionManager').default; const NativeAnimatedHelper = require('../NativeAnimatedHelper'); import type Animation, {EndCallback} from '../animations/Animation'; diff --git a/packages/react-native-web/src/vendor/PanResponder/index.js b/packages/react-native-web/src/vendor/PanResponder/index.js index 9fcf730f..3c6aad7a 100644 --- a/packages/react-native-web/src/vendor/PanResponder/index.js +++ b/packages/react-native-web/src/vendor/PanResponder/index.js @@ -11,7 +11,7 @@ 'use strict'; -const InteractionManager = require('../../apis/InteractionManager').default; +const InteractionManager = require('../../exports/InteractionManager').default; const TouchHistoryMath = require('../TouchHistoryMath'); const currentCentroidXOfTouchesChangedAfter = TouchHistoryMath.currentCentroidXOfTouchesChangedAfter;