@visactor/vgrammar-plot 0.6.7-alpha.1 → 0.7.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/area.js +3 -3
- package/cjs/area.js.map +1 -1
- package/cjs/cell.js +3 -3
- package/cjs/cell.js.map +1 -1
- package/cjs/circle-packing.js +5 -6
- package/cjs/circle-packing.js.map +1 -1
- package/cjs/image.js +3 -3
- package/cjs/image.js.map +1 -1
- package/cjs/interval.js +3 -3
- package/cjs/interval.js.map +1 -1
- package/cjs/line.js +3 -3
- package/cjs/line.js.map +1 -1
- package/cjs/path.js +4 -1
- package/cjs/path.js.map +1 -1
- package/cjs/plot.d.ts +6 -4
- package/cjs/plot.js +24 -16
- package/cjs/plot.js.map +1 -1
- package/cjs/polygon.js +3 -3
- package/cjs/polygon.js.map +1 -1
- package/cjs/rect-x.js +3 -3
- package/cjs/rect-x.js.map +1 -1
- package/cjs/rect-y.js +3 -3
- package/cjs/rect-y.js.map +1 -1
- package/cjs/rect.js +3 -3
- package/cjs/rect.js.map +1 -1
- package/cjs/rule-x.js +3 -3
- package/cjs/rule-x.js.map +1 -1
- package/cjs/rule-y.d.ts +1 -1
- package/cjs/rule-y.js +14 -8
- package/cjs/rule-y.js.map +1 -1
- package/cjs/rule.js +3 -3
- package/cjs/rule.js.map +1 -1
- package/cjs/sankey.js +8 -10
- package/cjs/sankey.js.map +1 -1
- package/cjs/semantic-mark.d.ts +9 -4
- package/cjs/semantic-mark.js +113 -77
- package/cjs/semantic-mark.js.map +1 -1
- package/cjs/sunburst.js +5 -6
- package/cjs/sunburst.js.map +1 -1
- package/cjs/symbol.d.ts +3 -1
- package/cjs/symbol.js +25 -3
- package/cjs/symbol.js.map +1 -1
- package/cjs/text.js +5 -3
- package/cjs/text.js.map +1 -1
- package/cjs/tree.js +6 -7
- package/cjs/tree.js.map +1 -1
- package/cjs/treemap.js +5 -6
- package/cjs/treemap.js.map +1 -1
- package/cjs/wordcloud-shape.d.ts +1 -0
- package/cjs/wordcloud-shape.js +13 -8
- package/cjs/wordcloud-shape.js.map +1 -1
- package/cjs/wordcloud.js +5 -6
- package/cjs/wordcloud.js.map +1 -1
- package/dist/index.js +283 -126
- package/dist/index.min.js +1 -1
- package/es/area.js +3 -3
- package/es/area.js.map +1 -1
- package/es/cell.js +3 -3
- package/es/cell.js.map +1 -1
- package/es/circle-packing.js +6 -6
- package/es/circle-packing.js.map +1 -1
- package/es/image.js +3 -3
- package/es/image.js.map +1 -1
- package/es/interval.js +4 -4
- package/es/interval.js.map +1 -1
- package/es/line.js +3 -3
- package/es/line.js.map +1 -1
- package/es/path.js +4 -1
- package/es/path.js.map +1 -1
- package/es/plot.d.ts +6 -4
- package/es/plot.js +25 -17
- package/es/plot.js.map +1 -1
- package/es/polygon.js +3 -3
- package/es/polygon.js.map +1 -1
- package/es/rect-x.js +3 -3
- package/es/rect-x.js.map +1 -1
- package/es/rect-y.js +3 -3
- package/es/rect-y.js.map +1 -1
- package/es/rect.js +3 -3
- package/es/rect.js.map +1 -1
- package/es/rule-x.js +3 -3
- package/es/rule-x.js.map +1 -1
- package/es/rule-y.d.ts +1 -1
- package/es/rule-y.js +15 -7
- package/es/rule-y.js.map +1 -1
- package/es/rule.js +3 -3
- package/es/rule.js.map +1 -1
- package/es/sankey.js +9 -9
- package/es/sankey.js.map +1 -1
- package/es/semantic-mark.d.ts +9 -4
- package/es/semantic-mark.js +111 -77
- package/es/semantic-mark.js.map +1 -1
- package/es/sunburst.js +6 -6
- package/es/sunburst.js.map +1 -1
- package/es/symbol.d.ts +3 -1
- package/es/symbol.js +25 -3
- package/es/symbol.js.map +1 -1
- package/es/text.js +5 -3
- package/es/text.js.map +1 -1
- package/es/tree.js +7 -7
- package/es/tree.js.map +1 -1
- package/es/treemap.js +6 -6
- package/es/treemap.js.map +1 -1
- package/es/wordcloud-shape.d.ts +1 -0
- package/es/wordcloud-shape.js +15 -7
- package/es/wordcloud-shape.js.map +1 -1
- package/es/wordcloud.js +6 -6
- package/es/wordcloud.js.map +1 -1
- package/package.json +10 -10
package/cjs/text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/text.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"sources":["../src/text.ts"],"names":[],"mappings":";;;AAWA,mDAA+C;AAE/C,iDAAqD;AACrD,mCAAsC;AAEtC,MAAa,gBAAiB,SAAQ,4BAA6D;IAEjG,YAAY,EAAoB;QAC9B,KAAK,CAAC,mBAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,OAAO,0BAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAES,mBAAmB,CAC3B,MAAuG;QAEvG,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,kBAAkB,CAChB,OAA2B,EAC3B,MAAuG;QAEvG,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB,CACf,MAA0E;;QAE1E,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAqD,WAAW,CAAC;QAE1E,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAG,GAAG,CAAC,IAAwB,CAAC,KAAK,EAAE,CAAC;SAC3D;QAED,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;YAC1C,GAAG,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,KAAK,mCAAI,WAAW,CAAC,KAAK,CAAC;SACnD;aAAM;YACL,GAAG,CAAC,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,mCAAI,MAAA,IAAI,CAAC,UAAU,EAAE,0CAAG,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;;AAhDH,4CAiDC;AAhDiB,qBAAI,GAAG,mBAAW,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import type {\n TextEncodeChannels,\n WithDefaultEncode,\n GenerateBaseEncodeSpec,\n GenerateEncoderSpec,\n Nil,\n ScaleSpec,\n ValueOf,\n BasicEncoderSpecMap,\n FieldEncodeType\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\n\nexport class TextSemanticMark extends SemanticMark<BasicEncoderSpecMap['text'], TextEncodeChannels> {\n static readonly type = PlotMakType.text;\n constructor(id?: string | number) {\n super(PlotMakType.text, id);\n }\n\n setMarkType() {\n return GrammarMarkType.text;\n }\n\n protected parseScaleOfEncodeX(\n option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>, TextEncodeChannels>\n ): ScaleSpec | Nil {\n const res = super.parseScaleOfEncodeX(option);\n\n res.type = 'point';\n return res;\n }\n\n parseScaleByEncode(\n channel: TextEncodeChannels,\n option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>, TextEncodeChannels>\n ): ScaleSpec | Nil {\n return this.parseScaleOfCommonEncode(channel, option);\n }\n\n convertMarkEncode(\n encode: WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>\n ): GenerateBaseEncodeSpec<BasicEncoderSpecMap['text']> {\n const markEncoder = this.convertSimpleMarkEncode(encode);\n\n const res: GenerateEncoderSpec<BasicEncoderSpecMap['text']> = markEncoder;\n\n if (res.text) {\n res.text = { field: (res.text as FieldEncodeType).field };\n }\n\n if (markEncoder.stroke) {\n res.stroke = markEncoder.stroke;\n }\n\n if (markEncoder.color || markEncoder.group) {\n res.fill = markEncoder.color ?? markEncoder.group;\n } else {\n res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n }\n\n return res;\n }\n}\n"]}
|
package/cjs/tree.js
CHANGED
|
@@ -8,8 +8,8 @@ const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visac
|
|
|
8
8
|
|
|
9
9
|
class TreeSemanticMark extends semantic_mark_1.SemanticMark {
|
|
10
10
|
constructor(id) {
|
|
11
|
-
super(enums_1.PlotMakType.tree, id),
|
|
12
|
-
|
|
11
|
+
super(enums_1.PlotMakType.tree, id), vgrammar_1.Factory.getTransform(enums_1.PlotMakType.tree) || this._logger.error("Please add this line of code: import { registerTreeTransforms } from 'vgrammar-hierarchy', \n and run registerTreeTransforms() before use tree"),
|
|
12
|
+
vgrammar_1.Factory.getGlyph("treePath") || this._logger.error("Please add this line of code: import { registerTreePathGlyph } from '@visactor/vgrammar';\n and run registerTreePathGlyph() before use tree");
|
|
13
13
|
}
|
|
14
14
|
setMarkType() {
|
|
15
15
|
return vgrammar_1.GrammarMarkType.symbol;
|
|
@@ -58,11 +58,11 @@ class TreeSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
58
58
|
data: this.getDataIdOfFiltered(),
|
|
59
59
|
field: option
|
|
60
60
|
},
|
|
61
|
-
range:
|
|
61
|
+
range: this.getPalette()
|
|
62
62
|
} : null;
|
|
63
63
|
}
|
|
64
64
|
convertMarkEncode(encode) {
|
|
65
|
-
var _a, _b;
|
|
65
|
+
var _a, _b, _c;
|
|
66
66
|
const markEncoder = this.convertSimpleMarkEncode(encode), res = {
|
|
67
67
|
x: {
|
|
68
68
|
field: "x"
|
|
@@ -71,14 +71,13 @@ class TreeSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
71
71
|
field: "y"
|
|
72
72
|
}
|
|
73
73
|
};
|
|
74
|
-
if (markEncoder.color) {
|
|
74
|
+
if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
|
|
75
75
|
const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
|
|
76
76
|
res.fill = (datum, el, params) => {
|
|
77
77
|
const scale = params[scaleColorId];
|
|
78
78
|
return (null == datum ? void 0 : datum.datum) ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : void 0;
|
|
79
79
|
};
|
|
80
|
-
} else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : (0
|
|
81
|
-
vgrammar_1.getPalette)()[0];
|
|
80
|
+
} else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : null === (_c = this.getPalette()) || void 0 === _c ? void 0 : _c[0];
|
|
82
81
|
return res;
|
|
83
82
|
}
|
|
84
83
|
setLabelTextGetter(channel, option) {
|
package/cjs/tree.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/tree.ts"],"names":[],"mappings":";;;AAgBA,mDAA+C;
|
|
1
|
+
{"version":3,"sources":["../src/tree.ts"],"names":[],"mappings":"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","file":"tree.js","sourcesContent":["import type {\n TreeEncodeChannels,\n WithDefaultEncode,\n PlotTreeEncodeSpec,\n SemanticLabelOption,\n MarkSpec,\n ChannelEncodeType,\n DataSpec,\n GenerateBaseEncodeSpec,\n GenerateEncoderSpec,\n Nil,\n ScaleSpec,\n ValueOf,\n TransformSpec,\n IElement\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { ITextAttribute } from '@visactor/vrender';\n\nexport class TreeSemanticMark extends SemanticMark<PlotTreeEncodeSpec, TreeEncodeChannels> {\n static readonly type = PlotMakType.tree;\n constructor(id?: string | number) {\n super(PlotMakType.tree, id);\n\n if (!Factory.getTransform(PlotMakType.tree)) {\n this._logger.error(\n `Please add this line of code: import { registerTreeTransforms } from 'vgrammar-hierarchy', \n and run registerTreeTransforms() before use tree`\n );\n }\n\n if (!Factory.getGlyph('treePath')) {\n this._logger.error(\n `Please add this line of code: import { registerTreePathGlyph } from '@visactor/vgrammar';\n and run registerTreePathGlyph() before use tree`\n );\n }\n }\n\n setMarkType() {\n return GrammarMarkType.symbol;\n }\n\n setDefaultDataTransform(): TransformSpec[] {\n return [\n {\n type: 'tree',\n width: { signal: 'viewWidth' },\n height: { signal: 'viewHeight' },\n nodeKey: this.spec.encode?.node,\n flatten: true\n }\n ];\n }\n\n getDataIdOfLink() {\n return `${this.spec.data?.id ?? this.spec.id}-data-link`;\n }\n\n setMultipleData(): DataSpec[] {\n return [\n {\n id: this.getDataIdOfFiltered(),\n transform: [\n {\n type: 'map',\n all: true,\n callback: (datum: any) => {\n return datum[0].nodes;\n }\n }\n ]\n },\n {\n source: this.getDataIdOfMain(),\n id: this.getDataIdOfLink(),\n transform: [\n {\n type: 'map',\n all: true,\n callback: (datum: any) => {\n // return formatLinkPath(datum[0].links);\n return datum[0].links;\n }\n }\n ]\n }\n ];\n }\n\n parseScaleByEncode(\n channel: TreeEncodeChannels,\n option: ValueOf<WithDefaultEncode<PlotTreeEncodeSpec, TreeEncodeChannels>, TreeEncodeChannels>\n ): ScaleSpec | Nil {\n if (channel === 'color') {\n return {\n type: 'ordinal',\n id: this.getScaleId('color'),\n domain: {\n data: this.getDataIdOfFiltered(),\n field: option as string\n },\n range: this.getPalette()\n };\n }\n\n return null;\n }\n\n convertMarkEncode(\n encode: WithDefaultEncode<PlotTreeEncodeSpec, TreeEncodeChannels>\n ): GenerateBaseEncodeSpec<PlotTreeEncodeSpec> {\n const markEncoder = this.convertSimpleMarkEncode(encode);\n\n const res: GenerateEncoderSpec<PlotTreeEncodeSpec> = {\n x: { field: 'x' },\n y: { field: 'y' }\n };\n\n if (markEncoder.stroke) {\n res.stroke = markEncoder.stroke;\n }\n\n if (markEncoder.color) {\n const scaleColorId = this.getScaleId('color');\n const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n res.fill = (datum: any, el: IElement, params: any) => {\n const scale = params[scaleColorId];\n return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n };\n } else {\n res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n }\n\n return res;\n }\n\n protected setLabelTextGetter(\n channel: string,\n option: SemanticLabelOption | boolean\n ): ChannelEncodeType<ITextAttribute['text']> {\n const textGetter = getFieldAccessor(channel);\n return (datum: any, el: IElement, params: any) => {\n return textGetter(datum.datum[datum.datum.length - 1]);\n };\n }\n\n setMainMarkSpec() {\n return { key: 'key' };\n }\n\n setMultiMarksSpec() {\n const label = this.spec.label;\n\n if (!label) {\n return null;\n }\n\n const marks: MarkSpec[] = [];\n\n marks.push({\n type: 'glyph',\n glyphType: 'treePath',\n from: { data: this.getDataIdOfLink() },\n key: 'key',\n zIndex: -1,\n encode: {\n update: {\n x0: { field: 'x0' },\n x1: { field: 'x1' },\n y0: { field: 'y0' },\n y1: { field: 'y1' },\n thickness: 1,\n round: true,\n stroke: '#333'\n }\n }\n });\n\n return marks;\n }\n}\n"]}
|
package/cjs/treemap.js
CHANGED
|
@@ -8,7 +8,7 @@ const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visac
|
|
|
8
8
|
|
|
9
9
|
class TreemapSemanticMark extends semantic_mark_1.SemanticMark {
|
|
10
10
|
constructor(id) {
|
|
11
|
-
super(enums_1.PlotMakType.treemap, id),
|
|
11
|
+
super(enums_1.PlotMakType.treemap, id), vgrammar_1.Factory.getTransform("treemap") || this._logger.error("Please add this line of code: import { registerTreemapTransforms } from 'vgrammar-hierarchy'; \n and run registerTreemapTransforms() before use treemap");
|
|
12
12
|
}
|
|
13
13
|
setMarkType() {
|
|
14
14
|
return vgrammar_1.GrammarMarkType.rect;
|
|
@@ -35,11 +35,11 @@ class TreemapSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
35
35
|
data: this.getDataIdOfFiltered(),
|
|
36
36
|
field: option
|
|
37
37
|
},
|
|
38
|
-
range:
|
|
38
|
+
range: this.getPalette()
|
|
39
39
|
} : null;
|
|
40
40
|
}
|
|
41
41
|
convertMarkEncode(encode) {
|
|
42
|
-
var _a, _b;
|
|
42
|
+
var _a, _b, _c;
|
|
43
43
|
const markEncoder = this.convertSimpleMarkEncode(encode), res = {
|
|
44
44
|
x: {
|
|
45
45
|
field: "x0"
|
|
@@ -54,14 +54,13 @@ class TreemapSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
54
54
|
field: "y1"
|
|
55
55
|
}
|
|
56
56
|
};
|
|
57
|
-
if (markEncoder.color) {
|
|
57
|
+
if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
|
|
58
58
|
const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
|
|
59
59
|
res.fill = (datum, el, params) => {
|
|
60
60
|
const scale = params[scaleColorId];
|
|
61
61
|
return (null == datum ? void 0 : datum.datum) ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : void 0;
|
|
62
62
|
};
|
|
63
|
-
} else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : (0
|
|
64
|
-
vgrammar_1.getPalette)()[0];
|
|
63
|
+
} else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : null === (_c = this.getPalette()) || void 0 === _c ? void 0 : _c[0];
|
|
65
64
|
return res;
|
|
66
65
|
}
|
|
67
66
|
setMainMarkSpec() {
|
package/cjs/treemap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/treemap.ts"],"names":[],"mappings":";;;AAaA,mDAA+C;
|
|
1
|
+
{"version":3,"sources":["../src/treemap.ts"],"names":[],"mappings":"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","file":"treemap.js","sourcesContent":["import type {\n TreemapEncodeChannels,\n WithDefaultEncode,\n PlotTreemapEncodeSpec,\n GenerateBaseEncodeSpec,\n GenerateEncoderSpec,\n Nil,\n ScaleSpec,\n ValueOf,\n TransformSpec,\n IElement,\n LabelSpec\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory, SIGNAL_VIEW_BOX } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { BaseLabelAttrs } from '@visactor/vrender-components';\n\nexport class TreemapSemanticMark extends SemanticMark<PlotTreemapEncodeSpec, TreemapEncodeChannels> {\n static readonly type = PlotMakType.treemap;\n constructor(id?: string | number) {\n super(PlotMakType.treemap, id);\n\n if (!Factory.getTransform('treemap')) {\n this._logger.error(\n `Please add this line of code: import { registerTreemapTransforms } from 'vgrammar-hierarchy'; \n and run registerTreemapTransforms() before use treemap`\n );\n }\n }\n\n setMarkType() {\n return GrammarMarkType.rect;\n }\n\n setDefaultDataTransform(): TransformSpec[] {\n return [\n {\n type: 'treemap',\n width: { signal: 'viewWidth' },\n height: { signal: 'viewHeight' },\n nodeKey: this.spec.encode?.node,\n flatten: true\n }\n ];\n }\n parseScaleByEncode(\n channel: TreemapEncodeChannels,\n option: ValueOf<WithDefaultEncode<PlotTreemapEncodeSpec, TreemapEncodeChannels>, TreemapEncodeChannels>\n ): ScaleSpec | Nil {\n if (channel === 'color') {\n return {\n type: 'ordinal',\n id: this.getScaleId('color'),\n domain: {\n data: this.getDataIdOfFiltered(),\n field: option as string\n },\n range: this.getPalette()\n };\n }\n\n return null;\n }\n\n convertMarkEncode(\n encode: WithDefaultEncode<PlotTreemapEncodeSpec, TreemapEncodeChannels>\n ): GenerateBaseEncodeSpec<PlotTreemapEncodeSpec> {\n const markEncoder = this.convertSimpleMarkEncode(encode);\n\n const res: GenerateEncoderSpec<PlotTreemapEncodeSpec> = {\n x: { field: 'x0' },\n x1: { field: 'x1' },\n y: { field: 'y0' },\n y1: { field: 'y1' }\n };\n\n if (markEncoder.stroke) {\n res.stroke = markEncoder.stroke;\n }\n\n if (markEncoder.color) {\n const scaleColorId = this.getScaleId('color');\n const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n res.fill = (datum: any, el: IElement, params: any) => {\n const scale = params[scaleColorId];\n return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n };\n } else {\n res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n }\n\n return res;\n }\n\n setMainMarkSpec() {\n return { key: 'key' };\n }\n\n protected parseLabelSpec(): LabelSpec[] {\n // TODO use arc label in the future\n return [];\n }\n\n setMultiMarksSpec() {\n const label = this.spec.label;\n\n if (!label) {\n return null;\n }\n\n return Object.keys(label).map(key => {\n const textGetter = getFieldAccessor(key);\n return {\n id: `${this.getMarkId()}-text-${key}`,\n type: 'text',\n from: {\n data: this.getDataIdOfFiltered()\n },\n layout: {\n position: 'content',\n skipBeforeLayouted: true\n },\n key: 'flattenIndex',\n dependency: this.viewSpec.scales.map(scale => scale.id).concat(SIGNAL_VIEW_BOX),\n animation: this.convertMarkAnimation(),\n encode: {\n enter: Object.assign(\n {\n textAlign: 'center',\n textBaseline: 'middle'\n },\n (label[key] as Partial<BaseLabelAttrs>).textStyle\n ),\n update: (datum: any, el: IElement, params: any) => {\n return {\n x: datum.labelRect ? (datum.labelRect.x0 + datum.labelRect.x1) / 2 : (datum.x0 + datum.x1) / 2,\n y: datum.labelRect ? (datum.labelRect.y0 + datum.labelRect.y1) / 2 : (datum.y0 + datum.y1) / 2,\n text: textGetter(datum.datum[datum.datum.length - 1])\n };\n }\n }\n };\n });\n }\n}\n"]}
|
package/cjs/wordcloud-shape.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export declare class WordcloudShapeSemanticMark extends SemanticMark<PlotWordclo
|
|
|
7
7
|
constructor(id?: string | number);
|
|
8
8
|
setMarkType(): GrammarMarkType;
|
|
9
9
|
setDefaultDataTransform(): TransformSpec[];
|
|
10
|
+
protected setMainMarkEnterEncode(): any;
|
|
10
11
|
parseScaleByEncode(channel: WordcloudShapeEncodeChannels, option: ValueOf<WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>, WordcloudShapeEncodeChannels>): ScaleSpec | Nil;
|
|
11
12
|
convertMarkEncode(encode: WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>): GenerateBaseEncodeSpec<PlotWordcloudShapeEncodeSpec>;
|
|
12
13
|
protected parseLabelSpec(): LabelSpec[];
|
package/cjs/wordcloud-shape.js
CHANGED
|
@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: !0
|
|
5
5
|
}), exports.WordcloudShapeSemanticMark = void 0;
|
|
6
6
|
|
|
7
|
-
const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visactor/vgrammar"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util");
|
|
7
|
+
const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visactor/vgrammar"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util"), vutils_1 = require("@visactor/vutils");
|
|
8
8
|
|
|
9
9
|
class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
|
|
10
10
|
constructor(id) {
|
|
11
|
-
super(enums_1.PlotMakType.wordcloudShape, id),
|
|
11
|
+
super(enums_1.PlotMakType.wordcloudShape, id), vgrammar_1.Factory.getTransform(enums_1.PlotMakType.wordcloudShape) || this._logger.error("Please add this line of code:\n import { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape'; \n and run registerWordCloudShapeTransforms() before use wordcloud-shape");
|
|
12
12
|
}
|
|
13
13
|
setMarkType() {
|
|
14
14
|
return vgrammar_1.GrammarMarkType.text;
|
|
@@ -21,12 +21,18 @@ class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
21
21
|
callback: params => [ params.viewBox.width(), params.viewBox.height() ],
|
|
22
22
|
dependency: [ "viewBox" ]
|
|
23
23
|
},
|
|
24
|
-
colorList:
|
|
24
|
+
colorList: this.getPalette(),
|
|
25
25
|
text: {
|
|
26
26
|
field: null === (_a = this.spec.encode) || void 0 === _a ? void 0 : _a.text
|
|
27
27
|
}
|
|
28
28
|
} ];
|
|
29
29
|
}
|
|
30
|
+
setMainMarkEnterEncode() {
|
|
31
|
+
return (0, vutils_1.merge)({
|
|
32
|
+
textAlign: "center",
|
|
33
|
+
textBaseline: "middle"
|
|
34
|
+
}, this.spec.style);
|
|
35
|
+
}
|
|
30
36
|
parseScaleByEncode(channel, option) {
|
|
31
37
|
return "color" === channel ? {
|
|
32
38
|
type: "ordinal",
|
|
@@ -35,11 +41,11 @@ class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
35
41
|
data: this.getDataIdOfFiltered(),
|
|
36
42
|
field: option
|
|
37
43
|
},
|
|
38
|
-
range:
|
|
44
|
+
range: this.getPalette()
|
|
39
45
|
} : null;
|
|
40
46
|
}
|
|
41
47
|
convertMarkEncode(encode) {
|
|
42
|
-
var _a, _b, _c;
|
|
48
|
+
var _a, _b, _c, _d;
|
|
43
49
|
const markEncoder = this.convertSimpleMarkEncode(encode), res = {
|
|
44
50
|
x: {
|
|
45
51
|
field: "x"
|
|
@@ -69,11 +75,10 @@ class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
69
75
|
field: null === (_a = this.spec.encode) || void 0 === _a ? void 0 : _a.text
|
|
70
76
|
}
|
|
71
77
|
};
|
|
72
|
-
if (markEncoder.color) {
|
|
78
|
+
if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
|
|
73
79
|
const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
|
|
74
80
|
res.fill = (datum, el, params) => params[scaleColorId].scale(colorAccessor(datum));
|
|
75
|
-
} else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : (0
|
|
76
|
-
vgrammar_1.getPalette)()[0];
|
|
81
|
+
} else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : null === (_d = this.getPalette()) || void 0 === _d ? void 0 : _d[0];
|
|
77
82
|
return res;
|
|
78
83
|
}
|
|
79
84
|
parseLabelSpec() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/wordcloud-shape.ts"],"names":[],"mappings":";;;AAaA,mDAA+C;
|
|
1
|
+
{"version":3,"sources":["../src/wordcloud-shape.ts"],"names":[],"mappings":";;;AAaA,mDAA+C;AAE/C,iDAA8D;AAC9D,mCAAsC;AACtC,2DAAoE;AACpE,6CAAyC;AAEzC,MAAa,0BAA2B,SAAQ,4BAG/C;IAEC,YAAY,EAAoB;QAC9B,KAAK,CAAC,mBAAW,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,kBAAO,CAAC,YAAY,CAAC,mBAAW,CAAC,cAAc,CAAC,EAAE;YACrD,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB;;8EAEsE,CACvE,CAAC;SACH;IACH,CAAC;IAED,WAAW;QACT,OAAO,0BAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,uBAAuB;;QACrB,OAAO;YACL;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE;oBACJ,QAAQ,EAAE,CAAC,MAAW,EAAE,EAAE;wBACxB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;oBAC3D,CAAC;oBACD,UAAU,EAAE,CAAC,SAAS,CAAC;iBACxB;gBACD,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE;gBAC5B,IAAI,EAAE,EAAE,KAAK,EAAE,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,IAAI,EAAE;aACxC;SACF,CAAC;IACJ,CAAC;IAES,sBAAsB;QAC9B,OAAO,IAAA,cAAK,EACV;YACE,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,QAAQ;SACvB,EACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAChB,CAAC;IACJ,CAAC;IAED,kBAAkB,CAChB,OAAqC,EACrC,MAGC;QAED,IAAI,OAAO,KAAK,OAAO,EAAE;YACvB,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC5B,MAAM,EAAE;oBACN,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE;oBAChC,KAAK,EAAE,MAAgB;iBACxB;gBACD,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;aACzB,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB,CACf,MAAqF;;QAErF,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAsD;YAC7D,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACjB,CAAC,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACjB,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YACzB,QAAQ,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE;YAC/B,SAAS,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;YACjC,UAAU,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE;YACnC,UAAU,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE;YACnC,WAAW,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;YACjC,IAAI,EAAE,EAAE,KAAK,EAAE,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,IAAI,EAAE;SACxC,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,KAAK,EAAE;YACrB,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,aAAa,GAAG,IAAA,qBAAgB,EAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAEhE,GAAG,CAAC,IAAI,GAAG,CAAC,KAAU,EAAE,EAAY,EAAE,MAAW,EAAE,EAAE;gBACnD,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC;SACH;aAAM;YACL,GAAG,CAAC,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,mCAAI,MAAA,IAAI,CAAC,UAAU,EAAE,0CAAG,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAES,cAAc;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;;AA3GH,gEA4GC;AAxGiB,+BAAI,GAAG,mBAAW,CAAC,cAAc,CAAC","file":"wordcloud-shape.js","sourcesContent":["import type {\n WordcloudShapeEncodeChannels,\n WithDefaultEncode,\n PlotWordcloudShapeEncodeSpec,\n GenerateBaseEncodeSpec,\n GenerateEncoderSpec,\n Nil,\n ScaleSpec,\n ValueOf,\n TransformSpec,\n IElement,\n LabelSpec\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport { merge } from '@visactor/vutils';\n\nexport class WordcloudShapeSemanticMark extends SemanticMark<\n PlotWordcloudShapeEncodeSpec,\n WordcloudShapeEncodeChannels\n> {\n static readonly type = PlotMakType.wordcloudShape;\n constructor(id?: string | number) {\n super(PlotMakType.wordcloudShape, id);\n\n if (!Factory.getTransform(PlotMakType.wordcloudShape)) {\n this._logger.error(\n `Please add this line of code:\n import { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape'; \n and run registerWordCloudShapeTransforms() before use wordcloud-shape`\n );\n }\n }\n\n setMarkType() {\n return GrammarMarkType.text;\n }\n\n setDefaultDataTransform(): TransformSpec[] {\n return [\n {\n type: 'wordcloudShape',\n size: {\n callback: (params: any) => {\n return [params.viewBox.width(), params.viewBox.height()];\n },\n dependency: ['viewBox']\n },\n colorList: this.getPalette(),\n text: { field: this.spec.encode?.text }\n }\n ];\n }\n\n protected setMainMarkEnterEncode() {\n return merge(\n {\n textAlign: 'center',\n textBaseline: 'middle'\n },\n this.spec.style\n );\n }\n\n parseScaleByEncode(\n channel: WordcloudShapeEncodeChannels,\n option: ValueOf<\n WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>,\n WordcloudShapeEncodeChannels\n >\n ): ScaleSpec | Nil {\n if (channel === 'color') {\n return {\n type: 'ordinal',\n id: this.getScaleId('color'),\n domain: {\n data: this.getDataIdOfFiltered(),\n field: option as string\n },\n range: this.getPalette()\n };\n }\n\n return null;\n }\n\n convertMarkEncode(\n encode: WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>\n ): GenerateBaseEncodeSpec<PlotWordcloudShapeEncodeSpec> {\n const markEncoder = this.convertSimpleMarkEncode(encode);\n\n const res: GenerateEncoderSpec<PlotWordcloudShapeEncodeSpec> = {\n x: { field: 'x' },\n y: { field: 'y' },\n angle: { field: 'angle' },\n fontSize: { field: 'fontSize' },\n fontStyle: { field: 'fontStyle' },\n fontFamily: { field: 'fontFamily' },\n fontWeight: { field: 'fontWeight' },\n fillOpacity: { field: 'opacity' },\n text: { field: this.spec.encode?.text }\n };\n\n if (markEncoder.stroke) {\n res.stroke = markEncoder.stroke;\n }\n\n if (markEncoder.color) {\n const scaleColorId = this.getScaleId('color');\n const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n res.fill = (datum: any, el: IElement, params: any) => {\n const scale = params[scaleColorId];\n return scale.scale(colorAccessor(datum));\n };\n } else {\n res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n }\n\n return res;\n }\n\n protected parseLabelSpec(): LabelSpec[] {\n return [];\n }\n}\n"]}
|
package/cjs/wordcloud.js
CHANGED
|
@@ -8,7 +8,7 @@ const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visac
|
|
|
8
8
|
|
|
9
9
|
class WordcloudSemanticMark extends semantic_mark_1.SemanticMark {
|
|
10
10
|
constructor(id) {
|
|
11
|
-
super(enums_1.PlotMakType.wordcloud, id),
|
|
11
|
+
super(enums_1.PlotMakType.wordcloud, id), vgrammar_1.Factory.getTransform(enums_1.PlotMakType.wordcloud) || this._logger.error("Please add this line of code:\n 'import { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud'; \n and run registerWordCloudTransforms() before use wordcloud");
|
|
12
12
|
}
|
|
13
13
|
setMarkType() {
|
|
14
14
|
return vgrammar_1.GrammarMarkType.text;
|
|
@@ -34,11 +34,11 @@ class WordcloudSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
34
34
|
data: this.getDataIdOfFiltered(),
|
|
35
35
|
field: option
|
|
36
36
|
},
|
|
37
|
-
range:
|
|
37
|
+
range: this.getPalette()
|
|
38
38
|
} : null;
|
|
39
39
|
}
|
|
40
40
|
convertMarkEncode(encode) {
|
|
41
|
-
var _a, _b, _c;
|
|
41
|
+
var _a, _b, _c, _d;
|
|
42
42
|
const markEncoder = this.convertSimpleMarkEncode(encode), res = {
|
|
43
43
|
x: {
|
|
44
44
|
field: "x"
|
|
@@ -65,11 +65,10 @@ class WordcloudSemanticMark extends semantic_mark_1.SemanticMark {
|
|
|
65
65
|
field: null === (_a = this.spec.encode) || void 0 === _a ? void 0 : _a.text
|
|
66
66
|
}
|
|
67
67
|
};
|
|
68
|
-
if (markEncoder.color) {
|
|
68
|
+
if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
|
|
69
69
|
const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
|
|
70
70
|
res.fill = (datum, el, params) => params[scaleColorId].scale(colorAccessor(datum));
|
|
71
|
-
} else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : (0
|
|
72
|
-
vgrammar_1.getPalette)()[0];
|
|
71
|
+
} else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : null === (_d = this.getPalette()) || void 0 === _d ? void 0 : _d[0];
|
|
73
72
|
return res;
|
|
74
73
|
}
|
|
75
74
|
parseLabelSpec() {
|
package/cjs/wordcloud.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/wordcloud.ts"],"names":[],"mappings":";;;AAaA,mDAA+C;
|
|
1
|
+
{"version":3,"sources":["../src/wordcloud.ts"],"names":[],"mappings":"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","file":"wordcloud.js","sourcesContent":["import type {\n WordcloudEncodeChannels,\n WithDefaultEncode,\n PlotWordcloudEncodeSpec,\n GenerateBaseEncodeSpec,\n GenerateEncoderSpec,\n Nil,\n ScaleSpec,\n ValueOf,\n TransformSpec,\n IElement,\n LabelSpec\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\n\nexport class WordcloudSemanticMark extends SemanticMark<PlotWordcloudEncodeSpec, WordcloudEncodeChannels> {\n static readonly type = PlotMakType.wordcloud;\n constructor(id?: string | number) {\n super(PlotMakType.wordcloud, id);\n\n if (!Factory.getTransform(PlotMakType.wordcloud)) {\n this._logger.error(\n `Please add this line of code:\n 'import { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud'; \n and run registerWordCloudTransforms() before use wordcloud`\n );\n }\n }\n\n setMarkType() {\n return GrammarMarkType.text;\n }\n\n setDefaultMarkTransform(): TransformSpec[] {\n return [\n {\n type: 'wordcloud',\n size: {\n callback: (params: any) => {\n return [params.viewBox.width(), params.viewBox.height()];\n },\n dependency: ['viewBox']\n },\n text: { field: this.spec.encode?.text }\n }\n ];\n }\n parseScaleByEncode(\n channel: WordcloudEncodeChannels,\n option: ValueOf<WithDefaultEncode<PlotWordcloudEncodeSpec, WordcloudEncodeChannels>, WordcloudEncodeChannels>\n ): ScaleSpec | Nil {\n if (channel === 'color') {\n return {\n type: 'ordinal',\n id: this.getScaleId('color'),\n domain: {\n data: this.getDataIdOfFiltered(),\n field: option as string\n },\n range: this.getPalette()\n };\n }\n\n return null;\n }\n\n convertMarkEncode(\n encode: WithDefaultEncode<PlotWordcloudEncodeSpec, WordcloudEncodeChannels>\n ): GenerateBaseEncodeSpec<PlotWordcloudEncodeSpec> {\n const markEncoder = this.convertSimpleMarkEncode(encode);\n\n const res: GenerateEncoderSpec<PlotWordcloudEncodeSpec> = {\n x: { field: 'x' },\n y: { field: 'y' },\n angle: { field: 'angle' },\n fontSize: { field: 'fontSize' },\n fontStyle: { field: 'fontStyle' },\n fontFamily: { field: 'fontFamily' },\n fontWeight: { field: 'fontWeight' },\n text: { field: this.spec.encode?.text }\n };\n\n if (markEncoder.stroke) {\n res.stroke = markEncoder.stroke;\n }\n\n if (markEncoder.color) {\n const scaleColorId = this.getScaleId('color');\n const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n res.fill = (datum: any, el: IElement, params: any) => {\n const scale = params[scaleColorId];\n return scale.scale(colorAccessor(datum));\n };\n } else {\n res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n }\n\n return res;\n }\n\n protected parseLabelSpec(): LabelSpec[] {\n return [];\n }\n}\n"]}
|