add numeric or auto cell def

owid · Oct 31, 2024 · 34a35c4 · 34a35c4
1 parent ba6ab35
commit 34a35c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/explorer/GrapherGrammar.ts b/explorer/GrapherGrammar.ts
@@ -15,14 +15,14 @@ import {
     EnumCellDef,
     Grammar,
     IntegerCellDef,
-    NumericCellDef,
     SlugDeclarationCellDef,
     SlugsDeclarationCellDef,
     StringCellDef,
     UrlCellDef,
     IndicatorIdsOrEtlPathsCellDef,
     IndicatorIdOrEtlPathCellDef,
     GrapherCellDef,
+    NumericOrAutoCellDef,
 } from "../gridLang/GridLangConstants.js"
 
 const toTerminalOptions = (keywords: string[]): CellDef[] => {
@@ -176,7 +176,7 @@ export const GrapherGrammar: Grammar<GrapherCellDef> = {
         toGrapherObject: (value) => ({ yAxis: { canChangeScaleType: value } }),
     },
     yAxisMin: {
-        ...NumericCellDef,
+        ...NumericOrAutoCellDef,
         keyword: "yAxisMin",
         description: "Set the minimum value for the yAxis",
         toGrapherObject: (value) => ({ yAxis: { min: value } }),

diff --git a/gridLang/GridLangConstants.ts b/gridLang/GridLangConstants.ts
@@ -102,6 +102,19 @@ export const NumericCellDef: CellDef = {
     parse: (value: any) => parseFloat(value),
 }
 
+export const NumericOrAutoCellDef: CellDef = {
+    keyword: "",
+    cssClass: "NumericCellDef",
+    description: "",
+    regex: /^(-?\d+\.?\d*|auto)$/,
+    requirementsDescription: `Must be a number or "auto"`,
+    valuePlaceholder: "98.6",
+    parse: (value: any) => {
+        if (value === "auto") return "auto"
+        return parseFloat(value)
+    },
+}
+
 export const IntegerCellDef: CellDef = {
     keyword: "",
     cssClass: "IntegerCellDef",