Merge pull request alibaba-fusion#1261 from youluna/fix-warning

Fix warning
z6super · Oct 24, 2019 · 0c9cc03 · 0c9cc03
2 parents 077f9a4 + 3f1e86e
commit 0c9cc03
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 43 deletions.
diff --git a/src/button/view/button.jsx b/src/button/view/button.jsx
@@ -1,6 +1,8 @@
 import React, { Component, Children } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import ConfigProvider from '../../config-provider';
+import { obj } from '../../util';
 
 function mapIconSize(size) {
     return {
@@ -13,6 +15,7 @@ function mapIconSize(size) {
 /** Button */
 export default class Button extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         rtl: PropTypes.bool,
         /**
@@ -113,6 +116,8 @@ export default class Button extends Component {
             ghost,
             component,
             iconSize,
+            disabled,
+            onClick,
             children,
             rtl,
             ...others
@@ -157,8 +162,10 @@ export default class Button extends Component {
 
         const TagName = component;
         const tagAttrs = {
-            ...others,
+            ...obj.pickOthers(Object.keys(Button.propTypes), others),
             type: htmlType,
+            disabled: disabled,
+            onClick: onClick,
             className: btnCls,
         };
 

diff --git a/src/button/view/group.jsx b/src/button/view/group.jsx
@@ -8,6 +8,7 @@ import ConfigProvider from '../../config-provider';
  */
 class ButtonGroup extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         rtl: PropTypes.bool,
         prefix: PropTypes.string,
         /**

diff --git a/src/calendar/calendar.jsx b/src/calendar/calendar.jsx
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
 import classnames from 'classnames';
+import ConfigProvider from '../config-provider';
 import nextLocale from '../locale/zh-cn';
 import { func, obj } from '../util';
 import CardHeader from './head/card-header';
@@ -26,6 +27,7 @@ import {
 /** Calendar */
 class Calendar extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         rtl: PropTypes.bool,
         /**

diff --git a/src/calendar/range-calendar.jsx b/src/calendar/range-calendar.jsx
@@ -25,6 +25,7 @@ import {
 
 class RangeCalendar extends React.Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         /**
          * 样式前缀
          */

diff --git a/src/card/card.jsx b/src/card/card.jsx
@@ -2,6 +2,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import ConfigProvider from '../config-provider';
 import BulletHeader from './bullet-header';
 import CollapseContent from './collapse-content';
 import CardMedia from './media';
@@ -18,6 +19,7 @@ export default class Card extends React.Component {
     static displayName = 'Card';
 
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         rtl: PropTypes.bool,
         /**

diff --git a/src/checkbox/checkbox.jsx b/src/checkbox/checkbox.jsx
@@ -17,6 +17,7 @@ function isChecked(selectedValue, value) {
 class Checkbox extends UIState {
     static displayName = 'Checkbox';
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         rtl: PropTypes.bool,
         /**

diff --git a/src/config-provider/index.jsx b/src/config-provider/index.jsx
@@ -58,7 +58,7 @@ class ConfigProvider extends Component {
         /**
          * 组件树
          */
-        children: PropTypes.element,
+        children: PropTypes.any,
         /**
          * 指定浮层渲染的父节点, 可以为节点id的字符串，也可以返回节点的函数
          */

diff --git a/src/date-picker/date-picker.jsx b/src/date-picker/date-picker.jsx
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import moment from 'moment';
+import ConfigProvider from '../config-provider';
 import Overlay from '../overlay';
 import Input from '../input';
 import Calendar from '../calendar';
@@ -27,6 +28,7 @@ const { Popup } = Overlay;
  */
 export default class DatePicker extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         rtl: PropTypes.bool,
         /**
@@ -128,7 +130,7 @@ export default class DatePicker extends Component {
          * @param {Element} target 目标元素
          * @return {Element} 弹层的容器元素
          */
-        popupContainer: PropTypes.func,
+        popupContainer: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
         /**
          * 弹层自定义样式
          */

diff --git a/src/date-picker/month-picker.jsx b/src/date-picker/month-picker.jsx
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import moment from 'moment';
+import ConfigProvider from '../config-provider';
 import Overlay from '../overlay';
 import Input from '../input';
 import Calendar from '../calendar';
@@ -16,6 +17,7 @@ const { Popup } = Overlay;
  */
 class MonthPicker extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         rtl: PropTypes.bool,
         /**
@@ -103,7 +105,7 @@ class MonthPicker extends Component {
          * @param {Element} target 目标元素
          * @return {Element} 弹层的容器元素
          */
-        popupContainer: PropTypes.func,
+        popupContainer: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
         /**
          * 弹层自定义样式
          */

diff --git a/src/date-picker/range-picker.jsx b/src/date-picker/range-picker.jsx
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import moment from 'moment';
+import ConfigProvider from '../config-provider';
 import Overlay from '../overlay';
 import Input from '../input';
 import RangeCalendar from '../calendar/range-calendar';
@@ -53,6 +54,7 @@ function getFormatValues(values, format) {
  */
 export default class RangePicker extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         rtl: PropTypes.bool,
         /**
@@ -150,7 +152,7 @@ export default class RangePicker extends Component {
          * @param {Element} target 目标元素
          * @return {Element} 弹层的容器元素
          */
-        popupContainer: PropTypes.func,
+        popupContainer: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
         /**
          * 弹层自定义样式
          */

diff --git a/src/icon/index.jsx b/src/icon/index.jsx
@@ -2,14 +2,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import ConfigProvider from '../config-provider';
-
+import { obj } from '../util';
 /**
  * Icon
  */
 class Icon extends Component {
     static propTypes = {
-        prefix: PropTypes.string,
-        rtl: PropTypes.bool,
+        ...ConfigProvider.propTypes,
         /**
          * 指定显示哪种图标
          */
@@ -40,7 +39,12 @@ class Icon extends Component {
 
     render() {
         /* eslint-disable no-unused-vars*/
-        const { prefix, type, size, className, rtl, ...other } = this.props;
+        const { prefix, type, size, className, rtl } = this.props;
+
+        const others = obj.pickOthers(
+            Object.assign({}, Icon.propTypes),
+            this.props
+        );
 
         const classes = cx({
             [`${prefix}icon`]: true,
@@ -62,10 +66,10 @@ class Icon extends Component {
                 'ascending',
             ].indexOf(type) !== -1
         ) {
-            other.dir = 'rtl';
+            others.dir = 'rtl';
         }
 
-        return <i {...other} className={classes} />;
+        return <i {...others} className={classes} />;
     }
 }
 

diff --git a/src/input/base.jsx b/src/input/base.jsx
@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { polyfill } from 'react-lifecycles-compat';
 
+import ConfigProvider from '../config-provider';
 import { func } from '../util';
 import zhCN from '../locale/zh-cn';
 
 class Base extends React.Component {
     static propTypes = {
-        prefix: PropTypes.string,
+        ...ConfigProvider.propTypes,
         /**
          * 当前值
          */

diff --git a/src/menu/view/menu.jsx b/src/menu/view/menu.jsx
@@ -3,6 +3,7 @@ import { findDOMNode } from 'react-dom';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import SubMenu from './sub-menu';
+import ConfigProvider from '../../config-provider';
 import { func, obj, dom, events, KEYCODE } from '../../util';
 import { getWidth } from './util';
 
@@ -18,6 +19,7 @@ export default class Menu extends Component {
     static isNextMenu = true;
 
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         pure: PropTypes.bool,
         rtl: PropTypes.bool,

diff --git a/src/pagination/pagination.jsx b/src/pagination/pagination.jsx
@@ -6,7 +6,7 @@ import Icon from '../icon';
 import Button from '../button';
 import Input from '../input';
 import Select from '../select';
-import { KEYCODE, str } from '../util';
+import { KEYCODE, str, obj } from '../util';
 import zhCN from '../locale/zh-cn.js';
 
 const { Option } = Select;
@@ -17,6 +17,7 @@ const noop = () => {};
  */
 class Pagination extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         prefix: PropTypes.string,
         pure: PropTypes.bool,
         rtl: PropTypes.bool,
@@ -630,7 +631,10 @@ class Pagination extends Component {
         }
 
         const buildComponent = (...coms) => (
-            <div className={classes} {...others}>
+            <div
+                className={classes}
+                {...obj.pickOthers(Object.keys(Pagination.propTypes), others)}
+            >
                 {isStart && sizeSelector}
                 {totalRender ? this.renderPageTotal() : null}
                 <div className={`${prefix}pagination-pages`}>

diff --git a/src/radio/radio-group.jsx b/src/radio/radio-group.jsx
@@ -13,11 +13,11 @@ const { pickOthers } = obj;
  */
 class RadioGroup extends Component {
     static propTypes = {
+        ...ConfigProvider.propTypes,
         /**
          * 样式类名的品牌前缀
          */
         prefix: PropTypes.string,
-        rtl: PropTypes.bool,
         /**
          * 自定义类名
          */

diff --git a/src/radio/radio.jsx b/src/radio/radio.jsx
@@ -13,8 +13,7 @@ const { makeChain, noop } = func;
 class Radio extends UIState {
     static displayName = 'Radio';
     static propTypes = {
-        prefix: PropTypes.string,
-        rtl: PropTypes.bool,
+        ...ConfigProvider.propTypes,
         /**
          * 自定义类名
          */

diff --git a/src/shell/base.jsx b/src/shell/base.jsx
@@ -11,6 +11,7 @@ export default function Base(props) {
         static _typeMark = `Shell_${componentName}`;
 
         static propTypes = {
+            ...ConfigProvider.propTypes,
             prefix: PropTypes.string,
             collapse: PropTypes.bool,
             miniable: PropTypes.bool,
@@ -35,10 +36,6 @@ export default function Base(props) {
             isCollapse: PropTypes.bool,
         };
 
-        static contextTypes = {
-            shellPrefix: PropTypes.string,
-        };
-
         getChildContext() {
             const { collapse } = this.props;
 
@@ -62,21 +59,19 @@ export default function Base(props) {
                 ...others
             } = this.props;
 
-            const basePrefix = this.context.prefix || prefix;
-
             let Tag = component;
 
             const cls = classnames({
-                [`${basePrefix}shell-${componentName.toLowerCase()}`]: true,
-                [`${basePrefix}shell-collapse`]: !!collapse,
-                [`${basePrefix}shell-mini`]: miniable,
+                [`${prefix}shell-${componentName.toLowerCase()}`]: true,
+                [`${prefix}shell-collapse`]: !!collapse,
+                [`${prefix}shell-mini`]: miniable,
                 [className]: !!className,
             });
 
             let newChildren = children;
             if (componentName === 'Content') {
                 newChildren = (
-                    <div className={`${basePrefix}shell-content-inner`}>
+                    <div className={`${prefix}shell-content-inner`}>
                         {children}
                     </div>
                 );

diff --git a/src/shell/index.jsx b/src/shell/index.jsx
@@ -24,9 +24,11 @@ const Shell = ShellBase({
     });
 });
 
-Shell.Page = ShellBase({
-    componentName: 'Page',
-});
+Shell.Page = ConfigProvider.config(
+    ShellBase({
+        componentName: 'Page',
+    })
+);
 
 export default ConfigProvider.config(Shell, {
     transform: /* istanbul ignore next */ (props, deprecated) => {