Fix imports from React and React Native modules.

artsy · May 25, 2016 · a9a51d9 · a9a51d9
1 parent 22e3fc7
commit a9a51d9
Show file tree

Hide file tree

Showing 29 changed files with 73 additions and 66 deletions.
diff --git a/lib/app_registry.js b/lib/app_registry.js
@@ -1,7 +1,8 @@
 'use strict';
 
-import React from 'react-native';
-import Relay from 'react-relay';
+import React from 'react';
+import { AppRegistry, Text } from 'react-native';
+import { RootContainer } from 'react-relay';
 
 import Spinner from './components/spinner';
 import Containers from './containers';
@@ -12,7 +13,7 @@ class Artist extends React.Component {
     const artistRoute = new Routes.Artist({ artistID: this.props.artistID });
 
     // https://facebook.github.io/relay/docs/guides-root-container.html
-    return (<Relay.RootContainer
+    return (<RootContainer
              Component={Containers.Artist}
              route={artistRoute}
              renderLoading={() => {
@@ -25,4 +26,4 @@ class Artist extends React.Component {
   }
 }
 
-React.AppRegistry.registerComponent('Artist', () => Artist);
+AppRegistry.registerComponent('Artist', () => Artist);
diff --git a/lib/components/artist/about.js b/lib/components/artist/about.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, StyleSheet } = React;
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
 
 import Biography from './biography';
 import Articles from './articles';

diff --git a/lib/components/artist/articles/article.js b/lib/components/artist/articles/article.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { ScrollView, StyleSheet, View, Text, TouchableWithoutFeedback } = React;
+import React from 'react';
+import { ScrollView, StyleSheet, View, Text, TouchableWithoutFeedback } from 'react-native';
 
 import colors from '../../../../data/colors';
 import SerifText from '../../text/serif';

diff --git a/lib/components/artist/articles/index.js b/lib/components/artist/articles/index.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { ScrollView, StyleSheet, View } = React;
+import React from 'react';
+import { ScrollView, StyleSheet, View } from 'react-native';
 
 import colors from '../../../../data/colors';
 import SerifText from '../../text/serif';

diff --git a/lib/components/artist/artworks/artwork.js b/lib/components/artist/artworks/artwork.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { Text, View, StyleSheet, TouchableWithoutFeedback } = React;
+import React from 'react';
+import { Text, View, StyleSheet, TouchableWithoutFeedback } from 'react-native';
 
 import ImageView from '../../opaque_image_view';
 import SerifText from '../../text/serif';

diff --git a/lib/components/artist/artworks/grid.js b/lib/components/artist/artworks/grid.js
@@ -9,8 +9,8 @@
 // 4. Update height of grid to encompass all items.
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { Dimensions, View, ScrollView, StyleSheet } = React;
+import React from 'react';
+import { Dimensions, View, ScrollView, StyleSheet } from 'react-native';
 
 import Artwork from './artwork';
 import Spinner from '../../spinner';

diff --git a/lib/components/artist/artworks/index.js b/lib/components/artist/artworks/index.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { Text, View, StyleSheet } = React;
+import React from 'react';
+import { Text, View, StyleSheet } from 'react-native';
 
 import Separator from '../../separator'
 import SerifText from '../../text/serif';

diff --git a/lib/components/artist/biography.js b/lib/components/artist/biography.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, Text, Dimensions } = React;
+import React from 'react';
+import { View, Text, Dimensions } from 'react-native';
 
 import removeMarkdown from 'remove-markdown';
 

diff --git a/lib/components/artist/header.js b/lib/components/artist/header.js
@@ -6,9 +6,9 @@
 // * Fix label that includes birthday is it’s unknown, e.g. banksy
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { StyleSheet, View, Text, TouchableHighlight } = React;
-const { ARTemporaryAPIModule } = React.NativeModules;
+import React from 'react';
+import { NativeModules, StyleSheet, View, Text, TouchableHighlight } from 'react-native';
+const { ARTemporaryAPIModule } = NativeModules;
 
 import colors from '../../../data/colors';
 import InvertedButton from '../buttons/inverted_button';

diff --git a/lib/components/artist/related_artists/index.js b/lib/components/artist/related_artists/index.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { ScrollView, StyleSheet, View } = React;
+import React from 'react';
+import { ScrollView, StyleSheet, View } from 'react-native';
 
 import colors from '../../../../data/colors';
 import SerifText from '../../text/serif';

diff --git a/lib/components/artist/related_artists/related_artist.js b/lib/components/artist/related_artists/related_artist.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { ScrollView, StyleSheet, View, Text, TouchableWithoutFeedback, Dimensions } = React;
+import React from 'react';
+import { ScrollView, StyleSheet, View, Text, TouchableWithoutFeedback, Dimensions } from 'react-native';
 
 import colors from '../../../../data/colors';
 import SerifText from '../../text/serif';

diff --git a/lib/components/artist/shows/index.js b/lib/components/artist/shows/index.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, Text, StyleSheet, Dimensions } = React;
+import React from 'react';
+import { View, Text, StyleSheet, Dimensions } from 'react-native';
 
 import SerifText from '../../text/serif'
 import Separator from '../../separator'

diff --git a/lib/components/artist/shows/large_image_show.js b/lib/components/artist/shows/large_image_show.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, Text, StyleSheet, Dimensions, TouchableWithoutFeedback } = React;
+import React from 'react';
+import { View, Text, StyleSheet, Dimensions, TouchableWithoutFeedback } from 'react-native';
 
 import Headline from '../../text/headline'
 import SerifText from '../../text/serif'

