fix: fix PropTypes.arrayOf(PropTypes.shape)

Author: imcuttle

__tests__/fixture/DownloadList.js

@@ -0,0 +1,73 @@
+/**
+ * @file DownloadList react component
+ * @author Xinyi Li
+ * @date 2018/6/11
+ * @description
+ */
+
+import * as React from 'react'
+import PropTypes from 'prop-types'
+import './style.less'
+import p from 'prefix-classname'
+import cn from 'classnames'
+import DirBtnLrg from 'dulife-ui/DirBtnLrg'
+// import More from 'comps/More'
+
+import GridLayout from 'dulife-ui/GridLayout'
+import '../DownloadSource'
+
+import './style.less'
+import DownloadSource from 'dulife-ui/DownloadSource';
+
+const c = p('du-page-download-list-')
+
+export default class DownloadList extends React.Component {
+  static propTypes = {
+    ...GridLayout.propTypes,
+    renderItem: PropTypes.any,
+    list: PropTypes.arrayOf(
+      PropTypes.string
+    ),
+    list2: PropTypes.arrayOf(
+      PropTypes.shape({
+        abc: PropTypes.string
+      })
+    ),
+    colNum: PropTypes.number
+  }
+
+  static defaultProps = {
+    list: [],
+    colNum: '1'
+  }
+
+  renderItem = ({ content, ...props }, index) => {
+    return <DownloadSource {...props} className={cn(this.props.className)}>{content}</DownloadSource>
+  }
+
+  render() {
+    return (
+      <div className={cn(this.props.className,c('container'))}>
+        <GridLayout {...this.props} renderItem={this.renderItem} />
+      </div>
+    )
+  }
+}
+
+// function NumberList(props) {
+//     const numbers = props.numbers;
+//     const listItems = numbers.map((number) =>
+//       <li key={number.toString()}>
+//         {number}
+//       </li>
+//     );
+//     return (
+//       <ul>{listItems}</ul>
+//     );
+//   }
+
+//   const numbers = [1, 2, 3, 4, 5];
+//   ReactDOM.render(
+//     <NumberList numbers={numbers} />,
+//     document.getElementById('root')
+//   );

examples/index.js

@@ -10,12 +10,14 @@ import TableDoc from '../'
 import '../lib/style.css'
 
 const data = require('!../loader!../__tests__/fixture/Button.js')
-console.log('data', data)
+console.log('data', require('!../loader!../__tests__/fixture/DownloadList'))
 render(
   <div>
     <TableDoc data={data} />
     <hr/>
     <TableDoc data={require('!../loader!../__tests__/fixture/StatelessBtn')} />
+    <hr/>
+    <TableDoc data={require('!../loader!../__tests__/fixture/DownloadList')} />
   </div>,
   window.root
 )

src/index.js

@@ -18,34 +18,27 @@ const cn = p('')
 export const i18n = _i18n
 export const marked = _marked
 
-function renderPureType(d) {
-  if (typeof d === 'string') {
-    return d
-  }
-  console.log('renderPureType', d)
-  switch (d.name) {
-    case 'custom':
-      return d.raw
-    default:
-      return d.value
-  }
-}
-
-function renderType(type) {
+function renderTypeAppend(type) {
   if (!type) {
     return null
   }
+  if (typeof type === 'string') {
+    return type
+  }
+
   const { name, value } = type
   let append = null
-  if (name === 'enum') {
+  if (name === 'custom') {
+    append = type.raw
+  } else if (name === 'enum') {
     append = value.map(({ value }, i) => (
       <span key={i}>
         {i > 0 && <span>|</span>}
-        {renderPureType(value)}
+        {renderTypeAppend(value)}
       </span>
     ))
   } else if (name === 'arrayOf') {
-    append = renderPureType(value)
+    append = renderTypeAppend(value) || (value && value.name)
   } else if (name === 'custom') {
     append = type.raw
   } else if (name === 'shape') {
@@ -61,7 +54,22 @@ function renderType(type) {
         </div>
       )
     }
+  } else {
+    append = value
   }
+  return append
+}
+
+function renderType(type) {
+  if (!type) {
+    return null
+  }
+  if (typeof type === 'string') {
+    return type
+  }
+
+  const { name, value } = type
+  const append = renderTypeAppend(type)
   return (
     <span className={c(`prop-type prop-type-${name}`)}>
       <code>{name}</code>