From 099141f6c5b0e43c7e3ceeae98ee7e6e512212d6 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 3 Nov 2021 16:05:37 +0800 Subject: [PATCH] =?UTF-8?q?breaking=20change(Tabs):=20remove=20click?= =?UTF-8?q?=E3=80=81disabled=20event?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/markdown/migrate-from-v3.zh-CN.md | 4 +++ packages/vant/src/tab/README.md | 2 -- packages/vant/src/tabs/Tabs.tsx | 35 ++----------------- 3 files changed, 6 insertions(+), 35 deletions(-) diff --git a/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md b/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md index 8c5502805..ebff2c6e9 100644 --- a/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md +++ b/packages/vant/docs/markdown/migrate-from-v3.zh-CN.md @@ -12,3 +12,7 @@ - `default` 插槽重命名为 `toolbar` - 移除了 `value-key` 属性,使用 `columnsFieldNames` 属性代替 + +### Tabs + +- 移除了 `click` 和 `disabled` 事件,使用 `click-tab` 事件代替 diff --git a/packages/vant/src/tab/README.md b/packages/vant/src/tab/README.md index d83979911..5a7e184e2 100644 --- a/packages/vant/src/tab/README.md +++ b/packages/vant/src/tab/README.md @@ -270,8 +270,6 @@ export default { | rendered | Emitted when content first rendered in lazy-render mode | _name: string \| number, title: string_ | | scroll | Emitted when tab scrolling in sticky mode | _{ scrollTop: number, isFixed: boolean }_ | -> Tips:click and disabled event is deprecated,place use click-tab event instead. - ### Tabs Methods Use [ref](https://v3.vuejs.org/guide/component-template-refs.html) to get Tabs instance and call instance methods. diff --git a/packages/vant/src/tabs/Tabs.tsx b/packages/vant/src/tabs/Tabs.tsx index 7e059a984..fbf12f1fe 100644 --- a/packages/vant/src/tabs/Tabs.tsx +++ b/packages/vant/src/tabs/Tabs.tsx @@ -10,7 +10,6 @@ import { CSSProperties, defineComponent, ExtractPropTypes, - getCurrentInstance, ComponentPublicInstance, } from 'vue'; @@ -90,31 +89,9 @@ export default defineComponent({ props: tabsProps, - emits: [ - 'click', - 'change', - 'scroll', - 'disabled', - 'rendered', - 'click-tab', - 'update:active', - ], + emits: ['change', 'scroll', 'rendered', 'click-tab', 'update:active'], setup(props, { emit, slots }) { - if (process.env.NODE_ENV !== 'production') { - const props = getCurrentInstance()?.vnode?.props; - if (props && 'onClick' in props) { - console.warn( - '[Vant] Tabs: "click" event is deprecated, using "click-tab" instead.' - ); - } - if (props && 'onDisabled' in props) { - console.warn( - '[Vant] Tabs: "disabled" event is deprecated, using "click-tab" instead.' - ); - } - } - let tabHeight: number; let lockScroll: boolean; let stickyFixed: boolean; @@ -302,11 +279,7 @@ export default defineComponent({ disabled, }); - if (disabled) { - // @deprecated - // should be removed in next major version - emit('disabled', name, title); - } else { + if (!disabled) { callInterceptor(props.beforeChange, { args: [name], done: () => { @@ -315,10 +288,6 @@ export default defineComponent({ }, }); - // @deprecated - // should be removed in next major version - emit('click', name, title); - route(item as ComponentPublicInstance); } };