Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui5-menu): fix focus steal of ui5-wizard in mozilla #9845

Merged
merged 15 commits into from
Oct 9, 2024
Merged

fix(ui5-menu): fix focus steal of ui5-wizard in mozilla #9845

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a22537d
fix(ui5-calendar): switch to two column layout on Islamic or Persian …
hinzzx May 10, 2024
8c444eb
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx May 22, 2024
74d323d
fix(ui5-calendar): respect component level calendarType in week calcu…
hinzzx May 21, 2024
78fbac0
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx May 30, 2024
1c92978
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx Aug 12, 2024
1e98b50
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx Aug 20, 2024
92ab330
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx Aug 30, 2024
d7ba277
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx Sep 11, 2024
cbebab0
fix(ui5-menu): fix focus steal of ui5- wizard in mozilla
hinzzx Sep 11, 2024
dc99503
fix: timing issue in mozilla
hinzzx Sep 18, 2024
5b0c068
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx Sep 25, 2024
b199731
Merge branch 'release-1.24' into menu-foc-steal-1.24
hinzzx Sep 25, 2024
a8b0309
fix: use async/await approach
hinzzx Sep 26, 2024
4478436
Merge branch 'release-1.24' of https://github.com/SAP/ui5-webcomponen…
hinzzx Oct 8, 2024
350fe3b
Merge branch 'release-1.24' into menu-foc-steal-1.24
hinzzx Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/main/src/Menu.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,11 @@
</ui5-busy-indicator>
{{/if}}
</div>
</ui5-responsive-popover>

<div
class="ui5-menu-submenus"
>
</div>
{{#if menuHasSubMenus}}
<div
class="ui5-menu-submenus"
>
</div>
{{/if}}
</ui5-responsive-popover>
8 changes: 7 additions & 1 deletion packages/main/src/Menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,10 @@ class Menu extends UI5Element {
Menu.i18nBundle = await getI18nBundle("@ui5/webcomponents");
}

get menuHasSubMenus() {
return !!this.items.filter(item => item.hasSubmenu).length;
}

get itemsWithChildren() {
return !!this._currentItems.filter(item => item.item.items.length).length;
}
Expand Down Expand Up @@ -564,7 +568,9 @@ class Menu extends UI5Element {
if (menuItem && menuItem.hasSubmenu) {
// create new sub-menu
this._createSubMenu(menuItem, opener);
this._openItemSubMenu(menuItem, opener);
setTimeout(() => {
hinzzx marked this conversation as resolved.
Show resolved Hide resolved
this._openItemSubMenu(menuItem, opener);
}, 0);
}
if (parentMenuItem) {
parentMenuItem._preventSubMenuClose = true;
Expand Down
Loading