Bug 1604594 - make accessibility walker front naming consistent across client. r=rcaliman

Differential Revision: https://phabricator.services.mozilla.com/D58033
This commit is contained in:
Yura Zenevich
2020-02-10 18:12:32 +00:00
parent b94dd41be3
commit d9841ebb07
4 changed files with 22 additions and 24 deletions

View File

@@ -227,8 +227,8 @@ class AccessibilityRow extends Component {
return;
}
const accessibilityWalkerFront = accessibleFront.parent();
if (!accessibilityWalkerFront) {
const accessibleWalkerFront = accessibleFront.parent();
if (!accessibleWalkerFront) {
return;
}
@@ -238,7 +238,7 @@ class AccessibilityRow extends Component {
await this.scrollNodeIntoViewIfNeeded(accessibleFront);
}
accessibilityWalkerFront
accessibleWalkerFront
.highlightAccessible(accessibleFront, options)
.catch(error => console.warn(error));
}
@@ -249,12 +249,12 @@ class AccessibilityRow extends Component {
return;
}
const accessibilityWalkerFront = accessibleFront.parent();
if (!accessibilityWalkerFront) {
const accessibleWalkerFront = accessibleFront.parent();
if (!accessibleWalkerFront) {
return;
}
accessibilityWalkerFront.unhighlight().catch(error => console.warn(error));
accessibleWalkerFront.unhighlight().catch(error => console.warn(error));
}
async printToJSON() {

View File

@@ -151,8 +151,8 @@ class AccessibilityTree extends Component {
*/
onNameChange(accessibleFront, parentFront) {
const { accessibles, dispatch } = this.props;
const accessibilityWalkerFront = accessibleFront.parent();
parentFront = parentFront || accessibilityWalkerFront;
const accessibleWalkerFront = accessibleFront.parent();
parentFront = parentFront || accessibleWalkerFront;
if (
accessibles.has(accessibleFront.actorID) ||

View File

@@ -230,20 +230,18 @@ class Accessible extends Component {
return;
}
const accessibilityWalkerFront = accessibleFront.parent();
if (!accessibilityWalkerFront) {
const accessibleWalkerFront = accessibleFront.parent();
if (!accessibleWalkerFront) {
return;
}
accessibilityWalkerFront
.highlightAccessible(accessibleFront)
.catch(error => {
// Only report an error where there's still a toolbox. Ignore cases
// where toolbox is already destroyed.
if (this.props.toolbox) {
console.error(error);
}
});
accessibleWalkerFront.highlightAccessible(accessibleFront).catch(error => {
// Only report an error where there's still a toolbox. Ignore cases
// where toolbox is already destroyed.
if (this.props.toolbox) {
console.error(error);
}
});
}
hideAccessibleHighlighter(accessibleFront) {
@@ -252,12 +250,12 @@ class Accessible extends Component {
return;
}
const accessibilityWalkerFront = accessibleFront.parent();
if (!accessibilityWalkerFront) {
const accessibleWalkerFront = accessibleFront.parent();
if (!accessibleWalkerFront) {
return;
}
accessibilityWalkerFront.unhighlight().catch(error => {
accessibleWalkerFront.unhighlight().catch(error => {
// Only report an error where there's still a toolbox. Ignore cases where
// toolbox is already destroyed.
if (this.props.toolbox) {

View File

@@ -664,12 +664,12 @@ async function toggleSimulationOption(doc, optionIndex) {
}
async function findAccessibleFor(
{ toolbox: { target }, panel: { walker: accessibilityWalker } },
{ toolbox: { target }, panel: { walker: accessibleWalkerFront } },
selector
) {
const domWalker = (await target.getFront("inspector")).walker;
const node = await domWalker.querySelector(domWalker.rootNode, selector);
return accessibilityWalker.getAccessibleFor(node);
return accessibleWalkerFront.getAccessibleFor(node);
}
async function selectAccessibleForNode(env, selector) {