@visactor/vgrammar-core 0.11.7 → 0.11.9

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.
Files changed (43) hide show
  1. package/cjs/component/datazoom.d.ts +3 -1
  2. package/cjs/component/datazoom.js +32 -24
  3. package/cjs/component/datazoom.js.map +1 -1
  4. package/cjs/graph/mark/encode.d.ts +0 -4
  5. package/cjs/graph/mark/encode.js +3 -29
  6. package/cjs/graph/mark/encode.js.map +1 -1
  7. package/cjs/index.d.ts +1 -1
  8. package/cjs/index.js +1 -1
  9. package/cjs/index.js.map +1 -1
  10. package/cjs/view/mark.d.ts +2 -1
  11. package/cjs/view/mark.js +16 -37
  12. package/cjs/view/mark.js.map +1 -1
  13. package/es/component/datazoom.d.ts +3 -1
  14. package/es/component/datazoom.js +32 -24
  15. package/es/component/datazoom.js.map +1 -1
  16. package/es/graph/mark/encode.d.ts +0 -4
  17. package/es/graph/mark/encode.js +0 -29
  18. package/es/graph/mark/encode.js.map +1 -1
  19. package/es/index.d.ts +1 -1
  20. package/es/index.js +1 -1
  21. package/es/index.js.map +1 -1
  22. package/es/interactions/brush-filter.js +1 -2
  23. package/es/interactions/element-highlight-by-group.js +2 -1
  24. package/es/interactions/index.js +1 -2
  25. package/es/interactions/legend-filter.js +1 -1
  26. package/es/interactions/player-filter.js +1 -1
  27. package/es/interactions/roll-up.js +1 -1
  28. package/es/interactions/scrollbar-filter.js +1 -1
  29. package/es/interactions/slider-filter.js +1 -1
  30. package/es/interactions/toggle-state-mixin.js +1 -1
  31. package/es/interactions/tooltip.js +1 -1
  32. package/es/parse/coordinate.js +1 -1
  33. package/es/parse/event.js +1 -1
  34. package/es/parse/mark.js +1 -1
  35. package/es/parse/option.js +1 -1
  36. package/es/parse/scale.js +2 -1
  37. package/es/parse/transform.js +1 -1
  38. package/es/parse/util.js +1 -1
  39. package/es/parse/view.js +1 -1
  40. package/es/view/mark.d.ts +2 -1
  41. package/es/view/mark.js +18 -38
  42. package/es/view/mark.js.map +1 -1
  43. package/package.json +6 -6
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/graph/mark/encode.ts"],"names":[],"mappings":"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","file":"encode.js","sourcesContent":["import { isNil, isNumber, isString } from '@visactor/vutils';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { BaseSingleEncodeSpec, IElement, MarkElementItem } from '../../types';\nimport { isFieldEncode, isScaleEncode } from '../../parse/mark';\nimport { getGrammarOutput, invokeFunctionType, isFunctionType } from '../../parse/util';\nimport { isPositionOrSizeChannel } from '../attributes/helpers';\nimport { GrammarMarkType } from '../enums';\nimport { Factory } from '../../core/factory';\n\n/**\n * invoke encoder for multiple items\n */\nexport function invokeEncoderToItems(\n element: IElement,\n items: MarkElementItem[],\n encoder: BaseSingleEncodeSpec,\n parameters: any,\n onlyFullEncodeFirst?: boolean\n) {\n if (!encoder) {\n return;\n }\n\n if (isFunctionType(encoder)) {\n items.forEach(item => {\n const attributes = invokeFunctionType(encoder, parameters, item.datum, element);\n Object.assign(item.nextAttrs, attributes);\n });\n } else {\n Object.keys(encoder).forEach(channel => {\n const encode = encoder[channel];\n const encodeItems =\n onlyFullEncodeFirst && !isPositionOrSizeChannel(element.mark.markType, channel) ? [items[0]] : items;\n\n if (isScaleEncode(encode)) {\n const scale = getGrammarOutput(encode.scale, parameters);\n const offset = encode?.offset ?? 0;\n const bandOffset = !isNil(encode.band) && scale.bandwidth ? scale.bandwidth() * encode.band : null;\n const hasField = isString(encode?.field);\n const fieldAccessor = hasField ? getFieldAccessor(encode.field) : null;\n\n let to = hasField ? null : !isNil(encode?.value) ? scale.scale?.(encode.value) : 0;\n\n encodeItems.forEach(item => {\n if (hasField) {\n to = scale.scale?.(fieldAccessor(item.datum));\n }\n item.nextAttrs[channel] = isNumber(to) || isNumber(bandOffset) ? to + offset + bandOffset : to;\n });\n } else if (isFieldEncode(encode)) {\n const fieldAccessor = getFieldAccessor(encode.field);\n\n encodeItems.forEach(item => {\n item.nextAttrs[channel] = fieldAccessor(item.datum);\n });\n } else {\n encodeItems.forEach(item => {\n item.nextAttrs[channel] = invokeFunctionType(encode, parameters, item.datum, element);\n });\n }\n });\n }\n}\n\n/**\n * invoke encoder for single item\n * use invokeEncoderToItems instead if item amount is large\n */\nexport function invokeEncoder(encoder: BaseSingleEncodeSpec, datum: any, element: IElement, parameters: any) {\n if (!encoder) {\n return null;\n }\n if (isFunctionType(encoder)) {\n return invokeFunctionType(encoder, parameters, datum, element);\n }\n const attributes: any = {};\n Object.keys(encoder).forEach(channel => {\n const encode = encoder[channel];\n\n if (isScaleEncode(encode)) {\n const scale = getGrammarOutput(encode.scale, parameters);\n const offset = encode?.offset ?? 0;\n const bandOffset = !isNil(encode.band) && scale.bandwidth ? scale.bandwidth() * encode.band : null;\n const hasField = isString(encode?.field);\n const fieldAccessor = hasField ? getFieldAccessor(encode.field) : null;\n const to = hasField\n ? scale.scale?.(fieldAccessor(datum))\n : !isNil(encode?.value)\n ? scale.scale?.(encode.value)\n : 0;\n\n attributes[channel] = isNumber(to) || isNumber(bandOffset) ? to + offset + bandOffset : to;\n } else if (isFieldEncode(encode)) {\n const fieldAccessor = getFieldAccessor(encode.field);\n attributes[channel] = fieldAccessor(datum);\n } else {\n attributes[channel] = invokeFunctionType(encode, parameters, datum, element);\n }\n });\n return attributes;\n}\n\nexport function splitEncoderInLarge(markType: string, encoder: BaseSingleEncodeSpec, glyphType?: string) {\n // function encoder can not be splitted\n if (isFunctionType(encoder)) {\n return { themeEncoder: {}, positionEncoder: encoder };\n }\n\n const themeEncoder = {};\n const positionEncoder = {};\n\n if (markType === GrammarMarkType.glyph && Factory.getGlyph(glyphType)) {\n const glyphMeta = Factory.getGlyph(glyphType);\n const progressiveChannels = glyphMeta.getProgressiveChannels();\n if (progressiveChannels) {\n Object.keys(encoder).forEach(channel => {\n if (progressiveChannels.includes(channel)) {\n positionEncoder[channel] = encoder[channel];\n } else {\n themeEncoder[channel] = encoder[channel];\n }\n });\n } else {\n const markTypes: string[] = Array.from(new Set(Object.values(glyphMeta.getMarks())));\n Object.keys(encoder).forEach(channel => {\n if (markTypes.some(type => isPositionOrSizeChannel(type, channel))) {\n positionEncoder[channel] = encoder[channel];\n } else {\n themeEncoder[channel] = encoder[channel];\n }\n });\n }\n } else {\n Object.keys(encoder).forEach(channel => {\n if (isPositionOrSizeChannel(markType, channel)) {\n positionEncoder[channel] = encoder[channel];\n } else {\n themeEncoder[channel] = encoder[channel];\n }\n });\n }\n\n return { positionEncoder, themeEncoder };\n}\n"]}
1
+ {"version":3,"sources":["../src/graph/mark/encode.ts"],"names":[],"mappings":"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","file":"encode.js","sourcesContent":["import { isNil, isNumber, isString } from '@visactor/vutils';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { BaseSingleEncodeSpec, IElement, MarkElementItem } from '../../types';\nimport { isFieldEncode, isScaleEncode } from '../../parse/mark';\nimport { getGrammarOutput, invokeFunctionType, isFunctionType } from '../../parse/util';\nimport { isPositionOrSizeChannel } from '../attributes/helpers';\n\n/**\n * invoke encoder for multiple items\n */\nexport function invokeEncoderToItems(\n element: IElement,\n items: MarkElementItem[],\n encoder: BaseSingleEncodeSpec,\n parameters: any,\n onlyFullEncodeFirst?: boolean\n) {\n if (!encoder) {\n return;\n }\n\n if (isFunctionType(encoder)) {\n items.forEach(item => {\n const attributes = invokeFunctionType(encoder, parameters, item.datum, element);\n Object.assign(item.nextAttrs, attributes);\n });\n } else {\n Object.keys(encoder).forEach(channel => {\n const encode = encoder[channel];\n const encodeItems =\n onlyFullEncodeFirst && !isPositionOrSizeChannel(element.mark.markType, channel) ? [items[0]] : items;\n\n if (isScaleEncode(encode)) {\n const scale = getGrammarOutput(encode.scale, parameters);\n const offset = encode?.offset ?? 0;\n const bandOffset = !isNil(encode.band) && scale.bandwidth ? scale.bandwidth() * encode.band : null;\n const hasField = isString(encode?.field);\n const fieldAccessor = hasField ? getFieldAccessor(encode.field) : null;\n\n let to = hasField ? null : !isNil(encode?.value) ? scale.scale?.(encode.value) : 0;\n\n encodeItems.forEach(item => {\n if (hasField) {\n to = scale.scale?.(fieldAccessor(item.datum));\n }\n item.nextAttrs[channel] = isNumber(to) || isNumber(bandOffset) ? to + offset + bandOffset : to;\n });\n } else if (isFieldEncode(encode)) {\n const fieldAccessor = getFieldAccessor(encode.field);\n\n encodeItems.forEach(item => {\n item.nextAttrs[channel] = fieldAccessor(item.datum);\n });\n } else {\n encodeItems.forEach(item => {\n item.nextAttrs[channel] = invokeFunctionType(encode, parameters, item.datum, element);\n });\n }\n });\n }\n}\n\n/**\n * invoke encoder for single item\n * use invokeEncoderToItems instead if item amount is large\n */\nexport function invokeEncoder(encoder: BaseSingleEncodeSpec, datum: any, element: IElement, parameters: any) {\n if (!encoder) {\n return null;\n }\n if (isFunctionType(encoder)) {\n return invokeFunctionType(encoder, parameters, datum, element);\n }\n const attributes: any = {};\n Object.keys(encoder).forEach(channel => {\n const encode = encoder[channel];\n\n if (isScaleEncode(encode)) {\n const scale = getGrammarOutput(encode.scale, parameters);\n const offset = encode?.offset ?? 0;\n const bandOffset = !isNil(encode.band) && scale.bandwidth ? scale.bandwidth() * encode.band : null;\n const hasField = isString(encode?.field);\n const fieldAccessor = hasField ? getFieldAccessor(encode.field) : null;\n const to = hasField\n ? scale.scale?.(fieldAccessor(datum))\n : !isNil(encode?.value)\n ? scale.scale?.(encode.value)\n : 0;\n\n attributes[channel] = isNumber(to) || isNumber(bandOffset) ? to + offset + bandOffset : to;\n } else if (isFieldEncode(encode)) {\n const fieldAccessor = getFieldAccessor(encode.field);\n attributes[channel] = fieldAccessor(datum);\n } else {\n attributes[channel] = invokeFunctionType(encode, parameters, datum, element);\n }\n });\n return attributes;\n}\n"]}
package/es/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const version = "0.11.7";
1
+ export declare const version = "0.11.9";
2
2
  export * from './graph';
3
3
  export * from './interactions';
4
4
  export { View } from './view';
package/es/index.js CHANGED
@@ -1,4 +1,4 @@
1
- export const version = "0.11.7";
1
+ export const version = "0.11.9";
2
2
 
3
3
  export * from "./graph";
4
4
 
package/es/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,SAAS,CAAC;AAExB,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,cAAc,EACd,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,6BAA6B,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,cAAc,OAAO,CAAC;AACtB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.11.7\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\n SIGNAL_AUTOFIT,\n SIGNAL_HEIGHT,\n SIGNAL_PADDING,\n SIGNAL_VIEW_HEIGHT,\n SIGNAL_VIEW_WIDTH,\n SIGNAL_WIDTH,\n SIGNAL_VIEW_BOX\n} from './view/constants';\n\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}
1
+ {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,SAAS,CAAC;AAExB,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,cAAc,EACd,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,6BAA6B,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,cAAc,OAAO,CAAC;AACtB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.11.9\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\n SIGNAL_AUTOFIT,\n SIGNAL_HEIGHT,\n SIGNAL_PADDING,\n SIGNAL_VIEW_HEIGHT,\n SIGNAL_VIEW_WIDTH,\n SIGNAL_WIDTH,\n SIGNAL_VIEW_BOX\n} from './view/constants';\n\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}
@@ -29,5 +29,4 @@ export class BrushFilter extends BrushBase {
29
29
  }
