Skip to content

fix!: Remove the blocklyMenuItemHighlight CSS class and use the hover #8536

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

Merged
BeksOmega merged 3 commits into from
Aug 21, 2024
Merged

fix!: Remove the blocklyMenuItemHighlight CSS class and use the hover #8536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd4594f
fix!: Remove the blocklyMenuItemHighlight CSS class and use the hover
Arun-cn Aug 19, 2024
7fdcad3
fix: Remove setHighlighted method in menuitem
Arun-cn Aug 20, 2024
e181ad4
fix: Remove blocklymenuitemhighlight css class
Arun-cn Aug 21, 2024
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
3 changes: 1 addition & 2 deletions core/css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,7 @@ input[type=number] {
cursor: inherit;
}

/* State: hover. */
.blocklyMenuItemHighlight {
.blocklyMenuItem:hover {
background-color: rgba(0,0,0,.1);
}

Expand Down
2 changes: 0 additions & 2 deletions core/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
21 changes: 0 additions & 21 deletions core/menuitem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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.
*
Expand Down