Merge branch 'master' into fix-hierarchySeparator-default-null-in-opt…

…ions
storybookjs · Jul 31, 2017 · e6980d3 · e6980d3
2 parents bef736a + 85de359
commit e6980d3
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 29 deletions.
diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -56,6 +56,7 @@
     "json-loader": "^0.5.4",
     "json5": "^0.5.1",
     "postcss-loader": "^2.0.5",
+    "react-native-compat": "0.0.2",
     "shelljs": "^0.7.8",
     "style-loader": "^0.17.0",
     "url-loader": "^0.5.8",

diff --git a/app/react-native/src/preview/components/OnDeviceUI/style.js b/app/react-native/src/preview/components/OnDeviceUI/style.js
@@ -1,4 +1,4 @@
-import { StyleSheet } from 'react-native';
+import { StyleSheet } from 'react-native-compat';
 
 export default {
   main: {

diff --git a/app/react-native/src/preview/components/StoryListView/index.js b/app/react-native/src/preview/components/StoryListView/index.js
@@ -1,5 +1,6 @@
 import React, { Component, PropTypes } from 'react';
-import { SectionList, View, Text, TouchableOpacity } from 'react-native';
+import { ListView, View, Text, TouchableOpacity } from 'react-native';
+import { MinMaxView } from 'react-native-compat';
 import style from './style';
 
 const SectionHeader = ({ title, selected }) =>
@@ -30,8 +31,14 @@ ListItem.propTypes = {
 export default class StoryListView extends Component {
   constructor(props, ...args) {
     super(props, ...args);
+
+    const ds = new ListView.DataSource({
+      rowHasChanged: (r1, r2) => r1 !== r2,
+      sectionHeaderHasChanged: (s1, s2) => s1 !== s2,
+    });
+
     this.state = {
-      sections: [],
+      dataSource: ds.cloneWithRowsAndSections({}),
     };
 
     this.storyAddedHandler = this.handleStoryAdded.bind(this);
@@ -56,16 +63,20 @@ export default class StoryListView extends Component {
   handleStoryAdded() {
     if (this.props.stories) {
       const data = this.props.stories.dumpStoryBook();
-      this.setState({
-        sections: data.map(section => ({
-          key: section.kind,
-          title: section.kind,
-          data: section.stories.map(story => ({
+
+      const sections = data.reduce(
+        (map, section) => ({
+          ...map,
+          [section.kind]: section.stories.map(story => ({
             key: story,
-            kind: section.kind,
             name: story,
+            kind: section.kind,
           })),
-        })),
+        }),
+        {}
+      );
+      this.setState({
+        dataSource: this.state.dataSource.cloneWithRowsAndSections(sections),
       });
     }
   }
@@ -76,24 +87,26 @@ export default class StoryListView extends Component {
 
   render() {
     return (
-      <SectionList
-        style={style.list}
-        renderItem={({ item }) =>
-          <ListItem
-            title={item.name}
-            selected={
-              item.kind === this.props.selectedKind && item.name === this.props.selectedStory
-            }
-            onPress={() => this.changeStory(item.kind, item.name)}
-          />}
-        renderSectionHeader={({ section }) =>
-          <SectionHeader
-            title={section.title}
-            selected={section.title === this.props.selectedKind}
-          />}
-        sections={this.state.sections}
-        stickySectionHeadersEnabled={false}
-      />
+      <MinMaxView maxWidth={250}>
+        <ListView
+          style={style.list}
+          renderRow={item =>
+            <ListItem
+              title={item.name}
+              selected={
+                item.kind === this.props.selectedKind && item.name === this.props.selectedStory
+              }
+              onPress={() => this.changeStory(item.kind, item.name)}
+            />}
+          renderSectionHeader={(sectionData, sectionName) =>
+            <SectionHeader
+              title={sectionName}
+              selected={sectionName === this.props.selectedKind}
+            />}
+          dataSource={this.state.dataSource}
+          stickySectionHeadersEnabled={false}
+        />
+      </MinMaxView>
     );
   }
 }

diff --git a/app/react-native/src/preview/components/StoryListView/style.js b/app/react-native/src/preview/components/StoryListView/style.js
@@ -1,7 +1,6 @@
 export default {
   list: {
     flex: 1,
-    maxWidth: 250,
   },
   header: {
     paddingTop: 4,