From e70cdf0cc1e931b80ea856ceb56eb6287de4c4d7 Mon Sep 17 00:00:00 2001 From: Spencer Ahrens Date: Wed, 1 Mar 2017 17:52:52 -0800 Subject: [PATCH] add to RN OSS package. Summary: Also fix some bugs with fbjs requires. Reviewed By: mkonicek Differential Revision: D4635805 fbshipit-source-id: b0663b727632fe5784f1caa1ff20b160a82a3931 --- Examples/UIExplorer/js/FlatListExample.js | 2 +- Examples/UIExplorer/js/MultiColumnExample.js | 2 +- Examples/UIExplorer/js/SectionListExample.js | 2 +- Libraries/CustomComponents/Lists/FlatList.js | 2 +- Libraries/CustomComponents/Lists/ViewabilityHelper.js | 2 +- Libraries/CustomComponents/Lists/VirtualizeUtils.js | 2 +- Libraries/CustomComponents/Lists/VirtualizedSectionList.js | 4 ++-- .../Lists/__tests__/ViewabilityHelper-test.js | 1 + Libraries/react-native/react-native-implementation.js | 3 +++ 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Examples/UIExplorer/js/FlatListExample.js b/Examples/UIExplorer/js/FlatListExample.js index 0871e7374..5e422a9a4 100644 --- a/Examples/UIExplorer/js/FlatListExample.js +++ b/Examples/UIExplorer/js/FlatListExample.js @@ -26,11 +26,11 @@ const React = require('react'); const ReactNative = require('react-native'); const { + FlatList, StyleSheet, View, } = ReactNative; -const FlatList = require('FlatList'); const UIExplorerPage = require('./UIExplorerPage'); const infoLog = require('infoLog'); diff --git a/Examples/UIExplorer/js/MultiColumnExample.js b/Examples/UIExplorer/js/MultiColumnExample.js index d682c2d41..806b6a731 100644 --- a/Examples/UIExplorer/js/MultiColumnExample.js +++ b/Examples/UIExplorer/js/MultiColumnExample.js @@ -26,12 +26,12 @@ const React = require('react'); const ReactNative = require('react-native'); const { + FlatList, StyleSheet, Text, View, } = ReactNative; -const FlatList = require('FlatList'); const UIExplorerPage = require('./UIExplorerPage'); const infoLog = require('infoLog'); diff --git a/Examples/UIExplorer/js/SectionListExample.js b/Examples/UIExplorer/js/SectionListExample.js index 41d3279f7..fb7a38574 100644 --- a/Examples/UIExplorer/js/SectionListExample.js +++ b/Examples/UIExplorer/js/SectionListExample.js @@ -26,12 +26,12 @@ const React = require('react'); const ReactNative = require('react-native'); const { + SectionList, StyleSheet, Text, View, } = ReactNative; -const SectionList = require('SectionList'); const UIExplorerPage = require('./UIExplorerPage'); const infoLog = require('infoLog'); diff --git a/Libraries/CustomComponents/Lists/FlatList.js b/Libraries/CustomComponents/Lists/FlatList.js index aac931077..bea61eaa0 100644 --- a/Libraries/CustomComponents/Lists/FlatList.js +++ b/Libraries/CustomComponents/Lists/FlatList.js @@ -37,7 +37,7 @@ const React = require('React'); const View = require('View'); const VirtualizedList = require('VirtualizedList'); -const invariant = require('invariant'); +const invariant = require('fbjs/lib/invariant'); import type {StyleObj} from 'StyleSheetTypes'; import type {ViewabilityConfig, ViewToken} from 'ViewabilityHelper'; diff --git a/Libraries/CustomComponents/Lists/ViewabilityHelper.js b/Libraries/CustomComponents/Lists/ViewabilityHelper.js index ef2b73a9e..b75bc2578 100644 --- a/Libraries/CustomComponents/Lists/ViewabilityHelper.js +++ b/Libraries/CustomComponents/Lists/ViewabilityHelper.js @@ -11,7 +11,7 @@ */ 'use strict'; -const invariant = require('invariant'); +const invariant = require('fbjs/lib/invariant'); export type ViewToken = {item: any, key: string, index: ?number, isViewable: boolean, section?: any}; diff --git a/Libraries/CustomComponents/Lists/VirtualizeUtils.js b/Libraries/CustomComponents/Lists/VirtualizeUtils.js index c366cc80a..e03fa4dd7 100644 --- a/Libraries/CustomComponents/Lists/VirtualizeUtils.js +++ b/Libraries/CustomComponents/Lists/VirtualizeUtils.js @@ -11,7 +11,7 @@ */ 'use strict'; -const invariant = require('invariant'); +const invariant = require('fbjs/lib/invariant'); /** * Used to find the indices of the frames that overlap the given offsets. Useful for finding the diff --git a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js index c0bacd3c8..84ec2c2c3 100644 --- a/Libraries/CustomComponents/Lists/VirtualizedSectionList.js +++ b/Libraries/CustomComponents/Lists/VirtualizedSectionList.js @@ -36,8 +36,8 @@ const React = require('React'); const View = require('View'); const VirtualizedList = require('VirtualizedList'); -const invariant = require('invariant'); -const warning = require('warning'); +const invariant = require('fbjs/lib/invariant'); +const warning = require('fbjs/lib/warning'); import type {ViewToken} from 'ViewabilityHelper'; import type {Props as VirtualizedListProps} from 'VirtualizedList'; diff --git a/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js index 9d7876f49..cd8e2fdef 100644 --- a/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js +++ b/Libraries/CustomComponents/Lists/__tests__/ViewabilityHelper-test.js @@ -10,6 +10,7 @@ 'use strict'; jest.unmock('ViewabilityHelper'); + const ViewabilityHelper = require('ViewabilityHelper'); let rowFrames; diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js index 0c5f44e4c..1ee23e0fa 100644 --- a/Libraries/react-native/react-native-implementation.js +++ b/Libraries/react-native/react-native-implementation.js @@ -34,6 +34,7 @@ const ReactNative = { get Button() { return require('Button'); }, get DatePickerIOS() { return require('DatePickerIOS'); }, get DrawerLayoutAndroid() { return require('DrawerLayoutAndroid'); }, + get FlatList() { return require('FlatList'); }, get Image() { return require('Image'); }, get ImageEditor() { return require('ImageEditor'); }, get ImageStore() { return require('ImageStore'); }, @@ -48,6 +49,7 @@ const ReactNative = { get ProgressBarAndroid() { return require('ProgressBarAndroid'); }, get ProgressViewIOS() { return require('ProgressViewIOS'); }, get ScrollView() { return require('ScrollView'); }, + get SectionList() { return require('SectionList'); }, get SegmentedControlIOS() { return require('SegmentedControlIOS'); }, get Slider() { return require('Slider'); }, get SnapshotViewIOS() { return require('SnapshotViewIOS'); }, @@ -67,6 +69,7 @@ const ReactNative = { get TouchableWithoutFeedback() { return require('TouchableWithoutFeedback'); }, get View() { return require('View'); }, get ViewPagerAndroid() { return require('ViewPagerAndroid'); }, + get VirtualizedList() { return require('VirtualizedList'); }, get WebView() { return require('WebView'); }, // APIs