Skip to content

Commit 8cc65f1

Browse files
authored
refactor: simplify logic, set modeless state using property (#5573)
1 parent 901a09a commit 8cc65f1

4 files changed

Lines changed: 29 additions & 15 deletions

File tree

‎packages/context-menu/src/vaadin-context-menu.d.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,11 @@ declare class ContextMenu extends OverlayClassMixin(ElementMixin(ThemePropertyMi
267267
*/
268268
renderer: ContextMenuRenderer | null | undefined;
269269

270+
/**
271+
* When true, the menu overlay is modeless.
272+
*/
273+
protected _modeless: boolean;
274+
270275
/**
271276
* Requests an update for the content of the menu overlay.
272277
* While performing the update, it invokes the renderer passed in the `renderer` property.

‎packages/context-menu/src/vaadin-context-menu.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@ class ContextMenu extends OverlayClassMixin(
225225
id="overlay"
226226
on-opened-changed="_onOverlayOpened"
227227
on-vaadin-overlay-open="_onVaadinOverlayOpen"
228+
modeless="[[_modeless]]"
228229
with-backdrop="[[_phone]]"
229230
phone$="[[_phone]]"
230231
model="[[_context]]"
231232
theme$="[[_theme]]"
232-
>
233-
</vaadin-context-menu-overlay>
233+
></vaadin-context-menu-overlay>
234234
`;
235235
}
236236

@@ -309,6 +309,14 @@ class ContextMenu extends OverlayClassMixin(
309309
type: Function,
310310
},
311311

312+
/**
313+
* When true, the menu overlay is modeless.
314+
* @protected
315+
*/
316+
_modeless: {
317+
type: Boolean,
318+
},
319+
312320
/** @private */
313321
_context: Object,
314322

‎packages/context-menu/src/vaadin-contextmenu-items-mixin.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ export const ItemsMixin = (superClass) =>
260260
}
261261

262262
/** @private */
263-
__initSubMenu(subMenu) {
264-
this._subMenu = subMenu;
263+
__initSubMenu() {
264+
const subMenu = document.createElement(this.constructor.is);
265265

266-
subMenu.$.overlay.modeless = true;
266+
subMenu._modeless = true;
267267
subMenu.openOn = 'opensubmenu';
268268

269269
// Sub-menu doesn't have a target to wrap,
@@ -307,6 +307,8 @@ export const ItemsMixin = (superClass) =>
307307
}
308308
}
309309
});
310+
311+
return subMenu;
310312
}
311313

312314
/** @private */
@@ -328,14 +330,16 @@ export const ItemsMixin = (superClass) =>
328330
const subMenu = this._subMenu;
329331

330332
if (item) {
331-
if (subMenu.items !== item._item.children) {
333+
const { children } = item._item;
334+
335+
if (subMenu.items !== children) {
332336
subMenu.close();
333337
}
334338
if (!this.opened) {
335339
return;
336340
}
337341

338-
if (item._item.children && item._item.children.length) {
342+
if (children && children.length) {
339343
this.__updateExpanded(item, true);
340344

341345
// Forward parent overlay class
@@ -353,19 +357,16 @@ export const ItemsMixin = (superClass) =>
353357
* @param {!ContextMenuRendererContext} context
354358
* @protected
355359
*/
356-
__itemsRenderer(root, menu, context) {
360+
__itemsRenderer(root, menu, { detail }) {
357361
this.__initMenu(root, menu);
358362

359363
const subMenu = root.querySelector(this.constructor.is);
360364
subMenu.closeOn = menu.closeOn;
361365

362366
const listBox = root.querySelector(`${this._tagNamePrefix}-list-box`);
363-
364367
listBox.innerHTML = '';
365368

366-
const items = Array.from(context.detail.children || menu.items);
367-
368-
items.forEach((item) => {
369+
[...(detail.children || menu.items)].forEach((item) => {
369370
const component = this.__createComponent(item);
370371
listBox.appendChild(component);
371372
});
@@ -407,10 +408,9 @@ export const ItemsMixin = (superClass) =>
407408
this._listBox = listBox;
408409
root.appendChild(listBox);
409410

410-
const subMenu = document.createElement(this.constructor.is);
411-
// Append before accessing the overlay
411+
const subMenu = this.__initSubMenu();
412+
this._subMenu = subMenu;
412413
root.appendChild(subMenu);
413-
this.__initSubMenu(subMenu);
414414

415415
requestAnimationFrame(() => {
416416
this.__openListenerActive = true;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class MenuBarSubmenu extends ContextMenu {
3838
id="overlay"
3939
on-opened-changed="_onOverlayOpened"
4040
on-vaadin-overlay-open="_onVaadinOverlayOpen"
41+
modeless="[[_modeless]]"
4142
with-backdrop="[[_phone]]"
4243
phone$="[[_phone]]"
4344
model="[[_context]]"

0 commit comments

Comments
 (0)