Merge branch 'main' into dom/rebuild-6782

vega · Feb 18, 2024 · a13fd7a · a13fd7a
2 parents 7455b87 + 9da3ecb
commit a13fd7a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 36 deletions.
diff --git a/build/vega-lite-schema.json b/build/vega-lite-schema.json
@@ -21928,6 +21928,12 @@
             {
               "$ref": "#/definitions/ColorScheme"
             },
+            {
+              "items": {
+                "type": "string"
+              },
+              "type": "array"
+            },
             {
               "$ref": "#/definitions/SchemeParams"
             },

diff --git a/examples/specs/line_dynamic_axis.vl.json b/examples/specs/line_dynamic_axis.vl.json
diff --git a/site/_data/examples.json b/site/_data/examples.json
@@ -520,10 +520,6 @@
       {
         "name": "layer_point_line_loess",
         "title": "Loess Regression"
-      },
-      {
-        "name": "line_dynamic_axis",
-        "title": "Dynamic Minimum and Maximum Y Axis"
       }
     ]
   },

diff --git a/src/compile/scale/range.ts b/src/compile/scale/range.ts
@@ -212,7 +212,7 @@ export function parseRangeForChannel(channel: ScaleChannel, model: UnitModel): E
   return makeImplicit(d);
 }
 
-function parseScheme(scheme: Scheme | SignalRef): RangeScheme {
+function parseScheme(scheme: Scheme | SignalRef | string[]): RangeScheme {
   if (isExtendedScheme(scheme)) {
     return {
       scheme: scheme.name,

diff --git a/src/scale.ts b/src/scale.ts
@@ -481,7 +481,7 @@ export type Domain =
 
 export type Scheme = string | SchemeParams;
 
-export function isExtendedScheme(scheme: Scheme | SignalRef): scheme is SchemeParams {
+export function isExtendedScheme(scheme: Scheme | SignalRef | string[]): scheme is SchemeParams {
   return !isString(scheme) && !!scheme['name'];
 }
 
@@ -611,7 +611,7 @@ export interface Scale<ES extends ExprRef | SignalRef = ExprRef | SignalRef> {
    *
    * For the full list of supported schemes, please refer to the [Vega Scheme](https://vega.github.io/vega/docs/schemes/#reference) reference.
    */
-  scheme?: ColorScheme | SchemeParams | ES;
+  scheme?: ColorScheme | string[] | SchemeParams | ES;
 
   /**
    * The alignment of the steps within the scale range.