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): restore focus to the opener #9041

Merged
merged 22 commits into from
Jul 3, 2024
Merged

fix(ui5-menu): restore focus to the opener #9041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0cda83f
fix(ui5-menu): restore focus to the opener
unazko May 22, 2024
488730f
fix: remove prevent focus restore
unazko May 22, 2024
5bd71f1
fix: add test
unazko Jun 18, 2024
f212001
fix: merge conflicts
unazko Jun 18, 2024
7ee5761
fix: adjust tests
unazko Jun 18, 2024
ec4df61
fix: adjust tests
unazko Jun 18, 2024
ed14c08
fix: resolve merge conflicts
unazko Jun 25, 2024
3798666
fix: adjust test
unazko Jun 25, 2024
ba1a389
fix: adjust test
unazko Jun 25, 2024
5b39b2b
fix: adjust test
unazko Jun 25, 2024
83a7fb2
fix: adjust test
unazko Jun 25, 2024
b1c00e1
fix: adjust test
unazko Jun 25, 2024
d46ee4a
fix: adjust test
unazko Jun 25, 2024
7203809
fix: do not open sub-menu over disabled items
unazko Jun 27, 2024
15f3cd1
fix: remove faling test
unazko Jun 27, 2024
95083fb
fix: add test
unazko Jun 27, 2024
5ad11ab
fix: adjust the test
unazko Jun 27, 2024
bdf824f
fix: replace spaces with tabulations
unazko Jun 28, 2024
517198a
Merge branch 'main' into menu_additional_improvements
unazko Jul 1, 2024
466db21
Merge branch 'main' of https://github.com/unazko/ui5-webcomponents in…
unazko Jul 2, 2024
626652e
fix: adjust test
unazko Jul 2, 2024
d7ecbdf
fix: remove test
unazko Jul 2, 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
1 change: 0 additions & 1 deletion packages/main/src/Menu.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
.opener={{opener}}
?open={{open}}
prevent-initial-focus
prevent-focus-restore
hide-arrow
allow-target-overlap
@ui5-before-open={{_beforePopoverOpen}}
Expand Down
3 changes: 0 additions & 3 deletions packages/main/src/Menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import ResponsivePopover from "./ResponsivePopover.js";
import type { ResponsivePopoverBeforeCloseEventDetail } from "./ResponsivePopover.js";
import Button from "./Button.js";
import List from "./List.js";
import Icon from "./Icon.js";
import BusyIndicator from "./BusyIndicator.js";
import MenuItem from "./MenuItem.js";
import MenuSeparator from "./MenuSeparator.js";
Expand Down Expand Up @@ -104,7 +103,6 @@ type MenuBeforeCloseEventDetail = { escPressed: boolean };
List,
MenuItem,
MenuSeparator,
Icon,
BusyIndicator,
],
})
Expand Down Expand Up @@ -387,7 +385,6 @@ class Menu extends UI5Element {
}

_afterPopoverOpen() {
this.open = true;
this._menuItems[0]?.focus();
this.fireEvent("open", {}, false, true);
}
Expand Down
5 changes: 4 additions & 1 deletion packages/main/src/MenuItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class MenuItem extends ListItem implements IMenuItem {
}

get hasSubmenu() {
return !!(this.items.length || this.loading);
return !!(this.items.length || this.loading) && !this.disabled;
}

get hasEndContent() {
Expand Down Expand Up @@ -296,6 +296,9 @@ class MenuItem extends ListItem implements IMenuItem {
this.selected = false;
if (e.detail.escPressed) {
this.focus();
if (isPhone()) {
this.fireEvent("close-menu", {});
}
}
}

Expand Down
11 changes: 8 additions & 3 deletions packages/main/test/pages/Menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<ui5-button id="btnOpen">Open Menu</ui5-button> <br/>
<ui5-menu id="menu" header-text="My ui5-menu">
<ui5-menu-item text="New File(selection prevented)" accessible-name="Opens a file explorer" additional-text="Ctrl+Alt+Shift+N" tooltip="Select a file - prevent default" icon="add-document"></ui5-menu-item>
<ui5-menu-item text="New Folder with very long title for a menu item" additional-text="Ctrl+F" icon="add-folder" disabled></ui5-menu-item>
<ui5-menu-item text="New Folder with very long title for a menu item" additional-text="Ctrl+F" icon="add-folder" disabled>
<ui5-menu-item text="test.txt"></ui5-menu-item>
</ui5-menu-item>
<ui5-menu-separator></ui5-menu-separator>
<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform" loading-delay="100" loading>
<ui5-menu-item text="Open Locally" icon="open-folder" additional-text="Ctrl+K">
Expand Down Expand Up @@ -85,10 +87,12 @@
<ui5-button id="newFavorite" slot="endContent" icon="favorite" design="Transparent"></ui5-button>
</ui5-menu-item>
<ui5-menu-item text="New Folder with very long title for a menu item" additional-text="Ctrl+F" icon="add-folder" disabled></ui5-menu-item>
<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform" starts-section>
<ui5-menu-separator></ui5-menu-separator>
<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform">
<ui5-menu-item text="Open Locally" icon="open-folder" additional-text="Ctrl+K">
<ui5-menu-item text="Open from C"></ui5-menu-item>
<ui5-menu-item text="Open from D"></ui5-menu-item>
<ui5-menu-separator></ui5-menu-separator>
<ui5-menu-item text="Open from E" disabled></ui5-menu-item>
</ui5-menu-item>
<ui5-menu-item text="Open from SAP Cloud" additional-text="Ctrl+L"></ui5-menu-item>
Expand All @@ -102,7 +106,8 @@
<ui5-menu-item text="Save on Cloud" icon="upload-to-cloud"></ui5-menu-item>
</ui5-menu-item>
<ui5-menu-item text="Close" additional-text="Ctrl+W"></ui5-menu-item>
<ui5-menu-item text="Preferences" icon="action-settings" starts-section disabled></ui5-menu-item>
<ui5-menu-separator></ui5-menu-separator>
<ui5-menu-item text="Preferences" icon="action-settings" disabled></ui5-menu-item>
<ui5-menu-item text="Exit" icon="journey-arrive"></ui5-menu-item>
</ui5-menu>

Expand Down