30
30
  }
31
31
 
32
- BrushFilter.type = "brush-filter", BrushFilter.defaultOptions = {};
33
- //# sourceMappingURL=brush-filter.js.map
32
+ BrushFilter.type = "brush-filter", BrushFilter.defaultOptions = {};
@@ -45,4 +45,5 @@ ElementHighlightByGroup.type = "element-highlight-by-group", ElementHighlightByG
45
45
  blurState: InteractionStateEnum.blur,
46
46
  trigger: "pointerover",
47
47
  triggerOff: "pointerout"
48
- };
48
+ };
49
+ //# sourceMappingURL=element-highlight-by-group.js.map
@@ -147,5 +147,4 @@ export const registerViewRoam = () => {
147
147
 
148
148
  export const registerFishEye = () => {
149
149
  Factory.registerInteraction(FishEye.type, FishEye);
150
- };
151
- //# sourceMappingURL=index.js.map
150
+ };
@@ -29,4 +29,4 @@ export class LegendFilter extends Filter {
29
29
  }
30
30
 
31
31
  LegendFilter.type = "legend-filter", LegendFilter.defaultOptions = {};
32
- //# sourceMappingURL=legend-filter.js.map
32
+ //# sourceMappingURL=legend-filter.js.map
@@ -29,4 +29,4 @@ export class PlayerFilter extends Filter {
29
29
  }
