diff --git a/android/snapshot-helper/src/main/java/com/callstack/agentdevice/snapshothelper/AccessibilityTreeXml.java b/android/snapshot-helper/src/main/java/com/callstack/agentdevice/snapshothelper/AccessibilityTreeXml.java
index 334fcaf115..31c3a11db1 100644
--- a/android/snapshot-helper/src/main/java/com/callstack/agentdevice/snapshothelper/AccessibilityTreeXml.java
+++ b/android/snapshot-helper/src/main/java/com/callstack/agentdevice/snapshothelper/AccessibilityTreeXml.java
@@ -61,6 +61,7 @@ static void appendNode(
appendAttribute(xml, "visible-to-user", Boolean.toString(node.isVisibleToUser()));
appendDrawingOrderAttribute(xml, node);
appendTrueAttribute(xml, "clickable", node.isClickable());
+ appendAttribute(xml, "long-clickable", Boolean.toString(node.isLongClickable()));
appendAttribute(xml, "enabled", Boolean.toString(node.isEnabled()));
appendTrueAttribute(xml, "focusable", node.isFocusable());
appendTrueAttribute(xml, "focused", node.isFocused());
@@ -188,8 +189,6 @@ private static boolean isHeading(AccessibilityNodeInfo node) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && node.isHeading();
}
- // Declared residue (agent-device #1832): long-clickable is not serialized. Adding it is a helper
- // protocol change (new attribute + host parser + field on the wire node).
private static void appendDrawingOrderAttribute(StringBuilder xml, AccessibilityNodeInfo node) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
appendAttribute(xml, "drawing-order", Integer.toString(node.getDrawingOrder()));
diff --git a/packages/command-runtime/src/commands/capture/runtime/snapshot-unchanged.ts b/packages/command-runtime/src/commands/capture/runtime/snapshot-unchanged.ts
index 7d293b61d8..b71f23dc82 100644
--- a/packages/command-runtime/src/commands/capture/runtime/snapshot-unchanged.ts
+++ b/packages/command-runtime/src/commands/capture/runtime/snapshot-unchanged.ts
@@ -131,6 +131,10 @@ const PRESENTATION_SCALAR_FIELDS = {
roleDescription: true,
placeholder: true,
hittable: true,
+ clickable: true,
+ focusable: true,
+ longClickable: true,
+ scrollable: true,
bundleId: true,
systemBar: true,
appName: true,
diff --git a/packages/kernel/src/snapshot.ts b/packages/kernel/src/snapshot.ts
index e8dc06b0c0..688a876360 100644
--- a/packages/kernel/src/snapshot.ts
+++ b/packages/kernel/src/snapshot.ts
@@ -333,6 +333,10 @@ export type RawSnapshotNode = {
/** UIKit `isUserInteractionEnabled`; absent means the producer did not read it, not false. */
userInteractionEnabled?: boolean;
hittable?: boolean;
+ clickable?: boolean;
+ focusable?: boolean;
+ longClickable?: boolean;
+ scrollable?: boolean;
depth?: number;
parentIndex?: number;
pid?: number;
diff --git a/packages/platform-android/src/__tests__/snapshot-clickability.test.ts b/packages/platform-android/src/__tests__/snapshot-clickability.test.ts
index 63b979b7dd..2fb76af056 100644
--- a/packages/platform-android/src/__tests__/snapshot-clickability.test.ts
+++ b/packages/platform-android/src/__tests__/snapshot-clickability.test.ts
@@ -42,9 +42,9 @@ afterEach(() => {
test('retains Android helper clickable facts from the same hierarchy projection', () => {
const built = buildUiHierarchySnapshot(
parseUiHierarchyTree(`
-
-
-
+
+
+
`),
undefined,
{ raw: true },
@@ -63,11 +63,23 @@ test('retains Android helper clickable facts from the same hierarchy projection'
],
);
assert.equal(publicSnapshot.nodes[1]?.hittable, true);
- assert.equal('clickable' in (publicSnapshot.nodes[1] ?? {}), false);
+ assert.deepEqual(
+ publicSnapshot.nodes.map((node) => [node.clickable, node.focusable, node.scrollable]),
+ [
+ [true, false, false],
+ [false, true, false],
+ [false, false, true],
+ ],
+ );
+ assert.deepEqual(
+ publicSnapshot.nodes.map((node) => node.longClickable),
+ [true, false, undefined],
+ );
+ assert.equal('longClickable' in (publicSnapshot.nodes[2] ?? {}), false);
assert.equal(readSnapshotClickabilityEvidence(publicSnapshot), undefined);
});
-test('snapshotAndroid captures the hierarchy once and retains clickability off-wire', async () => {
+test('snapshotAndroid captures the hierarchy once and publishes the clickability it retains', async () => {
let hierarchyCaptures = 0;
const helperAdb: AndroidAdbExecutor = async (args) => {
if (args.includes('--show-versioncode')) {
@@ -119,7 +131,10 @@ test('snapshotAndroid captures the hierarchy once and retains clickability off-w
[2, 2],
],
);
- assert.equal(JSON.stringify(result).includes('clickable'), false);
+ assert.deepEqual(
+ result.nodes.map((node) => node.clickable),
+ [false, true, false],
+ );
assert.equal(JSON.stringify(result).includes('sourceIndexByNodeIndex'), false);
});
diff --git a/packages/platform-android/src/ui-hierarchy-builder.ts b/packages/platform-android/src/ui-hierarchy-builder.ts
index 2821885b39..bde92fdc5d 100644
--- a/packages/platform-android/src/ui-hierarchy-builder.ts
+++ b/packages/platform-android/src/ui-hierarchy-builder.ts
@@ -478,6 +478,10 @@ function createAndroidRawSnapshotNode(
focused: node.focused,
visibleToUser: node.visibleToUser,
hittable: isAgentTarget(node) || undefined,
+ clickable: node.clickable,
+ focusable: node.focusable,
+ ...(node.longClickable === undefined ? {} : { longClickable: node.longClickable }),
+ scrollable: node.scrollable === true,
depth: compactedAndroidNodeDepth(state.nodes, parentIndex),
parentIndex,
...androidScrollActionHints(node, state.hidden),
diff --git a/packages/platform-android/src/ui-hierarchy-node.ts b/packages/platform-android/src/ui-hierarchy-node.ts
index 34197445dc..1c41ad673a 100644
--- a/packages/platform-android/src/ui-hierarchy-node.ts
+++ b/packages/platform-android/src/ui-hierarchy-node.ts
@@ -37,6 +37,7 @@ export type AndroidUiHierarchy = {
// encodings of one control opposite answers.
clickable: boolean;
focusable: boolean;
+ longClickable?: boolean;
depth: number;
parentIndex?: number;
scrollable?: boolean;
diff --git a/packages/platform-android/src/ui-hierarchy.ts b/packages/platform-android/src/ui-hierarchy.ts
index 7ef9b77d94..308c0deb06 100644
--- a/packages/platform-android/src/ui-hierarchy.ts
+++ b/packages/platform-android/src/ui-hierarchy.ts
@@ -30,6 +30,7 @@ export type AndroidUiNodeMetadata = {
bounds: string | null;
rect?: Rect;
clickable?: boolean;
+ longClickable?: boolean;
enabled?: boolean;
visibleToUser?: boolean;
drawingOrder?: number;
@@ -166,6 +167,7 @@ function readNodeAttributes(node: string): Omit {
className: getAttr('class'),
bounds: getAttr('bounds'),
clickable: boolAttr('clickable'),
+ ...optionalBoolAttr('longClickable', 'long-clickable'),
enabled: boolAttr('enabled'),
focusable: boolAttr('focusable'),
focused: boolAttr('focused'),
@@ -350,6 +352,7 @@ function normalizeAndroidUiHierarchyNode(
focused: attrs.focused,
visibleToUser: attrs.visibleToUser,
clickable: attrs.clickable === true,
+ longClickable: attrs.longClickable,
focusable: attrs.focusable === true,
scrollable: attrs.scrollable,
canScrollForward: attrs.canScrollForward,