Skip to content

Make videos on the computer you already own. FreeVideo runs MiniMax H3 in as little as 8 GB of VRAM and 16 GB of RAM, and adapts its acceleration path to your hardware.

Add first-open editor guide with grouped replay

Bowen Xue1002fb8ba3ce
diff --git a/web/editor.js b/web/editor.js
index d911f31..eacb1a8 100644
--- a/web/editor.js
+++ b/web/editor.js
@@ -22,6 +22,7 @@ import {createProgressConnection} from './progress_connection.js';
import {createSelectionActions, deletionStatus, isMultiple, isTyping, playheadIds, removableGaps, removeGaps} from './editor_select.js';
import {isolateDialogKeys, topDialog} from './dialog_keys.js';
import {createBlockNotes, describedTrack} from './editor_notes.js';
+import {createFirstRunGuide} from './first_run_guide.js';
const editorStyles = Promise.all(['editor.css', 'editor_tracks.css', 'editor_frame.css', 'editor_adjust.css', 'editor_adjust_picture.css', 'editor_preview_picture.css', 'editor_select.css', 'editor_menu.css', 'editor_text.css', 'editor_notes.css', 'editor_transport.css'].map(name => {
const style = document.createElement('link'); style.rel = 'stylesheet'; style.href = new URL(name, import.meta.url).href;
const ready = 'sheet' in style ? new Promise(resolve => { style.onload = style.onerror = resolve; }) : Promise.resolve();
@@ -115,6 +116,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
const top = el('header', 'fv-header fv-ed-top'), libraryHost = el('aside', 'fv-ed-library'), preview = el('section', 'fv-ed-preview'),
transport = el('div', 'fv-ed-transport'), genHost = el('div', 'fv-ed-genbar'), tracksHost = el('div', 'fv-ed-tracks'), zoomHost = el('div', 'fv-ed-zoom');
const adjustHost = el('aside', 'fv-ed-adjust-host');
+ tracksHost.dataset.fvGuide = 'editor-timeline';
const button = (label, action, cls = '') => { const value = el('button', cls, label); value.type = 'button'; value.onclick = action; return value; };
const navigation = viewSwitch('editor', () => handle.switchView('studio'), () => handle.switchView('nodes'), () => {}, () => handle.switchView('autopilot'));
for (const control of navigation.querySelectorAll('button')) control.removeAttribute('title');
@@ -159,7 +161,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
let library = null, closing = false, closePromise = null, exportSnapshot = null, lastSeed = null, projectEpoch = 0;
let disposed = false, suppressSave = false, savedContent = '', initializing = true, tracks = null, genbar = null, adjustPanel = null, exportStatus = null, pointerEditing = false, deferredStamp = null;
let capability = {maxSeconds: 15, maxFollowSeconds: 15, maxRequestFrames: null, estimate: () => null}, generationBusy = false, switching = false, generationDone = null, finishGeneration = null;
- let noticeTimer = null, stopExport = null, mostRecentJob = null;
+ let noticeTimer = null, stopExport = null, mostRecentJob = null, guide = null;
const jobWatchers = new Map(), progress = new Map(), jobStatuses = new Map(), runProgress = new Map();
let blockStates = null, progressObserver = null, progressConnection = null;
function barJob(job) {
@@ -969,6 +971,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
if (topDialog() === element && !dismissPopup(event)) state.select(null, {history: true});
});
const stopKeys = isolateDialogKeys(element, (event, inside) => {
+ if (guide?.handleKey(event)) return;
if (event.type === 'keyup') { transportControls.keyboard(event); return; }
if (event.type !== 'keydown') return;
if (event.isComposing || event.keyCode === 229) return;
@@ -1020,6 +1023,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
async close() {
if (closePromise) return closePromise;
textTools.flush();
+ guide?.suspend();
closing = true; element.inert = true; player.pause();
closePromise = (async () => {
await handle.ready;
@@ -1030,7 +1034,7 @@ export function openEditor({api, app, from = null, panel = {}, components: given
saveWarning.textContent = t('Not saved yet. Switching again will lose recent changes.', '还没保存好,再切换会丢掉最近的改动');
saveWarning.hidden = false; return false;
}
- rememberView(); disposed = true; transportControls.dispose(); player.dispose();
+ rememberView(); disposed = true; guide?.dispose(); transportControls.dispose(); player.dispose();
textTools.dispose(); adjust.dispose(); notes.dispose(); pictureEdit.dispose();
audio.dispose();
listeners.splice(0).forEach(remove => remove());
@@ -1150,5 +1154,9 @@ export function openEditor({api, app, from = null, panel = {}, components: given
for (const host of [tracksHost, toolbar]) host.classList.remove('fv-ed-pending');
if (!closing && !disposed) { player.refresh(); updateTop(); updateTransport(); }
});
+ if (typeof MutationObserver !== 'undefined') guide = createFirstRunGuide({dialog: element, api,
+ cn: String(language()).toLowerCase().startsWith('zh'), group: 'editor',
+ isBusy: () => initializing || !tracks || genHost.inert || pointerEditing || jobActive() || ['running', 'queued'].includes(exportStatus?.state),
+ targets: {'editor-trim': () => tracks?.guideTarget('trim'), 'editor-empty': () => tracks?.guideTarget('empty')}});
updateTop(); return handle;
}
diff --git a/web/editor_genbar.js b/web/editor_genbar.js
index b828114..0a07aef 100644
--- a/web/editor_genbar.js
+++ b/web/editor_genbar.js
@@ -13,6 +13,7 @@ export function createEditorGenbar(host, {state, t, actions, text = ''}) {
note.setAttribute('role', 'status'); note.hidden = true;
const input = el('input', 'fv-ed-description'); input.type = 'text'; input.value = text;
const generate = el('button', 'fv-ed-generate'), cancel = el('button', null, t('Cancel', '取消')), resume = el('button', null, t('Continue', '继续'));
+ input.dataset.fvGuide = 'editor-describe'; generate.dataset.fvGuide = 'editor-generate';
for (const button of [generate, cancel, resume]) button.type = 'button';
host.append(hint, note, input, generate, cancel, resume);
const firstFrame = createFirstFrameSwitch(host, {state, t, actions});
diff --git a/web/editor_tracks.js b/web/editor_tracks.js
index 4f8b297..0ca0688 100644
--- a/web/editor_tracks.js
+++ b/web/editor_tracks.js
@@ -424,6 +424,7 @@ export function createTracks(host, {state, sources = {}, t = en => en, actions =
const status = create('span', 'fv-ed-clip-status');
const left = create('span', 'fv-ed-trim-handle fv-ed-trim-start'); left.dataset.edge = 'start';
const right = create('span', 'fv-ed-trim-handle fv-ed-trim-end'); right.dataset.edge = 'end';
+ if (!isText(clip)) right.dataset.fvGuide = 'editor-trim';
node.append(media, fill, status, left, right);
const item = {element: node, media, fill, status, clip, kind: track.kind, component: null, waveKey: undefined};
if (blockProgress && !isText(clip)) {
@@ -453,6 +454,7 @@ export function createTracks(host, {state, sources = {}, t = en => en, actions =
let row = rows.get(track.id);
if (!row) {
const node = create('div', 'fv-ed-track-row'); node.dataset.track = track.id;
+ if (track.id === 'v1') node.dataset.fvGuide = 'editor-empty';
const empty = create('div', 'fv-ed-track-empty');
node.append(empty);
const head = create('div', 'fv-ed-track-head'); head.dataset.track = track.id;
@@ -1132,7 +1134,29 @@ export function createTracks(host, {state, sources = {}, t = en => en, actions =
showInsertion(null); insertion.classList.remove('fv-ed-blocked-insertion');
}, 700);
}
- return {element, keyboard, menu, dismissPopup, flashBlocked, seekPlayhead, extendClip,
+ function guideTarget(kind) {
+ const viewport = scroll.getBoundingClientRect();
+ const reveal = (left, width) => () => {
+ if (left < viewport.left + 12 || left + width > viewport.right - 12)
+ scroll.scrollLeft = Math.max(0, scroll.scrollLeft + left - viewport.left - 12);
+ };
+ if (kind === 'trim') {
+ const item = [...clips.values()].filter(item => item.clip.source && !isText(item.clip))
+ .sort((a, b) => (b.track === 'v1') - (a.track === 'v1') || b.clip.start - a.clip.start)[0];
+ if (!item) return null;
+ const node = item.element.querySelector('.fv-ed-trim-end');
+ const r = item.element.getBoundingClientRect(), left = r.right - 12;
+ return {node, rect: {left, right: left + 24, top: r.top, bottom: r.bottom, width: 24, height: r.height}, reveal: reveal(left, 24)};
+ }
+ const node = rows.get('v1')?.element;
+ if (!node) return null;
+ // Leave a small gap beyond all tracks, outside the trim hit area. At
+ // frame zero an empty project starts exactly at the timeline origin.
+ const end = model.duration(state.record), start = end ? Math.ceil(end / model.FPS + 12 / state.zoom) * model.FPS : 0;
+ const r = node.getBoundingClientRect(), left = content.getBoundingClientRect().left + pixels(start), width = 3 * state.zoom;
+ return {node, rect: {left, right: left + width, top: r.top, bottom: r.bottom, width, height: r.height}, reveal: reveal(left, width)};
+ }
+ return {element, keyboard, menu, dismissPopup, flashBlocked, seekPlayhead, extendClip, guideTarget,
setSnapping(enabled) {
if (typeof enabled !== 'boolean') return {ok: false, reason: 'snapping'};
setTransportSnapping(state, enabled); cachedPoints = allPoints(gesture?.ids || []);
diff --git a/web/first_run_guide.css b/web/first_run_guide.css
index 85b7fcb..2a92a3e 100644
--- a/web/first_run_guide.css
+++ b/web/first_run_guide.css
@@ -1,6 +1,7 @@
.fv-studio .fv-guide-layer{position:fixed;inset:0;z-index:40;pointer-events:none;overflow:hidden;font-family:var(--fv-font);color:var(--fv-ink)}
.fv-studio .fv-guide-ring{position:absolute;border:2px solid var(--fv-accent);box-shadow:0 0 0 9999px rgb(0 0 0 / 42%);pointer-events:none}
.fv-studio .fv-guide-bubble{position:absolute;pointer-events:auto;width:340px;max-width:calc(100vw - 48px);padding:20px;border-radius:14px;background:var(--fv-raised);border:1px solid var(--fv-border);box-shadow:0 16px 48px #0005}
+.fv-studio .fv-guide-layer[data-group=editor] .fv-guide-bubble{max-width:calc(100vw - 24px)}
.fv-studio .fv-guide-message{font-size:14px;font-weight:400;line-height:1.6;text-wrap:balance;margin:0;white-space:normal;overflow-wrap:normal;color:var(--fv-ink)}
.fv-studio .fv-guide-footer{display:flex;align-items:center;justify-content:space-between;gap:14px;margin-top:18px}
.fv-studio .fv-guide-dots{display:flex;align-items:center;gap:6px;flex-shrink:0}
diff --git a/web/first_run_guide.js b/web/first_run_guide.js
index 41d452e..3b6f5f1 100644
--- a/web/first_run_guide.js
+++ b/web/first_run_guide.js
@@ -1,5 +1,8 @@
const FILE = '/userdata/' + encodeURIComponent('freevideo/guide.json');
-let attempted = false, current = null;
+const attempted = new Set();
+let current = null;
+const guides = new Map();
+const recordWrites = new WeakMap();
export const REPLAY_TEXT = {
title: ['Getting started', '新手指引'],
@@ -21,11 +24,22 @@ export const CHAPTERS = [
en: 'For a longer video, or to change part of one, choose "Edit".', zh: '要做更长的视频,或者修\u2060改\u2060其\u2060中\u2060一\u2060段,点“剪辑视图”。'},
{id: 'agent', anchor: '[data-fv-guide="agent"]', added: true,
en: 'To have an AI agent such as Claude Code or Codex make videos for you, choose "Autopilot".', zh: '要让 Claude Code、Codex 等 Agent 替你生\u2060成\u2060视\u2060频,点“AI 全自动”。'},
+ {id: 'editor-timeline', group: 'editor', anchor: '[data-fv-guide="editor-timeline"]', added: true,
+ en: 'Drag a video here.', zh: '把视频拖到这里。'},
+ {id: 'editor-trim', group: 'editor', anchor: '[data-fv-guide="editor-trim"]', added: true,
+ en: 'Drag the right edge to make this part longer.', zh: '拖右边缘,把这一段拉长。'},
+ {id: 'editor-empty', group: 'editor', anchor: '[data-fv-guide="editor-empty"]', added: true,
+ en: 'Drag in an empty spot to add a new part.', zh: '在空白处拖出新的一段。'},
+ {id: 'editor-describe', group: 'editor', anchor: '[data-fv-guide="editor-describe"]',
+ anchors: ['[data-fv-guide="editor-describe"]', '[data-fv-guide="editor-generate"]'], added: true,
+ en: 'Describe it, then choose "Generate".', zh: '写一句描述,再点“\u2060生\u2060成\u2060”\u2060。'},
];
-export function guideSteps({record, available = [], returning = false, blockers = {}, all = false}) {
+const chaptersFor = group => CHAPTERS.filter(c => (c.group || 'studio') === group);
+
+export function guideSteps({record, available = [], returning = false, blockers = {}, all = false, group = 'studio'}) {
if (Object.values(blockers).some(Boolean)) return [];
- return CHAPTERS.filter(chapter => available.includes(chapter.id)
+ return chaptersFor(group).filter(chapter => available.includes(chapter.id)
&& (all || (!record?.seen.includes(chapter.id) && (record || !returning || chapter.added))));
}
@@ -35,6 +49,9 @@ export function guideRecord(record, ids) {
export async function readGuideRecord(api) {
try {
+ // Switching workspaces can race a slow acknowledgement from the old
+ // guide. Read after its writes so the next group retains those ids.
+ await recordWrites.get(api);
const reply = await api.fetchApi(FILE, {cache: 'no-store'});
if (reply.status === 404) return {ok: true, record: null};
if (!reply.ok) return {ok: false};
@@ -44,15 +61,19 @@ export async function readGuideRecord(api) {
} catch { return {ok: false}; }
}
-export async function saveGuideRecord(api, record) {
- try {
- return (await api.fetchApi(FILE + '?overwrite=true', {method: 'POST', body: JSON.stringify(record), keepalive: true})).ok;
- } catch { return false; }
+export function saveGuideRecord(api, record) {
+ const pending = (recordWrites.get(api) || Promise.resolve()).then(async () => {
+ try {
+ return (await api.fetchApi(FILE + '?overwrite=true', {method: 'POST', body: JSON.stringify(record), keepalive: true})).ok;
+ } catch { return false; }
+ });
+ recordWrites.set(api, pending);
+ return pending;
}
// An empty record checks write access before drawing anything. Never infer a
// new installation from an unreadable library, or consume an absent chapter.
-export async function prepareGuide(api, available) {
+export async function prepareGuide(api, available, group = 'studio') {
const loaded = await readGuideRecord(api);
if (!loaded.ok) return null;
let record = loaded.record, returning = false;
@@ -65,8 +86,8 @@ export async function prepareGuide(api, available) {
returning = data.items.length > 0;
} catch { return null; }
}
- const steps = guideSteps({record, available, returning});
- record = guideRecord(record, returning ? CHAPTERS.filter(c => !c.added && available.includes(c.id)).map(c => c.id) : []);
+ const steps = guideSteps({record, available, returning, group});
+ record = guideRecord(record, returning ? chaptersFor(group).filter(c => !c.added && available.includes(c.id)).map(c => c.id) : []);
if (!steps.length) {
if (returning) await saveGuideRecord(api, record);
return null;
@@ -76,6 +97,7 @@ export async function prepareGuide(api, available) {
}
export function showGuide({all = true} = {}) {
+ current = [...document.querySelectorAll('dialog[open]')].map(dialog => guides.get(dialog)).filter(Boolean).at(-1) || current;
return (all ? current?.replay() : current?.show()) || Promise.resolve(false);
}
@@ -112,9 +134,22 @@ export function createGuideReplayEntry({dialog, cn, openWorkspace, replay = show
return section;
}
-export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
+// Custom targets return viewport rectangles on every layout pass. They never
+// insert hit targets or change the editor's pointer handling.
+export function guideTarget(dialog, chapter, targets = {}) {
+ if (targets[chapter.id]) return targets[chapter.id]();
+ const nodes = (chapter.anchors || [chapter.anchor]).map(selector => dialog.querySelector(selector));
+ if (nodes.some(node => !visible(node))) return null;
+ const rects = nodes.map(node => node.getBoundingClientRect());
+ const left = Math.min(...rects.map(r => r.left)), top = Math.min(...rects.map(r => r.top));
+ const right = Math.max(...rects.map(r => r.right)), bottom = Math.max(...rects.map(r => r.bottom));
+ return {node: nodes[0], rect: {left, top, right, bottom, width: right - left, height: bottom - top}};
+}
+
+export function createFirstRunGuide({dialog, api, cn, isBusy = () => false, group = 'studio', targets = {}}) {
const t = (en, zh) => cn ? zh : en;
- const automatic = !attempted;
+ const automatic = !attempted.has(group), editor = group === 'editor';
+ const chapters = chaptersFor(group);
if (!document.querySelector('link[data-fv-first-run-guide]')) {
const css = el('link'); css.rel = 'stylesheet'; css.dataset.fvFirstRunGuide = '';
css.href = new URL('./first_run_guide.css', import.meta.url).href; document.head.append(css);
@@ -125,10 +160,17 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
let waiting = null, replayTimer = null;
const heldKeys = new Set();
const target = chapter => dialog.querySelector(chapter.anchor);
- const available = () => CHAPTERS.filter(c => visible(target(c))).map(c => c.id);
+ const resolved = chapter => {
+ const value = guideTarget(dialog, chapter, targets);
+ return value && visible(value.node) && value.rect.width > 0 && value.rect.height > 0 ? value : null;
+ };
+ const available = () => chapters.filter(c => resolved(c)).map(c => c.id);
function blocked() {
- return !dialog.open || serverBlocked || isBusy()
- || [...document.querySelectorAll('dialog[open]')].some(e => e !== dialog)
+ return !dialog.open || !dialog.isConnected || dialog.inert || serverBlocked || isBusy()
+ // Create stays open underneath Edit. It is an inactive workspace,
+ // while settings, export options and other dialogs still block.
+ || [...document.querySelectorAll('dialog[open]')].some(e => e !== dialog
+ && !(editor && e.matches('dialog.fv-studio:not(.fv-editor)')))
|| [...document.querySelectorAll('[role="dialog"], [aria-modal="true"], .p-dialog-mask, .p-overlay-mask:not(.p-blockui-mask)')]
.some(e => e !== dialog && !layer?.contains(e) && visible(e))
|| [...document.querySelectorAll('.fv-failure, .fv-health, .fv-update-notice, .fv-prewarm, [data-fv-guide-blocker]')]
@@ -149,10 +191,12 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
layer?.remove(); layer = bubble = ring = arrow = null;
if (restore && focused && restoreFocus?.isConnected) restoreFocus.focus({preventScroll: true});
}
- function interrupt() { if (automatic && dialog.open) attempted = true; stopped = true; clearTimeout(pollTimer); hide(); }
+ function interrupt() { if (automatic && dialog.open) attempted.add(group); stopped = true; clearTimeout(pollTimer); hide(); }
function remember() {
if (manual) return;
- record = guideRecord(record, steps.filter(c => visible(target(c))).map(c => c.id));
+ // Empty projects acknowledge the optional trim chapter too, so importing
+ // later cannot turn a completed three-step guide into a second prompt.
+ record = guideRecord(record, editor ? chapters.map(c => c.id) : steps.filter(c => resolved(c)).map(c => c.id));
// A failed write stays quiet. This page's single attempt is already used.
saveGuideRecord(api, record).then(ok => { if (!ok && !disposed) interrupt(); });
}
@@ -160,22 +204,30 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
function position() {
if (!layer) return;
if (blocked()) { interrupt(); return; }
- const node = target(steps[index]);
- if (!visible(node)) {
+ let value = resolved(steps[index]);
+ if (value?.reveal) { value.reveal(); value = resolved(steps[index]); }
+ if (!value) {
steps.splice(index, 1);
if (!steps.length) interrupt();
else { index = Math.min(index, steps.length - 1); draw(); }
return;
}
- const r = node.getBoundingClientRect(), bounds = dialog.getBoundingClientRect();
- const xmin = Math.max(24, bounds.left + 12), ymin = Math.max(24, bounds.top + 12);
- const xmax = Math.min(innerWidth - 24, bounds.right - 12), ymax = Math.min(innerHeight - 24, bounds.bottom - 12);
+ const {node, rect: raw} = value, bounds = dialog.getBoundingClientRect();
+ const margin = editor ? 12 : 24;
+ const xmin = Math.max(margin, bounds.left + 12), ymin = Math.max(margin, bounds.top + 12);
+ const xmax = Math.min(innerWidth - margin, bounds.right - 12), ymax = Math.min(innerHeight - margin, bounds.bottom - 12);
+ const r = editor ? {left: Math.max(0, raw.left), top: Math.max(0, raw.top),
+ right: Math.min(innerWidth, raw.right), bottom: Math.min(innerHeight, raw.bottom)} : raw;
+ r.width = r.right - r.left; r.height = r.bottom - r.top;
+ if (r.width <= 0 || r.height <= 0) { interrupt(); return; }
bubble.style.width = `${Math.min(340, xmax - xmin)}px`;
const b = bubble.getBoundingClientRect(), cx = r.left + r.width / 2, cy = r.top + r.height / 2;
const x = clamp(cx - b.width / 2, xmin, xmax - b.width), y = clamp(cy - b.height / 2, ymin, ymax - b.height);
const below = {side: 'below', x, y: r.bottom + 24}, above = {side: 'above', x, y: r.top - b.height - 24};
const narrow = innerWidth <= 680;
- const candidates = steps[index].id === 'longer'
+ const candidates = editor
+ ? [{...above, x: steps[index].id === 'editor-describe' ? clamp(r.left, xmin, xmax - b.width) : x}]
+ : steps[index].id === 'longer'
? [{side: 'below', x: clamp(r.right - b.width, xmin, xmax - b.width), y: r.bottom + 24}, above, below]
: narrow ? [{side: 'below', x, y: ymax - b.height}, above, below]
: [{side: 'right', x: r.right + 24, y}, {side: 'left', x: r.left - b.width - 24, y}, below, above];
@@ -184,8 +236,9 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
const place = candidates.find(fits);
if (!place) { interrupt(); return; }
const style = getComputedStyle(node);
- Object.assign(ring.style, {left: `${r.left - 4}px`, top: `${r.top - 4}px`, width: `${r.width + 8}px`, height: `${r.height + 8}px`,
- borderRadius: ['borderTopLeftRadius', 'borderTopRightRadius', 'borderBottomRightRadius', 'borderBottomLeftRadius'].map(n => `${(parseFloat(style[n]) || 0) + 4}px`).join(' ')});
+ const pad = editor ? 0 : 4;
+ Object.assign(ring.style, {left: `${r.left - pad}px`, top: `${r.top - pad}px`, width: `${r.width + 2 * pad}px`, height: `${r.height + 2 * pad}px`,
+ borderRadius: ['borderTopLeftRadius', 'borderTopRightRadius', 'borderBottomRightRadius', 'borderBottomLeftRadius'].map(n => `${(parseFloat(style[n]) || 0) + pad}px`).join(' ')});
Object.assign(bubble.style, {left: `${place.x}px`, top: `${place.y}px`}); bubble.dataset.side = place.side;
arrow.style.left = arrow.style.top = '';
if (['left', 'right'].includes(place.side)) arrow.style.top = `${clamp(cy - place.y - 6, 20, b.height - 32)}px`;
@@ -194,13 +247,14 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
const follow = () => { if (layer && frame === null) frame = requestAnimationFrame(() => { frame = null; position(); }); };
function draw() {
hide(false);
- while (steps[index] && !visible(target(steps[index]))) steps.splice(index, 1);
+ resolved(steps[index])?.reveal?.();
+ while (steps[index] && !resolved(steps[index])) steps.splice(index, 1);
if (!steps[index]) { interrupt(); return; }
- const node = target(steps[index]), r = node.getBoundingClientRect(), bounds = dialog.getBoundingClientRect();
+ const {node, rect: r} = resolved(steps[index]), bounds = dialog.getBoundingClientRect();
const clip = node.closest('.fv-controls, .fv-preview-column')?.getBoundingClientRect() || bounds;
- if (innerWidth <= 680 || r.top < clip.top + 8 || r.bottom > clip.bottom - 8)
+ if (!editor && (innerWidth <= 680 || r.top < clip.top + 8 || r.bottom > clip.bottom - 8))
node.scrollIntoView({block: 'center', inline: 'nearest', behavior: 'instant'});
- layer = el('div', null, 'fv-guide-layer'); layer.dataset.chapter = steps[index].id;
+ layer = el('div', null, 'fv-guide-layer'); layer.dataset.chapter = steps[index].id; layer.dataset.group = group;
ring = el('div', null, 'fv-guide-ring'); ring.setAttribute('aria-hidden', 'true');
bubble = el('div', null, 'fv-guide-bubble'); bubble.setAttribute('role', 'dialog'); bubble.setAttribute('aria-modal', 'false');
bubble.setAttribute('aria-label', t('Getting started', '使用指引')); bubble.setAttribute('aria-describedby', 'fv-guide-message');
@@ -228,16 +282,17 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
}
async function show(all = false, request = null) {
const cancelled = () => request && waiting !== request;
- if (all) serverBlocked = false;
+ if (all || editor) serverBlocked = false;
if (disposed || preparing || layer || !dialog.open || blocked() || (!all && (touched || stopped))) return false;
preparing = true; manual = all;
await document.fonts.ready;
if (cancelled() || [...document.querySelectorAll('.p-blockui-mask')].some(visible)) { preparing = false; return false; }
const ready = await serverState();
+ if (editor) serverBlocked = !ready;
let prepared = null;
if (ready && !disposed && !cancelled() && !blocked() && (all || !touched)) {
- if (all) prepared = {record, steps: guideSteps({available: available(), all: true})};
- else prepared = await prepareGuide(api, available());
+ if (all) prepared = {record, steps: guideSteps({available: available(), all: true, group})};
+ else prepared = await prepareGuide(api, available(), group);
}
preparing = false;
if (!prepared?.steps.length || disposed || cancelled() || blocked() || (!all && (touched || stopped))) return false;
@@ -257,7 +312,7 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
}
async function replay() {
if (disposed || !dialog.open) return false;
- attempted = true; manual = true; clearTimeout(startTimer); interrupt(); cancelReplay();
+ attempted.add(group); manual = true; clearTimeout(startTimer); interrupt(); cancelReplay();
waiting = el('div', null, 'fv-guide-wait');
const message = el('p', t(...REPLAY_TEXT.waiting)); message.setAttribute('role', 'status');
const cancel = el('button', t(...REPLAY_TEXT.cancel)); cancel.type = 'button'; cancel.onclick = cancelReplay;
@@ -267,7 +322,7 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
}
const touch = event => {
if (!dialog.contains(event.target) || layer?.contains(event.target)) return;
- if (automatic) attempted = true;
+ if (automatic) attempted.add(group);
touched = true;
if (layer) finish(); else stopped = true;
};
@@ -292,42 +347,66 @@ export function createFirstRunGuide({dialog, api, cn, isBusy = () => false}) {
if (event.type === 'keyup') heldKeys.delete(event.key);
};
const status = event => {
- if (event.detail?.exec_info?.queue_remaining > 0) { serverBlocked = true; interrupt(); }
+ if (event.detail?.exec_info?.queue_remaining > 0) { serverBlocked = true; if (!editor || layer) interrupt(); }
else if (layer) poll();
};
- const execution = () => { serverBlocked = true; interrupt(); };
+ const execution = () => { serverBlocked = true; if (!editor || layer) interrupt(); };
const observer = new MutationObserver(rows => {
if (disposed || stopped) return;
if (rows.every(row => layer?.contains(row.target))) return;
- if (blocked() || layer && [...document.querySelectorAll('.p-blockui-mask')].some(visible)) interrupt(); else follow();
+ if ((!editor || layer) && (blocked() || layer && [...document.querySelectorAll('.p-blockui-mask')].some(visible))) interrupt(); else follow();
});
observer.observe(document.body, {subtree: true, childList: true, attributes: true, attributeFilter: ['hidden', 'open', 'class', 'style', 'inert', 'role', 'aria-modal']});
const resizeObserver = new ResizeObserver(follow);
document.addEventListener('pointerdown', touch, true); document.addEventListener('click', touch, true);
+ document.addEventListener('dragstart', touch, true); document.addEventListener('dragenter', touch, true);
document.addEventListener('input', touch, true); document.addEventListener('keydown', key, true);
document.addEventListener('keypress', keyEnd, true); document.addEventListener('keyup', keyEnd, true);
window.addEventListener('resize', follow); document.addEventListener('scroll', follow, true);
- api.addEventListener('status', status); api.addEventListener('execution_start', execution);
- const handle = {show, replay, dispose() {
+ // The editor can be opened with a bare request helper that has no events.
+ const events = api?.addEventListener && api.removeEventListener;
+ if (events) { api.addEventListener('status', status); api.addEventListener('execution_start', execution); }
+ const handle = {show, replay, suspend() { cancelReplay(); interrupt(); },
+ handleKey(event) {
+ if (!['keydown', 'keypress', 'keyup'].includes(event.type)) return false;
+ const handled = !!layer || heldKeys.has(event.key);
+ if (event.type === 'keydown') key(event); else keyEnd(event);
+ return handled;
+ }, dispose() {
disposed = true; clearTimeout(startTimer); clearTimeout(pollTimer); cancelAnimationFrame(frame);
cancelReplay();
hide(); observer.disconnect(); resizeObserver.disconnect();
document.removeEventListener('pointerdown', touch, true); document.removeEventListener('click', touch, true);
+ document.removeEventListener('dragstart', touch, true); document.removeEventListener('dragenter', touch, true);
document.removeEventListener('input', touch, true); document.removeEventListener('keydown', key, true);
document.removeEventListener('keypress', keyEnd, true); document.removeEventListener('keyup', keyEnd, true);
window.removeEventListener('resize', follow); document.removeEventListener('scroll', follow, true);
- api.removeEventListener('status', status); api.removeEventListener('execution_start', execution);
- if (current === handle) current = null;
+ if (events) { api.removeEventListener('status', status); api.removeEventListener('execution_start', execution); }
+ guides.delete(dialog);
+ if (current === handle) current = [...guides.values()].at(-1) || null;
}};
- current = handle;
+ guides.set(dialog, handle);
+ const foreground = [...document.querySelectorAll('dialog[open]')].at(-1);
+ if (!foreground || foreground === dialog) { current?.suspend(); current = handle; }
// Steps are fixed when the guide starts, so give an anchor that is still waiting for its data up to 5 s.
// The Agent tab is not waited for: its discovery has already finished when the guide is created.
- const pending = () => CHAPTERS.some(c => c.id !== 'agent' && target(c) && !visible(target(c)));
+ const pending = () => chapters.some(c => c.id !== 'agent' && target(c) && !visible(target(c)));
function begin(waited = 0) {
startTimer = setTimeout(() => {
- if (!automatic || attempted || manual || layer || disposed) return;
+ if (!automatic || attempted.has(group) || manual || layer || disposed || touched) return;
+ if (editor) {
+ if (!dialog.open || !dialog.isConnected) return;
+ serverBlocked = false;
+ if (blocked() || pending()) { begin(250); return; }
+ show().then(shown => {
+ if (disposed || touched) return;
+ if (!shown && (serverBlocked || blocked())) begin(250);
+ else { attempted.add(group); if (!shown) stopped = true; }
+ });
+ return;
+ }
if (pending() && waited < 5000) { begin(waited + 250); return; }
- attempted = true;
+ attempted.add(group);
show().then(shown => { if (!shown) stopped = true; });
}, waited ? 250 : 1000);
}
diff --git a/web/view_navigation.js b/web/view_navigation.js
index c235914..cf145e5 100644
--- a/web/view_navigation.js
+++ b/web/view_navigation.js
@@ -71,6 +71,8 @@ export function refreshNavigation() {
}
export function openCreativeWorkspace() {
+ // Settings replay belongs to the visible editing workspace too.
+ if (currentView === 'editor' && document.querySelector('dialog.fv-editor[open]')) return true;
refreshNavigation();
const focused = Object.values(app.canvas?.selected_nodes || {}).find(n => n.comfyClass === 'FreeVideoGenerate' || n.type === 'FreeVideoGenerate');
const node = currentView === 'studio' ? selected : focused || selected;