🐛 (slope) fix tabs for line chart that turned into discrete bar

owid · Nov 22, 2024 · c5a7ff0 · c5a7ff0
1 parent 9750e7f
commit c5a7ff0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/packages/@ourworldindata/grapher/src/captionedChart/CaptionedChart.tsx b/packages/@ourworldindata/grapher/src/captionedChart/CaptionedChart.tsx
@@ -83,7 +83,7 @@ export interface CaptionedChartManager
     isOnMapTab?: boolean
     isOnTableTab?: boolean
     activeChartType?: GrapherChartType
-    isLineChartThatTurnedIntoDiscreteBar?: boolean
+    isLineChartThatTurnedIntoDiscreteBarActive?: boolean
     showEntitySelectionToggle?: boolean
     isExportingForSocialMedia?: boolean
 
@@ -197,7 +197,7 @@ export class CaptionedChart extends React.Component<CaptionedChartProps> {
         if (manager.isOnTableTab) return undefined
         if (manager.isOnMapTab) return GRAPHER_MAP_TYPE
         if (manager.isOnChartTab) {
-            return manager.isLineChartThatTurnedIntoDiscreteBar
+            return manager.isLineChartThatTurnedIntoDiscreteBarActive
                 ? GRAPHER_CHART_TYPES.DiscreteBar
                 : manager.activeChartType
         }

diff --git a/packages/@ourworldindata/grapher/src/controls/ContentSwitchers.tsx b/packages/@ourworldindata/grapher/src/controls/ContentSwitchers.tsx
@@ -174,9 +174,11 @@ function TabIcon({
         case GRAPHER_TAB_NAMES.WorldMap:
             return <FontAwesomeIcon icon={faEarthAmericas} />
         default:
-            const chartIcon = isLineChartThatTurnedIntoDiscreteBar
-                ? chartIcons[GRAPHER_CHART_TYPES.DiscreteBar]
-                : chartIcons[tab]
+            const chartIcon =
+                tab === GRAPHER_TAB_NAMES.LineChart &&
+                isLineChartThatTurnedIntoDiscreteBar
+                    ? chartIcons[GRAPHER_CHART_TYPES.DiscreteBar]
+                    : chartIcons[tab]
             return chartIcon
     }
 }
@@ -192,9 +194,15 @@ function makeTabLabelText(
     if (tab === GRAPHER_TAB_NAMES.WorldMap) return "Map"
     if (!options.hasMultipleChartTypes) return "Chart"
 
+    if (
+        tab === GRAPHER_TAB_NAMES.LineChart &&
+        options.isLineChartThatTurnedIntoDiscreteBar
+    )
+        return "Bar"
+
     switch (tab) {
         case GRAPHER_TAB_NAMES.LineChart:
-            return options.isLineChartThatTurnedIntoDiscreteBar ? "Bar" : "Line"
+            return "Line"
         case GRAPHER_TAB_NAMES.SlopeChart:
             return "Slope"
 

diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx
@@ -1943,7 +1943,7 @@ export class Grapher
 
     @computed
     get typeExceptWhenLineChartAndSingleTimeThenWillBeBarChart(): GrapherChartType {
-        return this.isLineChartThatTurnedIntoDiscreteBar
+        return this.isLineChartThatTurnedIntoDiscreteBarActive
             ? GRAPHER_CHART_TYPES.DiscreteBar
             : this.activeChartType ?? GRAPHER_CHART_TYPES.LineChart
     }
@@ -2002,6 +2002,12 @@ export class Grapher
         return closestMinTime !== undefined && closestMinTime === closestMaxTime
     }
 
+    @computed get isLineChartThatTurnedIntoDiscreteBarActive(): boolean {
+        return (
+            this.isOnLineChartTab && this.isLineChartThatTurnedIntoDiscreteBar
+        )
+    }
+
     @computed get isOnLineChartTab(): boolean {
         return this.activeChartType === GRAPHER_CHART_TYPES.LineChart
     }