fix: Submenu is not hidden after the mouse passes over it

liuyib · Feb 6, 2020 · 576f177 · 576f177
1 parent d0dc5e1
commit 576f177
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/source/css/_common/components/header/index.styl b/source/css/_common/components/header/index.styl
@@ -134,6 +134,12 @@ if (hexo-config('header.nav.height') && match('%', hexo-config('header.nav.heigh
       width: auto;
       background-color: $header-nav-bg-color;
 
+      &.hide {
+        &--force {
+          display: none !important;
+        }
+      }
+
       &-item {
         margin: 0;
         padding: 0;

diff --git a/source/js/header.js b/source/js/header.js
@@ -25,9 +25,13 @@ $(document).ready(function () {
     'resize',
     Stun.utils.throttle(function () {
       isMobile = $menuBtn.is(':visible');
-      if (isMobile && isSubmenuShow) {
-        resetMenuHeight();
-        isSubmenuShow = false;
+      if (isMobile) {
+        $submenu.removeClass('hide--force');
+
+        if (isSubmenuShow) {
+          resetMenuHeight();
+          isSubmenuShow = false;
+        }
       } else {
         $submenu.css({ display: 'none', opacity: 0 });
       }
@@ -158,6 +162,7 @@ $(document).ready(function () {
       if (isMobile) {
         $submenu.css({ display: 'block', opacity: 1 });
       } else {
+        $submenu.removeClass('hide--force');
         $submenu
           .velocity('stop')
           .velocity('transition.slideUpIn', { duration: 200 });
@@ -170,8 +175,8 @@ $(document).ready(function () {
     if (!$submenu.length) {
       return;
     }
-    if ($submenu.is(':visible') && !isMobile) {
-      $submenu.css({ display: 'none', opacity: 0 });
+    if (!isMobile) {
+      $submenu.addClass('hide--force');
       isSubmenuShow = false;
     }
   });