Merge branch 'next' into feat-css-var

CHANGELOG.en-US.md

@@ -10,6 +10,13 @@
 
 ---
 
+## 3.0.0-beta.12
+
+`2022-03-02`
+
+- 🌟 Optimize `Menu` horizontal mode animation to avoid flickering
+- 🐞 Fix the height issue caused by `Upload` animation [#5298](https://github.com/vueComponent/ant-design-vue/issues/5298)
+
 ## 3.0.0-beta.11
 
 `2022-02-28`

CHANGELOG.zh-CN.md

@@ -10,6 +10,13 @@
 
 ---
 
+## 3.0.0-beta.12
+
+`2022-03-02`
+
+- 🌟 优化 `Menu` horizontal 模式动画，避免闪动
+- 🐞 修复 `Upload` 动画引起的高度问题 [#5298](https://github.com/vueComponent/ant-design-vue/issues/5298)
+
 ## 3.0.0-beta.11
 
 `2022-02-28`

components/menu/src/PopupTrigger.tsx

@@ -42,7 +42,6 @@ export default defineComponent({
       forceSubMenuRender,
       motion,
       defaultMotions,
-      mode,
     } = useInjectMenu();
     const forceRender = useInjectForceRender();
     const placement = computed(() =>
@@ -72,7 +71,7 @@ export default defineComponent({
       emit('visibleChange', visible);
     };
     const mergedMotion = computed(() => {
-      const m = motion.value || defaultMotions.value?.[mode.value] || defaultMotions.value?.other;
+      const m = motion.value || defaultMotions.value?.[props.mode] || defaultMotions.value?.other;
       const res = typeof m === 'function' ? m() : m;
       return res ? getTransitionProps(res.name, { css: true }) : undefined;
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ant-design-vue",
-  "version": "3.0.0-beta.11",
+  "version": "3.0.0-beta.12",
   "title": "Ant Design Vue",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [