Files
blockly/core/toolbox/category.ts
Ben Henning 5bc83808bf feat: Make toolbox and flyout focusable (#8920)
## The basics

- [x] I [validated my changes](https://developers.google.com/blockly/guides/contribute/core#making_and_verifying_a_change)

## The details
### Resolves

Fixes #8918
Fixes #8919
Fixes part of #8771

### Proposed Changes

This updates several classes in order to make toolboxes and flyouts focusable:
- `IFlyout` is now an `IFocusableTree` with corresponding implementations in `FlyoutBase`.
- `IToolbox` is now an `IFocusableTree` with corresponding implementations in `Toolbox`.
- `IToolboxItem` is now an `IFocusableNode` with corresponding implementations in `ToolboxItem`.
- As the primary toolbox items, `ToolboxCategory` and `ToolboxSeparator` were updated to have -1 tab indexes and defined IDs to help `ToolboxItem` fulfill its contracted for `IFocusableNode.getFocusableElement`.

Each of these two new focusable trees have specific noteworthy behaviors behaviors:
- `Toolbox` will automatically indicate that its first item should be focused (if one is present), even overriding the ability to focus the toolbox's root (however there are some cases where that can still happen).
- `Toolbox` will automatically synchronize its selection state with its item nodes being focused.
- `FlyoutBase`, now being a focusable tree, has had a tab index of 0 added. Normally a tab index of -1 is all that's needed, but the keyboard navigation plugin specifically uses 0 for flyout so that the flyout is tabbable. This is a **new** tab stop being introduced.
- `FlyoutBase` holds a workspace (for rendering blocks) and, since `WorkspaceSvg` is already set up to be a focusable tree, it's represented as a subtree to `FlyoutBase`. This does introduce some wonky behaviors: the flyout's root will have passive focus while its contents have active focus. This could be manually disabled with some CSS if it ends up being a confusing user experience.
- Both `FlyoutBase` and `WorkspaceSvg` have built-in behaviors for detecting when a user tries navigating away from an open flyout to ensure that the flyout is closed when it's supposed to be. That is, the flyout is auto-hideable and a non-flyout, non-toolbox node has then been focused. This matches parity with the `T`/`Esc` flows supported in the keyboard navigation plugin playground.

One other thing to note: `Toolbox` had a few tests to update that were trying to reinit a toolbox without first disposing of it (which was caught by one of `FocusManager`'s state guardrails).

### Reason for Changes

This is part of an ongoing effort to ensure key components of Blockly are focusable so that they can be keyboard-navigable (with other needed changes yet both in Core Blockly and the keyboard navigation plugin).

### Test Coverage

No new tests have been added. It's certainly possible to add unit tests for the focusable configurations being introduced in this PR, but it may not be highly beneficial. It's largely assumed that the individual implementations should work due to a highly tested FocusManager, and it may be the case that the interactions of the components working together is far more important to verify (that is, the end user flows). The latter is planned to be tackled as part of #8915.

### Documentation

No documentation changes should be needed here.

### Additional Information

This includes changes that have been pulled from #8875.
2025-04-24 15:08:18 -07:00

745 lines
21 KiB
TypeScript

/**
* @license
* Copyright 2020 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
/**
* A toolbox category used to organize blocks in the toolbox.
*
* @class
*/
// Former goog.module ID: Blockly.ToolboxCategory
import * as Css from '../css.js';
import type {ICollapsibleToolboxItem} from '../interfaces/i_collapsible_toolbox_item.js';
import type {ISelectableToolboxItem} from '../interfaces/i_selectable_toolbox_item.js';
import type {IToolbox} from '../interfaces/i_toolbox.js';
import type {IToolboxItem} from '../interfaces/i_toolbox_item.js';
import * as registry from '../registry.js';
import * as aria from '../utils/aria.js';
import * as colourUtils from '../utils/colour.js';
import * as dom from '../utils/dom.js';
import * as parsing from '../utils/parsing.js';
import type {
CategoryInfo,
DynamicCategoryInfo,
FlyoutDefinition,
FlyoutItemInfo,
FlyoutItemInfoArray,
StaticCategoryInfo,
} from '../utils/toolbox.js';
import * as toolbox from '../utils/toolbox.js';
import {ToolboxItem} from './toolbox_item.js';
/**
* Class for a category in a toolbox.
*/
export class ToolboxCategory
extends ToolboxItem
implements ISelectableToolboxItem
{
/** Name used for registering a toolbox category. */
static registrationName = 'category';
/** The number of pixels to move the category over at each nested level. */
static nestedPadding = 19;
/** The width in pixels of the strip of colour next to each category. */
static borderWidth = 8;
/**
* The default colour of the category. This is used as the background colour
* of the category when it is selected.
*/
static defaultBackgroundColour = '#57e';
// TODO(b/109816955): remove '!', see go/strict-prop-init-fix.
override toolboxItemDef_!: CategoryInfo;
/** The name that will be displayed on the category. */
protected name_ = '';
/** The colour of the category. */
protected colour_ = '';
/** The HTML container for the category. */
protected htmlDiv_: HTMLDivElement | null = null;
/** The HTML element for the category row. */
protected rowDiv_: HTMLDivElement | null = null;
/** The HTML element that holds children elements of the category row. */
protected rowContents_: HTMLDivElement | null = null;
/** The HTML element for the toolbox icon. */
protected iconDom_: Element | null = null;
/** The HTML element for the toolbox label. */
protected labelDom_: Element | null = null;
protected cssConfig_: CssConfig;
/** True if the category is meant to be hidden, false otherwise. */
protected isHidden_ = false;
/** True if this category is disabled, false otherwise. */
protected isDisabled_ = false;
/** The flyout items for this category. */
protected flyoutItems_: string | FlyoutItemInfoArray = [];
/**
* @param categoryDef The information needed to create a category in the
* toolbox.
* @param parentToolbox The parent toolbox for the category.
* @param opt_parent The parent category or null if the category does not have
* a parent.
*/
constructor(
categoryDef: CategoryInfo,
parentToolbox: IToolbox,
opt_parent?: ICollapsibleToolboxItem,
) {
super(categoryDef, parentToolbox, opt_parent);
/** All the css class names that are used to create a category. */
this.cssConfig_ = this.makeDefaultCssConfig_();
}
/**
* Initializes the toolbox item.
* This includes creating the DOM and updating the state of any items based
* on the info object.
* Init should be called immediately after the construction of the toolbox
* item, to ensure that the category contents are properly parsed.
*/
override init() {
this.parseCategoryDef_(this.toolboxItemDef_);
this.parseContents_(this.toolboxItemDef_);
this.createDom_();
if (this.toolboxItemDef_['hidden'] === 'true') {
this.hide();
}
}
/**
* Creates an object holding the default classes for a category.
*
* @returns The configuration object holding all the CSS classes for a
* category.
*/
protected makeDefaultCssConfig_(): CssConfig {
return {
'container': 'blocklyToolboxCategoryContainer',
'row': 'blocklyToolboxCategory',
'rowcontentcontainer': 'blocklyTreeRowContentContainer',
'icon': 'blocklyToolboxCategoryIcon',
'label': 'blocklyToolboxCategoryLabel',
'contents': 'blocklyToolboxCategoryGroup',
'selected': 'blocklyToolboxSelected',
'openicon': 'blocklyToolboxCategoryIconOpen',
'closedicon': 'blocklyToolboxCategoryIconClosed',
};
}
/**
* Parses the contents array depending on if the category is a dynamic
* category, or if its contents are meant to be shown in the flyout.
*
* @param categoryDef The information needed to create a category.
*/
protected parseContents_(categoryDef: CategoryInfo) {
if ('custom' in categoryDef) {
this.flyoutItems_ = categoryDef['custom'];
} else {
const contents = categoryDef['contents'];
if (!contents) return;
for (let i = 0; i < contents.length; i++) {
const itemDef = contents[i];
const flyoutItem = itemDef as FlyoutItemInfo;
if (Array.isArray(this.flyoutItems_)) {
this.flyoutItems_.push(flyoutItem);
}
}
}
}
/**
* Parses the non-contents parts of the category def.
*
* @param categoryDef The information needed to create a category.
*/
protected parseCategoryDef_(categoryDef: CategoryInfo) {
this.name_ =
'name' in categoryDef
? parsing.replaceMessageReferences(categoryDef['name'])
: '';
this.colour_ = this.getColour_(categoryDef);
Object.assign(
this.cssConfig_,
categoryDef['cssconfig'] || (categoryDef as any)['cssConfig'],
);
}
/**
* Creates the DOM for the category.
*
* @returns The parent element for the category.
*/
protected createDom_(): HTMLDivElement {
this.htmlDiv_ = this.createContainer_();
aria.setRole(this.htmlDiv_, aria.Role.TREEITEM);
aria.setState(this.htmlDiv_, aria.State.SELECTED, false);
aria.setState(this.htmlDiv_, aria.State.LEVEL, this.level_ + 1);
this.rowDiv_ = this.createRowContainer_();
this.rowDiv_.style.pointerEvents = 'auto';
this.htmlDiv_.appendChild(this.rowDiv_);
this.rowContents_ = this.createRowContentsContainer_();
this.rowContents_.style.pointerEvents = 'none';
this.rowDiv_.appendChild(this.rowContents_);
this.iconDom_ = this.createIconDom_();
aria.setRole(this.iconDom_, aria.Role.PRESENTATION);
this.rowContents_.appendChild(this.iconDom_);
this.labelDom_ = this.createLabelDom_(this.name_);
this.rowContents_.appendChild(this.labelDom_);
const id = this.labelDom_.getAttribute('id');
if (id) {
aria.setState(this.htmlDiv_, aria.State.LABELLEDBY, id);
}
this.addColourBorder_(this.colour_);
return this.htmlDiv_;
}
/**
* Creates the container that holds the row and any subcategories.
*
* @returns The div that holds the icon and the label.
*/
protected createContainer_(): HTMLDivElement {
const container = document.createElement('div');
container.tabIndex = -1;
container.id = this.getId();
const className = this.cssConfig_['container'];
if (className) {
dom.addClass(container, className);
}
return container;
}
/**
* Creates the parent of the contents container. All clicks will happen on
* this div.
*
* @returns The div that holds the contents container.
*/
protected createRowContainer_(): HTMLDivElement {
const rowDiv = document.createElement('div');
const className = this.cssConfig_['row'];
if (className) {
dom.addClass(rowDiv, className);
}
const nestedPadding = `${
ToolboxCategory.nestedPadding * this.getLevel()
}px`;
if (this.workspace_.RTL) {
rowDiv.style.paddingRight = nestedPadding;
} else {
rowDiv.style.paddingLeft = nestedPadding;
}
return rowDiv;
}
/**
* Creates the container for the label and icon.
* This is necessary so we can set all subcategory pointer events to none.
*
* @returns The div that holds the icon and the label.
*/
protected createRowContentsContainer_(): HTMLDivElement {
const contentsContainer = document.createElement('div');
const className = this.cssConfig_['rowcontentcontainer'];
if (className) {
dom.addClass(contentsContainer, className);
}
return contentsContainer;
}
/**
* Creates the span that holds the category icon.
*
* @returns The span that holds the category icon.
*/
protected createIconDom_(): Element {
const toolboxIcon = document.createElement('span');
if (!this.parentToolbox_.isHorizontal()) {
const className = this.cssConfig_['icon'];
if (className) {
dom.addClass(toolboxIcon, className);
}
}
toolboxIcon.style.display = 'inline-block';
return toolboxIcon;
}
/**
* Creates the span that holds the category label.
* This should have an ID for accessibility purposes.
*
* @param name The name of the category.
* @returns The span that holds the category label.
*/
protected createLabelDom_(name: string): Element {
const toolboxLabel = document.createElement('span');
toolboxLabel.setAttribute('id', this.getId() + '.label');
toolboxLabel.textContent = name;
const className = this.cssConfig_['label'];
if (className) {
dom.addClass(toolboxLabel, className);
}
return toolboxLabel;
}
/** Updates the colour for this category. */
refreshTheme() {
this.colour_ = this.getColour_(this.toolboxItemDef_);
this.addColourBorder_(this.colour_);
}
/**
* Add the strip of colour to the toolbox category.
*
* @param colour The category colour.
*/
protected addColourBorder_(colour: string) {
if (colour) {
const border =
ToolboxCategory.borderWidth + 'px solid ' + (colour || '#ddd');
if (this.workspace_.RTL) {
this.rowDiv_!.style.borderRight = border;
} else {
this.rowDiv_!.style.borderLeft = border;
}
}
}
/**
* Gets either the colour or the style for a category.
*
* @param categoryDef The object holding information on the category.
* @returns The hex colour for the category.
*/
protected getColour_(categoryDef: CategoryInfo): string {
const styleName =
categoryDef['categorystyle'] || (categoryDef as any)['categoryStyle'];
const colour = categoryDef['colour'];
if (colour && styleName) {
console.warn(
'Toolbox category "' +
this.name_ +
'" must not have both a style and a colour',
);
} else if (styleName) {
return this.getColourfromStyle(styleName);
} else if (colour) {
return this.parseColour(colour);
}
return '';
}
/**
* Sets the colour for the category using the style name and returns the new
* colour as a hex string.
*
* @param styleName Name of the style.
* @returns The hex colour for the category.
*/
private getColourfromStyle(styleName: string): string {
const theme = this.workspace_.getTheme();
if (styleName && theme) {
const style = theme.categoryStyles[styleName];
if (style && style.colour) {
return this.parseColour(style.colour);
} else {
console.warn(
'Style "' + styleName + '" must exist and contain a colour value',
);
}
}
return '';
}
/**
* Gets the HTML element that is clickable.
* The parent toolbox element receives clicks. The parent toolbox will add an
* ID to this element so it can pass the onClick event to the correct
* toolboxItem.
*
* @returns The HTML element that receives clicks.
*/
override getClickTarget(): Element {
return this.rowDiv_ as Element;
}
/**
* Parses the colour on the category.
*
* @param colourValue HSV hue value (0 to 360), #RRGGBB string, or a message
* reference string pointing to one of those two values.
* @returns The hex colour for the category.
*/
private parseColour(colourValue: number | string): string {
// Decode the colour for any potential message references
// (eg. `%{BKY_MATH_HUE}`).
const colour = parsing.replaceMessageReferences(colourValue);
if (colour == null || colour === '') {
// No attribute. No colour.
return '';
} else {
const hue = Number(colour);
if (!isNaN(hue)) {
return colourUtils.hueToHex(hue);
} else {
const hex = colourUtils.parse(colour);
if (hex) {
return hex;
} else {
console.warn(
'Toolbox category "' +
this.name_ +
'" has unrecognized colour attribute: ' +
colour,
);
return '';
}
}
}
}
/**
* Adds appropriate classes to display an open icon.
*
* @param iconDiv The div that holds the icon.
*/
protected openIcon_(iconDiv: Element | null) {
if (!iconDiv) {
return;
}
const closedIconClass = this.cssConfig_['closedicon'];
if (closedIconClass) {
dom.removeClasses(iconDiv, closedIconClass);
}
const className = this.cssConfig_['openicon'];
if (className) {
dom.addClass(iconDiv, className);
}
}
/**
* Adds appropriate classes to display a closed icon.
*
* @param iconDiv The div that holds the icon.
*/
protected closeIcon_(iconDiv: Element | null) {
if (!iconDiv) {
return;
}
const openIconClass = this.cssConfig_['openicon'];
if (openIconClass) {
dom.removeClasses(iconDiv, openIconClass);
}
const className = this.cssConfig_['closedicon'];
if (className) {
dom.addClass(iconDiv, className);
}
}
/**
* Sets whether the category is visible or not.
* For a category to be visible its parent category must also be expanded.
*
* @param isVisible True if category should be visible.
*/
override setVisible_(isVisible: boolean) {
this.htmlDiv_!.style.display = isVisible ? 'block' : 'none';
this.isHidden_ = !isVisible;
if (this.parentToolbox_.getSelectedItem() === this) {
this.parentToolbox_.clearSelection();
}
}
/** Hide the category. */
hide() {
this.setVisible_(false);
}
/**
* Show the category. Category will only appear if its parent category is also
* expanded.
*/
show() {
this.setVisible_(true);
}
/**
* Whether the category is visible.
* A category is only visible if all of its ancestors are expanded and
* isHidden_ is false.
*
* @returns True if the category is visible, false otherwise.
*/
isVisible(): boolean {
return !this.isHidden_ && this.allAncestorsExpanded_();
}
/**
* Whether all ancestors of a category (parent and parent's parent, etc.) are
* expanded.
*
* @returns True only if every ancestor is expanded
*/
protected allAncestorsExpanded_(): boolean {
/* eslint-disable-next-line @typescript-eslint/no-this-alias */
let category: IToolboxItem = this;
while (category.getParent()) {
category = category.getParent()!;
if (!(category as ICollapsibleToolboxItem).isExpanded()) {
return false;
}
}
return true;
}
override isSelectable() {
return this.isVisible() && !this.isDisabled_;
}
/**
* Handles when the toolbox item is clicked.
*
* @param _e Click event to handle.
*/
onClick(_e: Event) {}
// No-op
/**
* Sets the current category as selected.
*
* @param isSelected True if this category is selected, false otherwise.
*/
setSelected(isSelected: boolean) {
if (!this.rowDiv_) {
return;
}
const className = this.cssConfig_['selected'];
if (isSelected) {
const defaultColour = this.parseColour(
ToolboxCategory.defaultBackgroundColour,
);
this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
if (className) {
dom.addClass(this.rowDiv_, className);
}
} else {
this.rowDiv_.style.backgroundColor = '';
if (className) {
dom.removeClass(this.rowDiv_, className);
}
}
aria.setState(this.htmlDiv_ as Element, aria.State.SELECTED, isSelected);
}
/**
* Sets whether the category is disabled.
*
* @param isDisabled True to disable the category, false otherwise.
*/
setDisabled(isDisabled: boolean) {
this.isDisabled_ = isDisabled;
this.getDiv()!.setAttribute('disabled', `${isDisabled}`);
if (isDisabled) {
this.getDiv()!.setAttribute('disabled', 'true');
} else {
this.getDiv()!.removeAttribute('disabled');
}
}
/**
* Gets the name of the category. Used for emitting events.
*
* @returns The name of the toolbox item.
*/
getName(): string {
return this.name_;
}
override getParent() {
return this.parent_;
}
override getDiv() {
return this.htmlDiv_;
}
/**
* Gets the contents of the category. These are items that are meant to be
* displayed in the flyout.
*
* @returns The definition of items to be displayed in the flyout.
*/
getContents(): FlyoutItemInfoArray | string {
return this.flyoutItems_;
}
/**
* Updates the contents to be displayed in the flyout.
* If the flyout is open when the contents are updated, refreshSelection on
* the toolbox must also be called.
*
* @param contents The contents to be displayed in the flyout. A string can be
* supplied to create a dynamic category.
*/
updateFlyoutContents(contents: FlyoutDefinition | string) {
this.flyoutItems_ = [];
if (typeof contents === 'string') {
const newDefinition: DynamicCategoryInfo = {
kind: this.toolboxItemDef_.kind,
custom: contents,
id: this.toolboxItemDef_.id,
categorystyle: this.toolboxItemDef_.categorystyle,
colour: this.toolboxItemDef_.colour,
cssconfig: this.toolboxItemDef_.cssconfig,
hidden: this.toolboxItemDef_.hidden,
};
this.toolboxItemDef_ = newDefinition;
} else {
const newDefinition: StaticCategoryInfo = {
kind: this.toolboxItemDef_.kind,
name:
'name' in this.toolboxItemDef_ ? this.toolboxItemDef_['name'] : '',
contents: toolbox.convertFlyoutDefToJsonArray(contents),
id: this.toolboxItemDef_.id,
categorystyle: this.toolboxItemDef_.categorystyle,
colour: this.toolboxItemDef_.colour,
cssconfig: this.toolboxItemDef_.cssconfig,
hidden: this.toolboxItemDef_.hidden,
};
this.toolboxItemDef_ = newDefinition;
}
this.parseContents_(this.toolboxItemDef_);
}
override dispose() {
dom.removeNode(this.htmlDiv_);
}
}
export namespace ToolboxCategory {
/** All the CSS class names that are used to create a category. */
export interface CssConfig {
container?: string;
row?: string;
rowcontentcontainer?: string;
icon?: string;
label?: string;
contents?: string;
selected?: string;
openicon?: string;
closedicon?: string;
}
}
export type CssConfig = ToolboxCategory.CssConfig;
/** CSS for Toolbox. See css.js for use. */
Css.register(`
.blocklyToolboxCategory:not(.blocklyToolboxSelected):hover {
background-color: rgba(255, 255, 255, .2);
}
.blocklyToolbox[layout="h"] .blocklyToolboxCategoryContainer {
margin: 1px 5px 1px 0;
}
.blocklyToolbox[dir="RTL"][layout="h"] .blocklyToolboxCategoryContainer {
margin: 1px 0 1px 5px;
}
.blocklyToolboxCategory {
height: 22px;
line-height: 22px;
margin-bottom: 3px;
padding-right: 8px;
white-space: nowrap;
}
.blocklyToolbox[dir="RTL"] .blocklyToolboxCategory {
margin-left: 8px;
padding-right: 0;
}
.blocklyToolboxCategoryIcon {
background-image: url(<<<PATH>>>/sprites.png);
height: 16px;
vertical-align: middle;
visibility: hidden;
width: 16px;
}
.blocklyToolboxCategoryIconClosed {
background-position: -32px -1px;
}
.blocklyToolbox[dir="RTL"] .blocklyToolboxCategoryIconClosed {
background-position: 0 -1px;
}
.blocklyToolboxSelected>.blocklyToolboxCategoryIconClosed {
background-position: -32px -17px;
}
.blocklyToolbox[dir="RTL"] .blocklyToolboxSelected>.blocklyToolboxCategoryIconClosed {
background-position: 0 -17px;
}
.blocklyToolboxCategoryIconOpen {
background-position: -16px -1px;
}
.blocklyToolboxSelected>.blocklyToolboxCategoryIconOpen {
background-position: -16px -17px;
}
.blocklyToolboxCategoryLabel {
cursor: default;
font: 16px sans-serif;
padding: 0 3px;
vertical-align: middle;
}
.blocklyToolboxDelete .blocklyToolboxCategoryLabel {
cursor: url("<<<PATH>>>/handdelete.cur"), auto;
}
.blocklyToolboxSelected .blocklyToolboxCategoryLabel {
color: #fff;
}
`);
registry.register(
registry.Type.TOOLBOX_ITEM,
ToolboxCategory.registrationName,
ToolboxCategory,
);