KC test uses shared LiveStreamManager, tree-nav dropdown, KC card badge fix
- KC test WS now acquires from LiveStreamManager instead of creating its own DXGI duplicator, eliminating capture contention with running LED targets - Tree-nav refactored to compact dropdown on click with outside-click dismiss (closes on click outside the trigger+panel, not just outside the container) - KC target card badge (e.g. "Daylight Cycle") no longer wastes empty space Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
/**
|
||||
* TreeNav — hierarchical sidebar navigation for Targets and Sources tabs.
|
||||
* Replaces flat sub-tab bars with a collapsible tree that groups related items.
|
||||
* TreeNav — dropdown navigation for Targets and Sources tabs.
|
||||
* Shows a compact trigger bar with the active leaf; click to open a
|
||||
* grouped dropdown menu for switching between sections.
|
||||
*
|
||||
* Config format (supports arbitrary nesting):
|
||||
* [
|
||||
@@ -14,20 +15,6 @@
|
||||
|
||||
import { t } from './i18n.js';
|
||||
|
||||
const STORAGE_KEY = 'tree_nav_collapsed';
|
||||
|
||||
function _getCollapsedMap() {
|
||||
try { return JSON.parse(localStorage.getItem(STORAGE_KEY) || '{}'); }
|
||||
catch { return {}; }
|
||||
}
|
||||
|
||||
function _saveCollapsed(key, collapsed) {
|
||||
const map = _getCollapsedMap();
|
||||
if (collapsed) map[key] = true;
|
||||
else delete map[key];
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(map));
|
||||
}
|
||||
|
||||
/** Recursively sum leaf counts in a tree node. */
|
||||
function _deepCount(node) {
|
||||
if (!node.children) return node.count || 0;
|
||||
@@ -48,6 +35,9 @@ export class TreeNav {
|
||||
this._activeLeaf = null;
|
||||
this._extraHtml = '';
|
||||
this._observerSuppressed = false;
|
||||
this._open = false;
|
||||
this._outsideHandler = null;
|
||||
this._escHandler = null;
|
||||
}
|
||||
|
||||
/** Temporarily suppress scroll-spy (e.g. during programmatic scroll). */
|
||||
@@ -58,7 +48,7 @@ export class TreeNav {
|
||||
}
|
||||
|
||||
/**
|
||||
* Full re-render of the tree.
|
||||
* Full re-render of the nav.
|
||||
* @param {Array} items - tree structure (groups and/or standalone leaves)
|
||||
* @param {string} activeLeafKey
|
||||
*/
|
||||
@@ -74,9 +64,10 @@ export class TreeNav {
|
||||
const container = document.getElementById(this.containerId);
|
||||
if (!container) return;
|
||||
for (const [key, count] of Object.entries(countMap)) {
|
||||
const el = container.querySelector(`[data-tree-leaf="${key}"] .tree-count`);
|
||||
if (el) el.textContent = count;
|
||||
// Also update in-memory
|
||||
// Update leaves in dropdown panel
|
||||
const els = container.querySelectorAll(`[data-tree-leaf="${key}"] .tree-count`);
|
||||
els.forEach(el => { el.textContent = count; });
|
||||
// Update in-memory
|
||||
const leaf = this._leafMap.get(key);
|
||||
if (leaf) leaf.count = count;
|
||||
}
|
||||
@@ -85,20 +76,22 @@ export class TreeNav {
|
||||
groups.reverse();
|
||||
for (const groupEl of groups) {
|
||||
let total = 0;
|
||||
// Sum direct leaf children
|
||||
for (const cnt of groupEl.querySelectorAll(':scope > .tree-children > .tree-leaf .tree-count')) {
|
||||
for (const cnt of groupEl.querySelectorAll(':scope > .tree-dd-children > [data-tree-leaf] .tree-count')) {
|
||||
total += parseInt(cnt.textContent, 10) || 0;
|
||||
}
|
||||
// Sum nested sub-group counts
|
||||
for (const cnt of groupEl.querySelectorAll(':scope > .tree-children > .tree-group > .tree-group-header > .tree-group-count')) {
|
||||
for (const cnt of groupEl.querySelectorAll(':scope > .tree-dd-children > [data-tree-group] > .tree-dd-group-header .tree-dd-group-count')) {
|
||||
total += parseInt(cnt.textContent, 10) || 0;
|
||||
}
|
||||
const groupCount = groupEl.querySelector(':scope > .tree-group-header > .tree-group-count');
|
||||
if (groupCount) groupCount.textContent = total;
|
||||
const gc = groupEl.querySelector(':scope > .tree-dd-group-header .tree-dd-group-count');
|
||||
if (gc) gc.textContent = total;
|
||||
}
|
||||
// Update trigger display if active leaf count changed
|
||||
if (countMap[this._activeLeaf] !== undefined) {
|
||||
this._updateTrigger();
|
||||
}
|
||||
}
|
||||
|
||||
/** Set extra HTML appended at the bottom (expand/collapse buttons, etc.) */
|
||||
/** Set extra HTML appended in the trigger bar (expand/collapse buttons, etc.) */
|
||||
setExtraHtml(html) {
|
||||
this._extraHtml = html;
|
||||
}
|
||||
@@ -108,13 +101,10 @@ export class TreeNav {
|
||||
this._activeLeaf = leafKey;
|
||||
const container = document.getElementById(this.containerId);
|
||||
if (!container) return;
|
||||
container.querySelectorAll('.tree-leaf').forEach(el =>
|
||||
el.classList.toggle('active', el.dataset.treeLeaf === leafKey)
|
||||
);
|
||||
// Also highlight standalone leaves
|
||||
container.querySelectorAll('.tree-standalone').forEach(el =>
|
||||
container.querySelectorAll('[data-tree-leaf]').forEach(el =>
|
||||
el.classList.toggle('active', el.dataset.treeLeaf === leafKey)
|
||||
);
|
||||
this._updateTrigger();
|
||||
}
|
||||
|
||||
/** Get leaf data for a key. */
|
||||
@@ -130,6 +120,8 @@ export class TreeNav {
|
||||
return null;
|
||||
}
|
||||
|
||||
// ── internal ──
|
||||
|
||||
_buildLeafMap() {
|
||||
this._leafMap.clear();
|
||||
this._collectLeaves(this._items);
|
||||
@@ -149,59 +141,133 @@ export class TreeNav {
|
||||
const container = document.getElementById(this.containerId);
|
||||
if (!container) return;
|
||||
|
||||
const collapsed = _getCollapsedMap();
|
||||
const leaf = this._leafMap.get(this._activeLeaf);
|
||||
const triggerIcon = leaf?.icon || '';
|
||||
const triggerTitle = leaf ? t(leaf.titleKey) : '';
|
||||
const triggerCount = leaf?.count ?? 0;
|
||||
|
||||
const html = this._items.map(item => {
|
||||
if (item.children) {
|
||||
return this._renderGroup(item, collapsed, 0);
|
||||
}
|
||||
return this._renderStandalone(item);
|
||||
}).join('');
|
||||
const panelHtml = this._items.map(item =>
|
||||
item.children ? this._renderGroup(item, 0) : this._renderLeaf(item)
|
||||
).join('');
|
||||
|
||||
container.innerHTML = `
|
||||
<div class="tree-dd-trigger" data-tree-trigger>
|
||||
<span class="tree-dd-trigger-icon">${triggerIcon}</span>
|
||||
<span class="tree-dd-trigger-title">${triggerTitle}</span>
|
||||
<span class="tree-dd-trigger-count tree-count">${triggerCount}</span>
|
||||
<span class="tree-dd-chevron">▾</span>
|
||||
${this._extraHtml ? `<span class="tree-dd-extra">${this._extraHtml}</span>` : ''}
|
||||
</div>
|
||||
<div class="tree-dd-panel" data-tree-panel>
|
||||
${panelHtml}
|
||||
</div>`;
|
||||
|
||||
container.innerHTML = html +
|
||||
(this._extraHtml ? `<div class="tree-extra">${this._extraHtml}</div>` : '');
|
||||
this._bindEvents(container);
|
||||
}
|
||||
|
||||
_renderGroup(group, collapsed, depth) {
|
||||
const isCollapsed = !!collapsed[group.key];
|
||||
_renderGroup(group, depth) {
|
||||
const groupCount = _deepCount(group);
|
||||
|
||||
const childrenHtml = group.children.map(child => {
|
||||
if (child.children) {
|
||||
return this._renderGroup(child, collapsed, depth + 1);
|
||||
}
|
||||
return `
|
||||
<div class="tree-leaf${child.key === this._activeLeaf ? ' active' : ''}" data-tree-leaf="${child.key}">
|
||||
${child.icon ? `<span class="tree-node-icon">${child.icon}</span>` : ''}
|
||||
<span class="tree-node-title" data-i18n="${child.titleKey}">${t(child.titleKey)}</span>
|
||||
<span class="tree-count">${child.count ?? 0}</span>
|
||||
</div>`;
|
||||
}).join('');
|
||||
const childrenHtml = group.children.map(child =>
|
||||
child.children ? this._renderGroup(child, depth + 1) : this._renderLeaf(child)
|
||||
).join('');
|
||||
|
||||
return `
|
||||
<div class="tree-group${depth > 0 ? ' tree-group-nested' : ''}" data-tree-group="${group.key}">
|
||||
<div class="tree-group-header" data-tree-group-toggle="${group.key}">
|
||||
<span class="tree-chevron${isCollapsed ? '' : ' open'}">▶</span>
|
||||
<div class="tree-dd-group" data-tree-group="${group.key}">
|
||||
<div class="tree-dd-group-header tree-dd-depth-${depth}">
|
||||
${group.icon ? `<span class="tree-node-icon">${group.icon}</span>` : ''}
|
||||
<span class="tree-node-title" data-i18n="${group.titleKey}">${t(group.titleKey)}</span>
|
||||
<span class="tree-group-count">${groupCount}</span>
|
||||
<span class="tree-dd-group-title" data-i18n="${group.titleKey}">${t(group.titleKey)}</span>
|
||||
<span class="tree-dd-group-count">${groupCount}</span>
|
||||
</div>
|
||||
<div class="tree-children${isCollapsed ? ' collapsed' : ''}">
|
||||
<div class="tree-dd-children">
|
||||
${childrenHtml}
|
||||
</div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
_renderStandalone(leaf) {
|
||||
_renderLeaf(leaf) {
|
||||
const isActive = leaf.key === this._activeLeaf;
|
||||
return `
|
||||
<div class="tree-standalone${leaf.key === this._activeLeaf ? ' active' : ''}" data-tree-leaf="${leaf.key}">
|
||||
<div class="tree-dd-leaf${isActive ? ' active' : ''}" data-tree-leaf="${leaf.key}">
|
||||
${leaf.icon ? `<span class="tree-node-icon">${leaf.icon}</span>` : ''}
|
||||
<span class="tree-node-title" data-i18n="${leaf.titleKey}">${t(leaf.titleKey)}</span>
|
||||
<span class="tree-count">${leaf.count ?? 0}</span>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
_updateTrigger() {
|
||||
const container = document.getElementById(this.containerId);
|
||||
if (!container) return;
|
||||
const leaf = this._leafMap.get(this._activeLeaf);
|
||||
if (!leaf) return;
|
||||
const icon = container.querySelector('.tree-dd-trigger-icon');
|
||||
const title = container.querySelector('.tree-dd-trigger-title');
|
||||
const count = container.querySelector('.tree-dd-trigger-count');
|
||||
if (icon) icon.innerHTML = leaf.icon || '';
|
||||
if (title) title.textContent = t(leaf.titleKey);
|
||||
if (count) count.textContent = leaf.count ?? 0;
|
||||
}
|
||||
|
||||
_openDropdown(container) {
|
||||
if (this._open) return;
|
||||
this._open = true;
|
||||
const panel = container.querySelector('[data-tree-panel]');
|
||||
const trigger = container.querySelector('[data-tree-trigger]');
|
||||
if (panel) panel.classList.add('open');
|
||||
if (trigger) trigger.classList.add('open');
|
||||
|
||||
this._outsideHandler = (e) => {
|
||||
const inTrigger = trigger && trigger.contains(e.target);
|
||||
const inPanel = panel && panel.contains(e.target);
|
||||
if (!inTrigger && !inPanel) this._closeDropdown(container);
|
||||
};
|
||||
this._escHandler = (e) => {
|
||||
if (e.key === 'Escape') this._closeDropdown(container);
|
||||
};
|
||||
// Use timeout so the current pointerdown doesn't immediately trigger close
|
||||
setTimeout(() => {
|
||||
window.addEventListener('mousedown', this._outsideHandler, true);
|
||||
window.addEventListener('pointerdown', this._outsideHandler, true);
|
||||
window.addEventListener('keydown', this._escHandler, true);
|
||||
}, 0);
|
||||
}
|
||||
|
||||
_closeDropdown(container) {
|
||||
if (!this._open) return;
|
||||
this._open = false;
|
||||
const panel = container.querySelector('[data-tree-panel]');
|
||||
const trigger = container.querySelector('[data-tree-trigger]');
|
||||
if (panel) panel.classList.remove('open');
|
||||
if (trigger) trigger.classList.remove('open');
|
||||
window.removeEventListener('mousedown', this._outsideHandler, true);
|
||||
window.removeEventListener('pointerdown', this._outsideHandler, true);
|
||||
window.removeEventListener('keydown', this._escHandler, true);
|
||||
}
|
||||
|
||||
_bindEvents(container) {
|
||||
// Trigger click — toggle dropdown
|
||||
const trigger = container.querySelector('[data-tree-trigger]');
|
||||
if (trigger) {
|
||||
trigger.addEventListener('pointerdown', (e) => {
|
||||
// Don't toggle when clicking extra buttons (expand/collapse/help)
|
||||
if (e.target.closest('.tree-dd-extra')) return;
|
||||
e.preventDefault();
|
||||
if (this._open) this._closeDropdown(container);
|
||||
else this._openDropdown(container);
|
||||
});
|
||||
}
|
||||
|
||||
// Leaf click — select and close
|
||||
container.querySelectorAll('[data-tree-leaf]').forEach(el => {
|
||||
el.addEventListener('click', () => {
|
||||
const key = el.dataset.treeLeaf;
|
||||
this.setActive(key);
|
||||
this._closeDropdown(container);
|
||||
this.suppressObserver();
|
||||
if (this.onSelect) this.onSelect(key, this._leafMap.get(key));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Start observing card-section elements so the active tree leaf
|
||||
* follows whichever section is currently visible on screen.
|
||||
@@ -269,31 +335,4 @@ export class TreeNav {
|
||||
this._observer = null;
|
||||
}
|
||||
}
|
||||
|
||||
_bindEvents(container) {
|
||||
// Group header toggle
|
||||
container.querySelectorAll('.tree-group-header').forEach(header => {
|
||||
header.addEventListener('click', () => {
|
||||
const key = header.dataset.treeGroupToggle;
|
||||
const children = header.nextElementSibling;
|
||||
if (!children) return;
|
||||
const isNowCollapsed = children.classList.toggle('collapsed');
|
||||
const chevron = header.querySelector('.tree-chevron');
|
||||
if (chevron) chevron.classList.toggle('open', !isNowCollapsed);
|
||||
_saveCollapsed(key, isNowCollapsed);
|
||||
});
|
||||
});
|
||||
|
||||
// Leaf click (both grouped and standalone)
|
||||
container.querySelectorAll('[data-tree-leaf]').forEach(el => {
|
||||
el.addEventListener('click', (e) => {
|
||||
// Don't trigger on group header clicks
|
||||
if (el.closest('.tree-group-header')) return;
|
||||
const key = el.dataset.treeLeaf;
|
||||
this.setActive(key);
|
||||
this.suppressObserver();
|
||||
if (this.onSelect) this.onSelect(key, this._leafMap.get(key));
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user