Skip to content

fix!: use :focus pseudo class instead of blocklyFocused #8360

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 6 commits into from
Jul 27, 2024
Merged

fix!: use :focus pseudo class instead of blocklyFocused #8360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1357a14
bug: removed blocklyFocused from menu.ts and dropdown.ts, changed css…
Skye967 Jul 14, 2024
438c5b3
removed blocklyFocused from menu.ts
Skye967 Jul 14, 2024
fa1a68a
resubmit
Skye967 Jul 14, 2024
eda2902
core css removed blocklyFocused
Skye967 Jul 24, 2024
95456a4
fix core css
Skye967 Jul 24, 2024
eca774a
menu file import cleanup, linting error
Skye967 Jul 25, 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
5 changes: 2 additions & 3 deletions core/css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

// Former goog.module ID: Blockly.Css

/** Has CSS already been injected? */
let injected = false;

Expand Down Expand Up @@ -119,7 +118,7 @@ let content = `
box-shadow: 0 0 3px 1px rgba(0,0,0,.3);
}

.blocklyDropDownDiv.blocklyFocused {
Copy link
Contributor

@BeksOmega BeksOmega Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is another reference to .blocklyFocused in this file, could you remove it as well?

.blocklyDropDownDiv:focus {
box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
}

Expand Down Expand Up @@ -445,7 +444,7 @@ input[type=number] {
z-index: 20000; /* Arbitrary, but some apps depend on it... */
}

.blocklyWidgetDiv .blocklyMenu.blocklyFocused {
.blocklyWidgetDiv .blocklyMenu:focus {
box-shadow: 0 0 6px 1px rgba(0,0,0,.3);
}

Expand Down
6 changes: 0 additions & 6 deletions core/dropdowndiv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,6 @@ export function createDom() {

// Handle focusin/out events to add a visual indicator when
// a child is focused or blurred.
div.addEventListener('focusin', function () {
dom.addClass(div, 'blocklyFocused');
});
div.addEventListener('focusout', function () {
dom.removeClass(div, 'blocklyFocused');
});
}

/**
Expand Down
3 changes: 0 additions & 3 deletions core/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import * as browserEvents from './browser_events.js';
import type {MenuItem} from './menuitem.js';
import * as aria from './utils/aria.js';
import {Coordinate} from './utils/coordinate.js';
import * as dom from './utils/dom.js';
import type {Size} from './utils/size.js';
import * as style from './utils/style.js';

Expand Down Expand Up @@ -156,7 +155,6 @@ export class Menu {
const el = this.getElement();
if (el) {
el.focus({preventScroll: true});
dom.addClass(el, 'blocklyFocused');
}
}

Expand All @@ -165,7 +163,6 @@ export class Menu {
const el = this.getElement();
if (el) {
el.blur();
dom.removeClass(el, 'blocklyFocused');
}
}

Expand Down