🎥 Make videos programmatically with React
Fix Canvas Capture clipping of nested canvases
JonnyBurger11aa3c497ba4
diff --git a/packages/canvas-capture-extension/README.md b/packages/canvas-capture-extension/README.mdindex ef3b7f818d..6c472b6b8e 100644--- a/packages/canvas-capture-extension/README.md+++ b/packages/canvas-capture-extension/README.md@@ -77,4 +77,4 @@ recordings. Stop the recording, then open it directly in[remotion.dev/new](https://remotion.dev/new), inspect it in[remotion.dev/convert](https://remotion.dev/convert), or save it to disk.-The page contents are temporarily placed inside a `content="drawable"` canvas while recording and restored afterward. The extension also sets `layoutSubtree` for older Chromium versions. Websites that rely on direct-child CSS selectors may look different during capture. Chrome's own pages and the Chrome Web Store do not allow extension script injection.+The page contents are temporarily placed inside a `content="drawable"` canvas while recording and restored afterward. The extension also sets `layoutSubtree` for older Chromium versions. Existing canvases and canvases added inside the captured subtree during recording temporarily receive `content="drawable"` to avoid Chromium clipping their bitmaps at the origin; their original attributes are restored afterward. Websites that rely on direct-child CSS selectors may look different during capture. Chrome's own pages and the Chrome Web Store do not allow extension script injection.diff --git a/packages/canvas-capture-extension/src/capture.ts b/packages/canvas-capture-extension/src/capture.tsindex d23dcad639..1edc142ed4 100644--- a/packages/canvas-capture-extension/src/capture.ts+++ b/packages/canvas-capture-extension/src/capture.ts@@ -150,6 +150,42 @@ const wrapWholePage = (): WrappedPage => {content.appendChild(child);}+ // Plain nested canvases can be clipped at the origin during HTML-in-canvas+ // capture. Mark them as drawable to use Chromium's nested canvas paint path.+ const originalCanvasContent = new Map<HTMLCanvasElement, string | null>();+ const markCanvasesDrawable = (element: Element) => {+ const canvases = [+ ...(element instanceof HTMLCanvasElement ? [element] : []),+ ...element.querySelectorAll('canvas'),+ ];+ for (const nestedCanvas of canvases) {+ if (nestedCanvas.getAttribute('content') === 'drawable') {+ continue;+ }++ if (!originalCanvasContent.has(nestedCanvas)) {+ originalCanvasContent.set(+ nestedCanvas,+ nestedCanvas.getAttribute('content'),+ );+ }++ nestedCanvas.setAttribute('content', 'drawable');+ }+ };++ markCanvasesDrawable(content);+ const canvasObserver = new MutationObserver((mutations) => {+ for (const mutation of mutations) {+ for (const node of mutation.addedNodes) {+ if (node instanceof Element) {+ markCanvasesDrawable(node);+ }+ }+ }+ });+ canvasObserver.observe(content, {childList: true, subtree: true});+body.appendChild(canvas);canvas.appendChild(content);const initialSize = getPageSize(content, minimumSize);@@ -189,6 +225,17 @@ const wrapWholePage = (): WrappedPage => {return size;},restore: () => {+ canvasObserver.disconnect();+ for (const [nestedCanvas, originalContent] of originalCanvasContent) {+ if (originalContent === null) {+ nestedCanvas.removeAttribute('content');+ } else {+ nestedCanvas.setAttribute('content', originalContent);+ }+ }++ originalCanvasContent.clear();+while (content.firstChild) {body.insertBefore(content.firstChild, canvas);}