diff --git a/lib/components/artist/shows/large_list.js b/lib/components/artist/shows/large_list.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, StyleSheet } = React;
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
 
 import LargeImageShow from './large_image_show'
 

diff --git a/lib/components/artist/shows/medium_image_show.js b/lib/components/artist/shows/medium_image_show.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, Text, StyleSheet, Dimensions, TouchableWithoutFeedback } = React;
+import React from 'react';
+import { View, Text, StyleSheet, Dimensions, TouchableWithoutFeedback } from 'react-native';
 
 import Headline from '../../text/headline'
 import SerifText from '../../text/serif'

diff --git a/lib/components/artist/shows/medium_list.js b/lib/components/artist/shows/medium_list.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, StyleSheet } = React;
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
 
 import MediumImageShow from './medium_image_show'
 

diff --git a/lib/components/artist/shows/metadata.js b/lib/components/artist/shows/metadata.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, Text, StyleSheet } = React;
+import React from 'react';
+import { View, Text, StyleSheet } from 'react-native';
 
 import colors from '../../../../data/colors';
 import SerifText from '../../text/serif'

diff --git a/lib/components/artist/shows/small_image_show.js b/lib/components/artist/shows/small_image_show.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, TouchableWithoutFeedback, StyleSheet } = React;
+import React from 'react';
+import { View, TouchableWithoutFeedback, StyleSheet } from 'react-native';
 
 import OpaqueImageView from '../../opaque_image_view'
 import ShowMetadata from './metadata'

diff --git a/lib/components/artist/shows/small_list.js b/lib/components/artist/shows/small_list.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { View, StyleSheet, ListView } = React;
+import React from 'react';
+import { View, StyleSheet, ListView } from 'react-native';
 
 import Headline from '../../text/headline'
 import SerifText from '../../text/serif'

diff --git a/lib/components/buttons/inverted_button.js b/lib/components/buttons/inverted_button.js
@@ -1,8 +1,8 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
-const { StyleSheet, TouchableHighlight, View, Dimensions } = React;
+import React from 'react';
+import { StyleSheet, TouchableHighlight, View, Dimensions } from 'react-native';
 
 import Headline from '../text/headline';
 import colors from '../../../data/colors';

diff --git a/lib/components/opaque_image_view.js b/lib/components/opaque_image_view.js
@@ -1,8 +1,14 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
-const { PixelRatio, StyleSheet } = React;
+import React from 'react';
+import {
+  processColor,
+  requireNativeComponent,
+  ColorPropType,
+  PixelRatio,
+  StyleSheet
+} from 'react-native';
 
 import colors from '../../data/colors';
 
@@ -45,7 +51,7 @@ export default class OpaqueImageView extends React.Component {
       imageURL: isLaidOut ? this.imageURL() : null,
       onLayout: isLaidOut ? null : this.onLayout.bind(this),
     });
