From 1e2814608db7749300420a60cf4b12f8a4daae8b Mon Sep 17 00:00:00 2001 From: Luka Jeran Date: Thu, 14 Jan 2021 03:03:43 +0100 Subject: [PATCH] refactor: move ConfigConsumerProps to own file (#3524) --- components/_util/wave.jsx | 2 +- components/affix/index.jsx | 2 +- components/alert/index.jsx | 2 +- components/anchor/Anchor.jsx | 2 +- components/anchor/AnchorLink.jsx | 2 +- components/auto-complete/index.jsx | 2 +- components/avatar/Avatar.jsx | 2 +- components/back-top/index.jsx | 2 +- components/badge/Badge.jsx | 2 +- components/badge/ScrollNumber.jsx | 2 +- components/breadcrumb/Breadcrumb.jsx | 2 +- components/breadcrumb/BreadcrumbItem.jsx | 2 +- components/breadcrumb/BreadcrumbSeparator.jsx | 2 +- components/button/button-group.jsx | 2 +- components/button/button.jsx | 2 +- components/calendar/Header.jsx | 2 +- components/calendar/index.jsx | 2 +- components/card/Card.jsx | 2 +- components/card/Grid.jsx | 2 +- components/card/Meta.jsx | 2 +- components/carousel/index.jsx | 2 +- components/cascader/index.jsx | 2 +- components/checkbox/Checkbox.jsx | 2 +- components/checkbox/Group.jsx | 2 +- components/collapse/Collapse.jsx | 2 +- components/collapse/CollapsePanel.jsx | 2 +- components/color-picker/ColorPicker.jsx | 2 +- components/comment/index.jsx | 2 +- components/config-provider/configConsumerProps.jsx | 9 +++++++++ components/config-provider/index.jsx | 8 -------- components/config-provider/renderEmpty.jsx | 2 +- components/date-picker/RangePicker.jsx | 2 +- components/date-picker/WeekPicker.jsx | 2 +- components/date-picker/createPicker.js | 2 +- components/date-picker/wrapPicker.js | 2 +- components/descriptions/index.jsx | 2 +- components/divider/index.jsx | 2 +- components/drawer/index.jsx | 2 +- components/dropdown/dropdown-button.jsx | 2 +- components/dropdown/dropdown.jsx | 2 +- components/empty/index.jsx | 2 +- components/form-model/Form.jsx | 2 +- components/form-model/FormItem.jsx | 2 +- components/form/Form.jsx | 2 +- components/form/FormItem.jsx | 2 +- components/grid/Col.jsx | 2 +- components/grid/Row.jsx | 2 +- components/input-number/index.jsx | 2 +- components/input/Group.jsx | 2 +- components/input/Input.jsx | 2 +- components/input/Search.jsx | 2 +- components/input/TextArea.jsx | 2 +- components/layout/Sider.jsx | 2 +- components/layout/layout.jsx | 2 +- components/list/Item.jsx | 2 +- components/list/index.jsx | 2 +- components/mentions/index.jsx | 2 +- components/menu/index.jsx | 2 +- components/modal/Modal.jsx | 2 +- components/page-header/index.jsx | 2 +- components/pagination/Pagination.jsx | 2 +- components/popconfirm/index.jsx | 2 +- components/popover/index.jsx | 2 +- components/progress/progress.jsx | 2 +- components/radio/Group.jsx | 2 +- components/radio/Radio.jsx | 2 +- components/radio/RadioButton.jsx | 2 +- components/rate/index.jsx | 2 +- components/result/index.jsx | 2 +- components/select/index.jsx | 2 +- components/skeleton/index.jsx | 2 +- components/slider/index.jsx | 2 +- components/space/index.jsx | 2 +- components/spin/Spin.jsx | 2 +- components/statistic/Statistic.jsx | 2 +- components/steps/index.jsx | 2 +- components/switch/index.jsx | 2 +- components/table/Table.jsx | 2 +- components/tabs/tabs.jsx | 2 +- components/tag/CheckableTag.jsx | 2 +- components/tag/Tag.jsx | 2 +- components/time-picker/index.jsx | 2 +- components/timeline/Timeline.jsx | 2 +- components/timeline/TimelineItem.jsx | 2 +- components/tooltip/Tooltip.jsx | 2 +- components/transfer/index.jsx | 2 +- components/tree-select/index.jsx | 2 +- components/tree/DirectoryTree.jsx | 2 +- components/tree/Tree.jsx | 2 +- components/upload/Upload.jsx | 2 +- components/upload/UploadList.jsx | 2 +- 91 files changed, 98 insertions(+), 97 deletions(-) create mode 100644 components/config-provider/configConsumerProps.jsx diff --git a/components/_util/wave.jsx b/components/_util/wave.jsx index e36bd5e6d..361da05bb 100644 --- a/components/_util/wave.jsx +++ b/components/_util/wave.jsx @@ -1,6 +1,6 @@ import TransitionEvents from './css-animation/Event'; import raf from './raf'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; let styleForPesudo; // Where el is the DOM element you'd like to test for visibility diff --git a/components/affix/index.jsx b/components/affix/index.jsx index d7019d017..e730c3d25 100644 --- a/components/affix/index.jsx +++ b/components/affix/index.jsx @@ -4,7 +4,7 @@ import omit from 'omit.js'; import ResizeObserver from '../vc-resize-observer'; import BaseMixin from '../_util/BaseMixin'; import throttleByAnimationFrame from '../_util/throttleByAnimationFrame'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; import warning from '../_util/warning'; import { diff --git a/components/alert/index.jsx b/components/alert/index.jsx index d9b826ab2..fcadb0c00 100644 --- a/components/alert/index.jsx +++ b/components/alert/index.jsx @@ -5,7 +5,7 @@ import PropTypes from '../_util/vue-types'; import getTransitionProps from '../_util/getTransitionProps'; import { getComponentFromProp, isValidElement } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; function noop() {} diff --git a/components/anchor/Anchor.jsx b/components/anchor/Anchor.jsx index 485bb9e22..085191dfa 100644 --- a/components/anchor/Anchor.jsx +++ b/components/anchor/Anchor.jsx @@ -6,7 +6,7 @@ import scrollTo from '../_util/scrollTo'; import getScroll from '../_util/getScroll'; import { initDefaultProps } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; function getDefaultContainer() { return window; diff --git a/components/anchor/AnchorLink.jsx b/components/anchor/AnchorLink.jsx index ca36495f2..6eb2567bb 100644 --- a/components/anchor/AnchorLink.jsx +++ b/components/anchor/AnchorLink.jsx @@ -1,7 +1,7 @@ import PropTypes from '../_util/vue-types'; import { initDefaultProps, getComponentFromProp } from '../_util/props-util'; import classNames from 'classnames'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const AnchorLinkProps = { prefixCls: PropTypes.string, diff --git a/components/auto-complete/index.jsx b/components/auto-complete/index.jsx index 0d5d93814..4dc8167e6 100644 --- a/components/auto-complete/index.jsx +++ b/components/auto-complete/index.jsx @@ -3,7 +3,7 @@ import Select, { AbstractSelectProps, SelectValue } from '../select'; import Input from '../input'; import InputElement from './InputElement'; import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { getComponentFromProp, getOptionProps, diff --git a/components/avatar/Avatar.jsx b/components/avatar/Avatar.jsx index 71d76979d..49540aad1 100644 --- a/components/avatar/Avatar.jsx +++ b/components/avatar/Avatar.jsx @@ -1,4 +1,4 @@ -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; import { getListeners, getComponentFromProp } from '../_util/props-util'; import PropTypes from '../_util/vue-types'; diff --git a/components/back-top/index.jsx b/components/back-top/index.jsx index 4a4df1bfc..29a8bed2c 100644 --- a/components/back-top/index.jsx +++ b/components/back-top/index.jsx @@ -3,7 +3,7 @@ import addEventListener from '../vc-util/Dom/addEventListener'; import getScroll from '../_util/getScroll'; import BaseMixin from '../_util/BaseMixin'; import getTransitionProps from '../_util/getTransitionProps'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; import { getListeners } from '../_util/props-util'; import scrollTo from '../_util/scrollTo'; diff --git a/components/badge/Badge.jsx b/components/badge/Badge.jsx index 8531e344b..317f7686b 100644 --- a/components/badge/Badge.jsx +++ b/components/badge/Badge.jsx @@ -11,7 +11,7 @@ import { import { cloneElement } from '../_util/vnode'; import getTransitionProps from '../_util/getTransitionProps'; import isNumeric from '../_util/isNumeric'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; const BadgeProps = { /** Number to show in badge */ diff --git a/components/badge/ScrollNumber.jsx b/components/badge/ScrollNumber.jsx index d4dd04107..888f27dd0 100644 --- a/components/badge/ScrollNumber.jsx +++ b/components/badge/ScrollNumber.jsx @@ -4,7 +4,7 @@ import BaseMixin from '../_util/BaseMixin'; import { getStyle } from '../_util/props-util'; import omit from 'omit.js'; import { cloneElement } from '../_util/vnode'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; function getNumberArray(num) { return num diff --git a/components/breadcrumb/Breadcrumb.jsx b/components/breadcrumb/Breadcrumb.jsx index 12b1521e5..732ac8fc9 100644 --- a/components/breadcrumb/Breadcrumb.jsx +++ b/components/breadcrumb/Breadcrumb.jsx @@ -2,7 +2,7 @@ import PropTypes from '../_util/vue-types'; import { cloneElement } from '../_util/vnode'; import { filterEmpty, getComponentFromProp, getSlotOptions } from '../_util/props-util'; import warning from '../_util/warning'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import BreadcrumbItem from './BreadcrumbItem'; import Menu from '../menu'; diff --git a/components/breadcrumb/BreadcrumbItem.jsx b/components/breadcrumb/BreadcrumbItem.jsx index bfebfb63c..955692473 100644 --- a/components/breadcrumb/BreadcrumbItem.jsx +++ b/components/breadcrumb/BreadcrumbItem.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import { hasProp, getComponentFromProp } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import DropDown from '../dropdown/dropdown'; import Icon from '../icon'; diff --git a/components/breadcrumb/BreadcrumbSeparator.jsx b/components/breadcrumb/BreadcrumbSeparator.jsx index 09f0b2c6f..f6c4d8c86 100644 --- a/components/breadcrumb/BreadcrumbSeparator.jsx +++ b/components/breadcrumb/BreadcrumbSeparator.jsx @@ -1,4 +1,4 @@ -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import PropTypes from '../_util/vue-types'; export default { diff --git a/components/button/button-group.jsx b/components/button/button-group.jsx index 41f05fd6d..af59736df 100644 --- a/components/button/button-group.jsx +++ b/components/button/button-group.jsx @@ -1,6 +1,6 @@ import { filterEmpty } from '../_util/props-util'; import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; const ButtonGroupProps = { prefixCls: PropTypes.string, diff --git a/components/button/button.jsx b/components/button/button.jsx index b113d3b7e..0488e8286 100644 --- a/components/button/button.jsx +++ b/components/button/button.jsx @@ -2,7 +2,7 @@ import Wave from '../_util/wave'; import Icon from '../icon'; import buttonTypes from './buttonTypes'; import { filterEmpty, getListeners, getComponentFromProp } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/; const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar); diff --git a/components/calendar/Header.jsx b/components/calendar/Header.jsx index e69643bdb..36e42b40f 100644 --- a/components/calendar/Header.jsx +++ b/components/calendar/Header.jsx @@ -2,7 +2,7 @@ import Select from '../select'; import { Group, Button } from '../radio'; import PropTypes from '../_util/vue-types'; import { initDefaultProps } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; const { Option } = Select; diff --git a/components/calendar/index.jsx b/components/calendar/index.jsx index e793a4b56..d93f41faa 100644 --- a/components/calendar/index.jsx +++ b/components/calendar/index.jsx @@ -6,7 +6,7 @@ import FullCalendar from '../vc-calendar/src/FullCalendar'; import Header from './Header'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; import interopDefault from '../_util/interopDefault'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import enUS from './locale/en_US'; import Base from '../base'; import { checkValidate, stringToMoment, momentToString, TimeType } from '../_util/moment-util'; diff --git a/components/card/Card.jsx b/components/card/Card.jsx index 9b1a8885a..40d4f9275 100644 --- a/components/card/Card.jsx +++ b/components/card/Card.jsx @@ -10,7 +10,7 @@ import { getListeners, } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; const { TabPane } = Tabs; export default { diff --git a/components/card/Grid.jsx b/components/card/Grid.jsx index 24df54786..a0521457e 100644 --- a/components/card/Grid.jsx +++ b/components/card/Grid.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { getListeners } from '../_util/props-util'; export default { diff --git a/components/card/Meta.jsx b/components/card/Meta.jsx index e77901948..f061b5435 100644 --- a/components/card/Meta.jsx +++ b/components/card/Meta.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import { getComponentFromProp, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export default { name: 'ACardMeta', diff --git a/components/carousel/index.jsx b/components/carousel/index.jsx index f64274ef5..e4e3a3fff 100644 --- a/components/carousel/index.jsx +++ b/components/carousel/index.jsx @@ -6,7 +6,7 @@ import hasProp, { filterEmpty, getListeners, } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; import warning from '../_util/warning'; import classNames from 'classnames'; diff --git a/components/cascader/index.jsx b/components/cascader/index.jsx index 1e35c4595..714fc85aa 100644 --- a/components/cascader/index.jsx +++ b/components/cascader/index.jsx @@ -20,7 +20,7 @@ import { import BaseMixin from '../_util/BaseMixin'; import { cloneElement } from '../_util/vnode'; import warning from '../_util/warning'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; const CascaderOptionType = PropTypes.shape({ diff --git a/components/checkbox/Checkbox.jsx b/components/checkbox/Checkbox.jsx index 3334f7cbb..e40f2b0b6 100644 --- a/components/checkbox/Checkbox.jsx +++ b/components/checkbox/Checkbox.jsx @@ -2,7 +2,7 @@ import PropTypes from '../_util/vue-types'; import classNames from 'classnames'; import VcCheckbox from '../vc-checkbox'; import hasProp, { getOptionProps, getAttrs, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import warning from '../_util/warning'; function noop() {} diff --git a/components/checkbox/Group.jsx b/components/checkbox/Group.jsx index da4d63886..d2d47d09d 100644 --- a/components/checkbox/Group.jsx +++ b/components/checkbox/Group.jsx @@ -1,7 +1,7 @@ import PropTypes from '../_util/vue-types'; import Checkbox from './Checkbox'; import hasProp from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; function noop() {} export default { diff --git a/components/collapse/Collapse.jsx b/components/collapse/Collapse.jsx index f212da98c..09fbbe259 100644 --- a/components/collapse/Collapse.jsx +++ b/components/collapse/Collapse.jsx @@ -9,7 +9,7 @@ import { import { cloneElement } from '../_util/vnode'; import VcCollapse, { collapseProps } from '../vc-collapse'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export default { name: 'ACollapse', diff --git a/components/collapse/CollapsePanel.jsx b/components/collapse/CollapsePanel.jsx index c4bb52035..c93baaf6f 100644 --- a/components/collapse/CollapsePanel.jsx +++ b/components/collapse/CollapsePanel.jsx @@ -1,6 +1,6 @@ import { getOptionProps, getComponentFromProp, getListeners } from '../_util/props-util'; import VcCollapse, { panelProps } from '../vc-collapse'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export default { name: 'ACollapsePanel', diff --git a/components/color-picker/ColorPicker.jsx b/components/color-picker/ColorPicker.jsx index 77bc630c4..dfcd64ccd 100644 --- a/components/color-picker/ColorPicker.jsx +++ b/components/color-picker/ColorPicker.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import BaseMixin from '../_util/BaseMixin'; import Pickr from '@simonwep/pickr/dist/pickr.es5.min'; import Icon from '../icon'; diff --git a/components/comment/index.jsx b/components/comment/index.jsx index 588849141..89a3cc729 100644 --- a/components/comment/index.jsx +++ b/components/comment/index.jsx @@ -1,6 +1,6 @@ import PropsTypes from '../_util/vue-types'; import { getComponentFromProp, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; export const CommentProps = { actions: PropsTypes.array, diff --git a/components/config-provider/configConsumerProps.jsx b/components/config-provider/configConsumerProps.jsx new file mode 100644 index 000000000..61dcff185 --- /dev/null +++ b/components/config-provider/configConsumerProps.jsx @@ -0,0 +1,9 @@ +import defaultRenderEmpty from './renderEmpty'; + +export const ConfigConsumerProps = { + getPrefixCls: (suffixCls, customizePrefixCls) => { + if (customizePrefixCls) return customizePrefixCls; + return `ant-${suffixCls}`; + }, + renderEmpty: defaultRenderEmpty, +}; diff --git a/components/config-provider/index.jsx b/components/config-provider/index.jsx index 5a591989d..a4c0c65a9 100644 --- a/components/config-provider/index.jsx +++ b/components/config-provider/index.jsx @@ -82,14 +82,6 @@ const ConfigProvider = { }, }; -export const ConfigConsumerProps = { - getPrefixCls: (suffixCls, customizePrefixCls) => { - if (customizePrefixCls) return customizePrefixCls; - return `ant-${suffixCls}`; - }, - renderEmpty: defaultRenderEmpty, -}; - /* istanbul ignore next */ ConfigProvider.install = function(Vue) { Vue.use(Base); diff --git a/components/config-provider/renderEmpty.jsx b/components/config-provider/renderEmpty.jsx index b0158acd8..2d990423b 100644 --- a/components/config-provider/renderEmpty.jsx +++ b/components/config-provider/renderEmpty.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import Empty from '../empty'; -import { ConfigConsumerProps } from './'; +import { ConfigConsumerProps } from './configConsumerProps'; const RenderEmpty = { functional: true, diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx index 88e05b569..565f545bd 100644 --- a/components/date-picker/RangePicker.jsx +++ b/components/date-picker/RangePicker.jsx @@ -5,7 +5,7 @@ import classNames from 'classnames'; import shallowequal from 'shallowequal'; import Icon from '../icon'; import Tag from '../tag'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import interopDefault from '../_util/interopDefault'; import { RangePickerProps } from './interface'; import { diff --git a/components/date-picker/WeekPicker.jsx b/components/date-picker/WeekPicker.jsx index 550f4e8cf..57659952a 100644 --- a/components/date-picker/WeekPicker.jsx +++ b/components/date-picker/WeekPicker.jsx @@ -2,7 +2,7 @@ import * as moment from 'moment'; import Calendar from '../vc-calendar'; import VcDatePicker from '../vc-calendar/src/Picker'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { hasProp, getOptionProps, diff --git a/components/date-picker/createPicker.js b/components/date-picker/createPicker.js index 4aac434f5..51a5d730d 100644 --- a/components/date-picker/createPicker.js +++ b/components/date-picker/createPicker.js @@ -4,7 +4,7 @@ import MonthCalendar from '../vc-calendar/src/MonthCalendar'; import VcDatePicker from '../vc-calendar/src/Picker'; import classNames from 'classnames'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import interopDefault from '../_util/interopDefault'; import BaseMixin from '../_util/BaseMixin'; import { diff --git a/components/date-picker/wrapPicker.js b/components/date-picker/wrapPicker.js index fad4e4fe5..bed325c2c 100644 --- a/components/date-picker/wrapPicker.js +++ b/components/date-picker/wrapPicker.js @@ -4,7 +4,7 @@ import LocaleReceiver from '../locale-provider/LocaleReceiver'; import { generateShowHourMinuteSecond } from '../time-picker'; import enUS from './locale/en_US'; import { getOptionProps, initDefaultProps, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { checkValidate, stringToMoment, momentToString } from '../_util/moment-util'; const DEFAULT_FORMAT = { diff --git a/components/descriptions/index.jsx b/components/descriptions/index.jsx index f60a0c8a1..8ee9ef62b 100644 --- a/components/descriptions/index.jsx +++ b/components/descriptions/index.jsx @@ -1,6 +1,6 @@ import warning from '../_util/warning'; import ResponsiveObserve, { responsiveArray } from '../_util/responsiveObserve'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Col from './Col'; import PropTypes from '../_util/vue-types'; import { diff --git a/components/divider/index.jsx b/components/divider/index.jsx index 2838bc66f..e0e24f4a5 100644 --- a/components/divider/index.jsx +++ b/components/divider/index.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; const Divider = { diff --git a/components/drawer/index.jsx b/components/drawer/index.jsx index 0ce9bfacf..9049ded1f 100644 --- a/components/drawer/index.jsx +++ b/components/drawer/index.jsx @@ -5,7 +5,7 @@ import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; import Icon from '../icon'; import { getComponentFromProp, getOptionProps, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; const Drawer = { diff --git a/components/dropdown/dropdown-button.jsx b/components/dropdown/dropdown-button.jsx index 548cf6010..ee1555bac 100644 --- a/components/dropdown/dropdown-button.jsx +++ b/components/dropdown/dropdown-button.jsx @@ -5,7 +5,7 @@ import Dropdown from './dropdown'; import PropTypes from '../_util/vue-types'; import { hasProp, getComponentFromProp } from '../_util/props-util'; import getDropdownProps from './getDropdownProps'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; const ButtonTypesProps = buttonTypes(); diff --git a/components/dropdown/dropdown.jsx b/components/dropdown/dropdown.jsx index 006636449..c0251b13a 100644 --- a/components/dropdown/dropdown.jsx +++ b/components/dropdown/dropdown.jsx @@ -9,7 +9,7 @@ import { getListeners, } from '../_util/props-util'; import getDropdownProps from './getDropdownProps'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; const DropdownProps = getDropdownProps(); diff --git a/components/empty/index.jsx b/components/empty/index.jsx index 2501864ed..78dfd3f7f 100644 --- a/components/empty/index.jsx +++ b/components/empty/index.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { getComponentFromProp, getListeners } from '../_util/props-util'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; import DefaultEmptyImg from './empty'; diff --git a/components/form-model/Form.jsx b/components/form-model/Form.jsx index d480516c3..9e606de9b 100755 --- a/components/form-model/Form.jsx +++ b/components/form-model/Form.jsx @@ -5,7 +5,7 @@ import isRegExp from 'lodash/isRegExp'; import warning from '../_util/warning'; import FormItem from './FormItem'; import { initDefaultProps, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const FormProps = { layout: PropTypes.oneOf(['horizontal', 'inline', 'vertical']), diff --git a/components/form-model/FormItem.jsx b/components/form-model/FormItem.jsx index bbd1a6778..a97254bb0 100644 --- a/components/form-model/FormItem.jsx +++ b/components/form-model/FormItem.jsx @@ -11,7 +11,7 @@ import { isValidElement, } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import FormItem from '../form/FormItem'; import { cloneElement } from '../_util/vnode'; diff --git a/components/form/Form.jsx b/components/form/Form.jsx index f3750ce58..ba28a633d 100755 --- a/components/form/Form.jsx +++ b/components/form/Form.jsx @@ -9,7 +9,7 @@ import createFormField from '../vc-form/src/createFormField'; import FormItem from './FormItem'; import { FIELD_META_PROP, FIELD_DATA_PROP } from './constants'; import { initDefaultProps, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; export const FormCreateOption = { diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx index 3ce209354..172bd90f4 100644 --- a/components/form/FormItem.jsx +++ b/components/form/FormItem.jsx @@ -17,7 +17,7 @@ import getTransitionProps from '../_util/getTransitionProps'; import BaseMixin from '../_util/BaseMixin'; import { cloneElement, cloneVNodes } from '../_util/vnode'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; function noop() {} diff --git a/components/grid/Col.jsx b/components/grid/Col.jsx index dbad40112..d064f5d15 100644 --- a/components/grid/Col.jsx +++ b/components/grid/Col.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { getListeners } from '../_util/props-util'; const stringOrNumber = PropTypes.oneOfType([PropTypes.string, PropTypes.number]); diff --git a/components/grid/Row.jsx b/components/grid/Row.jsx index 04757e8fe..d07bb3064 100644 --- a/components/grid/Row.jsx +++ b/components/grid/Row.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import ResponsiveObserve from '../_util/responsiveObserve'; const RowProps = { diff --git a/components/input-number/index.jsx b/components/input-number/index.jsx index 22784e228..5d8b153ce 100644 --- a/components/input-number/index.jsx +++ b/components/input-number/index.jsx @@ -3,7 +3,7 @@ import { initDefaultProps, getOptionProps, getListeners } from '../_util/props-u import classNames from 'classnames'; import Icon from '../icon'; import VcInputNumber from '../vc-input-number/src'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; export const InputNumberProps = { diff --git a/components/input/Group.jsx b/components/input/Group.jsx index e89cd578b..275404be6 100644 --- a/components/input/Group.jsx +++ b/components/input/Group.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import { filterEmpty, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export default { name: 'AInputGroup', diff --git a/components/input/Input.jsx b/components/input/Input.jsx index e7a003e83..33aec9f10 100644 --- a/components/input/Input.jsx +++ b/components/input/Input.jsx @@ -3,7 +3,7 @@ import TextArea from './TextArea'; import omit from 'omit.js'; import inputProps from './inputProps'; import { hasProp, getComponentFromProp, getListeners, getOptionProps } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import ClearableLabeledInput from './ClearableLabeledInput'; function noop() {} diff --git a/components/input/Search.jsx b/components/input/Search.jsx index 4df2a5e4e..58b931847 100644 --- a/components/input/Search.jsx +++ b/components/input/Search.jsx @@ -7,7 +7,7 @@ import Button from '../button'; import { cloneElement } from '../_util/vnode'; import PropTypes from '../_util/vue-types'; import { getOptionProps, getComponentFromProp, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export default { name: 'AInputSearch', diff --git a/components/input/TextArea.jsx b/components/input/TextArea.jsx index 5e8afa7c8..6b198d109 100644 --- a/components/input/TextArea.jsx +++ b/components/input/TextArea.jsx @@ -2,7 +2,7 @@ import ClearableLabeledInput from './ClearableLabeledInput'; import ResizableTextArea from './ResizableTextArea'; import inputProps from './inputProps'; import hasProp, { getListeners, getOptionProps } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { fixControlledValue, resolveOnChange } from './Input'; import PropTypes from '../_util/vue-types'; diff --git a/components/layout/Sider.jsx b/components/layout/Sider.jsx index 6fe4dc2e4..adc60e3c9 100644 --- a/components/layout/Sider.jsx +++ b/components/layout/Sider.jsx @@ -9,7 +9,7 @@ import { } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; import isNumeric from '../_util/isNumeric'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; // matchMedia polyfill for diff --git a/components/layout/layout.jsx b/components/layout/layout.jsx index ab4255fab..88f3b5dd2 100644 --- a/components/layout/layout.jsx +++ b/components/layout/layout.jsx @@ -1,7 +1,7 @@ import PropTypes from '../_util/vue-types'; import classNames from 'classnames'; import { getOptionProps, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const BasicProps = { prefixCls: PropTypes.string, diff --git a/components/list/Item.jsx b/components/list/Item.jsx index 20759106f..c9a6878df 100644 --- a/components/list/Item.jsx +++ b/components/list/Item.jsx @@ -7,7 +7,7 @@ import { isEmptyElement, } from '../_util/props-util'; import { Col } from '../grid'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { ListGridType } from './index'; import { cloneElement } from '../_util/vnode'; diff --git a/components/list/index.jsx b/components/list/index.jsx index c85716744..641b770fd 100644 --- a/components/list/index.jsx +++ b/components/list/index.jsx @@ -1,7 +1,7 @@ import PropTypes from '../_util/vue-types'; import classNames from 'classnames'; import omit from 'omit.js'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Spin from '../spin'; import Pagination, { PaginationConfig } from '../pagination'; diff --git a/components/mentions/index.jsx b/components/mentions/index.jsx index ada35d658..a79ab5831 100644 --- a/components/mentions/index.jsx +++ b/components/mentions/index.jsx @@ -6,7 +6,7 @@ import { mentionsProps } from '../vc-mentions/src/mentionsProps'; import Base from '../base'; import Spin from '../spin'; import BaseMixin from '../_util/BaseMixin'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { getOptionProps, getComponentFromProp, diff --git a/components/menu/index.jsx b/components/menu/index.jsx index 180d02a0b..04d84b40a 100644 --- a/components/menu/index.jsx +++ b/components/menu/index.jsx @@ -8,7 +8,7 @@ import Item from './MenuItem'; import { hasProp, getListeners, getOptionProps } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; import commonPropsType from '../vc-menu/commonPropsType'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; // import raf from '../_util/raf'; diff --git a/components/modal/Modal.jsx b/components/modal/Modal.jsx index 13ca61328..001ec1fe2 100644 --- a/components/modal/Modal.jsx +++ b/components/modal/Modal.jsx @@ -16,7 +16,7 @@ import { mergeProps, getListeners, } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; let mousePosition = null; // ref: https://github.com/ant-design/ant-design/issues/15795 diff --git a/components/page-header/index.jsx b/components/page-header/index.jsx index a22d0b2ce..619667747 100644 --- a/components/page-header/index.jsx +++ b/components/page-header/index.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import { getComponentFromProp, getOptionProps } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; import Breadcrumb from '../breadcrumb'; import Avatar from '../avatar'; diff --git a/components/pagination/Pagination.jsx b/components/pagination/Pagination.jsx index a4df55765..172b28e56 100644 --- a/components/pagination/Pagination.jsx +++ b/components/pagination/Pagination.jsx @@ -6,7 +6,7 @@ import { getOptionProps, getListeners } from '../_util/props-util'; import VcPagination from '../vc-pagination'; import enUS from '../vc-pagination/locale/en_US'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const PaginationProps = () => ({ total: PropTypes.number, diff --git a/components/popconfirm/index.jsx b/components/popconfirm/index.jsx index b52446909..33a579556 100644 --- a/components/popconfirm/index.jsx +++ b/components/popconfirm/index.jsx @@ -9,7 +9,7 @@ import Icon from '../icon'; import Button from '../button'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; import defaultLocale from '../locale-provider/default'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; const tooltipProps = abstractTooltipProps(); diff --git a/components/popover/index.jsx b/components/popover/index.jsx index 719db4bdb..755a43ec2 100644 --- a/components/popover/index.jsx +++ b/components/popover/index.jsx @@ -2,7 +2,7 @@ import Tooltip from '../tooltip'; import abstractTooltipProps from '../tooltip/abstractTooltipProps'; import PropTypes from '../_util/vue-types'; import { getOptionProps, getComponentFromProp, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; const props = abstractTooltipProps(); diff --git a/components/progress/progress.jsx b/components/progress/progress.jsx index cf13b631a..504720ccc 100644 --- a/components/progress/progress.jsx +++ b/components/progress/progress.jsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import PropTypes from '../_util/vue-types'; import { getOptionProps, initDefaultProps, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; import Line from './line'; import Circle from './circle'; diff --git a/components/radio/Group.jsx b/components/radio/Group.jsx index 0b8a6e2d5..94b659aa4 100644 --- a/components/radio/Group.jsx +++ b/components/radio/Group.jsx @@ -2,7 +2,7 @@ import classNames from 'classnames'; import PropTypes from '../_util/vue-types'; import Radio from './Radio'; import { getOptionProps, filterEmpty, hasProp, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; function noop() {} export default { diff --git a/components/radio/Radio.jsx b/components/radio/Radio.jsx index e24b6924e..095de6ef4 100644 --- a/components/radio/Radio.jsx +++ b/components/radio/Radio.jsx @@ -2,7 +2,7 @@ import PropTypes from '../_util/vue-types'; import VcCheckbox from '../vc-checkbox'; import classNames from 'classnames'; import { getOptionProps, getAttrs, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; function noop() {} diff --git a/components/radio/RadioButton.jsx b/components/radio/RadioButton.jsx index b88d51be0..c5b8f27ee 100644 --- a/components/radio/RadioButton.jsx +++ b/components/radio/RadioButton.jsx @@ -1,6 +1,6 @@ import Radio from './Radio'; import { getOptionProps, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export default { name: 'ARadioButton', diff --git a/components/rate/index.jsx b/components/rate/index.jsx index 0188deb51..fb4e58eac 100644 --- a/components/rate/index.jsx +++ b/components/rate/index.jsx @@ -1,7 +1,7 @@ import omit from 'omit.js'; import PropTypes from '../_util/vue-types'; import { getOptionProps, getComponentFromProp, getListeners } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import VcRate from '../vc-rate'; import Icon from '../icon'; import Tooltip from '../tooltip'; diff --git a/components/result/index.jsx b/components/result/index.jsx index 8523753e9..f773b3f79 100644 --- a/components/result/index.jsx +++ b/components/result/index.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import { getComponentFromProp } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; import Base from '../base'; import noFound from './noFound'; diff --git a/components/select/index.jsx b/components/select/index.jsx index 706c9886a..e8196d2f8 100644 --- a/components/select/index.jsx +++ b/components/select/index.jsx @@ -2,7 +2,7 @@ import warning from '../_util/warning'; import omit from 'omit.js'; import PropTypes from '../_util/vue-types'; import { Select as VcSelect, Option, OptGroup } from '../vc-select'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { getComponentFromProp, getOptionProps, diff --git a/components/skeleton/index.jsx b/components/skeleton/index.jsx index c66bdbde3..0ded44c7e 100644 --- a/components/skeleton/index.jsx +++ b/components/skeleton/index.jsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import PropTypes from '../_util/vue-types'; import { initDefaultProps, hasProp } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Avatar, { SkeletonAvatarProps } from './Avatar'; import Title, { SkeletonTitleProps } from './Title'; import Paragraph, { SkeletonParagraphProps } from './Paragraph'; diff --git a/components/slider/index.jsx b/components/slider/index.jsx index 734debb74..718046063 100644 --- a/components/slider/index.jsx +++ b/components/slider/index.jsx @@ -6,7 +6,7 @@ import VcRange from '../vc-slider/src/Range'; import VcHandle from '../vc-slider/src/Handle'; import Tooltip from '../tooltip'; import Base from '../base'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import abstractTooltipProps from '../tooltip/abstractTooltipProps'; // export interface SliderMarks { diff --git a/components/space/index.jsx b/components/space/index.jsx index 92cd92c92..e4dce17b7 100644 --- a/components/space/index.jsx +++ b/components/space/index.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import { filterEmpty, initDefaultProps } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const SpaceSizeType = PropTypes.oneOfType([ PropTypes.number, diff --git a/components/spin/Spin.jsx b/components/spin/Spin.jsx index 4ee6a6cd5..eca97eb15 100644 --- a/components/spin/Spin.jsx +++ b/components/spin/Spin.jsx @@ -9,7 +9,7 @@ import { getListeners, } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const SpinSize = PropTypes.oneOf(['small', 'default', 'large']); diff --git a/components/statistic/Statistic.jsx b/components/statistic/Statistic.jsx index fee065f27..ce0536aa6 100644 --- a/components/statistic/Statistic.jsx +++ b/components/statistic/Statistic.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import { getComponentFromProp, initDefaultProps } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import StatisticNumber from './Number'; export const StatisticProps = { diff --git a/components/steps/index.jsx b/components/steps/index.jsx index 6d50e5755..1a81bcdda 100644 --- a/components/steps/index.jsx +++ b/components/steps/index.jsx @@ -2,7 +2,7 @@ import PropTypes from '../_util/vue-types'; import { initDefaultProps, getOptionProps, getListeners } from '../_util/props-util'; import VcSteps from '../vc-steps'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; const getStepsProps = (defaultProps = {}) => { diff --git a/components/switch/index.jsx b/components/switch/index.jsx index fae809549..1cde8d9fc 100644 --- a/components/switch/index.jsx +++ b/components/switch/index.jsx @@ -3,7 +3,7 @@ import hasProp, { getOptionProps, getComponentFromProp, getListeners } from '../ import VcSwitch from '../vc-switch'; import Wave from '../_util/wave'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; import warning from '../_util/warning'; diff --git a/components/table/Table.jsx b/components/table/Table.jsx index bc4a786ee..96921909f 100755 --- a/components/table/Table.jsx +++ b/components/table/Table.jsx @@ -11,7 +11,7 @@ import createBodyRow from './createBodyRow'; import { flatArray, treeMap, flatFilter } from './util'; import { initDefaultProps, mergeProps, getOptionProps, getListeners } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { TableProps } from './interface'; import Pagination from '../pagination'; import Icon from '../icon'; diff --git a/components/tabs/tabs.jsx b/components/tabs/tabs.jsx index 4d4677013..5087d179f 100644 --- a/components/tabs/tabs.jsx +++ b/components/tabs/tabs.jsx @@ -11,7 +11,7 @@ import { } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; import isValid from '../_util/isValid'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import TabBar from './TabBar'; export default { diff --git a/components/tag/CheckableTag.jsx b/components/tag/CheckableTag.jsx index 8e9b1a9cb..1fc8a6a2b 100644 --- a/components/tag/CheckableTag.jsx +++ b/components/tag/CheckableTag.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export default { name: 'ACheckableTag', diff --git a/components/tag/Tag.jsx b/components/tag/Tag.jsx index b5b476e16..7abfe94c4 100644 --- a/components/tag/Tag.jsx +++ b/components/tag/Tag.jsx @@ -5,7 +5,7 @@ import omit from 'omit.js'; import Wave from '../_util/wave'; import { hasProp, getListeners, getOptionProps } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import warning from '../_util/warning'; const PresetColorTypes = [ diff --git a/components/time-picker/index.jsx b/components/time-picker/index.jsx index cda3bed3b..66f57e9d0 100644 --- a/components/time-picker/index.jsx +++ b/components/time-picker/index.jsx @@ -15,7 +15,7 @@ import { getListeners, } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; import { checkValidate, diff --git a/components/timeline/Timeline.jsx b/components/timeline/Timeline.jsx index 79291138a..6c60b2cd3 100644 --- a/components/timeline/Timeline.jsx +++ b/components/timeline/Timeline.jsx @@ -11,7 +11,7 @@ import { import { cloneElement } from '../_util/vnode'; import TimelineItem from './TimelineItem'; import Icon from '../icon'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const TimelineProps = { prefixCls: PropTypes.string, diff --git a/components/timeline/TimelineItem.jsx b/components/timeline/TimelineItem.jsx index ed7f2006f..88c876e6d 100644 --- a/components/timeline/TimelineItem.jsx +++ b/components/timeline/TimelineItem.jsx @@ -6,7 +6,7 @@ import { getComponentFromProp, getListeners, } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; export const TimeLineItemProps = { prefixCls: PropTypes.string, diff --git a/components/tooltip/Tooltip.jsx b/components/tooltip/Tooltip.jsx index f4c0977ad..fd4af1fb1 100644 --- a/components/tooltip/Tooltip.jsx +++ b/components/tooltip/Tooltip.jsx @@ -10,7 +10,7 @@ import { isValidElement, getListeners, } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import abstractTooltipProps from './abstractTooltipProps'; const splitObject = (obj, keys) => { diff --git a/components/transfer/index.jsx b/components/transfer/index.jsx index c8d670b27..0d7967545 100644 --- a/components/transfer/index.jsx +++ b/components/transfer/index.jsx @@ -12,7 +12,7 @@ import List from './list'; import Operation from './operation'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; import defaultLocale from '../locale-provider/default'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import warning from '../_util/warning'; import Base from '../base'; diff --git a/components/tree-select/index.jsx b/components/tree-select/index.jsx index d2bd10161..7fa467480 100644 --- a/components/tree-select/index.jsx +++ b/components/tree-select/index.jsx @@ -9,7 +9,7 @@ import { filterEmpty, getListeners, } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Base from '../base'; export { TreeData, TreeSelectProps } from './interface'; diff --git a/components/tree/DirectoryTree.jsx b/components/tree/DirectoryTree.jsx index 727d13ba1..ef0d12e93 100644 --- a/components/tree/DirectoryTree.jsx +++ b/components/tree/DirectoryTree.jsx @@ -18,7 +18,7 @@ import { getListeners, getComponentFromProp, } from '../_util/props-util'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; // export type ExpandAction = false | 'click' | 'dblclick'; export interface // DirectoryTreeProps extends TreeProps { expandAction?: ExpandAction; } diff --git a/components/tree/Tree.jsx b/components/tree/Tree.jsx index 60f833955..d2fb5676a 100644 --- a/components/tree/Tree.jsx +++ b/components/tree/Tree.jsx @@ -10,7 +10,7 @@ import { getListeners, } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Icon from '../icon'; function TreeProps() { diff --git a/components/upload/Upload.jsx b/components/upload/Upload.jsx index d77f02365..c5100dca9 100644 --- a/components/upload/Upload.jsx +++ b/components/upload/Upload.jsx @@ -7,7 +7,7 @@ import BaseMixin from '../_util/BaseMixin'; import { getOptionProps, initDefaultProps, hasProp, getListeners } from '../_util/props-util'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; import defaultLocale from '../locale-provider/default'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import Dragger from './Dragger'; import UploadList from './UploadList'; import { UploadProps } from './interface'; diff --git a/components/upload/UploadList.jsx b/components/upload/UploadList.jsx index 71bc5f29e..5b00e77f7 100644 --- a/components/upload/UploadList.jsx +++ b/components/upload/UploadList.jsx @@ -1,7 +1,7 @@ import BaseMixin from '../_util/BaseMixin'; import { getOptionProps, initDefaultProps, getListeners } from '../_util/props-util'; import getTransitionProps from '../_util/getTransitionProps'; -import { ConfigConsumerProps } from '../config-provider'; +import { ConfigConsumerProps } from '../config-provider/configConsumerProps'; import { previewImage, isImageUrl } from './utils'; import Icon from '../icon'; import Tooltip from '../tooltip';