Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 26 additions & 14 deletions src/lib/adapters/pdf/pdf.worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@ function renderLines(
doc.setTextColor(0, 0, 0);

// Center the contd text horizontally on the page
const contdText = `${lastCharacterName.trim()} ${payload.contdLabel}`;
// Prevent double CONT'D if the DOM already injected it via `.contd::after`
const cleanedName = lastCharacterName.replace(payload.contdLabel, "").trim();
const contdText = `${cleanedName} ${payload.contdLabel}`;
const contdX = pageSize.width / 2;
doc.text(contdText, contdX, currentY, { align: "center", baseline: "top" });

Expand All @@ -304,8 +306,9 @@ function renderLines(
}

// ── Render every run in this line ────────────────────────────
let runX = -1;
let isParenOpen = false;
let lastRunX = -1;
let lastRunWidth = 0;

for (let ri = 0; ri < line.runs.length; ri++) {
const run = line.runs[ri];
Expand All @@ -314,31 +317,40 @@ function renderLines(
doc.setFont(run.fontFamily, style);
doc.setFontSize(FONT_SIZE);

if (ri === 0 || run.absolutePosition || (ri > 0 && line.runs[ri - 1].absolutePosition)) {
runX = (run.x - pageLeftPx) * PX_TO_PT;
// Calculate the absolute X coordinate based on the browser's bounding rect.
// This prevents "skipped line breaks" causing text to run off the page:
// if a line is physically wrapped by the browser, its starting element
// `run.x` will correctly reflect the left margin boundary, automatically
// resetting the drawing cursor!
let runX = (run.x - pageLeftPx) * PX_TO_PT;

// Pseudo-elements injected by pdf-adapter (like the closing parenthesis)
// are given an x of 0. We must place them relative to the previous run.
if (run.x === 0 && ri > 0 && lastRunX !== -1) {
runX = lastRunX + lastRunWidth;
}

if (run.text === "(" && ri === 0 && !run.absolutePosition) {
const parenWidth = doc.getTextWidth("(");
runX -= parenWidth;
isParenOpen = true;
}
if (run.text === "(" && ri === 0 && !run.absolutePosition) {
const parenWidth = doc.getTextWidth("(");
runX -= parenWidth;
isParenOpen = true;
} else if (ri === 1 && isParenOpen) {
runX = (run.x - pageLeftPx) * PX_TO_PT;
isParenOpen = false;
}

doc.setTextColor(0, 0, 0);
doc.text(run.text, runX, currentY, { baseline: "top" });

const textWidth = doc.getTextWidth(run.text);
lastRunX = runX;
lastRunWidth = textWidth;

if (run.underline) {
const tw = doc.getTextWidth(run.text);
const underlineY = currentY + FONT_SIZE * 0.95;
doc.setDrawColor(0, 0, 0);
doc.setLineWidth(0.5);
doc.line(runX, underlineY, runX + tw, underlineY);
doc.line(runX, underlineY, runX + textWidth, underlineY);
}

runX += doc.getTextWidth(run.text);
}
}

Expand Down
20 changes: 15 additions & 5 deletions src/lib/screenplay/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -687,15 +687,25 @@ export const useScriptioEditor = (
if (!scriptioEditor || scriptioEditor.isDestroyed || !scriptioEditor.view) return;
try {
const format = SCREENPLAY_FORMATS[pageSize];
// 1. Update the Pagination engine variables
scriptioEditor.chain().updatePageSize(format).run();
// 2. Safely apply the CSS layout var
// 1. Bypass PaginationPlus Reference Bug
// `tiptap-pagination-plus` loses the reference to its TipTap bound `storage` internally.
// When `updatePageSize` is called, it mutates the wrong object. We must mutate the bound object directly.
const storage = scriptioEditor.storage.PaginationPlus;
if (storage) {
storage.pageHeight = format.pageHeight;
storage.pageWidth = format.pageWidth;
storage.marginTop = format.marginTop;
storage.marginBottom = format.marginBottom;
storage.marginLeft = format.marginLeft;
storage.marginRight = format.marginRight;
}

// 2. Set the custom layout variable used by our frontend (e.g., for bookmarks)
const dom = scriptioEditor.view.dom as HTMLElement;
if (dom) {
dom.style.setProperty("--page-margin-left", `${format.marginLeft}px`);

// 3. Force ProseMirror to flush/repaint its view to catch dynamic dimensions
// The extension's `updatePageSize` only sets variables. It does not dispatch
// an update to re-evaluate the DOM when called asynchronously from React.
scriptioEditor.commands.command(({ tr, dispatch }) => {
if (dispatch) {
tr.setMeta("pageFormatUpdate", true);
Expand Down