fixed #16 close #16

Author: 2534290808

MJFlatList.js

@@ -0,0 +1,33 @@
+import React, {Component} from 'react';
+import {VirtualizedList, FlatList,Platform} from 'react-native';
+import MJMetroListView from './MJMetroListView'
+
+class MJFlatList extends FlatList {
+    render() {
+        if (this.props.legacyImplementation) {
+            return (
+                <MJMetroListView
+                    {...this.props}
+                    items={this.props.data}
+                    ref={this._captureRef}
+                />
+            );
+        } else {
+            return (
+                <VirtualizedList
+                    {...this.props}
+                    renderItem={this._renderItem}
+                    getItem={this._getItem}
+                    getItemCount={this._getItemCount}
+                    keyExtractor={this._keyExtractor}
+                    ref={this._captureRef}
+                    onViewableItemsChanged={
+                        this.props.onViewableItemsChanged && this._onViewableItemsChanged
+                    }
+                />
+            );
+        }
+    }
+}
+
+module.exports = Platform.OS === 'ios' ? MJFlatList : FlatList;

MJListView.js

@@ -1,24 +1,40 @@
+import React,{Component} from 'react';
 import {
-  findNodeHandle,
-  NativeModules,
-} from 'react-native'
+    findNodeHandle,
+    NativeModules,
+    Platform,
+    ListView,
+} from 'react-native';
+import MJScrollView from './MJScrollView'
+const RCTMJScrollViewManager = NativeModules.MJScrollViewManager;
+var DEFAULT_PAGE_SIZE = 1;
+var DEFAULT_INITIAL_ROWS = 10;
+var DEFAULT_SCROLL_RENDER_AHEAD = 1000;
+var DEFAULT_END_REACHED_THRESHOLD = 1000;
 
-const ListView = require('react-native/Libraries/Lists/ListView/ListView')
-
-const RCTMJScrollViewManager = NativeModules.MJScrollViewManager
-
-module.exports = class MJListView extends ListView {
-  _measureAndUpdateScrollProps = () => {
-    var scrollComponent = this.getScrollResponder();
-    if (!scrollComponent || !scrollComponent.getInnerViewNode) {
-      return;
+class MJListView extends ListView {
+    static defaultProps = {
+        initialListSize: DEFAULT_INITIAL_ROWS,
+        pageSize: DEFAULT_PAGE_SIZE,
+        renderScrollComponent: props => <MJScrollView {...props} />,
+        scrollRenderAheadDistance: DEFAULT_SCROLL_RENDER_AHEAD,
+        onEndReachedThreshold: DEFAULT_END_REACHED_THRESHOLD,
+        stickySectionHeadersEnabled: Platform.OS === 'ios',
+        stickyHeaderIndices: [],
     }
 
-    RCTMJScrollViewManager &&
-      RCTMJScrollViewManager.calculateChildFrames &&
-      RCTMJScrollViewManager.calculateChildFrames(
-        findNodeHandle(scrollComponent),
-        this._updateVisibleRows,
-      )
-  }
+    _measureAndUpdateScrollProps = () => {
+        var scrollComponent = this.getScrollResponder();
+        if (!scrollComponent || !scrollComponent.getInnerViewNode) {
+            return;
+        }
+        RCTMJScrollViewManager &&
+        RCTMJScrollViewManager.calculateChildFrames &&
+        RCTMJScrollViewManager.calculateChildFrames(
+            findNodeHandle(scrollComponent),
+            this._updateVisibleRows,
+        )
+    }
 }
+
+module.exports = Platform.OS === 'ios' ? MJListView : ListView;

MJMetroListView.js

@@ -0,0 +1,56 @@
+import React, {Component} from 'react';
+import {RefreshControl} from 'react-native';
+
+const MetroList = require('react-native/Libraries/Lists/MetroListView')
+const MJListView = require('./MJListView');
+const MJScrollView = require('./MJScrollView');
+
+export default class MJMetroListView extends MetroList {
+    static defaultProps = {
+        keyExtractor: (item, index) => item.key || String(index),
+        renderScrollComponent: (props) => {
+            if (props.onRefresh) {
+                return (
+                    /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+                     * comment suppresses an error when upgrading Flow's support for
+                     * React. To see the error delete this comment and run Flow. */
+                    <MJScrollView
+                        {...props}
+                        refreshControl={
+                            /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss)
+                             * This comment suppresses an error when upgrading Flow's support
+                             * for React. To see the error delete this comment and run Flow.
+                             */
+                            <RefreshControl
+                                refreshing={props.refreshing}
+                                onRefresh={props.onRefresh}
+                            />
+                        }
+                    />
+                );
+            } else {
+                /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+                 * comment suppresses an error when upgrading Flow's support for React.
+                 * To see the error delete this comment and run Flow. */
+                return <MJScrollView {...props} />;
+            }
+        },
+    }
+
+    render() {
+        return (
+            /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This
+             * comment suppresses an error when upgrading Flow's support for React.
+             * To see the error delete this comment and run Flow. */
+            <MJListView
+                {...this.props}
+                dataSource={this.state.ds}
+                ref={this._captureRef}
+                renderRow={this._renderRow}
+                renderFooter={this.props.FooterComponent && this._renderFooter}
+                renderSectionHeader={this.props.sections && this._renderSectionHeader}
+                renderSeparator={this.props.SeparatorComponent && this._renderSeparator}
+            />
+        );
+    }
+}

MJRefresh.js

@@ -7,13 +7,12 @@ import {
     ViewPropTypes as RNViewPropTypes,
     findNodeHandle,
     UIManager,
-    ScrollView as NativeScrollView,
     Platform,
-    ListView as NativeListView,
 } from 'react-native';
 import PropTypes from 'prop-types'
 import MJScrollView from './MJScrollView'
 import MJListView from './MJListView'
+import MJFlatlist from './MJFlatList'
 const ViewPropTypes = RNViewPropTypes || View.propTypes;
 const UnimplementedView = require('react-native/Libraries/Components/UnimplementedViews/UnimplementedView')
 //Android平台未实现RCTMJRefreshView
@@ -79,6 +78,7 @@ MJRefresh.propTypes={
     onPulling:PropTypes.func,
     ...ViewPropTypes
 }
-export const ScrollView = Platform.OS === 'ios' ? MJScrollView : NativeScrollView;
-export const ListView = Platform.OS === 'ios' ? MJListView : NativeListView;
+export const ScrollView = MJScrollView;
+export const ListView = MJListView;
+export const FlatList = MJFlatlist;
 export default MJRefresh;