From c9a66ff9e02f6c5dedab09424461e597021322a2 Mon Sep 17 00:00:00 2001
From: jonahtanjz <jonahtanjz4884@gmail.com>
Date: Thu, 28 Jan 2021 14:00:50 +0800
Subject: [PATCH 1/3] Fix minor bugs for submenu

---
 docs/userGuide/syntax/dropdowns.mbdf    | 2 +-
 packages/vue-components/src/Submenu.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userGuide/syntax/dropdowns.mbdf b/docs/userGuide/syntax/dropdowns.mbdf
index 4c7eb7ef5b..afbca46524 100644
--- a/docs/userGuide/syntax/dropdowns.mbdf
+++ b/docs/userGuide/syntax/dropdowns.mbdf
@@ -56,7 +56,7 @@
 </variable>
 </include>
 
-**You can also use create multi-level submenu by nesting Dropdowns.**
+**You can also create multi-level submenu by nesting Dropdowns.**
 
 <include src="codeAndOutput.md" boilerplate >
 <variable name="highlightStyle">html</variable>
diff --git a/packages/vue-components/src/Submenu.vue b/packages/vue-components/src/Submenu.vue
index e418c2f934..f124f5ab97 100644
--- a/packages/vue-components/src/Submenu.vue
+++ b/packages/vue-components/src/Submenu.vue
@@ -100,7 +100,7 @@ export default {
     $el.findChildren('a,button').on('mouseover', (e) => {
       e.preventDefault();
       if (window.innerWidth > 767) {
-        if (this.disabledBool) { return false; }
+        if (this.show || this.disabledBool) { return false; }
         e.currentTarget.click();
         this.showSubmenu();
       }

From 6a11aa279902de47dd626ad56c21486e89cf70c1 Mon Sep 17 00:00:00 2001
From: jonahtanjz <jonahtanjz4884@gmail.com>
Date: Sat, 30 Jan 2021 13:37:57 +0800
Subject: [PATCH 2/3] Update after review

---
 docs/userGuide/syntax/dropdowns.mbdf    | 2 +-
 packages/vue-components/src/Submenu.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/userGuide/syntax/dropdowns.mbdf b/docs/userGuide/syntax/dropdowns.mbdf
index afbca46524..74ef507843 100644
--- a/docs/userGuide/syntax/dropdowns.mbdf
+++ b/docs/userGuide/syntax/dropdowns.mbdf
@@ -56,7 +56,7 @@
 </variable>
 </include>
 
-**You can also create multi-level submenu by nesting Dropdowns.**
+**You can also create multi-level submenus by nesting Dropdowns.**
 
 <include src="codeAndOutput.md" boilerplate >
 <variable name="highlightStyle">html</variable>
diff --git a/packages/vue-components/src/Submenu.vue b/packages/vue-components/src/Submenu.vue
index f124f5ab97..e418c2f934 100644
--- a/packages/vue-components/src/Submenu.vue
+++ b/packages/vue-components/src/Submenu.vue
@@ -100,7 +100,7 @@ export default {
     $el.findChildren('a,button').on('mouseover', (e) => {
       e.preventDefault();
       if (window.innerWidth > 767) {
-        if (this.show || this.disabledBool) { return false; }
+        if (this.disabledBool) { return false; }
         e.currentTarget.click();
         this.showSubmenu();
       }

From 61eab5f0e1e8151f800b8ba813122ca004a6f6e4 Mon Sep 17 00:00:00 2001
From: jonahtanjz <jonahtanjz4884@gmail.com>
Date: Sat, 30 Jan 2021 16:04:52 +0800
Subject: [PATCH 3/3] Prevent repositioning

---
 packages/vue-components/src/Submenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vue-components/src/Submenu.vue b/packages/vue-components/src/Submenu.vue
index e418c2f934..f124f5ab97 100644
--- a/packages/vue-components/src/Submenu.vue
+++ b/packages/vue-components/src/Submenu.vue
@@ -100,7 +100,7 @@ export default {
     $el.findChildren('a,button').on('mouseover', (e) => {
       e.preventDefault();
       if (window.innerWidth > 767) {
-        if (this.disabledBool) { return false; }
+        if (this.show || this.disabledBool) { return false; }
         e.currentTarget.click();
         this.showSubmenu();
       }