Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion packages/main/src/MenuItemTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ function listItemPostContent(this: MenuItem) {
)
}

<div id={`${this._id}-menu-main`}>
<div
id={`${this._id}-menu-main`}
class={this.loading ? "menu-busy-indicator-main" : ""}
>
{
this.items.length ? (
<List
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/MenuTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export default function MenuTemplate(this: Menu) {
}
<div
id={`${this._id}-menu-main`}
class={this.loading ? "ui5-menu-busy-indicator-main" : ""}
>
{this.items.length ?
(<List
Expand Down
8 changes: 8 additions & 0 deletions packages/main/src/themes/Menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@

.ui5-menu-busy-indicator {
width: 100%;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

.ui5-menu-busy-indicator-main {
min-height: var(--_ui5_list_item_base_height);
}

.ui5-menu-dialog-header {
Expand Down
8 changes: 8 additions & 0 deletions packages/main/src/themes/MenuItem.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,12 @@
.ui5-menu-item-icon-checked {
color: var(--sapContent_BusyColor);
padding-top: 0.25rem;
}

.ui5-menu-busy-indicator {
position: absolute;
width: 100%;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
19 changes: 19 additions & 0 deletions packages/main/test/pages/Menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
<ui5-menu id="delaymenu" loading-delay="100" loading>
</ui5-menu>

<ui5-menu id="delaymenu2" loading-delay="100" loading>
<ui5-menu-item id="menuItemExit" text="Exit" icon="journey-arrive"></ui5-menu-item>
<ui5-menu-item id="menuItemExit" text="Exit" icon="journey-arrive"></ui5-menu-item>
</ui5-menu>

<ui5-title level="H5" class="header-title">Clicked menu item text</ui5-title>
<ui5-input id="selectionInput"></ui5-input>

Expand Down Expand Up @@ -176,6 +181,7 @@

<ui5-title level="H5" class="header-title">Menu with delayed items loading</ui5-title>
<ui5-button id="btnAddOpenerDelay">Delayed</ui5-button>
<ui5-button id="btnAddOpenerDelay2">Delayed with pre-loaded items</ui5-button>
<br/><br/>

<ui5-title level="H5" class="header-title">Menu with right alignment</ui5-title>
Expand Down Expand Up @@ -233,6 +239,11 @@
delaymenu.open = !delaymenu.open;
});

btnAddOpenerDelay2.addEventListener("click", function() {
delaymenu2.opener = "btnAddOpenerDelay2";
delaymenu2.open = !delaymenu2.open;
});

delaymenu.addEventListener("ui5-before-open", function(event) {
setTimeout(function() {
delaymenu.loading = false;
Expand All @@ -246,6 +257,14 @@
}, 1000);
});

delaymenu2.addEventListener("ui5-before-open", function(event) {
setTimeout(function() {
delaymenu2.loading = false;
delaymenu2.loadingDelay = 0;
delaymenu2.focus();
}, 1000);
});

let fetched = false;

menu.addEventListener("ui5-before-open", function(event) {
Expand Down
Loading