diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 6cdcba29e14..5386495c784 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -2,7 +2,10 @@ ## Pending +### Fixes + - Fix `n-menu`'s `dropdown-props` prop can't override `n-dropdown`'s `size` prop, closes [#2868](https://github.com/TuSimple/naive-ui/issues/2868). +- Fix `n-switch` abnormal loading animation when switching state, closes [#2870](https://github.com/TuSimple/naive-ui/issues/2870) ## 2.28.2 diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 78dc45aa83d..0d5c1f7552b 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -2,7 +2,10 @@ ## Pending +### Fixes + - 修复 `n-menu` 的 `dropdown-props` 无法覆盖 `n-dropdown` 的 `size` 属性,关闭 [#2868](https://github.com/TuSimple/naive-ui/issues/2868) +- 修复 `n-switch` 切换状态时 loading 动画异常,关闭 [#2870](https://github.com/TuSimple/naive-ui/issues/2870) ## 2.28.2 diff --git a/src/switch/demos/enUS/loading.demo.vue b/src/switch/demos/enUS/loading.demo.vue index fdfb7128409..4e8e1c2ddca 100644 --- a/src/switch/demos/enUS/loading.demo.vue +++ b/src/switch/demos/enUS/loading.demo.vue @@ -3,5 +3,34 @@ + + diff --git a/src/switch/demos/zhCN/loading.demo.vue b/src/switch/demos/zhCN/loading.demo.vue index 61d88adcb06..a54a7ab514c 100644 --- a/src/switch/demos/zhCN/loading.demo.vue +++ b/src/switch/demos/zhCN/loading.demo.vue @@ -2,6 +2,36 @@ # 加载中 + + + diff --git a/src/switch/src/styles/index.cssr.ts b/src/switch/src/styles/index.cssr.ts index 0960f475cbe..e02d9dc78bc 100644 --- a/src/switch/src/styles/index.cssr.ts +++ b/src/switch/src/styles/index.cssr.ts @@ -56,6 +56,8 @@ export default cB('switch', ` transition: color .3s var(--n-bezier); `, [ iconSwitchTransition({ + left: '50%', + top: '50%', originalTransform: 'translateX(-50%) translateY(-50%)' }) ]),