diff --git a/core/css.ts b/core/css.ts index c7ae55397..d18d930a9 100644 --- a/core/css.ts +++ b/core/css.ts @@ -445,8 +445,7 @@ input[type=number] { cursor: inherit; } -/* State: hover. */ -.blocklyMenuItemHighlight { +.blocklyMenuItem:hover { background-color: rgba(0,0,0,.1); } diff --git a/core/menu.ts b/core/menu.ts index 6085d9274..f01c1edfb 100644 --- a/core/menu.ts +++ b/core/menu.ts @@ -249,11 +249,9 @@ export class Menu { setHighlighted(item: MenuItem | null) { const currentHighlighted = this.highlightedItem; if (currentHighlighted) { - currentHighlighted.setHighlighted(false); this.highlightedItem = null; } if (item) { - item.setHighlighted(true); this.highlightedItem = item; // Bring the highlighted item into view. This has no effect if the menu is // not scrollable. diff --git a/core/menuitem.ts b/core/menuitem.ts index 7fff1a72b..3d5b28b70 100644 --- a/core/menuitem.ts +++ b/core/menuitem.ts @@ -12,7 +12,6 @@ // Former goog.module ID: Blockly.MenuItem import * as aria from './utils/aria.js'; -import * as dom from './utils/dom.js'; import * as idGenerator from './utils/idgenerator.js'; /** @@ -68,7 +67,6 @@ export class MenuItem { 'blocklyMenuItem ' + (this.enabled ? '' : 'blocklyMenuItemDisabled ') + (this.checked ? 'blocklyMenuItemSelected ' : '') + - (this.highlight ? 'blocklyMenuItemHighlight ' : '') + (this.rightToLeft ? 'blocklyMenuItemRtl ' : ''); const content = document.createElement('div'); @@ -177,25 +175,6 @@ export class MenuItem { this.checked = checked; } - /** - * Highlights or unhighlights the component. - * - * @param highlight Whether to highlight or unhighlight the component. - * @internal - */ - setHighlighted(highlight: boolean) { - this.highlight = highlight; - const el = this.getElement(); - if (el && this.isEnabled()) { - const name = 'blocklyMenuItemHighlight'; - if (highlight) { - dom.addClass(el, name); - } else { - dom.removeClass(el, name); - } - } - } - /** * Returns true if the menu item is enabled, false otherwise. *