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

Jump to bottom

refactor!: update menu-bar submenu to not extend context-menu #7013

Merged
merged 2 commits into from
Dec 27, 2023
Merged

refactor!: update menu-bar submenu to not extend context-menu #7013

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ac6b3
refactor!: update menu-bar submenu to not extend context-menu
web-padawan Dec 26, 2023
948370e
docs: fix incorrect return type JSDoc for _attachDom
web-padawan Dec 27, 2023
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
28 changes: 24 additions & 4 deletions packages/menu-bar/src/vaadin-menu-bar-submenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,25 @@
import './vaadin-menu-bar-item.js';
import './vaadin-menu-bar-list-box.js';
import './vaadin-menu-bar-overlay.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js';
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
import { ContextMenu } from '@vaadin/context-menu/src/vaadin-context-menu.js';
import { OverlayClassMixin } from '@vaadin/component-base/src/overlay-class-mixin.js';
import { ContextMenuMixin } from '@vaadin/context-menu/src/vaadin-context-menu-mixin.js';
import { ThemePropertyMixin } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js';

/**
* An element used internally by `<vaadin-menu-bar>`. Not intended to be used separately.
*
* @customElement
* @extends ContextMenu
* @extends HTMLElement
* @mixes ContextMenuMixin
* @mixes ControllerMixin
* @mixes OverlayClassMixin
* @mixes ThemePropertyMixin
* @protected
*/
class MenuBarSubmenu extends ContextMenu {
class MenuBarSubmenu extends ContextMenuMixin(OverlayClassMixin(ControllerMixin(ThemePropertyMixin(PolymerElement)))) {
static get is() {
return 'vaadin-menu-bar-submenu';
}
Expand Down Expand Up @@ -53,6 +60,19 @@ class MenuBarSubmenu extends ContextMenu {
return 'vaadin-menu-bar';
}

/**
* @param {DocumentFragment} dom
* @return {ShadowRoot}
* @protected
* @override
*/
_attachDom(dom) {
const root = this.attachShadow({ mode: 'open' });
root.appendChild(dom);
root.appendChild(this._overlayElement);
return root;
}

/**
* Overriding the observer to not add global "contextmenu" listener.
*/
Expand Down