Skip to content

Commit d89fa78

Browse files
fix: wait for updateComplete before setting positionTarget (#7524) (#7528)
Co-authored-by: Serhii Kulykov <iamkulykov@gmail.com>
1 parent bcc06be commit d89fa78

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

‎packages/menu-bar/src/vaadin-menu-bar-mixin.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -878,14 +878,11 @@ export const MenuBarMixin = (superClass) =>
878878
subMenu.items = items;
879879
subMenu.listenOn = button;
880880
const overlay = subMenu._overlayElement;
881-
// Unset old positioning to prevent flashing.
882-
overlay.removeAttribute('style');
883-
overlay.positionTarget = undefined;
884881
overlay.noVerticalOverlap = true;
885882

886883
this._expandedButton = button;
887884

888-
requestAnimationFrame(() => {
885+
requestAnimationFrame(async () => {
889886
button.dispatchEvent(
890887
new CustomEvent('opensubmenu', {
891888
detail: {
@@ -896,6 +893,14 @@ export const MenuBarMixin = (superClass) =>
896893
this._hideTooltip(true);
897894

898895
this._setExpanded(button, true);
896+
897+
// Delay setting position target until overlay is rendered
898+
// to correctly measure item content in Lit based version.
899+
if (overlay.updateComplete) {
900+
await overlay.updateComplete;
901+
}
902+
903+
overlay.positionTarget = button;
899904
});
900905

901906
this.style.pointerEvents = 'auto';
@@ -915,11 +920,6 @@ export const MenuBarMixin = (superClass) =>
915920
if (!keydown) {
916921
overlay.$.overlay.focus();
917922
}
918-
919-
// Delay setting position target until overlay is rendered
920-
// to correctly measure item content in Lit based version.
921-
overlay.positionTarget = button;
922-
overlay._updatePosition();
923923
},
924924
{ once: true },
925925
);

0 commit comments

Comments
 (0)