mirror of
https://github.com/google/blockly.git
synced 2026-01-04 23:50:12 +01:00
## The basics - [x] I [validated my changes](https://developers.google.com/blockly/guides/contribute/core#making_and_verifying_a_change) ## The details ### Resolves Fixes #8206 Fixes #8210 Fixes #8213 Fixes #8255 Fixes #8211 Fixes #8212 Fixes #8254 Fixes part of #9301 Fixes part of #9304 ### Proposed Changes This PR completes the remaining ARIA roles and properties needed for all core fields. Specifically: - #8206: A better name needed to be used for the checkbox value, plus there was an ARIA property missing for actually representing the checkbox state. The latter needed to be updated upon toggling the checkbox, as well. These changes bring checkbox fields in compliance with the ARIA checkbox pattern documented here: https://www.w3.org/WAI/ARIA/apg/patterns/checkbox/. - #8210: This one required a lot of changes in order to adapt to the ARIA combobox pattern documented here: https://www.w3.org/WAI/ARIA/apg/patterns/combobox/. Specifically: - Menus needed to have a unique ID that's also exposed in order to link the combobox element to its menu when open. - ARIA's `activedescendant` proved very useful in ensuring that the current dropdown selection is correctly read when the combobox has focus but its menu isn't opened. - The default properties available for options (label and value) aren't very good for readout, so a custom ARIA property was added for much clearer option readouts. This is only demonstrated for the math arithmetic block for now. - The text element is normally hidden for ARIA but it's useful in conjunction with `activedescendant` to represent the current value selection. - Images have been handled here as well (partly as part of #8255) by leveraging their alt text for readouts. This actually seems to work quite well both for current value and selection. - #8213: Much of the improvements here come from the combobox (`FieldDropdown`) improvements explained above. However one additional bit was done to provide an explicit 'Variable <name>' readout for the purpose of clarity. This demonstrates some contextualization of the value of the field which may be a generally useful pattern to copy in other field contexts. - #8255: Image fields have been refined since they were redundantly specifying 'image' when an `image` ARIA role is already being used. Now only the alt text is supplied along with the role context. Note that images need special handling since they can sometimes be navigable (such as when they have click handlers). - #8211: Text input fields have had their labeling improved like all other fields, and the field's value is now exposed via its `text` element since this will show up as a `StaticText` node in the accessibility tree and automatically be read as part of the field's value. - #8212: This gets the same benefits as the previous point since those improvements were included for both text and number input. However, existing `valuemin` and `valuemax` ARIA properties have been removed. It seems these are really only useful when introducing a slider mechanism (see https://www.w3.org/WAI/ARIA/apg/patterns/slider/) and from testing seems to not really be utilized for the basic text input that `FieldNumber` currently uses. It may be the case that this is a better pattern to use in the future, but it's more likely that other custom fields could benefit from more specific patterns like slider rather than `FieldNumber` being changed in that way. - #8254 and part of #9304: Field labels have been completely removed from the accessibility node tree since they can never be navigated to (as #8254 explains all labels will be included as part of the block's ARIA label itself for readout parity with navigation options). Note that it doesn't cover external fields (such as those supplied in blockly-samples), nor does it fully set up the infrastructure work for those. Ultimately that work needs to happen as part of #9301. Beyond the role work above, this PR also introduces some fundamental work for #9301. Specifically: - It demonstrates how block definitions could be used to introduce accessibility label customizations (in this case for the options of the arithmetic operator block's drop-down field, plus the block itself). - It sets up some central label computation for all fields, though more thought is needed on whether this is sufficient for custom fields outside of core Blockly and on how to properly contextualize labels for field values. Core Blockly's fields are fairly simple for representing values which is why that aspect of #9301 didn't need to be solved in this PR. Note that the field labeling here is being used to improve all of the fields above, but also it tries to aggressively fall back to the _next best_ label to be used (though it's possible to run out of options which is why fields still need contextually-specific fallbacks). ### Reason for Changes Generally the initial approach for implementing labels is leveraging as specific ARIA roles as exist to directly represent the element. This PR is completing that work for all of core Blockly's built-in fields, and laying some of the groundwork for generalizing this support for custom fields. Having specific roles does potentially introduce inconsistencies across screen readers (though should improve consistency across sites for a single screen reader), and expectations for behaviors (like shortcuts) that may need to be ignored or only partially supported (#9313 is discussing this). ### Test Coverage Only manual testing has been completed since this is experimental work. Video demonstrating most of the changes: [Screen recording 2025-10-01 4.05.35 PM.webm](https://github.com/user-attachments/assets/c7961caa-eae0-4585-8fd9-87d7cbe65988) ### Documentation N/A -- Experimental work. ### Additional Information This has only been tested on ChromeVox.
278 lines
7.8 KiB
TypeScript
278 lines
7.8 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2012 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* Checkbox field. Checked or not checked.
|
|
*
|
|
* @class
|
|
*/
|
|
// Former goog.module ID: Blockly.FieldCheckbox
|
|
|
|
// Unused import preserved for side-effects. Remove if unneeded.
|
|
import './events/events_block_change.js';
|
|
|
|
import {Field, FieldConfig, FieldValidator} from './field.js';
|
|
import * as fieldRegistry from './field_registry.js';
|
|
import * as aria from './utils/aria.js';
|
|
import * as dom from './utils/dom.js';
|
|
|
|
type BoolString = 'TRUE' | 'FALSE';
|
|
type CheckboxBool = BoolString | boolean;
|
|
|
|
/**
|
|
* Class for a checkbox field.
|
|
*/
|
|
export class FieldCheckbox extends Field<CheckboxBool> {
|
|
/** Default character for the checkmark. */
|
|
static readonly CHECK_CHAR = '✓';
|
|
private checkChar: string;
|
|
|
|
/**
|
|
* Serializable fields are saved by the serializer, non-serializable fields
|
|
* are not. Editable fields should also be serializable.
|
|
*/
|
|
override SERIALIZABLE = true;
|
|
|
|
/**
|
|
* NOTE: The default value is set in `Field`, so maintain that value instead
|
|
* of overwriting it here or in the constructor.
|
|
*/
|
|
override value_: boolean | null = this.value_;
|
|
|
|
/**
|
|
* @param value The initial value of the field. Should either be 'TRUE',
|
|
* 'FALSE' or a boolean. Defaults to 'FALSE'. Also accepts
|
|
* Field.SKIP_SETUP if you wish to skip setup (only used by subclasses
|
|
* that want to handle configuration and setting the field value after
|
|
* their own constructors have run).
|
|
* @param validator A function that is called to validate changes to the
|
|
* field's value. Takes in a value ('TRUE' or 'FALSE') & returns a
|
|
* validated value ('TRUE' or 'FALSE'), or null to abort the change.
|
|
* @param config A map of options used to configure the field.
|
|
* See the [field creation documentation]{@link
|
|
* https://developers.google.com/blockly/guides/create-custom-blocks/fields/built-in-fields/checkbox#creation}
|
|
* for a list of properties this parameter supports.
|
|
*/
|
|
constructor(
|
|
value?: CheckboxBool | typeof Field.SKIP_SETUP,
|
|
validator?: FieldCheckboxValidator,
|
|
config?: FieldCheckboxConfig,
|
|
) {
|
|
super(Field.SKIP_SETUP);
|
|
|
|
/**
|
|
* Character for the check mark. Used to apply a different check mark
|
|
* character to individual fields.
|
|
*/
|
|
this.checkChar = FieldCheckbox.CHECK_CHAR;
|
|
|
|
if (value === Field.SKIP_SETUP) return;
|
|
if (config) {
|
|
this.configure_(config);
|
|
}
|
|
this.setValue(value);
|
|
if (validator) {
|
|
this.setValidator(validator);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Configure the field based on the given map of options.
|
|
*
|
|
* @param config A map of options to configure the field based on.
|
|
*/
|
|
protected override configure_(config: FieldCheckboxConfig) {
|
|
super.configure_(config);
|
|
if (config.checkCharacter) this.checkChar = config.checkCharacter;
|
|
}
|
|
|
|
/**
|
|
* Saves this field's value.
|
|
*
|
|
* @returns The boolean value held by this field.
|
|
* @internal
|
|
*/
|
|
override saveState(): AnyDuringMigration {
|
|
const legacyState = this.saveLegacyState(FieldCheckbox);
|
|
if (legacyState !== null) {
|
|
return legacyState;
|
|
}
|
|
return this.getValueBoolean();
|
|
}
|
|
|
|
/**
|
|
* Create the block UI for this checkbox.
|
|
*/
|
|
override initView() {
|
|
super.initView();
|
|
|
|
const textElement = this.getTextElement();
|
|
dom.addClass(this.fieldGroup_!, 'blocklyCheckboxField');
|
|
textElement.style.display = this.value_ ? 'block' : 'none';
|
|
|
|
this.recomputeAria();
|
|
}
|
|
|
|
private recomputeAria() {
|
|
const element = this.getFocusableElement();
|
|
aria.setRole(element, aria.Role.CHECKBOX);
|
|
aria.setState(element, aria.State.LABEL, this.getAriaName() ?? 'Checkbox');
|
|
aria.setState(element, aria.State.CHECKED, !!this.value_);
|
|
}
|
|
|
|
override render_() {
|
|
if (this.textContent_) {
|
|
this.textContent_.nodeValue = this.getDisplayText_();
|
|
}
|
|
this.updateSize_(this.getConstants()!.FIELD_CHECKBOX_X_OFFSET);
|
|
}
|
|
|
|
override getDisplayText_() {
|
|
return this.checkChar;
|
|
}
|
|
|
|
/**
|
|
* Set the character used for the check mark.
|
|
*
|
|
* @param character The character to use for the check mark, or null to use
|
|
* the default.
|
|
*/
|
|
setCheckCharacter(character: string | null) {
|
|
this.checkChar = character || FieldCheckbox.CHECK_CHAR;
|
|
this.forceRerender();
|
|
}
|
|
|
|
/** Toggle the state of the checkbox on click. */
|
|
protected override showEditor_() {
|
|
this.setValue(!this.value_);
|
|
this.recomputeAria();
|
|
}
|
|
|
|
/**
|
|
* Ensure that the input value is valid ('TRUE' or 'FALSE').
|
|
*
|
|
* @param newValue The input value.
|
|
* @returns A valid value ('TRUE' or 'FALSE), or null if invalid.
|
|
*/
|
|
protected override doClassValidation_(
|
|
newValue?: AnyDuringMigration,
|
|
): BoolString | null {
|
|
if (newValue === true || newValue === 'TRUE') {
|
|
return 'TRUE';
|
|
}
|
|
if (newValue === false || newValue === 'FALSE') {
|
|
return 'FALSE';
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Update the value of the field, and update the checkElement.
|
|
*
|
|
* @param newValue The value to be saved. The default validator guarantees
|
|
* that this is a either 'TRUE' or 'FALSE'.
|
|
*/
|
|
protected override doValueUpdate_(newValue: BoolString) {
|
|
this.value_ = this.convertValueToBool(newValue);
|
|
// Update visual.
|
|
if (this.textElement_) {
|
|
this.textElement_.style.display = this.value_ ? 'block' : 'none';
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the value of this field, either 'TRUE' or 'FALSE'.
|
|
*
|
|
* @returns The value of this field.
|
|
*/
|
|
override getValue(): BoolString {
|
|
return this.value_ ? 'TRUE' : 'FALSE';
|
|
}
|
|
|
|
/**
|
|
* Get the boolean value of this field.
|
|
*
|
|
* @returns The boolean value of this field.
|
|
*/
|
|
getValueBoolean(): boolean | null {
|
|
return this.value_;
|
|
}
|
|
|
|
/**
|
|
* Get the text of this field. Used when the block is collapsed.
|
|
*
|
|
* @returns Text representing the value of this field ('true' or 'false').
|
|
*/
|
|
override getText(): string {
|
|
return String(this.convertValueToBool(this.value_));
|
|
}
|
|
|
|
/**
|
|
* Convert a value into a pure boolean.
|
|
*
|
|
* Converts 'TRUE' to true and 'FALSE' to false correctly, everything else
|
|
* is cast to a boolean.
|
|
*
|
|
* @param value The value to convert.
|
|
* @returns The converted value.
|
|
*/
|
|
private convertValueToBool(value: CheckboxBool | null): boolean {
|
|
if (typeof value === 'string') return value === 'TRUE';
|
|
return !!value;
|
|
}
|
|
|
|
/**
|
|
* Construct a FieldCheckbox from a JSON arg object.
|
|
*
|
|
* @param options A JSON object with options (checked).
|
|
* @returns The new field instance.
|
|
* @nocollapse
|
|
* @internal
|
|
*/
|
|
static override fromJson(
|
|
options: FieldCheckboxFromJsonConfig,
|
|
): FieldCheckbox {
|
|
// `this` might be a subclass of FieldCheckbox if that class doesn't
|
|
// 'override' the static fromJson method.
|
|
return new this(options.checked, undefined, options);
|
|
}
|
|
}
|
|
|
|
fieldRegistry.register('field_checkbox', FieldCheckbox);
|
|
|
|
FieldCheckbox.prototype.DEFAULT_VALUE = false;
|
|
|
|
/**
|
|
* Config options for the checkbox field.
|
|
*/
|
|
export interface FieldCheckboxConfig extends FieldConfig {
|
|
checkCharacter?: string;
|
|
}
|
|
|
|
/**
|
|
* fromJson config options for the checkbox field.
|
|
*/
|
|
export interface FieldCheckboxFromJsonConfig extends FieldCheckboxConfig {
|
|
checked?: boolean;
|
|
}
|
|
|
|
/**
|
|
* A function that is called to validate changes to the field's value before
|
|
* they are set.
|
|
*
|
|
* @see {@link https://developers.google.com/blockly/guides/create-custom-blocks/fields/validators#return_values}
|
|
* @param newValue The value to be validated.
|
|
* @returns One of three instructions for setting the new value: `T`, `null`,
|
|
* or `undefined`.
|
|
*
|
|
* - `T` to set this function's returned value instead of `newValue`.
|
|
*
|
|
* - `null` to invoke `doValueInvalid_` and not set a value.
|
|
*
|
|
* - `undefined` to set `newValue` as is.
|
|
*/
|
|
export type FieldCheckboxValidator = FieldValidator<CheckboxBool>;
|