Skip to content

Fix cut mode in V3 script editor #1165

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
Tim020 merged 2 commits into from
Jun 7, 2026
Merged

Fix cut mode in V3 script editor #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbf42a6
Fix cut mode in V3 script editor: clickable links and clean exit
Tim020 Jun 7, 2026
7a0578e
Fix Prettier formatting in ScriptEditor.vue
Tim020 Jun 7, 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
67 changes: 67 additions & 0 deletions client-v3/e2e/tests/10-show-config-script.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,73 @@ test('saves a dialogue line to the script', async () => {
).toBeVisible({ timeout: 10_000 });
});

// ── Cut mode ──────────────────────────────────────────────────────────────

test('enters cut mode', async () => {
await page.goto(`${UI_BASE}/show-config/script`);
await waitForAppReady(page);
await page.click('button:has-text("Cuts")');
await expect(page.locator('button:has-text("Stop Editing")')).toBeVisible({ timeout: 10_000 });
});

test('dialogue line becomes clickable in cut mode', async () => {
await expect(
page.locator('a.viewable-line-cut').filter({ hasText: 'To be or not to be' })
).toBeVisible({ timeout: 5_000 });
});

test('clicking a line toggles cut styling', async () => {
await page.locator('a.viewable-line-cut').filter({ hasText: 'To be or not to be' }).click();
await expect(
page.locator('.cut-line-part').filter({ hasText: 'To be or not to be' })
).toBeVisible({ timeout: 3_000 });
});

test('saves cuts', async () => {
await page.getByRole('button', { name: 'Save', exact: true }).click();
await expect(page.locator('.v-toast__text').filter({ hasText: /saved/i })).toBeVisible({
timeout: 5_000,
});
});

test('stops cut mode without blank-page flash', async () => {
// In cut mode the line is an anchor (.viewable-line-cut); verify it exists before stopping
await expect(
page.locator('.viewable-line-cut').filter({ hasText: 'To be or not to be' })
).toBeVisible();

await page.click('button:has-text("Stop Editing")');

// Edit button reappears
await expect(page.getByRole('button', { name: 'Edit', exact: true })).toBeVisible({
timeout: 10_000,
});
// The saved line is still visible (no reload / blank flash)
await expect(
page.locator('.viewable-line').filter({ hasText: 'To be or not to be' })
).toBeVisible();
// No edit controls are shown after stopping
await expect(page.locator('.script-edit-controls')).not.toBeVisible();
});

test('cut styling persists after re-entering cut mode', async () => {
await page.click('button:has-text("Cuts")');
await expect(page.locator('button:has-text("Stop Editing")')).toBeVisible({ timeout: 10_000 });
await expect(
page.locator('.cut-line-part').filter({ hasText: 'To be or not to be' })
).toBeVisible({ timeout: 5_000 });
// Clean up: un-cut the line so later tests start from a known state
await page.locator('a.viewable-line-cut').filter({ hasText: 'To be or not to be' }).click();
await page.getByRole('button', { name: 'Save', exact: true }).click();
await expect(page.locator('.v-toast__text').filter({ hasText: /saved/i })).toBeVisible({
timeout: 5_000,
});
await page.click('button:has-text("Stop Editing")');
await expect(page.getByRole('button', { name: 'Edit', exact: true })).toBeVisible({
timeout: 10_000,
});
});

// ── Stage Direction Styles ────────────────────────────────────────────────

test('switches to Stage Direction Styles sub-tab', async () => {
Expand Down
15 changes: 11 additions & 4 deletions client-v3/src/components/show/config/script/ScriptEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ const isEditor = computed(
wsStore.internalUUID !== null &&
wsStore.internalUUID === scriptConfigStore.editStatus.currentEditor
);
const canEdit = computed(() => isEditor.value && !scriptConfigStore.cutMode);
const canEdit = computed(() => isEditor.value);

const saveProgressVariant = computed(() => {
if (savingInProgress.value) return 'primary';
Expand Down Expand Up @@ -336,13 +336,20 @@ async function stopEditing(): Promise<void> {
);
if (!ok) return;
}
const wasCutMode = scriptConfigStore.cutMode;
editingLines.value.clear();
exitBulkEditMode();
scriptConfigStore.emptyScript();
linePartCuts.value = [...scriptStore.cuts];
sendObj({ OP: 'STOP_SCRIPT_EDIT', DATA: {} });
scriptConfigStore.setCutMode(false);
await loadPage(currentPage.value);
scriptConfigStore.setEditStatus({
canRequestEdit: scriptConfigStore.editStatus.canRequestEdit,
currentEditor: null,
});
sendObj({ OP: 'STOP_SCRIPT_EDIT', DATA: {} });
if (!wasCutMode) {
scriptConfigStore.emptyScript();
await loadPage(currentPage.value);
}
}

async function loadPage(page: number): Promise<void> {
Expand Down
Loading