Building accessibility elements tree from unmerged root node

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/accessibility/ComponentsAccessibilitySemanticTest.kt

@@ -90,9 +90,15 @@ class ComponentsAccessibilitySemanticTest {
 
         assertAccessibilityTree {
             node {
-                isAccessibilityElement = true
-                label = "Content"
-                traits(UIAccessibilityTraitButton)
+                node {
+                    isAccessibilityElement = true
+                    label = "Content"
+                    traits(UIAccessibilityTraitButton)
+                }
+                node {
+                    isAccessibilityElement = false
+                    label = "Content"
+                }
             }
             node {
                 isAccessibilityElement = true
@@ -682,4 +688,37 @@ class ComponentsAccessibilitySemanticTest {
             }
         }
     }
+
+    @Test
+    fun testChildrenOfCollapsedNode() = runUIKitInstrumentedTest {
+        setContentWithAccessibilityEnabled {
+            Column {
+                Row(modifier = Modifier.testTag("row").clickable {}) {
+                    Text("Foo", modifier = Modifier.testTag("row_title"))
+                    Text("Bar", modifier = Modifier.testTag("row_subtitle"))
+                }
+            }
+        }
+
+        assertAccessibilityTree {
+            node {
+                label = "Foo\nBar"
+                identifier = "row"
+                isAccessibilityElement = true
+                traits(UIAccessibilityTraitButton)
+            }
+            node {
+                label = "Foo"
+                identifier = "row_title"
+                isAccessibilityElement = false
+                traits(UIAccessibilityTraitStaticText)
+            }
+            node {
+                label = "Bar"
+                identifier = "row_subtitle"
+                isAccessibilityElement = false
+                traits(UIAccessibilityTraitStaticText)
+            }
+        }
+    }
 }

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/accessibility/LayersAccessibilityTest.kt

@@ -68,10 +68,12 @@ class LayersAccessibilityTest {
                 label = "Root"
             }
             node {
-                label = "Popup 1"
-            }
-            node {
-                label = "Popup 2"
+                node {
+                    label = "Popup 1"
+                }
+                node {
+                    label = "Popup 2"
+                }
             }
         }
 

compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/test/AccessibilityTestNode.kt

@@ -247,9 +247,9 @@ data class AccessibilityTestNode(
  * Removes all element that are not accessibility elements or does not work as elements containers.
  */
 internal fun AccessibilityTestNode.normalized(): AccessibilityTestNode? {
-    val normalizedChildren = children?.flatMap {
-        it.normalized()?.let {
-            if (it.hasAccessibilityComponents) {
+    val normalizedChildren = children?.flatMap { child ->
+        child.normalized()?.let {
+            if (it.hasAccessibilityComponents || (it.children?.count() ?: 0) > 1) {
                 listOf(it)
             } else {
                 it.children

compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/platform/Accessibility.uikit.kt

@@ -144,9 +144,10 @@ private sealed interface AccessibilityNode {
      */
     class Semantics(
         private val semanticsNode: SemanticsNode,
-        private val mediator: AccessibilityMediator
+        private val mediator: AccessibilityMediator,
+        private val ignoreSemanticChildren: Boolean = false
     ) : AccessibilityNode {
-        private val cachedConfig = semanticsNode.config
+        private val cachedConfig = semanticsNode.copyWithMergingEnabled().config
 
         override val key: AccessibilityElementKey
             get() = semanticsNode.semanticsKey
@@ -158,7 +159,11 @@ private sealed interface AccessibilityNode {
             get() = mediator.convertToAppWindowCGRect(semanticsNode.boundsInWindow)
 
         override val accessibilityInteropView: InteropWrappingView?
-            get() = cachedConfig.getOrNull(NativeAccessibilityViewSemanticsKey)
+            get() = if (ignoreSemanticChildren) {
+                null
+            } else {
+                cachedConfig.getOrNull(NativeAccessibilityViewSemanticsKey)
+            }
 
         override val accessibilityLabel: String?
             get() = cachedConfig.accessibilityLabel()
@@ -509,6 +514,7 @@ private class AccessibilityElement(
         val indent = " ".repeat(depth * 2)
         logger.apply {
             log("${indent}${key}")
+            log("$indent  isAccessibilityElement: ${isAccessibilityElement()}")
             log("$indent  containmentChain: ${debugContainmentChain()}")
             log("$indent  accessibilityLabel: ${accessibilityLabel()}")
             log("$indent  accessibilityValue: ${accessibilityValue()}")
@@ -822,16 +828,20 @@ internal class AccessibilityMediator(
                 // To align behavior, flatting the node with all its children and arranging them
                 // inside the synthetic container node.
                 val containerElement = createOrUpdateAccessibilityElement(
-                    node = AccessibilityNode.Semantics(node, mediator = this),
+                    node = AccessibilityNode.Semantics(
+                        semanticsNode = node,
+                        mediator = this,
+                        ignoreSemanticChildren = true
+                    ),
                     children = emptyList()
                 )
                 createOrUpdateAccessibilityElement(
-                    node = AccessibilityNode.Container(node, mediator = this),
+                    node = AccessibilityNode.Container(containerNode = node, mediator = this),
                     children = listOf(containerElement) + children
                 )
             } else {
                 createOrUpdateAccessibilityElement(
-                    node = AccessibilityNode.Semantics(node, mediator = this),
+                    node = AccessibilityNode.Semantics(semanticsNode = node, mediator = this),
                     children = children
                 )
             }
@@ -869,7 +879,7 @@ internal class AccessibilityMediator(
      * Performs a complete sync of the accessibility tree with the current semantics tree.
      */
     private fun completeSync(): NodesSyncResult {
-        val rootSemanticsNode = owner.rootSemanticsNode
+        val rootSemanticsNode = owner.unmergedRootSemanticsNode
 
         check(!view.isAccessibilityElement) {
             "Root view must not be an accessibility element"