fix: cleanup after rebase

This commit is contained in:
Arnošt Pleskot 2023-08-18 19:00:38 +02:00
parent c2870a6df5
commit 5ff4e0d640
No known key found for this signature in database
3 changed files with 14 additions and 29 deletions

View file

@ -74,28 +74,6 @@ export const exportToCanvas = async (
const onlyExportingSingleFrame = isOnlyExportingSingleFrame(elements);
const renderConfig = {
viewBackgroundColor:
exportBackground && !exportWithFancyBackground
? viewBackgroundColor
: null,
scrollX: -minX + (onlyExportingSingleFrame ? 0 : padding),
scrollY: -minY + (onlyExportingSingleFrame ? 0 : padding),
zoom: defaultAppState.zoom,
remotePointerViewportCoords: {},
remoteSelectedElementIds: {},
shouldCacheIgnoreZoom: false,
remotePointerUsernames: {},
remotePointerUserStates: {},
theme: appState.exportWithDarkMode ? THEME.DARK : THEME.LIGHT,
imageCache,
renderScrollbars: false,
renderSelection: false,
renderGrid: false,
isExporting: true,
exportBackgroundImage: appState.fancyBackgroundImageKey,
};
if (
exportWithFancyBackground &&
appState.fancyBackgroundImageKey !== "solid"
@ -105,7 +83,7 @@ export const exportToCanvas = async (
fancyBackgroundImageKey: appState.fancyBackgroundImageKey,
backgroundColor: viewBackgroundColor,
exportScale: scale,
theme: renderConfig.theme,
theme: appState.exportWithDarkMode ? THEME.DARK : THEME.LIGHT,
});
}
@ -117,17 +95,21 @@ export const exportToCanvas = async (
scale,
appState: {
...appState,
viewBackgroundColor: exportBackground ? viewBackgroundColor : null,
scrollX: -minX + (onlyExportingSingleFrame ? 0 : exportPadding),
scrollY: -minY + (onlyExportingSingleFrame ? 0 : exportPadding),
viewBackgroundColor:
exportBackground && !exportWithFancyBackground
? viewBackgroundColor
: null,
scrollX: -minX + (onlyExportingSingleFrame ? 0 : padding),
scrollY: -minY + (onlyExportingSingleFrame ? 0 : padding),
zoom: defaultAppState.zoom,
shouldCacheIgnoreZoom: false,
theme: appState.exportWithDarkMode ? "dark" : "light",
theme: appState.exportWithDarkMode ? THEME.DARK : THEME.LIGHT,
},
renderConfig: {
imageCache,
renderGrid: false,
isExporting: true,
exportWithFancyBackground,
},
});