🐛 (download) fix mobx issue

owid · Dec 1, 2023 · 167d121 · 167d121
1 parent 147fb0b
commit 167d121
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx
@@ -1726,6 +1726,14 @@ export class Grapher
         return this.generateStaticSvg()
     }
 
+    get staticSVGLandscape(): string {
+        return this.staticSVG
+    }
+
+    get staticSVGPortrait(): string {
+        return this.generateStaticSvg(this.portraitBounds)
+    }
+
     @computed get disableIntroAnimation(): boolean {
         return this.isExportingToSvgOrPng
     }

diff --git a/packages/@ourworldindata/grapher/src/modal/DownloadModal.test.tsx b/packages/@ourworldindata/grapher/src/modal/DownloadModal.test.tsx
@@ -33,7 +33,8 @@ it("correctly passes non-redistributable flag", () => {
     const tableFalse = getTable({ nonRedistributable: false })
     const viewFalse = new DownloadModal({
         manager: {
-            generateStaticSvg: () => "",
+            staticSVGLandscape: "",
+            staticSVGPortrait: "",
             displaySlug: "",
             table: tableFalse,
             detailRenderers: [],
@@ -44,7 +45,8 @@ it("correctly passes non-redistributable flag", () => {
     const tableTrue = getTable({ nonRedistributable: true })
     const viewTrue = new DownloadModal({
         manager: {
-            generateStaticSvg: () => "",
+            staticSVGLandscape: "",
+            staticSVGPortrait: "",
             displaySlug: "",
             table: tableTrue,
             detailRenderers: [],

diff --git a/packages/@ourworldindata/grapher/src/modal/DownloadModal.tsx b/packages/@ourworldindata/grapher/src/modal/DownloadModal.tsx
@@ -31,7 +31,8 @@ import { StaticChartRasterizer } from "../captionedChart/StaticChartRasterizer"
 
 export interface DownloadModalManager {
     displaySlug: string
-    generateStaticSvg: (bounds?: Bounds) => string
+    staticSVGLandscape: string
+    staticSVGPortrait: string
     staticBounds?: Bounds
     baseUrl?: string
     queryStr?: string
@@ -100,10 +101,6 @@ export class DownloadModal extends React.Component<DownloadModalProps> {
         return this.staticBounds.height
     }
 
-    @computed private get staticSVG(): string {
-        return this.manager.generateStaticSvg(this.staticBounds)
-    }
-
     @computed private get manager(): DownloadModalManager {
         return this.props.manager
     }
@@ -117,7 +114,11 @@ export class DownloadModal extends React.Component<DownloadModalProps> {
     @observable private isReady: boolean = false
 
     @action.bound private export(): void {
-        const { staticSVG, targetWidth, targetHeight } = this
+        const { targetWidth, targetHeight } = this
+
+        const staticSVG = this.isExportingPortrait
+            ? this.manager.staticSVGPortrait
+            : this.manager.staticSVGLandscape
 
         // render the graphic then cache data-urls for display & blobs for downloads
         new StaticChartRasterizer(staticSVG, targetWidth, targetHeight)