diff --git a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js index 071ee6cdf6e..5bbe37f0a0b 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js @@ -46,12 +46,10 @@ type State = {| * A container component that renders multiple SwipeableRow's in a FlatList * implementation. This is designed to be a drop-in replacement for the * standard React Native `FlatList`, so use it as if it were a FlatList, but - * with extra props, i.e. - * - * + * with extra props. * * SwipeableRow can be used independently of this component, but the main - * benefit of using this component is + * benefits of using this component are: * * - It ensures that at most 1 row is swiped open (auto closes others) * - It can bounce the 1st row of the list so users know it's swipeable diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListView.js b/Libraries/Experimental/SwipeableRow/SwipeableListView.js deleted file mode 100644 index 3189b728a79..00000000000 --- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js +++ /dev/null @@ -1,244 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - * @flow - */ - -'use strict'; - -const ListView = require('ListView'); -const React = require('React'); -const SwipeableListViewDataSource = require('SwipeableListViewDataSource'); -const SwipeableRow = require('SwipeableRow'); - -type ListViewProps = React.ElementConfig; - -type Props = $ReadOnly<{| - ...ListViewProps, - - /** - * To alert the user that swiping is possible, the first row can bounce - * on component mount. - */ - bounceFirstRowOnMount: boolean, - /** - * Use `SwipeableListView.getNewDataSource()` to get a data source to use, - * then use it just like you would a normal ListView data source - */ - dataSource: SwipeableListViewDataSource, - /** - * Maximum distance to open to after a swipe - */ - maxSwipeDistance: - | number - | ((rowData: Object, sectionID: string, rowID: string) => number), - onScroll?: ?Function, - /** - * Callback method to render the swipeable view - */ - renderRow: ( - rowData: Object, - sectionID: string, - rowID: string, - ) => React.Element, - /** - * Callback method to render the view that will be unveiled on swipe - */ - renderQuickActions: ( - rowData: Object, - sectionID: string, - rowID: string, - ) => ?React.Element, -|}>; - -type State = {| - dataSource: Object, -|}; - -/** - * A container component that renders multiple SwipeableRow's in a ListView - * implementation. This is designed to be a drop-in replacement for the - * standard React Native `ListView`, so use it as if it were a ListView, but - * with extra props, i.e. - * - * let ds = SwipeableListView.getNewDataSource(); - * ds.cloneWithRowsAndSections(dataBlob, ?sectionIDs, ?rowIDs); - * // .. - * - * - * SwipeableRow can be used independently of this component, but the main - * benefit of using this component is - * - * - It ensures that at most 1 row is swiped open (auto closes others) - * - It can bounce the 1st row of the list so users know it's swipeable - * - More to come - */ -class SwipeableListView extends React.Component { - props: Props; - state: State; - - _listViewRef: ?React.Element = null; - _shouldBounceFirstRowOnMount: boolean = false; - - static getNewDataSource(): Object { - return new SwipeableListViewDataSource({ - getRowData: (data, sectionID, rowID) => data[sectionID][rowID], - getSectionHeaderData: (data, sectionID) => data[sectionID], - rowHasChanged: (row1, row2) => row1 !== row2, - sectionHeaderHasChanged: (s1, s2) => s1 !== s2, - }); - } - - static defaultProps = { - bounceFirstRowOnMount: false, - renderQuickActions: () => null, - }; - - constructor(props: Props, context: any): void { - super(props, context); - - this._shouldBounceFirstRowOnMount = this.props.bounceFirstRowOnMount; - this.state = { - dataSource: this.props.dataSource, - }; - } - - UNSAFE_componentWillReceiveProps(nextProps: Props): void { - if ( - this.state.dataSource.getDataSource() !== - nextProps.dataSource.getDataSource() - ) { - this.setState({ - dataSource: nextProps.dataSource, - }); - } - } - - render(): React.Node { - return ( - // $FlowFixMe Found when typing ListView - { - // $FlowFixMe Found when typing ListView - this._listViewRef = ref; - }} - dataSource={this.state.dataSource.getDataSource()} - onScroll={this._onScroll} - renderRow={this._renderRow} - /> - ); - } - - _onScroll = (e): void => { - // Close any opens rows on ListView scroll - if (this.props.dataSource.getOpenRowID()) { - this.setState({ - dataSource: this.state.dataSource.setOpenRowID(null), - }); - } - this.props.onScroll && this.props.onScroll(e); - }; - - /** - * This is a work-around to lock vertical `ListView` scrolling on iOS and - * mimic Android behaviour. Locking vertical scrolling when horizontal - * scrolling is active allows us to significantly improve framerates - * (from high 20s to almost consistently 60 fps) - */ - _setListViewScrollable(value: boolean): void { - if ( - this._listViewRef && - /* $FlowFixMe(>=0.68.0 site=react_native_fb) This comment suppresses an - * error found when Flow v0.68 was deployed. To see the error delete this - * comment and run Flow. */ - typeof this._listViewRef.setNativeProps === 'function' - ) { - this._listViewRef.setNativeProps({ - scrollEnabled: value, - }); - } - } - - // Passing through ListView's getScrollResponder() function - getScrollResponder(): ?Object { - if ( - this._listViewRef && - /* $FlowFixMe(>=0.68.0 site=react_native_fb) This comment suppresses an - * error found when Flow v0.68 was deployed. To see the error delete this - * comment and run Flow. */ - typeof this._listViewRef.getScrollResponder === 'function' - ) { - return this._listViewRef.getScrollResponder(); - } - } - - // This enables rows having variable width slideoutView. - _getMaxSwipeDistance( - rowData: Object, - sectionID: string, - rowID: string, - ): number { - if (typeof this.props.maxSwipeDistance === 'function') { - return this.props.maxSwipeDistance(rowData, sectionID, rowID); - } - - return this.props.maxSwipeDistance; - } - - _renderRow = ( - rowData: Object, - sectionID: string, - rowID: string, - ): React.Element => { - const slideoutView = this.props.renderQuickActions( - rowData, - sectionID, - rowID, - ); - - // If renderQuickActions is unspecified or returns falsey, don't allow swipe - if (!slideoutView) { - return this.props.renderRow(rowData, sectionID, rowID); - } - - let shouldBounceOnMount = false; - if (this._shouldBounceFirstRowOnMount) { - this._shouldBounceFirstRowOnMount = false; - shouldBounceOnMount = rowID === this.props.dataSource.getFirstRowID(); - } - - return ( - this._onOpen(rowData.id)} - onClose={() => this._onClose(rowData.id)} - onSwipeEnd={() => this._setListViewScrollable(true)} - onSwipeStart={() => this._setListViewScrollable(false)} - shouldBounceOnMount={shouldBounceOnMount}> - {this.props.renderRow(rowData, sectionID, rowID)} - - ); - }; - - _onOpen(rowID: string): void { - this.setState({ - dataSource: this.state.dataSource.setOpenRowID(rowID), - }); - } - - _onClose(rowID: string): void { - this.setState({ - dataSource: this.state.dataSource.setOpenRowID(null), - }); - } -} - -module.exports = SwipeableListView; diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js deleted file mode 100644 index 38e03c66140..00000000000 --- a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js +++ /dev/null @@ -1,116 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -'use strict'; - -const ListViewDataSource = require('ListViewDataSource'); - -/** - * Data source wrapper around ListViewDataSource to allow for tracking of - * which row is swiped open and close opened row(s) when another row is swiped - * open. - * - * See https://github.com/facebook/react-native/pull/5602 for why - * ListViewDataSource is not subclassed. - */ -class SwipeableListViewDataSource { - _previousOpenRowID: string; - _openRowID: string; - - _dataBlob: any; - _dataSource: ListViewDataSource; - - rowIdentities: Array>; - sectionIdentities: Array; - - constructor(params: Object) { - this._dataSource = new ListViewDataSource({ - getRowData: params.getRowData, - getSectionHeaderData: params.getSectionHeaderData, - rowHasChanged: (row1, row2) => { - /** - * Row needs to be re-rendered if its swiped open/close status is - * changed, or its data blob changed. - */ - return ( - (row1.id !== this._previousOpenRowID && - row2.id === this._openRowID) || - (row1.id === this._previousOpenRowID && - row2.id !== this._openRowID) || - params.rowHasChanged(row1, row2) - ); - }, - sectionHeaderHasChanged: params.sectionHeaderHasChanged, - }); - } - - cloneWithRowsAndSections( - dataBlob: any, - sectionIdentities: ?Array, - rowIdentities: ?Array>, - ): SwipeableListViewDataSource { - this._dataSource = this._dataSource.cloneWithRowsAndSections( - dataBlob, - sectionIdentities, - rowIdentities, - ); - - this._dataBlob = dataBlob; - this.rowIdentities = this._dataSource.rowIdentities; - this.sectionIdentities = this._dataSource.sectionIdentities; - - return this; - } - - // For the actual ListView to use - getDataSource(): ListViewDataSource { - return this._dataSource; - } - - getOpenRowID(): ?string { - return this._openRowID; - } - - getFirstRowID(): ?string { - /** - * If rowIdentities is specified, find the first data row from there since - * we don't want to attempt to bounce section headers. If unspecified, find - * the first data row from _dataBlob. - */ - if (this.rowIdentities) { - return this.rowIdentities[0] && this.rowIdentities[0][0]; - } - return Object.keys(this._dataBlob)[0]; - } - - getLastRowID(): ?string { - if (this.rowIdentities && this.rowIdentities.length) { - const lastSection = this.rowIdentities[this.rowIdentities.length - 1]; - if (lastSection && lastSection.length) { - return lastSection[lastSection.length - 1]; - } - } - return Object.keys(this._dataBlob)[this._dataBlob.length - 1]; - } - - setOpenRowID(rowID: string): SwipeableListViewDataSource { - this._previousOpenRowID = this._openRowID; - this._openRowID = rowID; - - this._dataSource = this._dataSource.cloneWithRowsAndSections( - this._dataBlob, - this.sectionIdentities, - this.rowIdentities, - ); - - return this; - } -} - -module.exports = SwipeableListViewDataSource; diff --git a/Libraries/Lists/ListView/InternalListViewType.js b/Libraries/Lists/ListView/InternalListViewType.js deleted file mode 100644 index c8eaddf392f..00000000000 --- a/Libraries/Lists/ListView/InternalListViewType.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - * @flow - */ - -const React = require('React'); -const ListViewDataSource = require('ListViewDataSource'); - -// This class is purely a facsimile of ListView so that we can -// properly type it with Flow before migrating ListView off of -// createReactClass. If there are things missing here that are in -// ListView, that is unintentional. -class InternalListViewType extends React.Component { - static DataSource = ListViewDataSource; - setNativeProps(props: Object) {} - flashScrollIndicators() {} - getScrollResponder(): any {} - getScrollableNode(): any {} - getMetrics(): Object {} - scrollTo(...args: Array) {} - scrollToEnd(options?: ?{animated?: ?boolean}) {} -} - -module.exports = InternalListViewType; diff --git a/Libraries/Lists/ListView/ListView.js b/Libraries/Lists/ListView/ListView.js deleted file mode 100644 index 193ca055d63..00000000000 --- a/Libraries/Lists/ListView/ListView.js +++ /dev/null @@ -1,766 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow - * @format - */ -'use strict'; - -const InternalListViewType = require('InternalListViewType'); -const ListViewDataSource = require('ListViewDataSource'); -const Platform = require('Platform'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const RCTScrollViewManager = require('NativeModules').ScrollViewManager; -const ScrollView = require('ScrollView'); -const ScrollResponder = require('ScrollResponder'); -const StaticRenderer = require('StaticRenderer'); -const View = require('View'); -const cloneReferencedElement = require('react-clone-referenced-element'); -const createReactClass = require('create-react-class'); -const isEmpty = require('isEmpty'); -const merge = require('merge'); - -import type {Props as ScrollViewProps} from 'ScrollView'; - -const DEFAULT_PAGE_SIZE = 1; -const DEFAULT_INITIAL_ROWS = 10; -const DEFAULT_SCROLL_RENDER_AHEAD = 1000; -const DEFAULT_END_REACHED_THRESHOLD = 1000; -const DEFAULT_SCROLL_CALLBACK_THROTTLE = 50; - -type Props = $ReadOnly<{| - ...ScrollViewProps, - - /** - * An instance of [ListView.DataSource](docs/listviewdatasource.html) to use - */ - dataSource: ListViewDataSource, - /** - * (sectionID, rowID, adjacentRowHighlighted) => renderable - * - * If provided, a renderable component to be rendered as the separator - * below each row but not the last row if there is a section header below. - * Take a sectionID and rowID of the row above and whether its adjacent row - * is highlighted. - */ - renderSeparator?: ?Function, - /** - * (rowData, sectionID, rowID, highlightRow) => renderable - * - * Takes a data entry from the data source and its ids and should return - * a renderable component to be rendered as the row. By default the data - * is exactly what was put into the data source, but it's also possible to - * provide custom extractors. ListView can be notified when a row is - * being highlighted by calling `highlightRow(sectionID, rowID)`. This - * sets a boolean value of adjacentRowHighlighted in renderSeparator, allowing you - * to control the separators above and below the highlighted row. The highlighted - * state of a row can be reset by calling highlightRow(null). - */ - renderRow: Function, - /** - * How many rows to render on initial component mount. Use this to make - * it so that the first screen worth of data appears at one time instead of - * over the course of multiple frames. - */ - initialListSize?: ?number, - /** - * Called when all rows have been rendered and the list has been scrolled - * to within onEndReachedThreshold of the bottom. The native scroll - * event is provided. - */ - onEndReached?: ?Function, - /** - * Threshold in pixels (virtual, not physical) for calling onEndReached. - */ - onEndReachedThreshold?: ?number, - /** - * Number of rows to render per event loop. Note: if your 'rows' are actually - * cells, i.e. they don't span the full width of your view (as in the - * ListViewGridLayoutExample), you should set the pageSize to be a multiple - * of the number of cells per row, otherwise you're likely to see gaps at - * the edge of the ListView as new pages are loaded. - */ - pageSize?: ?number, - /** - * () => renderable - * - * The header and footer are always rendered (if these props are provided) - * on every render pass. If they are expensive to re-render, wrap them - * in StaticContainer or other mechanism as appropriate. Footer is always - * at the bottom of the list, and header at the top, on every render pass. - * In a horizontal ListView, the header is rendered on the left and the - * footer on the right. - */ - renderFooter?: ?Function, - renderHeader?: ?Function, - /** - * (sectionData, sectionID) => renderable - * - * If provided, a header is rendered for this section. - */ - renderSectionHeader?: ?Function, - /** - * (props) => renderable - * - * A function that returns the scrollable component in which the list rows - * are rendered. Defaults to returning a ScrollView with the given props. - */ - renderScrollComponent?: ?Function, - /** - * How early to start rendering rows before they come on screen, in - * pixels. - */ - scrollRenderAheadDistance?: ?number, - /** - * (visibleRows, changedRows) => void - * - * Called when the set of visible rows changes. `visibleRows` maps - * { sectionID: { rowID: true }} for all the visible rows, and - * `changedRows` maps { sectionID: { rowID: true | false }} for the rows - * that have changed their visibility, with true indicating visible, and - * false indicating the view has moved out of view. - */ - onChangeVisibleRows?: ?Function, - /** - * A performance optimization for improving scroll perf of - * large lists, used in conjunction with overflow: 'hidden' on the row - * containers. This is enabled by default. - */ - removeClippedSubviews?: ?boolean, - /** - * Makes the sections headers sticky. The sticky behavior means that it - * will scroll with the content at the top of the section until it reaches - * the top of the screen, at which point it will stick to the top until it - * is pushed off the screen by the next section header. This property is - * not supported in conjunction with `horizontal={true}`. Only enabled by - * default on iOS because of typical platform standards. - */ - stickySectionHeadersEnabled?: ?boolean, - /** - * An array of child indices determining which children get docked to the - * top of the screen when scrolling. For example, passing - * `stickyHeaderIndices={[0]}` will cause the first child to be fixed to the - * top of the scroll view. This property is not supported in conjunction - * with `horizontal={true}`. - */ - stickyHeaderIndices?: ?$ReadOnlyArray, - /** - * Flag indicating whether empty section headers should be rendered. In the future release - * empty section headers will be rendered by default, and the flag will be deprecated. - * If empty sections are not desired to be rendered their indices should be excluded from sectionID object. - */ - enableEmptySections?: ?boolean, -|}>; - -/** - * DEPRECATED - use one of the new list components, such as [`FlatList`](docs/flatlist.html) - * or [`SectionList`](docs/sectionlist.html) for bounded memory use, fewer bugs, - * better performance, an easier to use API, and more features. Check out this - * [blog post](https://facebook.github.io/react-native/blog/2017/03/13/better-list-views.html) - * for more details. - * - * ListView - A core component designed for efficient display of vertically - * scrolling lists of changing data. The minimal API is to create a - * [`ListView.DataSource`](docs/listviewdatasource.html), populate it with a simple - * array of data blobs, and instantiate a `ListView` component with that data - * source and a `renderRow` callback which takes a blob from the data array and - * returns a renderable component. - * - * Minimal example: - * - * ``` - * class MyComponent extends Component { - * constructor() { - * super(); - * const ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2}); - * this.state = { - * dataSource: ds.cloneWithRows(['row 1', 'row 2']), - * }; - * } - * - * render() { - * return ( - * {rowData}} - * /> - * ); - * } - * } - * ``` - * - * ListView also supports more advanced features, including sections with sticky - * section headers, header and footer support, callbacks on reaching the end of - * the available data (`onEndReached`) and on the set of rows that are visible - * in the device viewport change (`onChangeVisibleRows`), and several - * performance optimizations. - * - * There are a few performance operations designed to make ListView scroll - * smoothly while dynamically loading potentially very large (or conceptually - * infinite) data sets: - * - * * Only re-render changed rows - the rowHasChanged function provided to the - * data source tells the ListView if it needs to re-render a row because the - * source data has changed - see ListViewDataSource for more details. - * - * * Rate-limited row rendering - By default, only one row is rendered per - * event-loop (customizable with the `pageSize` prop). This breaks up the - * work into smaller chunks to reduce the chance of dropping frames while - * rendering rows. - */ - -const ListView = createReactClass({ - displayName: 'ListView', - _rafIds: ([]: Array), - _childFrames: ([]: Array), - _sentEndForContentLength: (null: ?number), - _scrollComponent: (null: ?React.ElementRef), - _prevRenderedRowsCount: 0, - _visibleRows: ({}: Object), - scrollProperties: ({}: Object), - - mixins: [ScrollResponder.Mixin], - - statics: { - DataSource: ListViewDataSource, - }, - - /** - * Exports some data, e.g. for perf investigations or analytics. - */ - getMetrics: function() { - return { - contentLength: this.scrollProperties.contentLength, - totalRows: this.props.enableEmptySections - ? this.props.dataSource.getRowAndSectionCount() - : this.props.dataSource.getRowCount(), - renderedRows: this.state.curRenderedRowsCount, - visibleRows: Object.keys(this._visibleRows).length, - }; - }, - - /** - * Provides a handle to the underlying scroll responder. - * Note that `this._scrollComponent` might not be a `ScrollView`, so we - * need to check that it responds to `getScrollResponder` before calling it. - */ - getScrollResponder: function() { - if (this._scrollComponent && this._scrollComponent.getScrollResponder) { - return this._scrollComponent.getScrollResponder(); - } - }, - - getScrollableNode: function() { - if (this._scrollComponent && this._scrollComponent.getScrollableNode) { - return this._scrollComponent.getScrollableNode(); - } else { - return ReactNative.findNodeHandle(this._scrollComponent); - } - }, - - /** - * Scrolls to a given x, y offset, either immediately or with a smooth animation. - * - * See `ScrollView#scrollTo`. - */ - scrollTo: function(...args: any) { - if (this._scrollComponent && this._scrollComponent.scrollTo) { - this._scrollComponent.scrollTo(...args); - } - }, - - /** - * If this is a vertical ListView scrolls to the bottom. - * If this is a horizontal ListView scrolls to the right. - * - * Use `scrollToEnd({animated: true})` for smooth animated scrolling, - * `scrollToEnd({animated: false})` for immediate scrolling. - * If no options are passed, `animated` defaults to true. - * - * See `ScrollView#scrollToEnd`. - */ - scrollToEnd: function(options?: ?{animated?: boolean}) { - if (this._scrollComponent) { - if (this._scrollComponent.scrollToEnd) { - this._scrollComponent.scrollToEnd(options); - } else { - console.warn( - 'The scroll component used by the ListView does not support ' + - 'scrollToEnd. Check the renderScrollComponent prop of your ListView.', - ); - } - } - }, - - /** - * Displays the scroll indicators momentarily. - * - * @platform ios - */ - flashScrollIndicators: function() { - if (this._scrollComponent && this._scrollComponent.flashScrollIndicators) { - this._scrollComponent.flashScrollIndicators(); - } - }, - - setNativeProps: function(props: Object) { - if (this._scrollComponent) { - this._scrollComponent.setNativeProps(props); - } - }, - - /** - * React life cycle hooks. - */ - - getDefaultProps: function() { - return { - initialListSize: DEFAULT_INITIAL_ROWS, - pageSize: DEFAULT_PAGE_SIZE, - renderScrollComponent: props => , - scrollRenderAheadDistance: DEFAULT_SCROLL_RENDER_AHEAD, - onEndReachedThreshold: DEFAULT_END_REACHED_THRESHOLD, - stickySectionHeadersEnabled: Platform.OS === 'ios', - stickyHeaderIndices: [], - }; - }, - - getInitialState: function() { - return { - curRenderedRowsCount: this.props.initialListSize, - highlightedRow: ({}: Object), - }; - }, - - getInnerViewNode: function() { - return this._scrollComponent && this._scrollComponent.getInnerViewNode(); - }, - - UNSAFE_componentWillMount: function() { - // this data should never trigger a render pass, so don't put in state - this.scrollProperties = { - visibleLength: null, - contentLength: null, - offset: 0, - }; - - this._rafIds = []; - this._childFrames = []; - this._visibleRows = {}; - this._prevRenderedRowsCount = 0; - this._sentEndForContentLength = null; - }, - - componentWillUnmount: function() { - this._rafIds.forEach(cancelAnimationFrame); - this._rafIds = []; - }, - - componentDidMount: function() { - // do this in animation frame until componentDidMount actually runs after - // the component is laid out - this._requestAnimationFrame(() => { - this._measureAndUpdateScrollProps(); - }); - }, - - UNSAFE_componentWillReceiveProps: function(nextProps: Object) { - if ( - this.props.dataSource !== nextProps.dataSource || - this.props.initialListSize !== nextProps.initialListSize - ) { - this.setState( - (state, props) => { - this._prevRenderedRowsCount = 0; - return { - curRenderedRowsCount: Math.min( - Math.max(state.curRenderedRowsCount, props.initialListSize), - props.enableEmptySections - ? props.dataSource.getRowAndSectionCount() - : props.dataSource.getRowCount(), - ), - }; - }, - () => this._renderMoreRowsIfNeeded(), - ); - } - }, - - componentDidUpdate: function() { - this._requestAnimationFrame(() => { - this._measureAndUpdateScrollProps(); - }); - }, - - _onRowHighlighted: function(sectionID: string, rowID: string) { - this.setState({highlightedRow: {sectionID, rowID}}); - }, - - render: function() { - const bodyComponents = []; - - const dataSource = this.props.dataSource; - const allRowIDs = dataSource.rowIdentities; - let rowCount = 0; - const stickySectionHeaderIndices = []; - - const {renderSectionHeader} = this.props; - - const header = this.props.renderHeader && this.props.renderHeader(); - const footer = this.props.renderFooter && this.props.renderFooter(); - let totalIndex = header ? 1 : 0; - - for (let sectionIdx = 0; sectionIdx < allRowIDs.length; sectionIdx++) { - const sectionID = dataSource.sectionIdentities[sectionIdx]; - const rowIDs = allRowIDs[sectionIdx]; - if (rowIDs.length === 0) { - if (this.props.enableEmptySections === undefined) { - const warning = require('fbjs/lib/warning'); - warning( - false, - 'In next release empty section headers will be rendered.' + - " In this release you can use 'enableEmptySections' flag to render empty section headers.", - ); - continue; - } else { - const invariant = require('invariant'); - invariant( - this.props.enableEmptySections, - "In next release 'enableEmptySections' flag will be deprecated, empty section headers will always be rendered." + - ' If empty section headers are not desirable their indices should be excluded from sectionIDs object.' + - " In this release 'enableEmptySections' may only have value 'true' to allow empty section headers rendering.", - ); - } - } - - if (renderSectionHeader) { - const element = renderSectionHeader( - dataSource.getSectionHeaderData(sectionIdx), - sectionID, - ); - if (element) { - bodyComponents.push( - React.cloneElement(element, {key: 's_' + sectionID}), - ); - if (this.props.stickySectionHeadersEnabled) { - stickySectionHeaderIndices.push(totalIndex); - } - totalIndex++; - } - } - - for (let rowIdx = 0; rowIdx < rowIDs.length; rowIdx++) { - const rowID = rowIDs[rowIdx]; - const comboID = sectionID + '_' + rowID; - const shouldUpdateRow = - rowCount >= this._prevRenderedRowsCount && - dataSource.rowShouldUpdate(sectionIdx, rowIdx); - const row = ( - - ); - bodyComponents.push(row); - totalIndex++; - - if ( - this.props.renderSeparator && - (rowIdx !== rowIDs.length - 1 || sectionIdx === allRowIDs.length - 1) - ) { - const adjacentRowHighlighted = - this.state.highlightedRow.sectionID === sectionID && - (this.state.highlightedRow.rowID === rowID || - this.state.highlightedRow.rowID === rowIDs[rowIdx + 1]); - const separator = this.props.renderSeparator( - sectionID, - rowID, - adjacentRowHighlighted, - ); - if (separator) { - bodyComponents.push({separator}); - totalIndex++; - } - } - if (++rowCount === this.state.curRenderedRowsCount) { - break; - } - } - if (rowCount >= this.state.curRenderedRowsCount) { - break; - } - } - - const {renderScrollComponent, ...props} = this.props; - if (!props.scrollEventThrottle) { - props.scrollEventThrottle = DEFAULT_SCROLL_CALLBACK_THROTTLE; - } - if (props.removeClippedSubviews === undefined) { - props.removeClippedSubviews = true; - } - Object.assign(props, { - onScroll: this._onScroll, - stickyHeaderIndices: this.props.stickyHeaderIndices.concat( - stickySectionHeaderIndices, - ), - - // Do not pass these events downstream to ScrollView since they will be - // registered in ListView's own ScrollResponder.Mixin - onKeyboardWillShow: undefined, - onKeyboardWillHide: undefined, - onKeyboardDidShow: undefined, - onKeyboardDidHide: undefined, - }); - - return cloneReferencedElement( - renderScrollComponent(props), - { - ref: this._setScrollComponentRef, - onContentSizeChange: this._onContentSizeChange, - onLayout: this._onLayout, - DEPRECATED_sendUpdatedChildFrames: - typeof props.onChangeVisibleRows !== undefined, - }, - header, - bodyComponents, - footer, - ); - }, - - /** - * Private methods - */ - - _requestAnimationFrame: function(fn: () => void): void { - const rafId = requestAnimationFrame(() => { - this._rafIds = this._rafIds.filter(id => id !== rafId); - fn(); - }); - this._rafIds.push(rafId); - }, - - _measureAndUpdateScrollProps: function() { - const scrollComponent = this.getScrollResponder(); - if (!scrollComponent || !scrollComponent.getInnerViewNode) { - return; - } - - // RCTScrollViewManager.calculateChildFrames is not available on - // every platform - RCTScrollViewManager && - RCTScrollViewManager.calculateChildFrames && - RCTScrollViewManager.calculateChildFrames( - ReactNative.findNodeHandle(scrollComponent), - this._updateVisibleRows, - ); - }, - - _setScrollComponentRef: function(scrollComponent) { - this._scrollComponent = scrollComponent; - }, - - _onContentSizeChange: function(width: number, height: number) { - const contentLength = !this.props.horizontal ? height : width; - if (contentLength !== this.scrollProperties.contentLength) { - this.scrollProperties.contentLength = contentLength; - this._updateVisibleRows(); - this._renderMoreRowsIfNeeded(); - } - this.props.onContentSizeChange && - this.props.onContentSizeChange(width, height); - }, - - _onLayout: function(event: Object) { - const {width, height} = event.nativeEvent.layout; - const visibleLength = !this.props.horizontal ? height : width; - if (visibleLength !== this.scrollProperties.visibleLength) { - this.scrollProperties.visibleLength = visibleLength; - this._updateVisibleRows(); - this._renderMoreRowsIfNeeded(); - } - this.props.onLayout && this.props.onLayout(event); - }, - - _maybeCallOnEndReached: function(event?: Object) { - if ( - this.props.onEndReached && - this.scrollProperties.contentLength !== this._sentEndForContentLength && - this._getDistanceFromEnd(this.scrollProperties) < - this.props.onEndReachedThreshold && - this.state.curRenderedRowsCount === - (this.props.enableEmptySections - ? this.props.dataSource.getRowAndSectionCount() - : this.props.dataSource.getRowCount()) - ) { - this._sentEndForContentLength = this.scrollProperties.contentLength; - this.props.onEndReached(event); - return true; - } - return false; - }, - - _renderMoreRowsIfNeeded: function() { - if ( - this.scrollProperties.contentLength === null || - this.scrollProperties.visibleLength === null || - this.state.curRenderedRowsCount === - (this.props.enableEmptySections - ? this.props.dataSource.getRowAndSectionCount() - : this.props.dataSource.getRowCount()) - ) { - this._maybeCallOnEndReached(); - return; - } - - const distanceFromEnd = this._getDistanceFromEnd(this.scrollProperties); - if (distanceFromEnd < this.props.scrollRenderAheadDistance) { - this._pageInNewRows(); - } - }, - - _pageInNewRows: function() { - this.setState( - (state, props) => { - const rowsToRender = Math.min( - state.curRenderedRowsCount + props.pageSize, - props.enableEmptySections - ? props.dataSource.getRowAndSectionCount() - : props.dataSource.getRowCount(), - ); - this._prevRenderedRowsCount = state.curRenderedRowsCount; - return { - curRenderedRowsCount: rowsToRender, - }; - }, - () => { - this._measureAndUpdateScrollProps(); - this._prevRenderedRowsCount = this.state.curRenderedRowsCount; - }, - ); - }, - - _getDistanceFromEnd: function(scrollProperties: Object) { - return ( - scrollProperties.contentLength - - scrollProperties.visibleLength - - scrollProperties.offset - ); - }, - - _updateVisibleRows: function(updatedFrames?: Array) { - if (!this.props.onChangeVisibleRows) { - return; // No need to compute visible rows if there is no callback - } - if (updatedFrames) { - updatedFrames.forEach(newFrame => { - this._childFrames[newFrame.index] = merge(newFrame); - }); - } - const isVertical = !this.props.horizontal; - const dataSource = this.props.dataSource; - const visibleMin = this.scrollProperties.offset; - const visibleMax = visibleMin + this.scrollProperties.visibleLength; - const allRowIDs = dataSource.rowIdentities; - - const header = this.props.renderHeader && this.props.renderHeader(); - let totalIndex = header ? 1 : 0; - let visibilityChanged = false; - const changedRows = {}; - for (let sectionIdx = 0; sectionIdx < allRowIDs.length; sectionIdx++) { - const rowIDs = allRowIDs[sectionIdx]; - if (rowIDs.length === 0) { - continue; - } - const sectionID = dataSource.sectionIdentities[sectionIdx]; - if (this.props.renderSectionHeader) { - totalIndex++; - } - let visibleSection = this._visibleRows[sectionID]; - if (!visibleSection) { - visibleSection = {}; - } - for (let rowIdx = 0; rowIdx < rowIDs.length; rowIdx++) { - const rowID = rowIDs[rowIdx]; - const frame = this._childFrames[totalIndex]; - totalIndex++; - if ( - this.props.renderSeparator && - (rowIdx !== rowIDs.length - 1 || sectionIdx === allRowIDs.length - 1) - ) { - totalIndex++; - } - if (!frame) { - break; - } - const rowVisible = visibleSection[rowID]; - const min = isVertical ? frame.y : frame.x; - const max = min + (isVertical ? frame.height : frame.width); - if ((!min && !max) || min === max) { - break; - } - if (min > visibleMax || max < visibleMin) { - if (rowVisible) { - visibilityChanged = true; - delete visibleSection[rowID]; - if (!changedRows[sectionID]) { - changedRows[sectionID] = {}; - } - changedRows[sectionID][rowID] = false; - } - } else if (!rowVisible) { - visibilityChanged = true; - visibleSection[rowID] = true; - if (!changedRows[sectionID]) { - changedRows[sectionID] = {}; - } - changedRows[sectionID][rowID] = true; - } - } - if (!isEmpty(visibleSection)) { - this._visibleRows[sectionID] = visibleSection; - } else if (this._visibleRows[sectionID]) { - delete this._visibleRows[sectionID]; - } - } - visibilityChanged && - this.props.onChangeVisibleRows(this._visibleRows, changedRows); - }, - - _onScroll: function(e: Object) { - const isVertical = !this.props.horizontal; - this.scrollProperties.visibleLength = - e.nativeEvent.layoutMeasurement[isVertical ? 'height' : 'width']; - this.scrollProperties.contentLength = - e.nativeEvent.contentSize[isVertical ? 'height' : 'width']; - this.scrollProperties.offset = - e.nativeEvent.contentOffset[isVertical ? 'y' : 'x']; - this._updateVisibleRows(e.nativeEvent.updatedChildFrames); - if (!this._maybeCallOnEndReached(e)) { - this._renderMoreRowsIfNeeded(); - } - - if ( - this.props.onEndReached && - this._getDistanceFromEnd(this.scrollProperties) > - this.props.onEndReachedThreshold - ) { - // Scrolled out of the end zone, so it should be able to trigger again. - this._sentEndForContentLength = null; - } - - this.props.onScroll && this.props.onScroll(e); - }, -}); - -module.exports = ((ListView: any): Class>); diff --git a/Libraries/Lists/ListView/ListViewDataSource.js b/Libraries/Lists/ListView/ListViewDataSource.js deleted file mode 100644 index e1b872c4e7a..00000000000 --- a/Libraries/Lists/ListView/ListViewDataSource.js +++ /dev/null @@ -1,428 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow - * @format - */ -'use strict'; - -const invariant = require('invariant'); -const isEmpty = require('isEmpty'); -/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error - * found when Flow v0.54 was deployed. To see the error delete this comment and - * run Flow. */ -const warning = require('fbjs/lib/warning'); - -function defaultGetRowData( - dataBlob: any, - sectionID: number | string, - rowID: number | string, -): any { - return dataBlob[sectionID][rowID]; -} - -function defaultGetSectionHeaderData( - dataBlob: any, - sectionID: number | string, -): any { - return dataBlob[sectionID]; -} - -type differType = (data1: any, data2: any) => boolean; - -type ParamType = { - rowHasChanged: differType, - getRowData?: ?typeof defaultGetRowData, - sectionHeaderHasChanged?: ?differType, - getSectionHeaderData?: ?typeof defaultGetSectionHeaderData, -}; - -/** - * Provides efficient data processing and access to the - * `ListView` component. A `ListViewDataSource` is created with functions for - * extracting data from the input blob, and comparing elements (with default - * implementations for convenience). The input blob can be as simple as an - * array of strings, or an object with rows nested inside section objects. - * - * To update the data in the datasource, use `cloneWithRows` (or - * `cloneWithRowsAndSections` if you care about sections). The data in the - * data source is immutable, so you can't modify it directly. The clone methods - * suck in the new data and compute a diff for each row so ListView knows - * whether to re-render it or not. - * - * In this example, a component receives data in chunks, handled by - * `_onDataArrived`, which concats the new data onto the old data and updates the - * data source. We use `concat` to create a new array - mutating `this._data`, - * e.g. with `this._data.push(newRowData)`, would be an error. `_rowHasChanged` - * understands the shape of the row data and knows how to efficiently compare - * it. - * - * ``` - * getInitialState: function() { - * const ds = new ListView.DataSource({rowHasChanged: this._rowHasChanged}); - * return {ds}; - * }, - * _onDataArrived(newData) { - * this._data = this._data.concat(newData); - * this.setState({ - * ds: this.state.ds.cloneWithRows(this._data) - * }); - * } - * ``` - */ - -class ListViewDataSource { - /** - * You can provide custom extraction and `hasChanged` functions for section - * headers and rows. If absent, data will be extracted with the - * `defaultGetRowData` and `defaultGetSectionHeaderData` functions. - * - * The default extractor expects data of one of the following forms: - * - * { sectionID_1: { rowID_1: , ... }, ... } - * - * or - * - * { sectionID_1: [ , , ... ], ... } - * - * or - * - * [ [ , , ... ], ... ] - * - * The constructor takes in a params argument that can contain any of the - * following: - * - * - getRowData(dataBlob, sectionID, rowID); - * - getSectionHeaderData(dataBlob, sectionID); - * - rowHasChanged(prevRowData, nextRowData); - * - sectionHeaderHasChanged(prevSectionData, nextSectionData); - */ - constructor(params: ParamType) { - invariant( - params && typeof params.rowHasChanged === 'function', - 'Must provide a rowHasChanged function.', - ); - this._rowHasChanged = params.rowHasChanged; - this._getRowData = params.getRowData || defaultGetRowData; - this._sectionHeaderHasChanged = params.sectionHeaderHasChanged; - this._getSectionHeaderData = - params.getSectionHeaderData || defaultGetSectionHeaderData; - - this._dataBlob = null; - this._dirtyRows = []; - this._dirtySections = []; - this._cachedRowCount = 0; - - // These two private variables are accessed by outsiders because ListView - // uses them to iterate over the data in this class. - this.rowIdentities = []; - this.sectionIdentities = []; - } - - /** - * Clones this `ListViewDataSource` with the specified `dataBlob` and - * `rowIdentities`. The `dataBlob` is just an arbitrary blob of data. At - * construction an extractor to get the interesting information was defined - * (or the default was used). - * - * The `rowIdentities` is a 2D array of identifiers for rows. - * ie. [['a1', 'a2'], ['b1', 'b2', 'b3'], ...]. If not provided, it's - * assumed that the keys of the section data are the row identities. - * - * Note: This function does NOT clone the data in this data source. It simply - * passes the functions defined at construction to a new data source with - * the data specified. If you wish to maintain the existing data you must - * handle merging of old and new data separately and then pass that into - * this function as the `dataBlob`. - */ - cloneWithRows( - dataBlob: $ReadOnlyArray | {+[key: string]: any}, - rowIdentities: ?$ReadOnlyArray, - ): ListViewDataSource { - const rowIds = rowIdentities ? [[...rowIdentities]] : null; - if (!this._sectionHeaderHasChanged) { - this._sectionHeaderHasChanged = () => false; - } - return this.cloneWithRowsAndSections({s1: dataBlob}, ['s1'], rowIds); - } - - /** - * This performs the same function as the `cloneWithRows` function but here - * you also specify what your `sectionIdentities` are. If you don't care - * about sections you should safely be able to use `cloneWithRows`. - * - * `sectionIdentities` is an array of identifiers for sections. - * ie. ['s1', 's2', ...]. The identifiers should correspond to the keys or array indexes - * of the data you wish to include. If not provided, it's assumed that the - * keys of dataBlob are the section identities. - * - * Note: this returns a new object! - * - * ``` - * const dataSource = ds.cloneWithRowsAndSections({ - * addresses: ['row 1', 'row 2'], - * phone_numbers: ['data 1', 'data 2'], - * }, ['phone_numbers']); - * ``` - */ - cloneWithRowsAndSections( - dataBlob: any, - sectionIdentities: ?Array, - rowIdentities: ?Array>, - ): ListViewDataSource { - invariant( - typeof this._sectionHeaderHasChanged === 'function', - 'Must provide a sectionHeaderHasChanged function with section data.', - ); - invariant( - !sectionIdentities || - !rowIdentities || - sectionIdentities.length === rowIdentities.length, - 'row and section ids lengths must be the same', - ); - - const newSource = new ListViewDataSource({ - getRowData: this._getRowData, - getSectionHeaderData: this._getSectionHeaderData, - rowHasChanged: this._rowHasChanged, - sectionHeaderHasChanged: this._sectionHeaderHasChanged, - }); - newSource._dataBlob = dataBlob; - if (sectionIdentities) { - newSource.sectionIdentities = sectionIdentities; - } else { - newSource.sectionIdentities = Object.keys(dataBlob); - } - if (rowIdentities) { - newSource.rowIdentities = rowIdentities; - } else { - newSource.rowIdentities = []; - newSource.sectionIdentities.forEach(sectionID => { - newSource.rowIdentities.push(Object.keys(dataBlob[sectionID])); - }); - } - newSource._cachedRowCount = countRows(newSource.rowIdentities); - - newSource._calculateDirtyArrays( - this._dataBlob, - this.sectionIdentities, - this.rowIdentities, - ); - - return newSource; - } - - /** - * Returns the total number of rows in the data source. - * - * If you are specifying the rowIdentities or sectionIdentities, then `getRowCount` will return the number of rows in the filtered data source. - */ - getRowCount(): number { - return this._cachedRowCount; - } - - /** - * Returns the total number of rows in the data source (see `getRowCount` for how this is calculated) plus the number of sections in the data. - * - * If you are specifying the rowIdentities or sectionIdentities, then `getRowAndSectionCount` will return the number of rows & sections in the filtered data source. - */ - getRowAndSectionCount(): number { - return this._cachedRowCount + this.sectionIdentities.length; - } - - /** - * Returns if the row is dirtied and needs to be rerendered - */ - rowShouldUpdate(sectionIndex: number, rowIndex: number): boolean { - const needsUpdate = this._dirtyRows[sectionIndex][rowIndex]; - warning( - needsUpdate !== undefined, - 'missing dirtyBit for section, row: ' + sectionIndex + ', ' + rowIndex, - ); - return needsUpdate; - } - - /** - * Gets the data required to render the row. - */ - getRowData(sectionIndex: number, rowIndex: number): any { - const sectionID = this.sectionIdentities[sectionIndex]; - const rowID = this.rowIdentities[sectionIndex][rowIndex]; - warning( - sectionID !== undefined && rowID !== undefined, - 'rendering invalid section, row: ' + sectionIndex + ', ' + rowIndex, - ); - return this._getRowData(this._dataBlob, sectionID, rowID); - } - - /** - * Gets the rowID at index provided if the dataSource arrays were flattened, - * or null of out of range indexes. - */ - getRowIDForFlatIndex(index: number): ?string { - let accessIndex = index; - for (let ii = 0; ii < this.sectionIdentities.length; ii++) { - if (accessIndex >= this.rowIdentities[ii].length) { - accessIndex -= this.rowIdentities[ii].length; - } else { - return this.rowIdentities[ii][accessIndex]; - } - } - return null; - } - - /** - * Gets the sectionID at index provided if the dataSource arrays were flattened, - * or null for out of range indexes. - */ - getSectionIDForFlatIndex(index: number): ?string { - let accessIndex = index; - for (let ii = 0; ii < this.sectionIdentities.length; ii++) { - if (accessIndex >= this.rowIdentities[ii].length) { - accessIndex -= this.rowIdentities[ii].length; - } else { - return this.sectionIdentities[ii]; - } - } - return null; - } - - /** - * Returns an array containing the number of rows in each section - */ - getSectionLengths(): Array { - const results = []; - for (let ii = 0; ii < this.sectionIdentities.length; ii++) { - results.push(this.rowIdentities[ii].length); - } - return results; - } - - /** - * Returns if the section header is dirtied and needs to be rerendered - */ - sectionHeaderShouldUpdate(sectionIndex: number): boolean { - const needsUpdate = this._dirtySections[sectionIndex]; - warning( - needsUpdate !== undefined, - 'missing dirtyBit for section: ' + sectionIndex, - ); - return needsUpdate; - } - - /** - * Gets the data required to render the section header - */ - getSectionHeaderData(sectionIndex: number): any { - if (!this._getSectionHeaderData) { - return null; - } - const sectionID = this.sectionIdentities[sectionIndex]; - warning( - sectionID !== undefined, - 'renderSection called on invalid section: ' + sectionIndex, - ); - return this._getSectionHeaderData(this._dataBlob, sectionID); - } - - /** - * Private members and methods. - */ - - _getRowData: typeof defaultGetRowData; - _getSectionHeaderData: typeof defaultGetSectionHeaderData; - _rowHasChanged: differType; - _sectionHeaderHasChanged: ?differType; - - _dataBlob: any; - _dirtyRows: Array>; - _dirtySections: Array; - _cachedRowCount: number; - - // These two 'protected' variables are accessed by ListView to iterate over - // the data in this class. - rowIdentities: Array>; - sectionIdentities: Array; - - _calculateDirtyArrays( - prevDataBlob: any, - prevSectionIDs: Array, - prevRowIDs: Array>, - ): void { - // construct a hashmap of the existing (old) id arrays - const prevSectionsHash = keyedDictionaryFromArray(prevSectionIDs); - const prevRowsHash = {}; - for (let ii = 0; ii < prevRowIDs.length; ii++) { - const sectionID = prevSectionIDs[ii]; - warning( - !prevRowsHash[sectionID], - 'SectionID appears more than once: ' + sectionID, - ); - prevRowsHash[sectionID] = keyedDictionaryFromArray(prevRowIDs[ii]); - } - - // compare the 2 identity array and get the dirtied rows - this._dirtySections = []; - this._dirtyRows = []; - - let dirty; - for (let sIndex = 0; sIndex < this.sectionIdentities.length; sIndex++) { - const sectionID = this.sectionIdentities[sIndex]; - // dirty if the sectionHeader is new or _sectionHasChanged is true - dirty = !prevSectionsHash[sectionID]; - const sectionHeaderHasChanged = this._sectionHeaderHasChanged; - if (!dirty && sectionHeaderHasChanged) { - dirty = sectionHeaderHasChanged( - this._getSectionHeaderData(prevDataBlob, sectionID), - this._getSectionHeaderData(this._dataBlob, sectionID), - ); - } - this._dirtySections.push(!!dirty); - - this._dirtyRows[sIndex] = []; - for ( - let rIndex = 0; - rIndex < this.rowIdentities[sIndex].length; - rIndex++ - ) { - const rowID = this.rowIdentities[sIndex][rIndex]; - // dirty if the section is new, row is new or _rowHasChanged is true - dirty = - !prevSectionsHash[sectionID] || - !prevRowsHash[sectionID][rowID] || - this._rowHasChanged( - this._getRowData(prevDataBlob, sectionID, rowID), - this._getRowData(this._dataBlob, sectionID, rowID), - ); - this._dirtyRows[sIndex].push(!!dirty); - } - } - } -} - -function countRows(allRowIDs) { - let totalRows = 0; - for (let sectionIdx = 0; sectionIdx < allRowIDs.length; sectionIdx++) { - const rowIDs = allRowIDs[sectionIdx]; - totalRows += rowIDs.length; - } - return totalRows; -} - -function keyedDictionaryFromArray(arr) { - if (isEmpty(arr)) { - return {}; - } - const result = {}; - for (let ii = 0; ii < arr.length; ii++) { - const key = arr[ii]; - warning(!result[key], 'Value appears more than once in array: ' + key); - result[key] = true; - } - return result; -} - -module.exports = ListViewDataSource; diff --git a/Libraries/Lists/ListView/__mocks__/ListViewMock.js b/Libraries/Lists/ListView/__mocks__/ListViewMock.js deleted file mode 100644 index 4813e7a428a..00000000000 --- a/Libraries/Lists/ListView/__mocks__/ListViewMock.js +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @flow strict-local - * @format - */ -'use strict'; - -const ListViewDataSource = require('ListViewDataSource'); -const React = require('React'); -const ScrollView = require('ScrollView'); -const StaticRenderer = require('StaticRenderer'); - -class ListViewMock extends React.Component<$FlowFixMeProps> { - static latestRef: ?ListViewMock; - static defaultProps = { - /* $FlowFixMe(>=0.59.0 site=react_native_fb) This comment suppresses an - * error caught by Flow 0.59 which was not caught before. Most likely, this - * error is because an exported function parameter is missing an - * annotation. Without an annotation, these parameters are uncovered by - * Flow. */ - renderScrollComponent: props => , - }; - - componentDidMount() { - ListViewMock.latestRef = this; - } - - render() { - const {dataSource, renderFooter, renderHeader} = this.props; - let rows = [ - renderHeader && ( - - ), - ]; - - const dataSourceRows = dataSource.rowIdentities.map( - (rowIdentity, rowIdentityIndex) => { - const sectionID = dataSource.sectionIdentities[rowIdentityIndex]; - return rowIdentity.map((row, rowIndex) => ( - - )); - }, - ); - - rows = [...rows, ...dataSourceRows]; - renderFooter && - rows.push( - , - ); - - return this.props.renderScrollComponent({...this.props, children: rows}); - } - static DataSource = ListViewDataSource; -} - -module.exports = ListViewMock; diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js index b35910c818a..5900c79af48 100644 --- a/Libraries/react-native/react-native-implementation.js +++ b/Libraries/react-native/react-native-implementation.js @@ -71,14 +71,6 @@ module.exports = { get KeyboardAvoidingView() { return require('KeyboardAvoidingView'); }, - get ListView() { - warnOnce( - 'listview-deprecation', - 'ListView is deprecated and will be removed in a future release. ' + - 'See https://fb.me/nolistview for more information', - ); - return require('ListView'); - }, get MaskedViewIOS() { warnOnce( 'maskedviewios-moved', @@ -136,14 +128,6 @@ module.exports = { get SwipeableFlatList() { return require('SwipeableFlatList'); }, - get SwipeableListView() { - warnOnce( - 'swipablelistview-deprecation', - 'ListView and SwipeableListView are deprecated and will be removed in a future release. ' + - 'See https://fb.me/nolistview for more information', - ); - return require('SwipeableListView'); - }, get Text() { return require('Text'); }, @@ -374,3 +358,31 @@ module.exports = { return require('DeprecatedViewPropTypes'); }, }; + +if (__DEV__) { + // $FlowFixMe This is intentional: Flow will error when attempting to access ListView. + Object.defineProperty(module.exports, 'ListView', { + configurable: true, + get() { + invariant( + false, + 'ListView has been removed from React Native. ' + + 'See https://fb.me/nolistview for more information or use ' + + '`deprecated-react-native-listview`.', + ); + }, + }); + + // $FlowFixMe This is intentional: Flow will error when attempting to access SwipeableListView. + Object.defineProperty(module.exports, 'SwipeableListView', { + configurable: true, + get() { + invariant( + false, + 'SwipeableListView has been removed from React Native. ' + + 'See https://fb.me/nolistview for more information or use ' + + '`deprecated-react-native-swipeable-listview`.', + ); + }, + }); +} diff --git a/RNTester/js/ListViewExample.js b/RNTester/js/ListViewExample.js deleted file mode 100644 index a8663da20bd..00000000000 --- a/RNTester/js/ListViewExample.js +++ /dev/null @@ -1,175 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - * @flow strict-local - */ - -'use strict'; - -const React = require('react'); -const ReactNative = require('react-native'); -const { - Image, - ListView, - TouchableHighlight, - StyleSheet, - Text, - View, -} = ReactNative; -const ListViewDataSource = require('ListViewDataSource'); -const RNTesterPage = require('./RNTesterPage'); - -import type {RNTesterProps} from 'RNTesterTypes'; - -type State = {| - dataSource: ListViewDataSource, -|}; - -class ListViewExample extends React.Component { - state = { - dataSource: this.getInitialDataSource(), - }; - - _pressData: {[key: number]: boolean} = {}; - - getInitialDataSource() { - const ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2}); - return ds.cloneWithRows(this._genRows({})); - } - - UNSAFE_componentWillMount() { - this._pressData = {}; - } - - render() { - return ( - '} - noSpacer={true} - noScroll={true}> - - - ); - } - - _renderRow = ( - rowData: string, - sectionID: number, - rowID: number, - highlightRow: (sectionID: number, rowID: number) => void, - ) => { - const rowHash = Math.abs(hashCode(rowData)); - const imgSource = THUMB_URLS[rowHash % THUMB_URLS.length]; - return ( - { - this._pressRow(rowID); - highlightRow(sectionID, rowID); - }}> - - - - - {rowData + ' - ' + LOREM_IPSUM.substr(0, (rowHash % 301) + 10)} - - - - - ); - }; - - _genRows(pressData: {[key: number]: boolean}): Array { - const dataBlob = []; - for (let ii = 0; ii < 100; ii++) { - const pressedText = pressData[ii] ? ' (pressed)' : ''; - dataBlob.push('Row ' + ii + pressedText); - } - return dataBlob; - } - - _pressRow = (rowID: number) => { - this._pressData[rowID] = !this._pressData[rowID]; - this.setState({ - dataSource: this.state.dataSource.cloneWithRows( - this._genRows(this._pressData), - ), - }); - }; - - _renderSeparator( - sectionID: number, - rowID: number, - adjacentRowHighlighted: boolean, - ) { - return ( - - ); - } -} - -const THUMB_URLS = [ - require('./Thumbnails/like.png'), - require('./Thumbnails/dislike.png'), - require('./Thumbnails/call.png'), - require('./Thumbnails/fist.png'), - require('./Thumbnails/bandaged.png'), - require('./Thumbnails/flowers.png'), - require('./Thumbnails/heart.png'), - require('./Thumbnails/liking.png'), - require('./Thumbnails/party.png'), - require('./Thumbnails/poke.png'), - require('./Thumbnails/superlike.png'), - require('./Thumbnails/victory.png'), -]; -const LOREM_IPSUM = - 'Lorem ipsum dolor sit amet, ius ad pertinax oportere accommodare, an vix civibus corrumpit referrentur. Te nam case ludus inciderint, te mea facilisi adipiscing. Sea id integre luptatum. In tota sale consequuntur nec. Erat ocurreret mei ei. Eu paulo sapientem vulputate est, vel an accusam intellegam interesset. Nam eu stet pericula reprimique, ea vim illud modus, putant invidunt reprehendunt ne qui.'; - -/* eslint no-bitwise: 0 */ -const hashCode = function(str) { - let hash = 15; - for (let ii = str.length - 1; ii >= 0; ii--) { - hash = (hash << 5) - hash + str.charCodeAt(ii); - } - return hash; -}; - -const styles = StyleSheet.create({ - row: { - flexDirection: 'row', - justifyContent: 'center', - padding: 10, - backgroundColor: '#F6F6F6', - }, - thumb: { - width: 64, - height: 64, - }, - text: { - flex: 1, - }, -}); - -exports.title = ''; -exports.description = 'Performant, scrollable list of data.'; -exports.examples = [ - { - title: 'Simple list of items', - render: function(): React.Element { - return ; - }, - }, -]; diff --git a/RNTester/js/ListViewGridLayoutExample.js b/RNTester/js/ListViewGridLayoutExample.js deleted file mode 100644 index e3d6cb5b63c..00000000000 --- a/RNTester/js/ListViewGridLayoutExample.js +++ /dev/null @@ -1,161 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - * @flow strict-local - */ - -'use strict'; - -const React = require('react'); -const ReactNative = require('react-native'); -const { - Image, - ListView, - TouchableHighlight, - StyleSheet, - Text, - View, -} = ReactNative; -const ListViewDataSource = require('ListViewDataSource'); - -import type {RNTesterProps} from 'RNTesterTypes'; - -const THUMB_URLS = [ - require('./Thumbnails/like.png'), - require('./Thumbnails/dislike.png'), - require('./Thumbnails/call.png'), - require('./Thumbnails/fist.png'), - require('./Thumbnails/bandaged.png'), - require('./Thumbnails/flowers.png'), - require('./Thumbnails/heart.png'), - require('./Thumbnails/liking.png'), - require('./Thumbnails/party.png'), - require('./Thumbnails/poke.png'), - require('./Thumbnails/superlike.png'), - require('./Thumbnails/victory.png'), -]; - -type State = {| - dataSource: ListViewDataSource, -|}; - -class ListViewGridLayoutExample extends React.Component { - state = { - dataSource: this.getInitialDataSource(), - }; - - getInitialDataSource() { - const ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2}); - return ds.cloneWithRows(this._genRows({})); - } - - _pressData: {[key: number]: boolean} = {}; - - UNSAFE_componentWillMount() { - this._pressData = {}; - } - - render() { - return ( - // ListView wraps ScrollView and so takes on its properties. - // With that in mind you can use the ScrollView's contentContainerStyle prop to style the items. - - ); - } - - _renderRow = (rowData: string, sectionID: number, rowID: number) => { - const rowHash = Math.abs(hashCode(rowData)); - const imgSource = THUMB_URLS[rowHash % THUMB_URLS.length]; - return ( - this._pressRow(rowID)} - underlayColor="transparent"> - - - - {rowData} - - - - ); - }; - - _genRows(pressData: {[key: number]: boolean}): Array { - const dataBlob = []; - for (let ii = 0; ii < 100; ii++) { - const pressedText = pressData[ii] ? ' (X)' : ''; - dataBlob.push('Cell ' + ii + pressedText); - } - return dataBlob; - } - - _pressRow = (rowID: number) => { - this._pressData[rowID] = !this._pressData[rowID]; - this.setState({ - dataSource: this.state.dataSource.cloneWithRows( - this._genRows(this._pressData), - ), - }); - }; -} - -/* eslint no-bitwise: 0 */ -const hashCode = function(str) { - let hash = 15; - for (let ii = str.length - 1; ii >= 0; ii--) { - hash = (hash << 5) - hash + str.charCodeAt(ii); - } - return hash; -}; - -const styles = StyleSheet.create({ - list: { - justifyContent: 'space-around', - flexDirection: 'row', - flexWrap: 'wrap', - alignItems: 'flex-start', - }, - row: { - justifyContent: 'center', - padding: 5, - margin: 3, - width: 100, - height: 100, - backgroundColor: '#F6F6F6', - alignItems: 'center', - borderWidth: 1, - borderRadius: 5, - borderColor: '#CCC', - }, - thumb: { - width: 64, - height: 64, - }, - text: { - flex: 1, - marginTop: 5, - fontWeight: 'bold', - }, -}); - -exports.title = ' - Grid Layout'; -exports.description = 'Flexbox grid layout.'; -exports.examples = [ - { - title: 'Simple list view with grid layout', - render: function(): React.Element { - return ; - }, - }, -]; diff --git a/RNTester/js/ListViewPagingExample.js b/RNTester/js/ListViewPagingExample.js deleted file mode 100644 index aa41c9d4e5d..00000000000 --- a/RNTester/js/ListViewPagingExample.js +++ /dev/null @@ -1,290 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - * @flow - */ - -'use strict'; - -const React = require('react'); -const ReactNative = require('react-native'); -const { - Image, - LayoutAnimation, - ListView, - StyleSheet, - Text, - TouchableOpacity, - View, -} = ReactNative; - -const NativeModules = require('NativeModules'); -const {UIManager} = NativeModules; - -const THUMB_URLS = [ - require('./Thumbnails/like.png'), - require('./Thumbnails/dislike.png'), - require('./Thumbnails/call.png'), - require('./Thumbnails/fist.png'), - require('./Thumbnails/bandaged.png'), - require('./Thumbnails/flowers.png'), - require('./Thumbnails/heart.png'), - require('./Thumbnails/liking.png'), - require('./Thumbnails/party.png'), - require('./Thumbnails/poke.png'), - require('./Thumbnails/superlike.png'), - require('./Thumbnails/victory.png'), -]; -const NUM_SECTIONS = 100; -const NUM_ROWS_PER_SECTION = 10; - -class Thumb extends React.Component<{}, $FlowFixMeState> { - UNSAFE_componentWillMount() { - UIManager.setLayoutAnimationEnabledExperimental && - UIManager.setLayoutAnimationEnabledExperimental(true); - } - - _getThumbIdx = () => { - return Math.floor(Math.random() * THUMB_URLS.length); - }; - - _onPressThumb = () => { - const config = - layoutAnimationConfigs[ - this.state.thumbIndex % layoutAnimationConfigs.length - ]; - LayoutAnimation.configureNext(config); - this.setState({ - thumbIndex: this._getThumbIdx(), - dir: this.state.dir === 'row' ? 'column' : 'row', - }); - }; - - state = {thumbIndex: this._getThumbIdx(), dir: 'row'}; - - render() { - return ( - - - - - {this.state.dir === 'column' ? ( - - Oooo, look at this new text! So awesome it may just be crazy. Let me - keep typing here so it wraps at least one line. - - ) : ( - - )} - - ); - } -} - -class ListViewPagingExample extends React.Component<$FlowFixMeProps, *> { - constructor(props) { - super(props); - const getSectionData = (dataBlob, sectionID) => { - return dataBlob[sectionID]; - }; - const getRowData = (dataBlob, sectionID, rowID) => { - return dataBlob[rowID]; - }; - - const dataSource = new ListView.DataSource({ - getRowData: getRowData, - getSectionHeaderData: getSectionData, - rowHasChanged: (row1, row2) => row1 !== row2, - sectionHeaderHasChanged: (s1, s2) => s1 !== s2, - }); - - const dataBlob = {}; - const sectionIDs = []; - const rowIDs = []; - for (let ii = 0; ii < NUM_SECTIONS; ii++) { - const sectionName = 'Section ' + ii; - sectionIDs.push(sectionName); - dataBlob[sectionName] = sectionName; - rowIDs[ii] = []; - - for (let jj = 0; jj < NUM_ROWS_PER_SECTION; jj++) { - const rowName = 'S' + ii + ', R' + jj; - rowIDs[ii].push(rowName); - dataBlob[rowName] = rowName; - } - } - - this.state = { - dataSource: dataSource.cloneWithRowsAndSections( - dataBlob, - sectionIDs, - rowIDs, - ), - headerPressCount: 0, - }; - } - - renderRow = ( - rowData: string, - sectionID: string, - rowID: string, - ): React.Element => { - return ; - }; - - renderSectionHeader = (sectionData: string, sectionID: string) => { - return ( - - {sectionData} - - ); - }; - - renderHeader = () => { - const headerLikeText = - this.state.headerPressCount % 2 ? ( - - 1 Like - - ) : null; - return ( - - {headerLikeText} - - Table Header (click me) - - - ); - }; - - renderFooter = () => { - return ( - - console.log('Footer!')} style={styles.text}> - Table Footer - - - ); - }; - - render() { - return ( - - console.log({visibleRows, changedRows}) - } - renderHeader={this.renderHeader} - renderFooter={this.renderFooter} - renderSectionHeader={this.renderSectionHeader} - renderRow={this.renderRow} - initialListSize={10} - pageSize={4} - scrollRenderAheadDistance={500} - stickySectionHeadersEnabled - /> - ); - } - - _onPressHeader = () => { - const config = - layoutAnimationConfigs[ - Math.floor(this.state.headerPressCount / 2) % - layoutAnimationConfigs.length - ]; - LayoutAnimation.configureNext(config); - this.setState({headerPressCount: this.state.headerPressCount + 1}); - }; -} - -const styles = StyleSheet.create({ - listview: { - backgroundColor: '#B0C4DE', - }, - header: { - height: 40, - justifyContent: 'center', - alignItems: 'center', - backgroundColor: '#3B5998', - flexDirection: 'row', - }, - text: { - color: 'white', - paddingHorizontal: 8, - }, - buttonContents: { - flexDirection: 'row', - justifyContent: 'center', - alignItems: 'center', - marginHorizontal: 5, - marginVertical: 3, - padding: 5, - backgroundColor: '#EAEAEA', - borderRadius: 3, - paddingVertical: 10, - }, - img: { - width: 64, - height: 64, - marginHorizontal: 10, - backgroundColor: 'transparent', - }, - section: { - flexDirection: 'column', - justifyContent: 'center', - alignItems: 'flex-start', - padding: 6, - backgroundColor: '#5890ff', - }, -}); - -const animations = { - layout: { - spring: { - duration: 750, - create: { - duration: 300, - type: LayoutAnimation.Types.easeInEaseOut, - property: LayoutAnimation.Properties.opacity, - }, - update: { - type: LayoutAnimation.Types.spring, - springDamping: 0.4, - }, - }, - easeInEaseOut: { - duration: 300, - create: { - type: LayoutAnimation.Types.easeInEaseOut, - property: LayoutAnimation.Properties.scaleXY, - }, - update: { - delay: 100, - type: LayoutAnimation.Types.easeInEaseOut, - }, - }, - }, -}; - -const layoutAnimationConfigs = [ - animations.layout.spring, - animations.layout.easeInEaseOut, -]; - -exports.title = ' - Paging'; -exports.description = 'Floating headers & layout animations.'; -exports.examples = [ - { - title: 'Simple list view with pagination', - render: function(): React.Element { - return ; - }, - }, -]; diff --git a/RNTester/js/RNTesterApp.ios.js b/RNTester/js/RNTesterApp.ios.js index 0ba8d62eb7f..c0c467261a8 100644 --- a/RNTester/js/RNTesterApp.ios.js +++ b/RNTester/js/RNTesterApp.ios.js @@ -43,8 +43,6 @@ type Props = { }; YellowBox.ignoreWarnings([ - 'ListView and SwipeableListView are deprecated', - 'ListView is deprecated', 'Module RCTImagePickerManager requires main queue setup', ]); diff --git a/RNTester/js/RNTesterList.android.js b/RNTester/js/RNTesterList.android.js index 9f1b648c7a5..6e38076328b 100644 --- a/RNTester/js/RNTesterList.android.js +++ b/RNTester/js/RNTesterList.android.js @@ -33,18 +33,6 @@ const ComponentExamples: Array = [ key: 'ImageExample', module: require('./ImageExample'), }, - { - key: 'ListViewExample', - module: require('./ListViewExample'), - }, - { - key: 'ListViewGridLayoutExample', - module: require('./ListViewGridLayoutExample'), - }, - { - key: 'ListViewPagingExample', - module: require('./ListViewPagingExample'), - }, { key: 'ModalExample', module: require('./ModalExample'), @@ -87,10 +75,6 @@ const ComponentExamples: Array = [ key: 'SwipeableFlatListExample', module: require('./SwipeableFlatListExample'), }, - { - key: 'SwipeableListViewExample', - module: require('./SwipeableListViewExample'), - }, { key: 'SwitchExample', module: require('./SwitchExample'), diff --git a/RNTester/js/RNTesterList.ios.js b/RNTester/js/RNTesterList.ios.js index b2302c238c4..675ee5bb68f 100644 --- a/RNTester/js/RNTesterList.ios.js +++ b/RNTester/js/RNTesterList.ios.js @@ -58,21 +58,6 @@ const ComponentExamples: Array = [ module: require('./LayoutEventsExample'), supportsTVOS: true, }, - { - key: 'ListViewExample', - module: require('./ListViewExample'), - supportsTVOS: true, - }, - { - key: 'ListViewGridLayoutExample', - module: require('./ListViewGridLayoutExample'), - supportsTVOS: true, - }, - { - key: 'ListViewPagingExample', - module: require('./ListViewPagingExample'), - supportsTVOS: true, - }, { key: 'MaskedViewExample', module: require('./MaskedViewExample'), @@ -148,11 +133,6 @@ const ComponentExamples: Array = [ module: require('./SwipeableFlatListExample'), supportsTVOS: false, }, - { - key: 'SwipeableListViewExample', - module: require('./SwipeableListViewExample'), - supportsTVOS: false, - }, { key: 'SwitchExample', module: require('./SwitchExample'), diff --git a/RNTester/js/SwipeableFlatListExample.js b/RNTester/js/SwipeableFlatListExample.js index feef9fff12a..d79336cc30a 100644 --- a/RNTester/js/SwipeableFlatListExample.js +++ b/RNTester/js/SwipeableFlatListExample.js @@ -47,7 +47,7 @@ class SwipeableFlatListExample extends React.Component { render() { return ( '} + title={this.props.navigator ? null : ''} noSpacer={true} noScroll={true}> { - state = { - dataSource: SwipeableListView.getNewDataSource().cloneWithRowsAndSections( - ...this._genDataSource({}), - ), - }; - - _pressData: {[key: number]: boolean} = {}; - - render(): React.Node { - return ( - '} - noSpacer={true} - noScroll={true}> - { - return ( - - { - Alert.alert( - 'Tips', - 'You could do something with this row: ' + rowData.text, - ); - }}> - Remove - - - ); - }} - renderRow={this._renderRow} - renderSeparator={this._renderSeperator} - /> - - ); - } - - _renderRow(rowData: Object, sectionID: string, rowID: string) { - const rowHash = Math.abs(hashCode(rowData.id)); - const imgSource = THUMB_URLS[rowHash % THUMB_URLS.length]; - return ( - {}}> - - - - - {rowData.id + ' - ' + LOREM_IPSUM.substr(0, (rowHash % 301) + 10)} - - - - - ); - } - - _genDataSource(pressData: {[key: number]: boolean}) { - const dataBlob = {}; - const sectionIDs = ['Section 0']; - const rowIDs = [[]]; - /** - * dataBlob example below: - * { - * 'Section 0': { - * 'Row 0': { - * id: '0', - * text: 'row 0 text' - * }, - * 'Row 1': { - * id: '1', - * text: 'row 1 text' - * } - * } - * } - */ - - // Only one section in this example - dataBlob['Section 0'] = {}; - for (let ii = 0; ii < 100; ii++) { - const pressedText = pressData[ii] ? ' (pressed)' : ''; - dataBlob[sectionIDs[0]]['Row ' + ii] = { - id: 'Row ' + ii, - text: 'Row ' + ii + pressedText, - }; - rowIDs[0].push('Row ' + ii); - } - return [dataBlob, sectionIDs, rowIDs]; - } - - _renderSeperator( - sectionID: string, - rowID: string, - adjacentRowHighlighted: boolean, - ) { - return ( - - ); - } -} - -const THUMB_URLS = [ - require('./Thumbnails/like.png'), - require('./Thumbnails/dislike.png'), - require('./Thumbnails/call.png'), - require('./Thumbnails/fist.png'), - require('./Thumbnails/bandaged.png'), - require('./Thumbnails/flowers.png'), - require('./Thumbnails/heart.png'), - require('./Thumbnails/liking.png'), - require('./Thumbnails/party.png'), - require('./Thumbnails/poke.png'), - require('./Thumbnails/superlike.png'), - require('./Thumbnails/victory.png'), -]; - -const LOREM_IPSUM = [ - 'Lorem ipsum dolor sit amet, ius ad pertinax oportere accommodare, an vix ', - 'civibus corrumpit referrentur. Te nam case ludus inciderint, te mea facilisi ', - 'adipiscing. Sea id integre luptatum. In tota sale consequuntur nec. Erat ', - 'ocurreret mei ei. Eu paulo sapientem vulputate est, vel an accusam ', - 'intellegam interesset. Nam eu stet pericula reprimique, ea vim illud modus, ', - 'putant invidunt reprehendunt ne qui.', -].join(''); - -/* eslint-disable no-bitwise */ -const hashCode = str => { - let hash = 15; - for (let ii = str.length - 1; ii >= 0; ii--) { - hash = (hash << 5) - hash + str.charCodeAt(ii); - } - return hash; -}; -/* eslint-enable no-bitwise */ - -const styles = StyleSheet.create({ - row: { - flexDirection: 'row', - justifyContent: 'center', - padding: 10, - backgroundColor: '#F6F6F6', - }, - thumb: { - width: 64, - height: 64, - }, - text: { - flex: 1, - }, - actionsContainer: { - flex: 1, - flexDirection: 'row', - justifyContent: 'flex-end', - alignItems: 'center', - }, -}); - -exports.title = ''; -exports.description = 'Performant, scrollable, swipeable list of data.'; -exports.examples = [ - { - title: 'Simple swipable list', - render: function(): React.Element { - return ; - }, - }, -]; diff --git a/jest/setup.js b/jest/setup.js index 9a5291a88f8..4bc9a7ad049 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -43,28 +43,6 @@ jest .mock('RefreshControl', () => jest.requireMock('RefreshControlMock')) .mock('ScrollView', () => jest.requireMock('ScrollViewMock')) .mock('ActivityIndicator', () => mockComponent('ActivityIndicator')) - .mock('ListView', () => jest.requireMock('ListViewMock')) - .mock('ListViewDataSource', () => { - const DataSource = jest.requireActual('ListViewDataSource'); - DataSource.prototype.toJSON = function() { - function ListViewDataSource(dataBlob) { - this.items = 0; - // Ensure this doesn't throw. - try { - Object.keys(dataBlob).forEach(key => { - this.items += - dataBlob[key] && - (dataBlob[key].length || dataBlob[key].size || 0); - }); - } catch (e) { - this.items = 'unknown'; - } - } - - return new ListViewDataSource(this._dataBlob); - }; - return DataSource; - }) .mock('AnimatedImplementation', () => { const AnimatedImplementation = jest.requireActual('AnimatedImplementation'); const oldCreate = AnimatedImplementation.createAnimatedComponent; diff --git a/package.json b/package.json index 6778f28e379..b618a744c1f 100644 --- a/package.json +++ b/package.json @@ -88,8 +88,8 @@ "create-react-class": "^15.6.3", "escape-string-regexp": "^1.0.5", "event-target-shim": "^1.0.5", - "fbjs": "^1.0.0", "fbjs-scripts": "^1.0.0", + "fbjs": "^1.0.0", "invariant": "^2.2.4", "metro-babel-register": "0.52.0", "metro-react-native-babel-transformer": "0.52.0",