Dylan/excalidraw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: disable frame clip on export with fancy bcg

Browse Source
This commit is contained in:
Arnošt Pleskot 2023-09-18 14:32:05 +02:00
parent c8180308c2
commit 22b58e68ec
No known key found for this signature in database
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/scene/export.ts
View File

@ -90,7 +90,7 @@ export const exportToCanvas = async (
exportingWithFancyBackground, exportingWithFancyBackground,
opts: { opts: {
aspectRatio: { width: 16, height: 9 }, aspectRatio: { width: 16, height: 9 },
clipFrame: appState.frameRendering.clip, clipFrame: false,
}, },
}); });
@ -116,7 +116,7 @@ export const exportToCanvas = async (
const commonBounds = getElementsSize({ const commonBounds = getElementsSize({
elements, elements,
onlyExportingSingleFrame, onlyExportingSingleFrame,
clipFrame: appState.frameRendering.clip, clipFrame: false,
}); });
const contentSize: Dimensions = { const contentSize: Dimensions = {
width: distance(commonBounds[0], commonBounds[2]), width: distance(commonBounds[0], commonBounds[2]),
@ -165,6 +165,10 @@ export const exportToCanvas = async (
zoom: defaultAppState.zoom, zoom: defaultAppState.zoom,
shouldCacheIgnoreZoom: false, shouldCacheIgnoreZoom: false,
theme: appState.exportWithDarkMode ? THEME.DARK : THEME.LIGHT, theme: appState.exportWithDarkMode ? THEME.DARK : THEME.LIGHT,
frameRendering: {
...appState.frameRendering,
clip: appState.frameRendering.clip && !exportingWithFancyBackground,
},
}, },
renderConfig: { renderConfig: {
imageCache, imageCache,
@ -252,7 +256,7 @@ export const exportToSvg = async (
exportingWithFancyBackground, exportingWithFancyBackground,
opts: { opts: {
aspectRatio: { width: 16, height: 9 }, aspectRatio: { width: 16, height: 9 },
clipFrame: appState.clipFrame ?? false, clipFrame: false,
}, },
}); });
@ -304,7 +308,7 @@ export const exportToSvg = async (
: elements.find((element) => element.type === "frame"); : elements.find((element) => element.type === "frame");
let exportingFrameClipPath = ""; let exportingFrameClipPath = "";
if (exportingFrame && appState.clipFrame) { if (exportingFrame && appState.clipFrame && !exportingWithFancyBackground) {
const [x1, y1, x2, y2] = getElementAbsoluteCoords(exportingFrame); const [x1, y1, x2, y2] = getElementAbsoluteCoords(exportingFrame);
const cx = (x2 - x1) / 2 - (exportingFrame.x - x1); const cx = (x2 - x1) / 2 - (exportingFrame.x - x1);
const cy = (y2 - y1) / 2 - (exportingFrame.y - y1); const cy = (y2 - y1) / 2 - (exportingFrame.y - y1);
@ -351,7 +355,7 @@ export const exportToSvg = async (
const commonBounds = getElementsSize({ const commonBounds = getElementsSize({
elements, elements,
onlyExportingSingleFrame, onlyExportingSingleFrame,
clipFrame: appState.clipFrame ?? false, clipFrame: false,
}); });
const contentSize: Dimensions = { const contentSize: Dimensions = {
width: distance(commonBounds[0], commonBounds[2]), width: distance(commonBounds[0], commonBounds[2]),
@ -480,16 +484,18 @@ export const getExportSize = (
scale: number, scale: number,
appState: AppState, appState: AppState,
): [number, number] => { ): [number, number] => {
const exportingWithFancyBackground = isExportingWithFacnyBackground(
appState,
elements,
);
const [, , width, height] = getCanvasSize({ const [, , width, height] = getCanvasSize({
elements, elements,
padding: convertExportPadding(exportPadding), padding: convertExportPadding(exportPadding),
onlyExportingSingleFrame: isOnlyExportingSingleFrame(elements), onlyExportingSingleFrame: isOnlyExportingSingleFrame(elements),
exportingWithFancyBackground: isExportingWithFacnyBackground( exportingWithFancyBackground,
appState,
elements,
),
opts: { opts: {
clipFrame: appState.frameRendering.clip, clipFrame: appState.frameRendering.clip && !exportingWithFancyBackground,
}, },
}).map((dimension) => Math.trunc(dimension * scale)); }).map((dimension) => Math.trunc(dimension * scale));