Fixes card expansion blocking collapsed action clicks

d13 · d13 · commit f9564f613b40 · 2025-03-11T18:17:18.000-04:00
diff --git a/src/webviews/apps/plus/home/components/branch-card.ts b/src/webviews/apps/plus/home/components/branch-card.ts
@@ -496,8 +496,9 @@ export abstract class GlBranchCardBase extends GlElement {
 		}
 	}
 
-	private onFocus() {
-		if (this.expanded) return;
+	private onFocus(e: FocusEvent) {
+		const actionElement = e.composedPath().some(el => (el as HTMLElement).matches?.('action-item') ?? false);
+		if (actionElement || this.expanded) return;
 		this.toggleExpanded(true);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -496,8 +496,9 @@ export abstract class GlBranchCardBase extends GlElement {`
`496`	`496`	`}`
`497`	`497`	`}`
`498`	`498`
`499`		`- private onFocus() {`
`500`		`- if (this.expanded) return;`
	`499`	`+ private onFocus(e: FocusEvent) {`
	`500`	`+ const actionElement = e.composedPath().some(el => (el as HTMLElement).matches?.('action-item') ?? false);`
	`501`	`+ if (actionElement \|\| this.expanded) return;`
`501`	`502`	`this.toggleExpanded(true);`
`502`	`503`	`}`
`503`	`504`