From f725732b558b64f25643fd463f05b5e2d2566c67 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Sun, 4 Sep 2022 22:23:27 +0800 Subject: [PATCH] fix(date-picker): style is unexpected in `inline-theme-disabled` mode, closes #3655 --- CHANGELOG.en-US.md | 1 + CHANGELOG.zh-CN.md | 1 + src/date-picker/src/DatePicker.tsx | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 30123c5ac..fed190d0d 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -10,6 +10,7 @@ ### Performance - Fix `n-menu`'s `value` will cause useless rendering of menu item, closes [#3670](https://github.com/tusen-ai/naive-ui/issues/3670). +- Fix `n-date-picker`'s style is unexpected in `inline-theme-disabled` mode, closes [#3655](https://github.com/tusen-ai/naive-ui/issues/3655). ## 2.33.2 diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 099f99176..c17d0de4c 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -10,6 +10,7 @@ ### Performance - 修复 `n-menu` 在 `value` 改变时会引发菜单项无用的渲染,关闭 [#3670](https://github.com/tusen-ai/naive-ui/issues/3670) +- 修复 `n-date-picker` 在 `inline-theme-disabled` 模式下样式不正常,关闭 [#3655](https://github.com/tusen-ai/naive-ui/issues/3655) ## 2.33.2 diff --git a/src/date-picker/src/DatePicker.tsx b/src/date-picker/src/DatePicker.tsx index 26b1ef3ec..7f8c58c80 100644 --- a/src/date-picker/src/DatePicker.tsx +++ b/src/date-picker/src/DatePicker.tsx @@ -902,7 +902,14 @@ export default defineComponent({ } }) const themeClassHandle = inlineThemeDisabled - ? useThemeClass('date-picker', undefined, cssVarsRef, props) + ? useThemeClass( + 'date-picker', + computed(() => { + return props.type + }), + cssVarsRef, + props + ) : undefined return {