feat: sequences can step on time; searchable group pickers
- Sequences: advance_mode "time" makes each step last its `seconds` (0.1–3600) instead of beats; editor gets a "Steps last" selector. - UI: search box in the groups modal; searchable add pickers for zone groups and presets. - Preset "try" sends only to the current zone's groups, never broadcast. - led-driver: max_brightness ceiling from device config; follow a controller that restarted its beat counter. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
38162d4b89
commit
d664026ee5
10 files changed
+229
-92
No files matched your search
+48
-4
@@ -185,6 +185,7 @@ function normalizeSequenceLanes(doc) {
|
||||
.map((s) => ({
|
||||
preset_id: s.preset_id != null ? String(s.preset_id) : String(s.presetId || ''),
|
||||
beats: Math.max(1, parseInt(String(s.beats != null ? s.beats : 1), 10) || 1),
|
||||
seconds: Math.max(0.1, parseFloat(String(s.seconds != null ? s.seconds : 3)) || 3),
|
||||
group_ids: Array.isArray(s.group_ids)
|
||||
? s.group_ids.map((x) => String(x).trim()).filter(Boolean)
|
||||
: [],
|
||||
@@ -776,6 +777,26 @@ function renderSequenceStepRow(presetsMap, step) {
|
||||
beatsInp.style.width = '4rem';
|
||||
beatWrap.appendChild(bl);
|
||||
beatWrap.appendChild(beatsInp);
|
||||
beatWrap.classList.add('sequence-step-beats-wrap');
|
||||
|
||||
const secWrap = document.createElement('div');
|
||||
secWrap.className = 'sequence-step-seconds-wrap';
|
||||
secWrap.style.cssText = 'display:flex;align-items:center;gap:0.35rem;';
|
||||
const sl = document.createElement('label');
|
||||
sl.textContent = 'Seconds';
|
||||
const secInp = document.createElement('input');
|
||||
secInp.type = 'number';
|
||||
secInp.className = 'sequence-step-seconds';
|
||||
secInp.autocomplete = 'off';
|
||||
secInp.min = '0.1';
|
||||
secInp.max = '3600';
|
||||
secInp.step = '0.1';
|
||||
secInp.value = String(
|
||||
step && step.seconds != null ? Math.max(0.1, parseFloat(String(step.seconds)) || 3) : 3,
|
||||
);
|
||||
secInp.style.width = '5rem';
|
||||
secWrap.appendChild(sl);
|
||||
secWrap.appendChild(secInp);
|
||||
|
||||
const editPresetBtn = document.createElement('button');
|
||||
editPresetBtn.type = 'button';
|
||||
@@ -806,6 +827,7 @@ function renderSequenceStepRow(presetsMap, step) {
|
||||
top.appendChild(dragHandle);
|
||||
top.appendChild(presetWrap);
|
||||
top.appendChild(beatWrap);
|
||||
top.appendChild(secWrap);
|
||||
top.appendChild(editPresetBtn);
|
||||
row.appendChild(top);
|
||||
|
||||
@@ -839,7 +861,8 @@ function renderSequenceLane(laneIndex, laneSteps, laneGroupIds, presetsMap, grou
|
||||
addStep.addEventListener('click', () => {
|
||||
const stepsHost = wrap.querySelector('.sequence-lane-steps');
|
||||
if (stepsHost) {
|
||||
stepsHost.appendChild(renderSequenceStepRow(presetsMap, { preset_id: '', beats: 1 }));
|
||||
stepsHost.appendChild(renderSequenceStepRow(presetsMap, { preset_id: '', beats: 1, seconds: 3 }));
|
||||
applySequenceEditorMode();
|
||||
}
|
||||
});
|
||||
const rmLane = document.createElement('button');
|
||||
@@ -862,7 +885,7 @@ function renderSequenceLane(laneIndex, laneSteps, laneGroupIds, presetsMap, grou
|
||||
|
||||
const stepsHost = document.createElement('div');
|
||||
stepsHost.className = 'sequence-lane-steps';
|
||||
const steps = Array.isArray(laneSteps) && laneSteps.length ? laneSteps : [{ preset_id: '', beats: 1 }];
|
||||
const steps = Array.isArray(laneSteps) && laneSteps.length ? laneSteps : [{ preset_id: '', beats: 1, seconds: 3 }];
|
||||
steps.forEach((s) => {
|
||||
stepsHost.appendChild(renderSequenceStepRow(presetsMap, s));
|
||||
});
|
||||
@@ -883,6 +906,18 @@ function refreshSequenceEditorLaneTitles() {
|
||||
});
|
||||
}
|
||||
|
||||
/** Show the Beats or Seconds field on every step, to match the sequence's advance mode. */
|
||||
function applySequenceEditorMode() {
|
||||
const sel = document.getElementById('sequence-editor-mode');
|
||||
const timed = !!sel && sel.value === 'time';
|
||||
document.querySelectorAll('#sequence-editor-lanes .sequence-step-beats-wrap').forEach((e) => {
|
||||
e.style.display = timed ? 'none' : 'flex';
|
||||
});
|
||||
document.querySelectorAll('#sequence-editor-lanes .sequence-step-seconds-wrap').forEach((e) => {
|
||||
e.style.display = timed ? 'flex' : 'none';
|
||||
});
|
||||
}
|
||||
|
||||
function collectLanesFromEditor() {
|
||||
const host = document.getElementById('sequence-editor-lanes');
|
||||
const laneEls = host ? [...host.querySelectorAll('.sequence-lane')] : [];
|
||||
@@ -903,7 +938,9 @@ function collectLanesFromEditor() {
|
||||
const presetId = presetSel && presetSel.value ? String(presetSel.value) : '';
|
||||
if (!presetId) return;
|
||||
const beats = Math.max(1, parseInt(beatsInp && beatsInp.value ? beatsInp.value : '1', 10) || 1);
|
||||
steps.push({ preset_id: presetId, beats });
|
||||
const secInp = row.querySelector('.sequence-step-seconds');
|
||||
const seconds = Math.max(0.1, parseFloat(secInp && secInp.value ? secInp.value : '3') || 3);
|
||||
steps.push({ preset_id: presetId, beats, seconds });
|
||||
});
|
||||
lanes.push(steps);
|
||||
});
|
||||
@@ -961,6 +998,8 @@ async function openSequenceEditor(sequenceId, existing) {
|
||||
doc = {};
|
||||
}
|
||||
nameInput.value = doc.name || '';
|
||||
const modeSelOpen = document.getElementById('sequence-editor-mode');
|
||||
if (modeSelOpen) modeSelOpen.value = doc.advance_mode === 'time' ? 'time' : 'beats';
|
||||
|
||||
const lanes = normalizeSequenceLanes(doc);
|
||||
lanesHost.innerHTML = '';
|
||||
@@ -974,6 +1013,7 @@ async function openSequenceEditor(sequenceId, existing) {
|
||||
});
|
||||
}
|
||||
refreshSequenceEditorLaneTitles();
|
||||
applySequenceEditorMode();
|
||||
|
||||
const edDel = document.getElementById('sequence-editor-delete-btn');
|
||||
if (edDel) edDel.style.display = sequenceEditorId ? 'inline-block' : 'none';
|
||||
@@ -997,6 +1037,7 @@ function resolveZoneIdForPresetStripRefresh() {
|
||||
}
|
||||
|
||||
async function saveSequenceEditor() {
|
||||
const modeSel = document.getElementById('sequence-editor-mode');
|
||||
const nameInput = document.getElementById('sequence-editor-name');
|
||||
const { lanes, lanes_group_ids } = collectLanesFromEditor();
|
||||
const idxs = [];
|
||||
@@ -1014,7 +1055,7 @@ async function saveSequenceEditor() {
|
||||
lanes: nonEmpty,
|
||||
lanes_group_ids: nonEmptyLg,
|
||||
group_ids: nonEmptyLg[0] ? [...nonEmptyLg[0]] : [],
|
||||
advance_mode: 'beats',
|
||||
advance_mode: modeSel && modeSel.value === 'time' ? 'time' : 'beats',
|
||||
loop: true,
|
||||
steps: nonEmpty.length === 1 ? nonEmpty[0] : [],
|
||||
};
|
||||
@@ -1205,6 +1246,9 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
const idx = host.querySelectorAll('.sequence-lane').length;
|
||||
host.appendChild(renderSequenceLane(idx, [], [], presetsMap, groupsMap));
|
||||
refreshSequenceEditorLaneTitles();
|
||||
applySequenceEditorMode();
|
||||
});
|
||||
}
|
||||
const edMode = document.getElementById('sequence-editor-mode');
|
||||
if (edMode) edMode.addEventListener('change', applySequenceEditorMode);
|
||||
});
|
||||
Reference in new issue
Block a user