yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(accessibiltiy): ignore new roles that came with new chromium (#6329)

Browse Source
This commit is contained in:
Joel Einbinder 2021-04-26 12:02:54 -07:00 committed by GitHub
parent f4b8c3a848
commit a51dc50d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/chromium/crAccessibility.ts
View File

@ -75,7 +75,7 @@ class CRAXNode implements accessibility.AXNode {
private _isTextOnlyObject(): boolean { private _isTextOnlyObject(): boolean {
const role = this._role; const role = this._role;
return (role === 'LineBreak' || role === 'text' || return (role === 'LineBreak' || role === 'text' ||
role === 'InlineTextBox'); role === 'InlineTextBox' || role === 'StaticText');
} }
private _hasFocusableChild(): boolean { private _hasFocusableChild(): boolean {
@ -145,7 +145,7 @@ class CRAXNode implements accessibility.AXNode {
// Here and below: Android heuristics // Here and below: Android heuristics
if (this._hasFocusableChild()) if (this._hasFocusableChild())
return false; return false;
if (this._focusable && this._role !== 'WebArea' && this._name) if (this._focusable && this._role !== 'WebArea' && this._role !== 'RootWebArea' && this._name)
return true; return true;
if (this._role === 'heading' && this._name) if (this._role === 'heading' && this._name)
return true; return true;
@ -199,6 +199,17 @@ class CRAXNode implements accessibility.AXNode {
return this.isLeafNode() && !!this._name; return this.isLeafNode() && !!this._name;
} }
normalizedRole() {
switch (this._role) {
case 'RootWebArea':
return 'WebArea';
case 'StaticText':
return 'text';
default:
return this._role;
}
}
serialize(): types.SerializedAXNode { serialize(): types.SerializedAXNode {
const properties: Map<string, number | string | boolean> = new Map(); const properties: Map<string, number | string | boolean> = new Map();
for (const property of this._payload.properties || []) for (const property of this._payload.properties || [])
@ -207,7 +218,7 @@ class CRAXNode implements accessibility.AXNode {
properties.set('description', this._payload.description.value); properties.set('description', this._payload.description.value);
const node: {[x in keyof types.SerializedAXNode]: any} = { const node: {[x in keyof types.SerializedAXNode]: any} = {
role: this._role, role: this.normalizedRole(),
name: this._payload.name ? (this._payload.name.value || '') : '', name: this._payload.name ? (this._payload.name.value || '') : '',
}; };
@ -236,7 +247,7 @@ class CRAXNode implements accessibility.AXNode {
for (const booleanProperty of booleanProperties) { for (const booleanProperty of booleanProperties) {
// WebArea's treat focus differently than other nodes. They report whether their frame has focus, // WebArea's treat focus differently than other nodes. They report whether their frame has focus,
// not whether focus is specifically on the root node. // not whether focus is specifically on the root node.
if (booleanProperty === 'focused' && this._role === 'WebArea') if (booleanProperty === 'focused' && (this._role === 'WebArea' || this._role === 'RootWebArea'))
continue; continue;
const value = properties.get(booleanProperty); const value = properties.get(booleanProperty);
if (!value) if (!value)