Skip to content

Extract duplicated include-fragment check into private method #3917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
francinelucca merged 4 commits into from
Feb 5, 2026
Merged

Extract duplicated include-fragment check into private method #3917

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0d93e3
Initial plan
Copilot Feb 5, 2026
b7e32bb
Extract duplicated include-fragment check into #isIncludeFragment() m…
Copilot Feb 5, 2026
9a9fafd
Merge branch 'chore/add-treeview-role' into copilot/sub-pr-3894
francinelucca Feb 5, 2026
4decb85
Remove package-lock.json changes
Copilot Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions app/components/primer/alpha/tree_view/tree_view_sub_tree_node_element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@ export class TreeViewSubTreeNodeElement extends HTMLElement {
previousNode?.setAttribute('tabindex', '-1')

// Also check if the subtree element itself is an include-fragment with role="treeitem" and has focus
if (
this.subTree.getAttribute('data-target')?.includes('tree-view-sub-tree-node.includeFragment') &&
this.subTree.getAttribute('tabindex') === '0'
) {
if (this.#isIncludeFragment() && this.subTree.getAttribute('tabindex') === '0') {
this.subTree.setAttribute('tabindex', '-1')
}

Expand Down Expand Up @@ -273,11 +270,7 @@ export class TreeViewSubTreeNodeElement extends HTMLElement {
case 'include-fragment-replace':
this.#activeElementIsLoader = document.activeElement === this.loadingIndicator.closest('[role=treeitem]')
// Also check if the include-fragment itself has focus (when it has role="treeitem")
if (
!this.#activeElementIsLoader &&
document.activeElement === this.subTree &&
this.subTree.getAttribute('data-target')?.includes('tree-view-sub-tree-node.includeFragment')
) {
if (!this.#activeElementIsLoader && document.activeElement === this.subTree && this.#isIncludeFragment()) {
this.#activeElementIsLoader = true
}
this.loadingState = 'success'
Expand Down Expand Up @@ -427,7 +420,7 @@ export class TreeViewSubTreeNodeElement extends HTMLElement {
#update() {
if (this.expanded) {
if (this.subTree) this.subTree.hidden = false
if (this.subTree.getAttribute('data-target')?.includes('tree-view-sub-tree-node.includeFragment')) {
if (this.#isIncludeFragment()) {
this.subTree.setAttribute('role', 'treeitem')
// Ensure the include-fragment can participate in roving tab index
if (!this.subTree.hasAttribute('tabindex')) {
Expand All @@ -447,7 +440,7 @@ export class TreeViewSubTreeNodeElement extends HTMLElement {
}
} else {
if (this.subTree) this.subTree.hidden = true
if (this.subTree.getAttribute('data-target')?.includes('tree-view-sub-tree-node.includeFragment')) {
if (this.#isIncludeFragment()) {
this.subTree.removeAttribute('role')
// Remove tabindex when role is removed
this.subTree.removeAttribute('tabindex')
Expand Down Expand Up @@ -482,6 +475,10 @@ export class TreeViewSubTreeNodeElement extends HTMLElement {
}
}

#isIncludeFragment(): boolean {
return this.subTree?.getAttribute('data-target')?.includes('tree-view-sub-tree-node.includeFragment') ?? false
}

get #checkboxElement(): HTMLElement | null {
return this.querySelector('.TreeViewItemCheckbox')
}
Expand Down