🔨 introduce displayUnit

owid · Jan 13, 2025 · 1bd5220 · 1bd5220
1 parent 591b9a6
commit 1bd5220
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/@ourworldindata/core-table/src/CoreTableColumns.ts b/packages/@ourworldindata/core-table/src/CoreTableColumns.ts
@@ -269,6 +269,12 @@ export abstract class AbstractCoreColumn<JS_TYPE extends PrimitiveType> {
         return undefined
     }
 
+    @imemo get displayUnit(): string | undefined {
+        return this.unit && this.unit !== this.shortUnit
+            ? this.unit.replace(/^\((.*)\)$/, "$1")
+            : undefined
+    }
+
     // Returns a map where the key is a series slug such as "name" and the value is a set
     // of all the unique values that this column has for that particular series.
     getUniqueValuesGroupedBy(

diff --git a/packages/@ourworldindata/grapher/src/tooltip/TooltipContents.tsx b/packages/@ourworldindata/grapher/src/tooltip/TooltipContents.tsx
@@ -132,11 +132,7 @@ class Variable extends React.Component<{
 
         if (column.isMissing || column.name === "time") return null
 
-        const { unit, shortUnit, displayName } = column,
-            displayUnit =
-                unit && unit !== shortUnit
-                    ? unit.replace(/^\((.*)\)$/, "$1")
-                    : undefined,
+        const { displayUnit, displayName } = column,
             displayNotice =
                 uniq((notice ?? []).filter((t) => t !== undefined))
                     .map((time) =>