mirror of
https://github.com/google/blockly.git
synced 2026-01-05 08:00:09 +01:00
feat: return element from menu.render (#6426)
* feat: return element from menu.render * chore: format * chore: add returns annotation
This commit is contained in:
@@ -178,9 +178,8 @@ function createWidget_(menu: Menu) {
|
||||
if (!div) {
|
||||
throw Error('Attempting to create a context menu when widget div is null');
|
||||
}
|
||||
menu.render(div);
|
||||
const menuDom = menu.getElement();
|
||||
menuDom?.classList.add('blocklyContextMenu');
|
||||
const menuDom = menu.render(div);
|
||||
menuDom.classList.add('blocklyContextMenu');
|
||||
// Prevent system context menu when right-clicking a Blockly context menu.
|
||||
browserEvents.conditionalBind(
|
||||
(menuDom as EventTarget), 'contextmenu', null, haltPropagation);
|
||||
|
||||
@@ -273,8 +273,7 @@ export class FieldDropdown extends Field {
|
||||
// Remove any pre-existing elements in the dropdown.
|
||||
dropDownDiv.clearContent();
|
||||
// Element gets created in render.
|
||||
this.menu_!.render(dropDownDiv.getContentDiv());
|
||||
const menuElement = this.menu_!.getElement() as Element;
|
||||
const menuElement = this.menu_!.render(dropDownDiv.getContentDiv());
|
||||
menuElement.classList.add('blocklyDropdownMenu');
|
||||
|
||||
if (this.getConstants()!.FIELD_DROPDOWN_COLOURED_DIV) {
|
||||
|
||||
@@ -85,8 +85,9 @@ export class Menu {
|
||||
* Creates the menu DOM.
|
||||
*
|
||||
* @param container Element upon which to append this menu.
|
||||
* @returns The menu's root DOM element.
|
||||
*/
|
||||
render(container: Element) {
|
||||
render(container: Element): HTMLDivElement {
|
||||
const element = (document.createElement('div'));
|
||||
// goog-menu is deprecated, use blocklyMenu. May 2020.
|
||||
element.className = 'blocklyMenu goog-menu blocklyNonSelectable';
|
||||
@@ -114,6 +115,7 @@ export class Menu {
|
||||
element, 'keydown', this, this.handleKeyEvent_);
|
||||
|
||||
container.appendChild(element);
|
||||
return element;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user