fix(grapher): fix chart icon on first load for line charts

owid · Oct 16, 2023 · 565d485 · 565d485
1 parent fc2f6b2
commit 565d485
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/packages/@ourworldindata/grapher/src/controls/ContentSwitchers.tsx b/packages/@ourworldindata/grapher/src/controls/ContentSwitchers.tsx
@@ -13,6 +13,7 @@ export interface ContentSwitchersManager {
     isNarrow?: boolean
     type?: ChartTypeName
     isLineChartThatTurnedIntoDiscreteBar?: boolean
+    isAuthoredAsLineChartThatTurnedIntoDiscreteBar?: boolean
 }
 
 @observer
@@ -45,20 +46,28 @@ export class ContentSwitchers extends React.Component<{
             case GrapherTabOption.map:
                 return <FontAwesomeIcon icon={faEarthAmericas} />
             case GrapherTabOption.chart:
-                const chartIcon = manager.isLineChartThatTurnedIntoDiscreteBar
+                let chartIcon = manager.isLineChartThatTurnedIntoDiscreteBar
                     ? chartIcons[ChartTypeName.DiscreteBar]
                     : chartIcons[this.chartType]
                 // If we're switching from a line chart to the map, then the timeline
                 // is automatically set to a single year, and the underlying chart switches to
                 // a discrete bar chart, which makes the line chart icon change into a bar chart icon.
                 // To prevent that, we hold onto the previous chart icon if we're not currently on the chart tab.
-                const newChartIcon =
-                    this.previousChartIcon &&
-                    manager.tab !== GrapherTabOption.chart
-                        ? this.previousChartIcon
-                        : chartIcon
-                this.previousChartIcon = newChartIcon
-                return newChartIcon
+                if (manager.tab !== GrapherTabOption.chart) {
+                    // make sure we're showing the line chart icon on first load
+                    // if the chart is configured to be a line chart initially
+                    if (
+                        !this.previousChartIcon &&
+                        this.chartType === ChartTypeName.LineChart &&
+                        !manager.isAuthoredAsLineChartThatTurnedIntoDiscreteBar
+                    ) {
+                        chartIcon = chartIcons[ChartTypeName.LineChart]
+                    } else if (this.previousChartIcon) {
+                        chartIcon = this.previousChartIcon
+                    }
+                }
+                this.previousChartIcon = chartIcon
+                return chartIcon
         }
     }
 

diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx
@@ -2676,6 +2676,16 @@ export class Grapher
         })
     }
 
+    @computed
+    get isAuthoredAsLineChartThatTurnedIntoDiscreteBar(): boolean {
+        const {
+            type = ChartTypeName.LineChart,
+            minTime,
+            maxTime,
+        } = this.legacyConfigAsAuthored
+        return type === ChartTypeName.LineChart && minTime === maxTime
+    }
+
     @computed get queryStr(): string {
         return queryParamsToStr(this.changedParams)
     }