@@ -94,52 +94,93 @@ test('launcher-hosted navigation survives omitted wrappers while taskbar app ico
9494 ] ) ;
9595} ) ;
9696
97- test ( 'publishes a Compose role node as its clickable parent and keeps real child controls ' , ( ) => {
97+ test ( 'folds a Compose role node into its clickable parent only when every guard holds ' , ( ) => {
9898 const tree = parseUiHierarchyTree ( `<hierarchy>
99- <node class="android.view.View" bounds="[0,0][1080,2400]" visible-to-user="true">
100- <node class="android.view.View" resource-id="continue-with-email"
101- bounds="[53,1856][1027,1982]" clickable="true" focusable="true" visible-to-user="true">
102- <node class="android.widget.TextView" text="Continue with email"
103- bounds="[352,1895][728,1943]" visible-to-user="true" />
104- <node class="android.widget.Button" checked="false" bounds="[53,1858][1027,1980]"
105- visible-to-user="true" />
99+ <node class="android.widget.FrameLayout" bounds="[0,0][1000,1000]" visible-to-user="true">
100+ <node class="android.view.View" resource-id="compose-container" bounds="[0,0][1000,100]"
101+ clickable="true" visible-to-user="true">
102+ <node class="android.widget.TextView" text="Continue" bounds="[400,0][600,100]" visible-to-user="true" />
103+ <node class="android.widget.Button" checked="false" bounds="[0,0][1000,100]" visible-to-user="true" />
106104 </node>
107- <node class="android.view.View" resource-id="nested-control-row"
108- bounds="[53,2000][1027,2110]" clickable="true" visible-to-user="true">
109- <node class="android.widget.Button" bounds="[53,2000][1027,2110]" clickable="true"
110- visible-to-user="true" />
105+ <node class="android.view.View" resource-id="compose-checkbox" bounds="[0,100][1000,200]"
106+ clickable="true" checked="true" visible-to-user="true">
107+ <node class="android.widget.CheckBox" bounds="[0,130][1000,190]" visible-to-user="true" />
111108 </node>
112- <node class="android.view.View" resource-id="legacy-row"
113- bounds="[53,2120][1027,2230]" clickable="true" visible-to-user="true">
114- <node class="android.widget.CheckBox" bounds="[900,2140][1000,2210]"
115- visible-to-user="true" />
109+ <node class="android.view.View" resource-id="labeled-role" bounds="[0,200][1000,300]"
110+ clickable="true" visible-to-user="true">
111+ <node class="android.widget.Button" text="Details" bounds="[0,200][1000,300]" visible-to-user="true" />
116112 </node>
117- <node class="android.widget.Button" bounds="[53,2250][1027,2370]" visible-to-user="true" />
118- <node class="android.view.View" resource-id="hidden-role-row"
119- bounds="[53,2380][1027,2390]" clickable="true" visible-to-user="true">
120- <node class="android.widget.Button" bounds="[53,2380][1027,2390]"
121- visible-to-user="false" />
113+ <node class="android.view.View" resource-id="identified-role" bounds="[0,300][1000,400]"
114+ clickable="true" visible-to-user="true">
115+ <node class="android.widget.Button" resource-id="inner" bounds="[0,300][1000,400]" visible-to-user="true" />
116+ </node>
117+ <node class="android.view.View" resource-id="parent-role" bounds="[0,400][1000,500]"
118+ clickable="true" visible-to-user="true">
119+ <node class="android.widget.Button" bounds="[0,400][1000,500]" visible-to-user="true">
120+ <node class="android.widget.TextView" text="Inside" bounds="[400,400][600,500]" visible-to-user="true" />
121+ </node>
122+ </node>
123+ <node class="android.view.View" resource-id="nested-control" bounds="[0,500][1000,600]"
124+ clickable="true" visible-to-user="true">
125+ <node class="android.widget.Button" clickable="true" bounds="[0,500][1000,600]" visible-to-user="true" />
126+ </node>
127+ <node class="android.view.View" resource-id="hidden-role" bounds="[0,600][1000,700]"
128+ clickable="true" visible-to-user="true">
129+ <node class="android.widget.Button" bounds="[0,600][1000,700]" visible-to-user="false" />
130+ </node>
131+ <node class="android.view.View" resource-id="outside-role" bounds="[0,700][1000,800]"
132+ clickable="true" visible-to-user="true">
133+ <node class="android.widget.CheckBox" bounds="[900,700][1100,800]" visible-to-user="true" />
134+ </node>
135+ <node class="android.view.View" resource-id="passive-parent" bounds="[0,800][1000,900]"
136+ visible-to-user="true">
137+ <node class="android.widget.Button" bounds="[0,800][1000,900]" visible-to-user="true" />
138+ </node>
139+ <node class="android.widget.LinearLayout" resource-id="native-parent" bounds="[0,900][1000,950]"
140+ clickable="true" visible-to-user="true">
141+ <node class="android.widget.Button" bounds="[0,900][1000,950]" visible-to-user="true" />
142+ </node>
143+ <node class="android.view.View" resource-id="non-role-child" bounds="[0,950][1000,1000]"
144+ clickable="true" visible-to-user="true">
145+ <node class="android.widget.ImageView" bounds="[0,950][1000,1000]" visible-to-user="true" />
122146 </node>
123147 </node>
124148 </hierarchy>` ) ;
125149
126- const { nodes } = buildUiHierarchySnapshot ( tree , undefined , { } ) ;
150+ const describe = ( nodes : ReturnType < typeof buildUiHierarchySnapshot > [ 'nodes' ] ) =>
151+ nodes
152+ . filter ( ( node ) => node . type !== 'android.widget.FrameLayout' )
153+ . map ( ( node ) =>
154+ [ node . type ?. split ( '.' ) . pop ( ) , node . identifier ?? node . label ?? '' ] . join ( ' ' ) . trim ( ) ,
155+ ) ;
156+ const regular = buildUiHierarchySnapshot ( tree , undefined , { } ) . nodes ;
127157 const interactive = buildUiHierarchySnapshot ( tree , undefined , { interactiveOnly : true } ) . nodes ;
128- const published = nodes
129- . filter ( ( node ) => node . parentIndex !== undefined )
130- . map ( ( node ) => `${ node . type } ${ node . identifier ?? '' } ` . trim ( ) ) ;
131158
132- expect ( published ) . toEqual ( [
133- 'android.widget.Button continue-with-email' ,
134- 'android.widget.TextView' ,
135- 'android.view.View nested-control-row' ,
136- 'android.widget.Button' ,
137- 'android.view.View legacy-row' ,
138- 'android.widget.CheckBox' ,
139- 'android.widget.Button' ,
140- 'android.view.View hidden-role-row' ,
159+ expect ( describe ( regular ) ) . toEqual ( [
160+ 'Button compose-container' ,
161+ 'TextView Continue' ,
162+ 'CheckBox compose-checkbox' ,
163+ 'View labeled-role' ,
164+ 'Button Details' ,
165+ 'View identified-role' ,
166+ 'Button inner' ,
167+ 'View parent-role' ,
168+ 'Button' ,
169+ 'TextView Inside' ,
170+ 'View nested-control' ,
171+ 'Button' ,
172+ 'View hidden-role' ,
173+ 'View outside-role' ,
174+ 'CheckBox' ,
175+ 'View passive-parent' ,
176+ 'Button' ,
177+ 'LinearLayout native-parent' ,
178+ 'Button' ,
179+ 'View non-role-child' ,
180+ 'ImageView' ,
141181 ] ) ;
142- expect ( interactive . find ( ( node ) => node . identifier === 'continue-with-email' ) ?. type ) . toBe (
182+ expect ( regular . find ( ( node ) => node . identifier === 'compose-checkbox' ) ?. checked ) . toBe ( true ) ;
183+ expect ( interactive . find ( ( node ) => node . identifier === 'compose-container' ) ?. type ) . toBe (
143184 'android.widget.Button' ,
144185 ) ;
145186} ) ;
0 commit comments