From abcbfe888c49ff22d25d18373a10b9ff0802865f Mon Sep 17 00:00:00 2001 From: ludanxer Date: Mon, 14 Oct 2019 15:12:43 +0800 Subject: [PATCH 1/2] update isLastItemOfArray to isOpenAndLastItemOfArray --- .../theme-default/components/DropdownLink.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@vuepress/theme-default/components/DropdownLink.vue b/packages/@vuepress/theme-default/components/DropdownLink.vue index 7812984a7b..9d65df043e 100644 --- a/packages/@vuepress/theme-default/components/DropdownLink.vue +++ b/packages/@vuepress/theme-default/components/DropdownLink.vue @@ -39,8 +39,8 @@ > @@ -49,7 +49,7 @@ @@ -90,8 +90,8 @@ export default { this.open = !this.open }, - isLastItemOfArray (item, array) { - return last(array) === item + isOpenAndLastItemOfArray (item, array) { + return this.open && last(array) === item } }, From 5e642c4edaf34b6871fa1e2bd8221866a0475185 Mon Sep 17 00:00:00 2001 From: Franck Date: Mon, 14 Oct 2019 14:00:56 +0200 Subject: [PATCH 2/2] refactor: Improve code to fix the bug --- .../theme-default/components/DropdownLink.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/@vuepress/theme-default/components/DropdownLink.vue b/packages/@vuepress/theme-default/components/DropdownLink.vue index 9d65df043e..d67f85cba4 100644 --- a/packages/@vuepress/theme-default/components/DropdownLink.vue +++ b/packages/@vuepress/theme-default/components/DropdownLink.vue @@ -7,7 +7,7 @@ class="dropdown-title" type="button" :aria-label="dropdownAriaLabel" - @click="toggle" + @click="setOpen(!open)" > {{ item.text }} @@ -49,7 +49,7 @@ @@ -86,12 +86,12 @@ export default { }, methods: { - toggle () { - this.open = !this.open + setOpen (value) { + this.open = value }, - isOpenAndLastItemOfArray (item, array) { - return this.open && last(array) === item + isLastItemOfArray (item, array) { + return last(array) === item } },