Merge branch 'master' into greenkeeper/lerna-2.0.0-rc.4

storybookjs · Apr 28, 2017 · 42b6f41 · 42b6f41
2 parents d8b9a17 + 691b55e
commit 42b6f41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/packages/addon-info/src/components/Node.js b/packages/addon-info/src/components/Node.js
@@ -70,6 +70,10 @@ function getData(element) {
     text: null,
     children: null,
   };
+
+  if (typeof element === 'null') {
+    return data
+  }
 
   if (typeof element == 'string') {
     data.text = element;

diff --git a/packages/addon-info/src/components/PropTable.js b/packages/addon-info/src/components/PropTable.js
@@ -38,7 +38,8 @@ export default class PropTable extends React.Component {
         const typeInfo = type.propTypes[property];
         const propType = PropTypesMap.get(typeInfo) || 'other';
         const required = typeInfo.isRequired === undefined ? 'yes' : 'no';
-        props[property] = { property, propType, required };
+        const description = type.__docgenInfo && type.__docgenInfo.props && type.__docgenInfo.props[property] ? type.__docgenInfo.props[property].description : null;
+        props[property] = { property, propType, required, description };
       }
     }
 
@@ -72,6 +73,7 @@ export default class PropTable extends React.Component {
             <th>propType</th>
             <th>required</th>
             <th>default</th>
+            <th>description></th>
           </tr>
         </thead>
         <tbody>
@@ -81,6 +83,7 @@ export default class PropTable extends React.Component {
               <td>{row.propType}</td>
               <td>{row.required}</td>
               <td>{row.defaultValue === undefined ? '-' : <PropVal val={row.defaultValue} />}</td>
+              <td>{row.description}</td>
             </tr>
           ))}
         </tbody>