30
30
 
31
31
  PlayerFilter.type = "player-filter", PlayerFilter.defaultOptions = {};
32
- //# sourceMappingURL=player-filter.js.map
32
+ //# sourceMappingURL=player-filter.js.map
@@ -42,4 +42,4 @@ RollUp.type = "roll-up", RollUp.defaultOptions = {
42
42
  trigger: "click",
43
43
  triggerOff: "empty"
44
44
  };
45
- //# sourceMappingURL=roll-up.js.map
45
+ //# sourceMappingURL=roll-up.js.map
@@ -47,4 +47,4 @@ export class ScrollbarFilter extends Filter {
47
47
  }
48
48
 
49
49
  ScrollbarFilter.type = "scrollbar-filter", ScrollbarFilter.defaultOptions = {};
50
- //# sourceMappingURL=scrollbar-filter.js.map
50
+ //# sourceMappingURL=scrollbar-filter.js.map
@@ -26,4 +26,4 @@ export class SliderFilter extends Filter {
26
26
  }
27
27
 
28
28
  SliderFilter.type = "slider-filter", SliderFilter.defaultOptions = {};
29
- //# sourceMappingURL=slider-filter.js.map
29
+ //# sourceMappingURL=slider-filter.js.map
@@ -44,4 +44,4 @@ export class ToggleStateMixin {
44
44
  }));
