A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
apply patch for extraStyleContent (#8043)
Shahmir Varqhae662a0f259f3
diff --git a/frontend/src/core/export/hooks.ts b/frontend/src/core/export/hooks.tsindex b90050e586..e622583209 100644--- a/frontend/src/core/export/hooks.ts+++ b/frontend/src/core/export/hooks.ts@@ -194,10 +194,9 @@ export function useEnrichCellOutputs(): (inFlightWaiters.map(({ promise }) => promise),);for (const [i, { cellId }] of inFlightWaiters.entries()) {- const result =- settled[i].status === "fulfilled" ? settled[i].value : undefined;- if (result) {- results[cellId] = result;+ const settledResult = settled[i];+ if (settledResult.status === "fulfilled" && settledResult.value) {+ results[cellId] = settledResult.value;}}diff --git a/frontend/src/utils/download.ts b/frontend/src/utils/download.tsindex b2bc39bfea..f281048dfc 100644--- a/frontend/src/utils/download.ts+++ b/frontend/src/utils/download.ts@@ -65,6 +65,10 @@ function prepareCellElementForScreenshot(element: HTMLElement) {}const THRESHOLD_TIME_MS = 500;+const HIDE_SCROLLBAR_STYLES = `+ * { scrollbar-width: none; -ms-overflow-style: none; }+ *::-webkit-scrollbar { display: none; }+`;/*** Capture a cell output as a PNG data URL.@@ -89,7 +93,9 @@ export async function getImageDataUrlForCell(try {const startTime = Date.now();- const dataUrl = await toPng(element);+ const dataUrl = await toPng(element, {+ extraStyleContent: HIDE_SCROLLBAR_STYLES,+ });const timeTaken = Date.now() - startTime;if (timeTaken > THRESHOLD_TIME_MS) {Logger.debug(@@ -115,7 +121,7 @@ export async function downloadCellOutputAsImage(if (!dataUrl) {return;}- return downloadByURL(dataUrl, Filenames.toPNG(filename));+ downloadByURL(dataUrl, Filenames.toPNG(filename));}export const ADD_PRINTING_CLASS = (): (() => void) => {diff --git a/patches/[email protected] b/patches/[email protected]index 9756ae96ef..c41e18dea3 100644--- a/patches/[email protected]+++ b/patches/[email protected]@@ -1,5 +1,5 @@diff --git a/es/clone-node.js b/es/clone-node.js-index 114cbf214f65cda237dbba67458c2b68fadf421e..f6194624c9fcb8b57eb72f445277b6cd14d31c6d 100644+index 114cbf214f65cda237dbba67458c2b68fadf421e..2f31795bdb0f81b6a435b630a475b1ffe9f1d666 100644--- a/es/clone-node.js+++ b/es/clone-node.js@@ -59,10 +59,6 @@ async function cloneChildren(nativeNode, clonedNode, options) {@@ -13,8 +13,43 @@ index 114cbf214f65cda237dbba67458c2b68fadf421e..f6194624c9fcb8b57eb72f445277b6cdelse {children = toArray(((_b = nativeNode.shadowRoot) !== null && _b !== void 0 ? _b : nativeNode).childNodes);}+diff --git a/es/embed-webfonts.js b/es/embed-webfonts.js+index f6b0d96829c8a3301c142cacd07079e85b1f64fd..f5bfa86bc18c8314ad565c73c7dfab87728f3428 100644+--- a/es/embed-webfonts.js++++ b/es/embed-webfonts.js+@@ -190,9 +190,12 @@ export async function embedWebFonts(clonedNode, options) {+ : options.skipFonts+ ? null+ : await getWebFontCSS(clonedNode, options);+- if (cssText) {++ const finalCssText = options.extraStyleContent != null++ ? options.extraStyleContent.concat(cssText || '')++ : cssText++ if (finalCssText) {+ const styleNode = document.createElement('style');+- const sytleContent = document.createTextNode(cssText);++ const sytleContent = document.createTextNode(finalCssText);+ styleNode.appendChild(sytleContent);+ if (clonedNode.firstChild) {+ clonedNode.insertBefore(styleNode, clonedNode.firstChild);+diff --git a/es/types.d.ts b/es/types.d.ts+index a832baf45e95d7b3bb076ecacd46e73493f3e9ef..b487b064337bf75cb74dd530b54b7c6a1db40da4 100644+--- a/es/types.d.ts++++ b/es/types.d.ts+@@ -75,6 +75,11 @@ export interface Options {+ * create embed CSS for use across multiple calls to library functions.+ */+ fontEmbedCSS?: string;++ /**++ * A CSS string to specify additional custom style content. It will be++ * added to the style-tag.++ */++ extraStyleContent?: string;+ /**+ * A boolean to turn off auto scaling for truly massive images..+ */diff --git a/lib/clone-node.js b/lib/clone-node.js-index 214f4d30a50baae7f007d2399eeac298366538c7..a81d0e313ace6c50ce1652c4deb0dc8df3e073a8 100644+index 214f4d30a50baae7f007d2399eeac298366538c7..4de9de97b39a620ebe8ba16e5feb9e552eb95bc6 100644--- a/lib/clone-node.js+++ b/lib/clone-node.js@@ -134,10 +134,6 @@ function cloneChildren(nativeNode, clonedNode, options) {@@ -28,12 +63,47 @@ index 214f4d30a50baae7f007d2399eeac298366538c7..a81d0e313ace6c50ce1652c4deb0dc8delse {children = (0, util_1.toArray)(((_b = nativeNode.shadowRoot) !== null && _b !== void 0 ? _b : nativeNode).childNodes);}+diff --git a/lib/embed-webfonts.js b/lib/embed-webfonts.js+index c91538bd9c3afa63326a91267fb7b5b9c999cccd..f3e3bc8f0e9e254b3c10e3c317d804e3c83f769e 100644+--- a/lib/embed-webfonts.js++++ b/lib/embed-webfonts.js+@@ -300,9 +300,12 @@ function embedWebFonts(clonedNode, options) {+ _c.label = 5;+ case 5:+ cssText = _a;+- if (cssText) {++ const finalCssText = options.extraStyleContent != null++ ? options.extraStyleContent.concat(cssText || '')++ : cssText++ if (finalCssText) {+ styleNode = document.createElement('style');+- sytleContent = document.createTextNode(cssText);++ sytleContent = document.createTextNode(finalCssText);+ styleNode.appendChild(sytleContent);+ if (clonedNode.firstChild) {+ clonedNode.insertBefore(styleNode, clonedNode.firstChild);+diff --git a/lib/types.d.ts b/lib/types.d.ts+index a832baf45e95d7b3bb076ecacd46e73493f3e9ef..b487b064337bf75cb74dd530b54b7c6a1db40da4 100644+--- a/lib/types.d.ts++++ b/lib/types.d.ts+@@ -75,6 +75,11 @@ export interface Options {+ * create embed CSS for use across multiple calls to library functions.+ */+ fontEmbedCSS?: string;++ /**++ * A CSS string to specify additional custom style content. It will be++ * added to the style-tag.++ */++ extraStyleContent?: string;+ /**+ * A boolean to turn off auto scaling for truly massive images..+ */diff --git a/src/clone-node.ts b/src/clone-node.tsindex 5dfcd117a1dd3d3d5cfb7c98ead3eb828085337a..8aa85ca88f84e8e64297673dcff36b21d48a95b4 100644--- a/src/clone-node.ts+++ b/src/clone-node.ts@@ -88,11 +88,6 @@ async function cloneChildren<T extends HTMLElement>(-+if (isSlotElement(nativeNode) && nativeNode.assignedNodes) {children = toArray<T>(nativeNode.assignedNodes())- } else if (@@ -44,3 +114,46 @@ index 5dfcd117a1dd3d3d5cfb7c98ead3eb828085337a..8aa85ca88f84e8e64297673dcff36b21} else {children = toArray<T>((nativeNode.shadowRoot ?? nativeNode).childNodes)}+diff --git a/src/embed-webfonts.ts b/src/embed-webfonts.ts+index a84a699d37aeaaea19b9b31e0e98710f1e30da3c..6835efb8a2431aa8f066cd5ed0b47234b55f347a 100644+--- a/src/embed-webfonts.ts++++ b/src/embed-webfonts.ts+@@ -258,9 +258,13 @@ export async function embedWebFonts<T extends HTMLElement>(+ ? null+ : await getWebFontCSS(clonedNode, options)++- if (cssText) {++ const finalCssText = options.extraStyleContent != null++ ? options.extraStyleContent.concat(cssText || '')++ : cssText++++ if (finalCssText) {+ const styleNode = document.createElement('style')+- const sytleContent = document.createTextNode(cssText)++ const sytleContent = document.createTextNode(finalCssText)++ styleNode.appendChild(sytleContent)++diff --git a/src/types.ts b/src/types.ts+index 6023c3c2def1cb3ce83112c4c902997617582f59..ef40283ab6e47c98c7f8ea477c3ae29671682d98 100644+--- a/src/types.ts++++ b/src/types.ts+@@ -76,12 +76,18 @@ export interface Options {+ | 'embedded-opentype'+ | 'svg'+ | string+++ /**+ * A CSS string to specify for font embeds. If specified only this CSS will+ * be present in the resulting image. Use with `getFontEmbedCSS()` to+ * create embed CSS for use across multiple calls to library functions.+ */+ fontEmbedCSS?: string++ /**++ * A CSS string to specify additional custom style content. It will be++ * added to the style-tag.++ */++ extraStyleContent?: string+ /**+ * A boolean to turn off auto scaling for truly massive images..+ */diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 063f36e086..d91de4e50d 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -12,7 +12,7 @@ overrides:patchedDependencies:- hash: eced1b085df9a49a9c81d730049c8285c754fc89e68672c14722337c75d72eaf+ hash: 5fdb1de4a857e2fda0956b7e05a1b32817de8e7008009e71c0120ef02b886219path: patches/[email protected]react-plotly.js:hash: e65888c226f3ef8f42923cbb3b026d2f4811da3e96fa0d7dee3cb62df02c6189@@ -363,7 +363,7 @@ importers:version: 5.2.11(@types/[email protected])([email protected])html-to-image:specifier: 1.11.13- version: 1.11.13(patch_hash=eced1b085df9a49a9c81d730049c8285c754fc89e68672c14722337c75d72eaf)+ version: 1.11.13(patch_hash=5fdb1de4a857e2fda0956b7e05a1b32817de8e7008009e71c0120ef02b886219)humanize-duration:specifier: ^3.33.2version: 3.33.2@@ -17458,7 +17458,7 @@ snapshots:- [email protected](patch_hash=eced1b085df9a49a9c81d730049c8285c754fc89e68672c14722337c75d72eaf): {}+ [email protected](patch_hash=5fdb1de4a857e2fda0956b7e05a1b32817de8e7008009e71c0120ef02b886219): {}diff --git a/pyproject.toml b/pyproject.tomlindex fb6d58e3d2..61c8c76293 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -549,6 +549,7 @@ extend-exclude = ["**/__demo__/*","base64.test.ts","SECURITY.md", # Contains usernames that trigger typos+ "patches/*", # Patches may contain typos from source code][tool.black]