@@ -6,18 +6,17 @@ import * as Common from '../../core/common/common.js';
6
6
import * as SDK from '../../core/sdk/sdk.js' ;
7
7
import * as TreeOutline from '../../ui/components/tree_outline/tree_outline.js' ;
8
8
import * as UI from '../../ui/legacy/legacy.js' ;
9
+ import * as AccessibilityTreeUtils from './AccessibilityTreeUtils.js' ;
9
10
import type * as LitHtml from '../../ui/lit-html/lit-html.js' ;
10
11
11
- import * as ElementsComponents from './components/components.js' ;
12
-
13
12
export class AccessibilityTreeView extends UI . Widget . VBox {
14
13
private readonly accessibilityTreeComponent =
15
- new TreeOutline . TreeOutline . TreeOutline < SDK . AccessibilityModel . AccessibilityNode > ( ) ;
16
- private treeData : ElementsComponents . AccessibilityTreeUtils . AXTreeNode [ ] = [ ] ;
14
+ new TreeOutline . TreeOutline . TreeOutline < AccessibilityTreeUtils . AXTreeNodeData > ( ) ;
15
+ private treeData : AccessibilityTreeUtils . AXTreeNode [ ] = [ ] ;
17
16
private readonly toggleButton : HTMLButtonElement ;
18
17
private accessibilityModel : SDK . AccessibilityModel . AccessibilityModel | null = null ;
19
18
private rootAXNode : SDK . AccessibilityModel . AccessibilityNode | null = null ;
20
- private selectedTreeNode : ElementsComponents . AccessibilityTreeUtils . AXTreeNode | null = null ;
19
+ private selectedTreeNode : AccessibilityTreeUtils . AXTreeNode | null = null ;
21
20
private inspectedDOMNode : SDK . DOMModel . DOMNode | null = null ;
22
21
23
22
constructor ( toggleButton : HTMLButtonElement ) {
@@ -32,7 +31,7 @@ export class AccessibilityTreeView extends UI.Widget.VBox {
32
31
// on node selection, update the currently inspected node and reveal in the
33
32
// DOM tree.
34
33
this . accessibilityTreeComponent . addEventListener ( 'itemselected' , ( event : Event ) => {
35
- const evt = event as TreeOutline . TreeOutline . ItemSelectedEvent < SDK . AccessibilityModel . AccessibilityNode > ;
34
+ const evt = event as TreeOutline . TreeOutline . ItemSelectedEvent < AccessibilityTreeUtils . AXTreeNodeData > ;
36
35
const axNode = evt . data . node . treeNodeData ;
37
36
if ( ! axNode . isDOMNode ( ) ) {
38
37
return ;
@@ -48,11 +47,11 @@ export class AccessibilityTreeView extends UI.Widget.VBox {
48
47
}
49
48
50
49
// Highlight the node as well, for keyboard navigation.
51
- evt . data . node . treeNodeData . highlightDOMNode ( ) ;
50
+ axNode . highlightDOMNode ( ) ;
52
51
} ) ;
53
52
54
53
this . accessibilityTreeComponent . addEventListener ( 'itemmouseover' , ( event : Event ) => {
55
- const evt = event as TreeOutline . TreeOutline . ItemMouseOverEvent < SDK . AccessibilityModel . AccessibilityNode > ;
54
+ const evt = event as TreeOutline . TreeOutline . ItemMouseOverEvent < AccessibilityTreeUtils . AXTreeNodeData > ;
56
55
evt . data . node . treeNodeData . highlightDOMNode ( ) ;
57
56
} ) ;
58
57
@@ -83,11 +82,10 @@ export class AccessibilityTreeView extends UI.Widget.VBox {
83
82
}
84
83
85
84
this . rootAXNode = root ;
86
- this . treeData = [ ElementsComponents . AccessibilityTreeUtils . sdkNodeToAXTreeNode ( this . rootAXNode ) ] ;
85
+ this . treeData = [ AccessibilityTreeUtils . sdkNodeToAXTreeNode ( this . rootAXNode ) ] ;
87
86
88
87
this . accessibilityTreeComponent . data = {
89
- defaultRenderer : ( node ) : LitHtml . TemplateResult =>
90
- ElementsComponents . AccessibilityTreeUtils . accessibilityNodeRenderer ( node ) ,
88
+ defaultRenderer : ( node ) : LitHtml . TemplateResult => AccessibilityTreeUtils . accessibilityNodeRenderer ( node ) ,
91
89
tree : this . treeData ,
92
90
} ;
93
91
@@ -122,8 +120,7 @@ export class AccessibilityTreeView extends UI.Widget.VBox {
122
120
}
123
121
124
122
this . accessibilityTreeComponent . data = {
125
- defaultRenderer : ( node ) : LitHtml . TemplateResult =>
126
- ElementsComponents . AccessibilityTreeUtils . accessibilityNodeRenderer ( node ) ,
123
+ defaultRenderer : ( node ) : LitHtml . TemplateResult => AccessibilityTreeUtils . accessibilityNodeRenderer ( node ) ,
127
124
tree : this . treeData ,
128
125
} ;
129
126
@@ -138,7 +135,7 @@ export class AccessibilityTreeView extends UI.Widget.VBox {
138
135
return ;
139
136
}
140
137
141
- this . selectedTreeNode = ElementsComponents . AccessibilityTreeUtils . sdkNodeToAXTreeNode ( inspectedAXNode ) ;
138
+ this . selectedTreeNode = AccessibilityTreeUtils . sdkNodeToAXTreeNode ( inspectedAXNode ) ;
142
139
this . accessibilityTreeComponent . expandToAndSelectTreeNode ( this . selectedTreeNode ) ;
143
140
}
144
141
0 commit comments