Skip to content

Feature/better honking #1054

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
merged 4 commits into from
Mar 7, 2024
Merged

Feature/better honking #1054

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
d62e3a6
Avoids honking during collapse action.
zorkow Feb 9, 2024
30f036f
Removes duplicate data-maction-id that leads to XML parsing error
zorkow Feb 10, 2024
ad0ecce
Changes expanse key to Enter.
zorkow Feb 10, 2024
89eddf6
Fixes type and commenting.
zorkow Feb 10, 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
11 changes: 7 additions & 4 deletions ts/a11y/explorer/KeyExplorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ export class SpeechExplorer extends AbstractExplorer<string> implements KeyExplo
['>', this.nextRules.bind(this)],
['<', this.nextStyle.bind(this)],
['x', this.summary.bind(this)],
['-', this.expand.bind(this)],
['Enter', this.expand.bind(this)],
['d', this.depth.bind(this)],
]);

Expand Down Expand Up @@ -327,12 +327,15 @@ export class SpeechExplorer extends AbstractExplorer<string> implements KeyExplo
* Expands or collapses the currently focused node.
*
* @param {HTMLElement} node The focused node.
* @return {HTMLElement} The node if action was successful. O/w null.
*/
public expand(node: HTMLElement) {
public expand(node: HTMLElement): HTMLElement {
const expandable = this.actionable(node);
if (expandable) {
expandable.dispatchEvent(new Event('click'));
if (!expandable) {
return null;
}
expandable.dispatchEvent(new Event('click'));
return node;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ts/a11y/semantic-enrich.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class enrichVisitor<N, T, D> extends SerializedMmlVisitor {
// Add maction id and make sure selection is the next attribute
//
attributes = ` data-maction-id="${id}" selection="${node.attributes.get('selection')}"`
+ attributes.replace(/ selection="\d+"/, '');
+ attributes.replace(/ selection="\d+"/, '').replace(/ data-maction-id="\d+"/, '');
}
return space + '<maction' + attributes + '>'
+ (children.match(/\S/) ? nl + children + endspace : '')
Expand Down