Skip to content

Commit 0c9e4df

Browse files
committed
chore: use vue-ref
1 parent c41cf5b commit 0c9e4df

File tree

9 files changed

+25
-17
lines changed

9 files changed

+25
-17
lines changed

components/_util/proxyComponent.jsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,21 @@ export default function wrapWithConnect (WrappedComponent) {
2828
props: {
2929
...props,
3030
__propsSymbol__: Symbol(),
31+
componentWillReceiveProps: { ...props },
3132
children: $slots.default || props.children || [],
3233
},
3334
on: $listeners,
3435
attrs: $attrs,
35-
scopedSlots: $scopedSlots,
3636
}
37+
if (Object.keys($scopedSlots).length) {
38+
wrapProps.scopedSlots = $scopedSlots
39+
}
40+
const slotsKey = Object.keys($slots)
3741
return (
3842
<WrappedComponent {...wrapProps} ref='wrappedInstance'>
39-
{Object.keys($slots).map(name => {
43+
{slotsKey.length ? slotsKey.map(name => {
4044
return <template slot={name}>{$slots[name]}</template>
41-
})}
45+
}) : null}
4246
</WrappedComponent>
4347
)
4448
},

components/form/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Vue from 'vue'
22
import Form from './Form'
3-
import antRefDirective from '../_util/antRefDirective'
3+
import ref from 'vue-ref'
44

5-
Vue.use(antRefDirective)
5+
Vue.use(ref, { name: 'ant-ref' })
66

77
export { FormProps, FormCreateOption, ValidationRule } from './Form'
88
export { FormItemProps } from './FormItem'

components/trigger/Trigger.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
import Vue from 'vue'
3-
import antRefDirective from '../_util/antRefDirective'
3+
import ref from 'vue-ref'
44
import PropTypes from '../_util/vue-types'
55
import contains from '../_util/Dom/contains'
66
import { hasProp, getComponentFromProp, getEvents, filterEmpty } from '../_util/props-util'
@@ -13,7 +13,7 @@ import BaseMixin from '../_util/BaseMixin'
1313
import { cloneElement } from '../_util/vnode'
1414
import ContainerRender from '../_util/ContainerRender'
1515

16-
Vue.use(antRefDirective)
16+
Vue.use(ref, { name: 'ant-ref' })
1717

1818
function returnEmptyString () {
1919
return ''

components/vc-drawer/src/Drawer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import classnames from 'classnames'
22
import Vue from 'vue'
3+
import ref from 'vue-ref'
34
import BaseMixin from '../../_util/BaseMixin'
4-
import antRefDirective from '../../_util/antRefDirective'
55
import { initDefaultProps, getEvents } from '../../_util/props-util'
66
import { cloneElement } from '../../_util/vnode'
77
import ContainerRender from '../../_util/ContainerRender'
@@ -25,7 +25,8 @@ const windowIsUndefined = !(
2525
window.document &&
2626
window.document.createElement
2727
)
28-
Vue.use(antRefDirective)
28+
29+
Vue.use(ref, { name: 'ant-ref' })
2930
const Drawer = {
3031
mixins: [BaseMixin],
3132
props: initDefaultProps(drawerProps, {

components/vc-form/src/index.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import createForm from './createForm'
33
import createFormField from './createFormField'
44
import formShape from './propTypes'
55
import Vue from 'vue'
6-
import antRefDirective from '../../_util/antRefDirective'
7-
Vue.use(antRefDirective)
6+
import ref from 'vue-ref'
7+
8+
Vue.use(ref, { name: 'ant-ref' })
89

910
export { createForm, createFormField, formShape }

components/vc-select/Select.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import getTransitionProps from '../_util/getTransitionProps'
1212
import { cloneElement } from '../_util/vnode'
1313
import BaseMixin from '../_util/BaseMixin'
1414
import proxyComponent from '../_util/proxyComponent'
15-
import antRefDirective from '../_util/antRefDirective'
15+
import ref from 'vue-ref'
1616

17-
Vue.use(antRefDirective)
17+
Vue.use(ref, { name: 'ant-ref' })
1818

1919
import {
2020
getPropValue,

components/vc-slick/src/inner-slider.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import debounce from 'lodash/debounce'
22
import classnames from 'classnames'
33
import Vue from 'vue'
4-
import antRefDirective from '../../_util/antRefDirective'
4+
import ref from 'vue-ref'
55
import { getStyle } from '../../_util/props-util'
66
import BaseMixin from '../../_util/BaseMixin'
77
import defaultProps from './default-props'
@@ -28,7 +28,7 @@ import Dots from './dots'
2828
import { PrevArrow, NextArrow } from './arrows'
2929
import ResizeObserver from 'resize-observer-polyfill'
3030

31-
Vue.use(antRefDirective)
31+
Vue.use(ref, { name: 'ant-ref' })
3232

3333
function noop () {}
3434

components/vc-slick/src/slider.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import json2mq from 'json2mq'
22
import Vue from 'vue'
3-
import antRefDirective from '../../_util/antRefDirective'
3+
import ref from 'vue-ref'
44
import BaseMixin from '../../_util/BaseMixin'
55
import { cloneElement } from '../../_util/vnode'
66
import { getStyle } from '../../_util/props-util'
@@ -9,7 +9,8 @@ import defaultProps from './default-props'
99
import { canUseDOM } from './utils/innerSliderUtils'
1010
const enquire = canUseDOM() && require('enquire.js')
1111

12-
Vue.use(antRefDirective)
12+
Vue.use(ref, { name: 'ant-ref' })
13+
1314
export default {
1415
props: {
1516
...defaultProps,

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
"resize-observer-polyfill": "^1.5.0",
178178
"shallow-equal": "^1.0.0",
179179
"shallowequal": "^1.0.2",
180+
"vue-ref": "^1.0.1",
180181
"warning": "^3.0.0"
181182
}
182183
}

0 commit comments

Comments
 (0)