-    return <NativeOpaqueImageView placeholderBackgroundColor={React.processColor(placeholderBackgroundColor)} style={style} {...props} />;
+    return <NativeOpaqueImageView placeholderBackgroundColor={processColor(placeholderBackgroundColor)} style={style} {...props} />;
   }
 }
 
@@ -70,11 +76,11 @@ OpaqueImageView.propTypes = {
    */
   onLoad: React.PropTypes.func,
 
-  placeholderBackgroundColor: React.ColorPropType,
+  placeholderBackgroundColor: ColorPropType,
 };
 
 OpaqueImageView.defaultProps = {
   placeholderBackgroundColor: colors['gray-regular'],
 };
 
-const NativeOpaqueImageView = React.requireNativeComponent('AROpaqueImageView', OpaqueImageView);
+const NativeOpaqueImageView = requireNativeComponent('AROpaqueImageView', OpaqueImageView);
diff --git a/lib/components/separator.js b/lib/components/separator.js
@@ -1,8 +1,8 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
-const { StyleSheet, View, Dimensions } = React;
+import React from 'react';
+import { StyleSheet, View, Dimensions } from 'react-native';
 
 import colors from '../../data/colors';
 

diff --git a/lib/components/spinner.js b/lib/components/spinner.js
@@ -1,8 +1,8 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
-const { View, StyleSheet } = React;
+import React from 'react';
+import { requireNativeComponent, View, StyleSheet } from 'react-native';
 
 export default class Spinner extends React.Component {
   render() {
@@ -28,4 +28,4 @@ const styles = StyleSheet.create({
 // Only needed so React doesn’t complain about ARSpinner not havig any propTypes.
 Spinner.propTypes = {};
 
-const NativeSpinner = React.requireNativeComponent('ARSpinner', Spinner);
+const NativeSpinner = requireNativeComponent('ARSpinner', Spinner);
diff --git a/lib/components/switch_view.js b/lib/components/switch_view.js
@@ -1,7 +1,8 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
+import React from 'react';
+import { requireNativeComponent } from 'react-native';
 
 export default class SwitchView extends React.Component {
   render() {
@@ -16,7 +17,7 @@ SwitchView.propTypes = {
   onSelectionChange: React.PropTypes.func.isRequired,
 };
 
-const NativeSwitchView = React.requireNativeComponent('ARSwitchView', SwitchView);
+const NativeSwitchView = requireNativeComponent('ARSwitchView', SwitchView);
 
 export type SwitchEvent = {
   nativeEvent: {

diff --git a/lib/components/tab_view.js b/lib/components/tab_view.js
@@ -1,8 +1,8 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
-const { StyleSheet, View, Dimensions } = React;
+import React from 'react';
+import { StyleSheet, View, Dimensions } from 'react-native';
 
 import SwitchView from './switch_view';
 import type SwitchEvent from './switch_view';

diff --git a/lib/components/text/headline.js b/lib/components/text/headline.js
@@ -1,8 +1,8 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
-const { StyleSheet, Text } = React;
+import React from 'react';
+import { StyleSheet, Text } from 'react-native';
 
 export default class Headline extends React.Component {
   render() {

diff --git a/lib/components/text/serif.js b/lib/components/text/serif.js
@@ -1,8 +1,8 @@
 /* @flow */
 'use strict';
 
-import React from 'react-native';
-const { StyleSheet, Text } = React;
+import React from 'react';
+import { StyleSheet, Text } from 'react-native';
 
 export default class Serif extends React.Component {
   render() {

diff --git a/lib/containers/artist.js b/lib/containers/artist.js
@@ -2,8 +2,8 @@
 'use strict';
 
 import Relay from 'react-relay';
-import React from 'react-native';
-const { ScrollView, View, Dimensions } = React;
+import React from 'react';
+import { ScrollView, View, Dimensions } from 'react-native';
 
 import Header from '../components/artist/header';
 import About from '../components/artist/about';

diff --git a/lib/modules/switch_board.js b/lib/modules/switch_board.js
@@ -1,8 +1,7 @@
 'use strict';
 
-import React from 'react-native';
-const { findNodeHandle } = React;
-const { ARSwitchBoardModule } = React.NativeModules;
+import { findNodeHandle, NativeModules } from 'react-native';
+const { ARSwitchBoardModule } = NativeModules;
 
 function presentNavigationViewController(component, route) {
   ARSwitchBoardModule.presentNavigationViewController(findNodeHandle(component), route);