Skip to content

fix!: Replace Closure UI CSS classes with Blockly CSS classes #8339

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 4 commits into from
Jul 17, 2024
Merged

fix!: Replace Closure UI CSS classes with Blockly CSS classes #8339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18c6370
fix!: Replace Closure UI CSS classes with Blockly CSS classes
Arun-cn Jul 12, 2024
bd1d968
chore: remove comments about deprecated goog-x class
Arun-cn Jul 16, 2024
dc2ec5a
chore: remove deprecated goog-x classes
Arun-cn Jul 16, 2024
8ff9c37
fix: correct coding format to pass CI checks
Arun-cn Jul 16, 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/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ export class Menu {
*/
render(container: Element): HTMLDivElement {
const element = document.createElement('div');
// goog-menu is deprecated, use blocklyMenu. May 2020.
element.className = 'blocklyMenu goog-menu blocklyNonSelectable';
element.className = 'blocklyMenu blocklyNonSelectable';
element.tabIndex = 0;
if (this.roleName) {
aria.setRole(element, this.roleName);
Expand Down
23 changes: 7 additions & 16 deletions core/menuitem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,19 @@ export class MenuItem {
this.element = element;

// Set class and style
// goog-menuitem* is deprecated, use blocklyMenuItem*. May 2020.
element.className =
'blocklyMenuItem goog-menuitem ' +
(this.enabled ? '' : 'blocklyMenuItemDisabled goog-menuitem-disabled ') +
(this.checked ? 'blocklyMenuItemSelected goog-option-selected ' : '') +
(this.highlight
? 'blocklyMenuItemHighlight goog-menuitem-highlight '
: '') +
(this.rightToLeft ? 'blocklyMenuItemRtl goog-menuitem-rtl ' : '');
'blocklyMenuItem ' +
(this.enabled ? '' : 'blocklyMenuItemDisabled ') +
(this.checked ? 'blocklyMenuItemSelected ' : '') +
(this.highlight ? 'blocklyMenuItemHighlight ' : '') +
(this.rightToLeft ? 'blocklyMenuItemRtl ' : '');

const content = document.createElement('div');
content.className = 'blocklyMenuItemContent goog-menuitem-content';
content.className = 'blocklyMenuItemContent';
// Add a checkbox for checkable menu items.
if (this.checkable) {
const checkbox = document.createElement('div');
checkbox.className = 'blocklyMenuItemCheckbox goog-menuitem-checkbox';
checkbox.className = 'blocklyMenuItemCheckbox ';
content.appendChild(checkbox);
}

Expand Down Expand Up @@ -188,19 +185,13 @@ export class MenuItem {
*/
setHighlighted(highlight: boolean) {
this.highlight = highlight;

const el = this.getElement();
if (el && this.isEnabled()) {
// goog-menuitem-highlight is deprecated, use blocklyMenuItemHighlight.
// May 2020.
const name = 'blocklyMenuItemHighlight';
const nameDep = 'goog-menuitem-highlight';
if (highlight) {
dom.addClass(el, name);
dom.addClass(el, nameDep);
} else {
dom.removeClass(el, name);
dom.removeClass(el, nameDep);
}
}
}
Expand Down