Menu: improve vertical collapse transition (#9777)

ElemeFE · Feb 11, 2018 · c4ac575 · c4ac575
1 parent 610723e
commit c4ac575
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/packages/menu/src/menu.vue b/packages/menu/src/menu.vue
@@ -61,32 +61,22 @@
                 if (hasClass(el, 'el-menu--collapse')) {
                   removeClass(el, 'el-menu--collapse');
                   el.dataset.oldOverflow = el.style.overflow;
-                  el.dataset.scrollWidth = el.scrollWidth;
+                  el.dataset.scrollWidth = el.clientWidth;
                   addClass(el, 'el-menu--collapse');
+                } else {
+                  addClass(el, 'el-menu--collapse');
+                  el.dataset.oldOverflow = el.style.overflow;
+                  el.dataset.scrollWidth = el.clientWidth;
+                  removeClass(el, 'el-menu--collapse');
                 }
 
                 el.style.width = el.scrollWidth + 'px';
                 el.style.overflow = 'hidden';
               },
 
               leave(el) {
-                if (!hasClass(el, 'el-menu--collapse')) {
-                  addClass(el, 'horizontal-collapse-transition');
-                  el.style.width = '64px';
-                } else {
-                  addClass(el, 'horizontal-collapse-transition');
-                  el.style.width = el.dataset.scrollWidth + 'px';
-                }
-              },
-
-              afterLeave(el) {
-                removeClass(el, 'horizontal-collapse-transition');
-                if (hasClass(el, 'el-menu--collapse')) {
-                  el.style.width = el.dataset.scrollWidth + 'px';
-                } else {
-                  el.style.width = '64px';
-                }
-                el.style.overflow = el.dataset.oldOverflow;
+                addClass(el, 'horizontal-collapse-transition');
+                el.style.width = el.dataset.scrollWidth + 'px';
               }
             }
           };