45
45
  }
46
46
  }
47
- //# sourceMappingURL=toggle-state-mixin.js.map
47
+ //# sourceMappingURL=toggle-state-mixin.js.map
@@ -56,4 +56,4 @@ Tooltip.type = "tooltip", Tooltip.defaultOptions = {
56
56
  trigger: "pointermove",
57
57
  triggerOff: "pointerleave"
58
58
  };
59
- //# sourceMappingURL=tooltip.js.map
59
+ //# sourceMappingURL=tooltip.js.map
@@ -62,4 +62,4 @@ export function configureCoordinate(spec, coordinate, parameters) {
62
62
  }
63
63
  coordinate.applyTransforms(transforms);
64
64
  }
65
- //# sourceMappingURL=coordinate.js.map
65
+ //# sourceMappingURL=coordinate.js.map
package/es/parse/event.js CHANGED
@@ -24,4 +24,4 @@ export const parseEventSelector = (selector, source = EVENT_SOURCE_VIEW) => {
24
24
  } else 1 === splitArr.length && (spec.type = selector, spec.source = source);
25
25
  return spec;
26
26
  };
27
- //# sourceMappingURL=event.js.map
27
+ //# sourceMappingURL=event.js.map
package/es/parse/mark.js CHANGED
@@ -16,4 +16,4 @@ export function parseEncodeType(encoder, view) {
16
16
  return encoder.scale && (dependencies = isGrammar(encoder.scale) ? [ encoder.scale ] : array(view.getScaleById(encoder.scale))),
17
17
  dependencies.concat(parseFunctionType(encoder, view));
18
18
  }
