Skip to content

Commit f9131eb

Browse files
authored
fix(ui5-menu): center busy state animation (#12907)
Related to: #12887
1 parent f921450 commit f9131eb

7 files changed

Lines changed: 40 additions & 27 deletions

File tree

packages/base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"devDependencies": {
4747
"@openui5/sap.ui.core": "1.120.17",
4848
"@ui5/webcomponents-tools": "1.24.25",
49-
"chromedriver": "^137.0.0",
49+
"chromedriver": "^143.0.4",
5050
"clean-css": "^5.2.2",
5151
"copy-and-watch": "^0.1.5",
5252
"cross-env": "^7.0.3",

packages/fiori/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@
5454
},
5555
"devDependencies": {
5656
"@ui5/webcomponents-tools": "1.24.25",
57-
"chromedriver": "^137.0.0"
57+
"chromedriver": "^143.0.4"
5858
}
5959
}

packages/localization/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@openui5/sap.ui.core": "1.120.17",
3636
"@ui5/webcomponents-tools": "1.24.25",
3737
"babel-plugin-amd-to-esm": "^2.0.3",
38-
"chromedriver": "^137.0.0",
38+
"chromedriver": "^143.0.4",
3939
"estree-walk": "^2.2.0",
4040
"mkdirp": "^1.0.4",
4141
"resolve": "^1.20.0"

packages/main/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@
5757
},
5858
"devDependencies": {
5959
"@ui5/webcomponents-tools": "1.24.25",
60-
"chromedriver": "^137.0.0"
60+
"chromedriver": "^143.0.4"
6161
}
6262
}

packages/main/src/themes/Menu.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
width: 100%;
1515
}
1616

17+
.ui5-menu-busy-indicator {
18+
position: absolute;
19+
top: 50%;
20+
left: 50%;
21+
transform: translate(-50%, -50%);
22+
}
23+
1724
.ui5-menu-dialog-header {
1825
display: flex;
1926
height: var(--_ui5-responsive_popover_header_height);

packages/main/test/pages/Menu.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@
7777
<ui5-link id="detailsLink" href="https://en.wikipedia.org/wiki/Google_logo" target="_blank"></ui5-link>
7878
</ui5-popover>
7979

80+
<ui5-button id="btnOpenLoading">Open Loading Menu</ui5-button>
81+
<ui5-menu id="menuLoading" header-text="My ui5-menu" busy-delay="100" busy></ui5-menu>
82+
</ui5-menu>
83+
8084
<script>
8185
btnOpen.accessibilityAttributes = {
8286
hasPopup: "Menu",
@@ -98,6 +102,10 @@
98102
menu.open = btnToggleOpen.pressed;
99103
});
100104

105+
btnOpenLoading.addEventListener("click", function() {
106+
menuLoading.showAt(btnOpenLoading);
107+
});
108+
101109
let fetched = false;
102110

103111
menu.addEventListener("ui5-before-open", function(event) {
@@ -116,6 +124,22 @@
116124
}
117125
});
118126

127+
menuLoading.addEventListener("ui5-before-open", function(event) {
128+
const item = event.detail.item;
129+
if (item && item.text === "Open" && !fetched) {
130+
setTimeout(function() {
131+
item.removeAttribute("busy");
132+
item.removeAttribute("busy-delay");
133+
let oneNode = document.createElement("ui5-menu-item");
134+
oneNode.setAttribute("text", "Open from Amazon Cloud");
135+
let twoNode = document.createElement("ui5-menu-item");
136+
twoNode.setAttribute("text", "Open from Google Cloud");
137+
item.append(oneNode, twoNode);
138+
fetched = true;
139+
}, 1000);
140+
}
141+
});
142+
119143
menu.addEventListener("ui5-item-click", function(event) {
120144
const item = event.detail.item;
121145
selectionInput.value = item.text;

yarn.lock

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7214,15 +7214,6 @@ axios@^1.12.0:
72147214
form-data "^4.0.4"
72157215
proxy-from-env "^1.1.0"
72167216

7217-
axios@^1.7.4:
7218-
version "1.7.5"
7219-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.5.tgz#21eed340eb5daf47d29b6e002424b3e88c8c54b1"
7220-
integrity sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==
7221-
dependencies:
7222-
follow-redirects "^1.15.6"
7223-
form-data "^4.0.0"
7224-
proxy-from-env "^1.1.0"
7225-
72267217
babar@0.2.0:
72277218
version "0.2.0"
72287219
resolved "https://registry.yarnpkg.com/babar/-/babar-0.2.0.tgz#79bc0f029721467207f2b6baedf96b3938ad7db0"
@@ -8090,13 +8081,13 @@ chrome-trace-event@^1.0.2:
80908081
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
80918082
integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
80928083

8093-
chromedriver@^137.0.0:
8094-
version "137.0.4"
8095-
resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-137.0.4.tgz#9889b6b4128676bcaa75573fa141c20ccdb76288"
8096-
integrity sha512-IxipIe0AnoQhWvG6eSTOLhVf1Tt586LA1IH4RdhGhXrrK6nZx8+VcKdjtlyZIV60S0CttUij/YnYuHAI+7qzWg==
8084+
chromedriver@^143.0.4:
8085+
version "143.0.4"
8086+
resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-143.0.4.tgz#0ede0354f2970d8d650a6befc6b458d9cd8d32b9"
8087+
integrity sha512-mE++40DprY2n4d3OPxzW7ujIFRY9eLYwJf4uBgQtMaJQkapSVXRzUrLzSMcRaybrt47Y1t8xW5AKoaUIL3aYZw==
80978088
dependencies:
80988089
"@testim/chrome-version" "^1.1.4"
8099-
axios "^1.7.4"
8090+
axios "^1.12.0"
81008091
compare-versions "^6.1.0"
81018092
extract-zip "^2.0.1"
81028093
proxy-agent "^6.4.0"
@@ -10856,15 +10847,6 @@ form-data@^3.0.0:
1085610847
combined-stream "^1.0.8"
1085710848
mime-types "^2.1.12"
1085810849

10859-
form-data@^4.0.0:
10860-
version "4.0.0"
10861-
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
10862-
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
10863-
dependencies:
10864-
asynckit "^0.4.0"
10865-
combined-stream "^1.0.8"
10866-
mime-types "^2.1.12"
10867-
1086810850
form-data@^4.0.4:
1086910851
version "4.0.5"
1087010852
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"

0 commit comments

Comments
 (0)