feat: use any mark config for composite mark components (#8145)

fixes #8144
vega · Feb 12, 2023 · 67c44e3 · 67c44e3
1 parent a68e8e3
commit 67c44e3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/build/vega-lite-schema.json b/build/vega-lite-schema.json
@@ -4430,7 +4430,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4452,7 +4452,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4462,7 +4462,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4472,7 +4472,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4486,7 +4486,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         }
@@ -4502,7 +4502,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4553,7 +4553,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4573,7 +4573,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4583,7 +4583,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -4597,7 +4597,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -8338,7 +8338,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -8348,7 +8348,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -8378,7 +8378,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -8388,7 +8388,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -8461,7 +8461,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -8479,7 +8479,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         }
@@ -8527,7 +8527,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },
@@ -8545,7 +8545,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/definitions/MarkConfig"
+              "$ref": "#/definitions/AnyMarkConfig"
             }
           ]
         },

diff --git a/src/compositemark/common.ts b/src/compositemark/common.ts
@@ -16,13 +16,14 @@ import {
 import {Encoding, fieldDefs} from '../encoding';
 import {ExprRef} from '../expr';
 import * as log from '../log';
-import {ColorMixins, GenericMarkDef, isMarkDef, Mark, MarkConfig, MarkDef} from '../mark';
+import {ColorMixins, GenericMarkDef, isMarkDef, Mark, AnyMarkConfig, MarkDef} from '../mark';
 import {GenericUnitSpec, NormalizedUnitSpec} from '../spec';
 import {getFirstDefined, hash, unique} from '../util';
 import {isSignalRef} from '../vega.schema';
 import {toStringFieldDef} from './../channeldef';
 
-export type PartsMixins<P extends string> = Partial<Record<P, boolean | MarkConfig<ExprRef | SignalRef>>>;
+// Parts mixins can be any mark type. We could make a more specific type for each part.
+export type PartsMixins<P extends string> = Partial<Record<P, boolean | AnyMarkConfig<ExprRef | SignalRef>>>;
 
 export type GenericCompositeMarkDef<T> = GenericMarkDef<T> &
   ColorMixins<ExprRef | SignalRef> & {
@@ -207,13 +208,13 @@ export function partLayerMixins<P extends PartsMixins<any>>(
       {
         ...partBaseSpec,
         mark: {
-          ...(compositeMarkConfig[part] as MarkConfig<ExprRef | SignalRef>),
+          ...(compositeMarkConfig[part] as AnyMarkConfig<ExprRef | SignalRef>),
           ...(clip ? {clip} : {}),
           ...(color ? {color} : {}),
           ...(opacity ? {opacity} : {}),
           ...(isMarkDef(partBaseSpec.mark) ? partBaseSpec.mark : {type: partBaseSpec.mark}),
           style: `${mark}-${String(part)}`,
-          ...(isBoolean(markDef[part]) ? {} : (markDef[part] as MarkConfig<ExprRef | SignalRef>))
+          ...(isBoolean(markDef[part]) ? {} : (markDef[part] as AnyMarkConfig<ExprRef | SignalRef>))
         }
       }
     ];