19
- //# sourceMappingURL=mark.js.map
19
+ //# sourceMappingURL=mark.js.map
@@ -8,4 +8,4 @@ export const parseOptions = (options, params) => options ? isObject(options) ? O
8
8
  const option = options[key];
9
9
  return res[key] = parseOptionValue(option, params), res;
10
10
  }), {}) : options.map((option => parseOptionValue(option, params))) : options;
11
- //# sourceMappingURL=option.js.map
11
+ //# sourceMappingURL=option.js.map
package/es/parse/scale.js CHANGED
@@ -343,4 +343,5 @@ export function configureScale(spec, scale, parameters) {
343
343
  case "quantile":
344
344
  scale.rescale();
345
345
  }
346
- }
346
+ }
347
+ //# sourceMappingURL=scale.js.map
@@ -99,4 +99,4 @@ export const parseTransformSpec = (spec, view) => {
99
99
  }
100
100
  return null;
101
101
  };
102
- //# sourceMappingURL=transform.js.map
102
+ //# sourceMappingURL=transform.js.map
package/es/parse/util.js CHANGED
@@ -62,4 +62,4 @@ export const isGrammar = el => el && !isNil(el.grammarType);
62
62
  export const parseField = field => isFunction(field) ? field : datum => datum[field];
63
63
 
64
64
  export const parseColor = color => isString(color) && Color.parseColorString(color) ? color : null;
65
- //# sourceMappingURL=util.js.map
65
+ //# sourceMappingURL=util.js.map
package/es/parse/view.js CHANGED
@@ -96,4 +96,4 @@ export const normalizeRunningConfig = runningConfig => {
96
96
  enableExitAnimation: enableExitAnimation
97
97
  };
98
98
  };
