From 1a68c7144e3b648643e5e91491a11a3a349b7a66 Mon Sep 17 00:00:00 2001 From: tugcekucukoglu Date: Wed, 3 Apr 2024 16:23:23 +0300 Subject: [PATCH] Fixed #5327 - TieredMenu: Pressing Escape-Key in submenu moves focus to first menuitem --- components/lib/tieredmenu/TieredMenu.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/lib/tieredmenu/TieredMenu.vue b/components/lib/tieredmenu/TieredMenu.vue index ea172a540..968809e7a 100755 --- a/components/lib/tieredmenu/TieredMenu.vue +++ b/components/lib/tieredmenu/TieredMenu.vue @@ -380,8 +380,12 @@ export default { this.onEnterKey(event); }, onEscapeKey(event) { - this.hide(event, true); - !this.popup && (this.focusedItemInfo.index = this.findFirstFocusedItemIndex()); + if (this.focusedItemInfo.level !== 0) { + const _focusedItemInfo = this.focusedItemInfo; + + this.hide(event, false); + !this.popup && (this.focusedItemInfo = { index: Number(_focusedItemInfo.parentKey.split('_')[0]), level: 0, parentKey: '' }); + } event.preventDefault(); },