fix: tabs keydown event trigger twice #1947

pull/1965/head
tanjinzhou 5 years ago
parent 185241472a
commit ff9f408879

@ -1,5 +1,6 @@
import { filterEmpty, parseStyleText } from './props-util'; import { filterEmpty, parseStyleText } from './props-util';
import classNames from 'classnames'; import classNames from 'classnames';
import { warning } from '../vc-util/warning';
export function cloneVNode(vnode, deep) { export function cloneVNode(vnode, deep) {
const componentOptions = vnode.componentOptions; const componentOptions = vnode.componentOptions;
@ -62,6 +63,11 @@ export function cloneElement(n, nodeProps = {}, deep) {
return null; return null;
} }
const node = cloneVNode(ele, deep); const node = cloneVNode(ele, deep);
// 函数式组件不支持clone https://github.com/vueComponent/ant-design-vue/pull/1947
warning(
!(node.fnOptions && node.fnOptions.functional),
`can not use cloneElement for functional component (${node.tag})`,
);
const { props = {}, key, on = {}, children, directives = [] } = nodeProps; const { props = {}, key, on = {}, children, directives = [] } = nodeProps;
const data = node.data || {}; const data = node.data || {};
let cls = {}; let cls = {};
@ -127,10 +133,6 @@ export function cloneElement(n, nodeProps = {}, deep) {
node.data.on = { ...(node.data.on || {}), ...on }; node.data.on = { ...(node.data.on || {}), ...on };
} }
if (node.fnOptions && node.fnOptions.functional) {
node.data.on = { ...(node.data.on || {}), ...on };
}
if (key !== undefined) { if (key !== undefined) {
node.key = key; node.key = key;
node.data.key = key; node.data.key = key;

@ -1,9 +1,25 @@
import Icon from '../icon'; import Icon from '../icon';
import ScrollableInkTabBar from '../vc-tabs/src/ScrollableInkTabBar'; import ScrollableInkTabBar from '../vc-tabs/src/ScrollableInkTabBar';
import { cloneElement } from '../_util/vnode'; import { cloneElement } from '../_util/vnode';
import PropTypes from '../_util/vue-types';
import { getListeners } from '../_util/props-util';
const TabBar = { const TabBar = {
functional: true, name: 'TabBar',
render(h, context) { inheritAttrs: false,
props: {
prefixCls: PropTypes.string,
tabBarStyle: PropTypes.object,
tabBarExtraContent: PropTypes.any,
type: PropTypes.oneOf(['line', 'card', 'editable-card']),
tabPosition: PropTypes.oneOf(['top', 'right', 'bottom', 'left']).def('top'),
tabBarPosition: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
size: PropTypes.oneOf(['default', 'small', 'large']),
animated: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
renderTabBar: PropTypes.func,
panels: PropTypes.array.def([]),
activeKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
},
render() {
const { const {
tabBarStyle, tabBarStyle,
animated = true, animated = true,
@ -13,7 +29,7 @@ const TabBar = {
prefixCls, prefixCls,
type = 'line', type = 'line',
size, size,
} = context.props; } = this.$props;
const inkBarAnimated = typeof animated === 'object' ? animated.inkBar : animated; const inkBarAnimated = typeof animated === 'object' ? animated.inkBar : animated;
const isVertical = tabPosition === 'left' || tabPosition === 'right'; const isVertical = tabPosition === 'left' || tabPosition === 'right';
@ -39,14 +55,15 @@ const TabBar = {
const renderProps = { const renderProps = {
props: { props: {
...context.props, ...this.$props,
...this.$attrs,
inkBarAnimated, inkBarAnimated,
extraContent: tabBarExtraContent, extraContent: tabBarExtraContent,
prevIcon, prevIcon,
nextIcon, nextIcon,
}, },
style: tabBarStyle, style: tabBarStyle,
on: context.listeners, on: getListeners(this),
class: cls, class: cls,
}; };
@ -58,7 +75,7 @@ const TabBar = {
RenderTabBar = <ScrollableInkTabBar {...renderProps} />; RenderTabBar = <ScrollableInkTabBar {...renderProps} />;
} }
return cloneElement(RenderTabBar, renderProps); return cloneElement(RenderTabBar);
}, },
}; };

@ -26,12 +26,7 @@ export default {
defaultActiveKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), defaultActiveKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
hideAdd: PropTypes.bool.def(false), hideAdd: PropTypes.bool.def(false),
tabBarStyle: PropTypes.object, tabBarStyle: PropTypes.object,
tabBarExtraContent: PropTypes.oneOfType([ tabBarExtraContent: PropTypes.any,
PropTypes.string,
PropTypes.number,
PropTypes.func,
PropTypes.array,
]),
destroyInactiveTabPane: PropTypes.bool.def(false), destroyInactiveTabPane: PropTypes.bool.def(false),
type: PropTypes.oneOf(['line', 'card', 'editable-card']), type: PropTypes.oneOf(['line', 'card', 'editable-card']),
tabPosition: PropTypes.oneOf(['top', 'right', 'bottom', 'left']).def('top'), tabPosition: PropTypes.oneOf(['top', 'right', 'bottom', 'left']).def('top'),

Loading…
Cancel
Save