99
- //# sourceMappingURL=view.js.map
99
+ //# sourceMappingURL=view.js.map
package/es/view/mark.d.ts CHANGED
@@ -18,6 +18,7 @@ export declare class Mark extends GrammarBase implements IMark {
18
18
  elementMap: Map<string, IElement>;
19
19
  isUpdated: boolean;
20
20
  private _groupKeys;
21
+ private _groupEncodeResult;
21
22
  private _isReentered;
22
23
  private _context;
23
24
  private renderContext?;
@@ -66,7 +67,7 @@ export declare class Mark extends GrammarBase implements IMark {
66
67
  protected evaluateJoin(data: any[]): void;
67
68
  protected evaluateState(elements: IElement[], stateSpec: MarkStateSpec, parameters: any): void;
68
69
  protected evaluateGroupEncode(elements: IElement[], groupEncode: any, parameters: any): {};
69
- protected evaluateEncode(elements: IElement[], encoders: any, parameters: any): void;
70
+ protected evaluateEncode(elements: IElement[], encoders: any, parameters: any, noGroupEncode?: boolean): void;
70
71
  addGraphicItem(attrs: any, groupKey?: string, newGraphicItem?: any): any;
71
72
  parseRenderContext(data: any[], parameters: any): {
72
73
  large: boolean;
package/es/view/mark.js CHANGED
@@ -20,9 +20,9 @@ import { parseTransformSpec } from "../parse/transform";
20
20
 
21
21
  import { createElement } from "../graph/util/element";
22
22
 
23
- import { invokeEncoder, invokeEncoderToItems, splitEncoderInLarge } from "../graph/mark/encode";
23
+ import { invokeEncoder, invokeEncoderToItems } from "../graph/mark/encode";
24
24
 
25
- import { isPositionOrSizeChannel, transformsByType } from "../graph/attributes";
25
+ import { transformsByType } from "../graph/attributes";
26
26
 
27
27
  import getExtendedEvents from "../graph/util/events-extend";
28
28
 
@@ -101,7 +101,7 @@ export class Mark extends GrammarBase {
101
101
  evaluateGroup(data) {
102
102
  if (this.markType === GrammarMarkType.group) return;
103
103
  const res = groupData(null != data ? data : DefaultMarkData, this.spec.groupBy, this.spec.groupSort), groupKeys = res.keys;
104
- this._groupKeys = groupKeys, this.differ.setCurrentData(res);
104
+ this._groupKeys = groupKeys, this._groupEncodeResult = null, this.differ.setCurrentData(res);
105
105
  }
106
106
  _getTransformsAfterEncodeItems() {
107
107
  return this.transforms && this.transforms.filter((entry => "afterEncodeItems" === entry.markPhase));
@@ -319,25 +319,28 @@ export class Mark extends GrammarBase {
319
319
  const el = this.elements[0], nextAttrs = {}, items = [ Object.assign({}, null === (_a = el.items) || void 0 === _a ? void 0 : _a[0], {
320
320
  nextAttrs: nextAttrs
321
321
  }) ];
322
- return invokeEncoderToItems(el, items, groupEncode, parameters), nextAttrs;
322
+ return invokeEncoderToItems(el, items, groupEncode, parameters), this._groupEncodeResult = nextAttrs,
323
+ nextAttrs;
323
324
  }
324
325
  if (!this._groupKeys || !groupEncode) return;
325
326
  const res = {};
326
327
  return this._groupKeys.forEach((key => {
327
328
  const el = elements.find((el => el.groupKey === key));
328
329
  el && (res[key] = invokeEncoder(groupEncode, el.items && el.items[0] && el.items[0].datum, el, parameters));
329
- })), res;
330
+ })), this._groupEncodeResult = res, res;
330
331
  }
331
- evaluateEncode(elements, encoders, parameters) {
332
+ evaluateEncode(elements, encoders, parameters, noGroupEncode) {
332
333
  if (encoders) {
333
334
  this.emit(HOOK_EVENT.BEFORE_ELEMENT_ENCODE, {
334
335
  encoders: encoders,
335
336
  parameters: parameters
336
337
  }, this);
337
- const groupEncodeAttrs = this.evaluateGroupEncode(elements, encoders[BuiltInEncodeNames.group], parameters);
338
+ const groupEncodeAttrs = noGroupEncode ? null : this.evaluateGroupEncode(elements, encoders[BuiltInEncodeNames.group], parameters);
338
339
  elements.forEach((element => {
339
340
  this.markType === GrammarMarkType.group && groupEncodeAttrs ? element.items.forEach((item => {
340
341
  item.nextAttrs = Object.assign(item.nextAttrs, groupEncodeAttrs);
342
+ })) : this.markType === GrammarMarkType.glyph && this._groupEncodeResult ? element.items.forEach((item => {
343
+ item.nextAttrs = Object.assign(item.nextAttrs, this._groupEncodeResult[element.groupKey]);
341
344
  })) : (null == groupEncodeAttrs ? void 0 : groupEncodeAttrs[element.groupKey]) && !this.isCollectionMark() && element.items.forEach((item => {
342
345
  item.nextAttrs = Object.assign(item.nextAttrs, groupEncodeAttrs[element.groupKey]);
343
346
  })), element.encodeItems(element.items, encoders, this._isReentered, parameters);
@@ -432,38 +435,15 @@ export class Mark extends GrammarBase {
432
435
  };
433
436
  }
434
437
  evaluateEncodeProgressive(elements, encoders, parameters) {
435
- if (!encoders) return void elements.forEach((element => {
436
- element.initGraphicItem();
437
- }));
438
- const positionEncoders = Object.keys(encoders).reduce(((res, state) => (!encoders[state] || state !== BuiltInEncodeNames.enter && state !== BuiltInEncodeNames.exit && state !== BuiltInEncodeNames.update || (res[state] = splitEncoderInLarge(this.markType, encoders[state], this.glyphType).positionEncoder),
439
- res)), {}), progressiveIndex = this.renderContext.progressive.currentIndex, isCollection = this.isCollectionMark();
440
- this.emit(HOOK_EVENT.BEFORE_ELEMENT_ENCODE, {
441
- encoders: encoders,
442
- parameters: parameters
443
- }, this);
444
- const groupEncodeAttrs = this.evaluateGroupEncode(elements, encoders[BuiltInEncodeNames.group], parameters);
445
- if (elements.forEach(((element, index) => {
446
- const onlyPos = progressiveIndex > 0 || !isCollection && index > 0;
447
- !onlyPos && (null == groupEncodeAttrs ? void 0 : groupEncodeAttrs[element.groupKey]) && element.items.forEach((item => {
448
- item.nextAttrs = Object.assign(item.nextAttrs, groupEncodeAttrs[element.groupKey]);
449
- })), element.encodeItems(element.items, onlyPos ? positionEncoders : encoders, this._isReentered, parameters);
450
- })), this._isReentered = !1, this.evaluateTransform(this._getTransformsAfterEncodeItems(), elements, parameters),
451
- elements.forEach((element => {
452
- element.encodeGraphic();
453
- })), this.emit(HOOK_EVENT.AFTER_ELEMENT_ENCODE, {
454
- encoders: encoders,
455
- parameters: parameters
456
- }, this), 0 === progressiveIndex && !isCollection) {
457
- const firstChild = elements[0].getGraphicItem(), group = null == firstChild ? void 0 : firstChild.parent;
458
- if (group) {
459
- const attrs = firstChild.attribute, theme = {}, itemAttrs = {};
460
- Object.keys(attrs).forEach((key => {
461
- [ "pickable", "zIndex" ].includes(key) || (isPositionOrSizeChannel(this.markType, key) ? itemAttrs[key] = attrs[key] : theme[key] = attrs[key]);
462
- })), group.setTheme({
463
- common: theme
464
- }), firstChild.initAttributes(itemAttrs);
438
+ const progressiveIndex = this.renderContext.progressive.currentIndex;
439
+ if (0 === progressiveIndex) {
440
+ if (this.evaluateEncode(elements, encoders, parameters), 0 === progressiveIndex && this._groupEncodeResult && !this.isCollectionMark() && this.markType !== GrammarMarkType.glyph) {
441
+ const firstElement = elements[0], firstChild = firstElement.getGraphicItem(), group = null == firstChild ? void 0 : firstChild.parent;
442
+ group && this._groupEncodeResult[firstElement.groupKey] && group.setTheme({
443
+ common: this._groupEncodeResult[firstElement.groupKey]
444
+ });
465
445
  }
466
- }
446
+ } else this.evaluateEncode(elements, encoders, parameters, !0);
467
447
  }
468
448
  evaluateProgressive() {
469
449
  var _a, _b, _c;