@visactor/react-vchart 1.10.0-alpha.0 → 1.10.0-alpha.4

package/cjs/charts/BaseChart.js

@@ -33,19 +33,25 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.createChart = void 0;
 
-const react_1 = __importStar(require("react")), withContainer_1 = __importDefault(require("../containers/withContainer")), chart_1 = __importDefault(require("../context/chart")), vutils_1 = require("@visactor/vutils"), view_1 = __importDefault(require("../context/view")), util_1 = require("../util"), constants_1 = require("../constants"), eventsUtils_1 = require("../eventsUtils"), notSpecKeys = [ ...constants_1.REACT_PRIVATE_PROPS, ...eventsUtils_1.CHART_EVENTS_KEYS, "skipFunctionDiff", "onError", "onReady", "spec", "container", "options" ], BaseChart = react_1.default.forwardRef(((props, ref) => {
-    const [updateId, setUpdateId] = (0, react_1.useState)(0), chartContext = (0, react_1.useRef)({
-        specFromChildren: {}
-    });
+const react_1 = __importStar(require("react")), withContainer_1 = __importDefault(require("../containers/withContainer")), chart_1 = __importDefault(require("../context/chart")), vutils_1 = require("@visactor/vutils"), view_1 = __importDefault(require("../context/view")), util_1 = require("../util"), constants_1 = require("../constants"), eventsUtils_1 = require("../eventsUtils"), notSpecKeys = [ ...constants_1.REACT_PRIVATE_PROPS, ...eventsUtils_1.CHART_EVENTS_KEYS, "vchartConstrouctor", "useSyncRender", "skipFunctionDiff", "onError", "onReady", "spec", "container", "options" ], parseSpecFromChildren = props => {
+    const specFromChildren = {};
+    return (0, util_1.toArray)(props.children).map((child => {
+        const parseSpec = child && child.type && child.type.parseSpec;
+        if (parseSpec && child.props) {
+            const specResult = parseSpec(child.props);
+            specResult.isSingle ? specFromChildren[specResult.specName] = specResult.spec : (specFromChildren[specResult.specName] || (specFromChildren[specResult.specName] = []), 
+            specFromChildren[specResult.specName].push(specResult.spec));
+        }
+    })), specFromChildren;
+}, BaseChart = react_1.default.forwardRef(((props, ref) => {
+    const [updateId, setUpdateId] = (0, react_1.useState)(0), chartContext = (0, react_1.useRef)({});
     (0, react_1.useImperativeHandle)(ref, (() => {
         var _a;
         return null === (_a = chartContext.current) || void 0 === _a ? void 0 : _a.chart;
     }));
     const hasSpec = !!props.spec, [view, setView] = (0, react_1.useState)(null), isUnmount = (0, 
-    react_1.useRef)(!1), prevSpec = (0, react_1.useRef)((0, vutils_1.pickWithout)(props, notSpecKeys)), eventsBinded = react_1.default.useRef(null), skipFunctionDiff = !!props.skipFunctionDiff, parseSpec = props => {
-        var _a;
-        return hasSpec && props.spec ? props.spec : Object.assign(Object.assign({}, prevSpec.current), null === (_a = chartContext.current) || void 0 === _a ? void 0 : _a.specFromChildren);
-    }, handleChartRender = () => {
+    react_1.useRef)(!1), prevSpec = (0, react_1.useRef)((0, vutils_1.pickWithout)(props, notSpecKeys)), specFromChildren = (0, 
+    react_1.useRef)(null), eventsBinded = react_1.default.useRef(null), skipFunctionDiff = !!props.skipFunctionDiff, parseSpec = props => hasSpec && props.spec ? props.spec : Object.assign(Object.assign({}, prevSpec.current), specFromChildren.current), handleChartRender = () => {
         if (!isUnmount.current) {
             if (!chartContext.current || !chartContext.current.chart) return;
             (0, eventsUtils_1.bindEventsToChart)(chartContext.current.chart, props, eventsBinded.current, eventsUtils_1.CHART_EVENTS);
@@ -56,7 +62,9 @@ const react_1 = __importStar(require("react")), withContainer_1 = __importDefaul
     };
     return (0, react_1.useEffect)((() => {
         var _a;
-        if (!(null === (_a = chartContext.current) || void 0 === _a ? void 0 : _a.chart)) return (props => {
+        const newSpecFromChildren = hasSpec ? null : parseSpecFromChildren(props);
+        if (!(null === (_a = chartContext.current) || void 0 === _a ? void 0 : _a.chart)) return hasSpec || (specFromChildren.current = newSpecFromChildren), 
+        (props => {
             const cs = new props.vchartConstrouctor(parseSpec(props), Object.assign(Object.assign({}, props.options), {
                 onError: props.onError,
                 autoFit: !0,
@@ -68,9 +76,7 @@ const react_1 = __importStar(require("react")), withContainer_1 = __importDefaul
         })(props), chartContext.current.chart && (chartContext.current.chart.renderSync({
             reuse: !1
         }), handleChartRender()), (0, eventsUtils_1.bindEventsToChart)(chartContext.current.chart, props, null, eventsUtils_1.CHART_EVENTS), 
-        chartContext.current = Object.assign(Object.assign({}, chartContext.current), {
-            isChildrenUpdated: !1
-        }), void (eventsBinded.current = props);
+        void (eventsBinded.current = props);
         if (hasSpec) return void ((0, vutils_1.isEqual)(eventsBinded.current.spec, props.spec, {
             skipFunction: skipFunctionDiff
         }) || (eventsBinded.current = props, chartContext.current.chart.updateSpecSync(parseSpec(props), void 0, {
@@ -80,25 +86,26 @@ const react_1 = __importStar(require("react")), withContainer_1 = __importDefaul
         const newSpec = (0, vutils_1.pickWithout)(props, notSpecKeys);
         (0, vutils_1.isEqual)(newSpec, prevSpec.current, {
             skipFunction: skipFunctionDiff
-        }) && !chartContext.current.isChildrenUpdated || (prevSpec.current = newSpec, chartContext.current.chart.updateSpecSync(parseSpec(props), void 0, {
+        }) && (0, vutils_1.isEqual)(newSpecFromChildren, specFromChildren.current) || (prevSpec.current = newSpec, 
+        specFromChildren.current = newSpecFromChildren, chartContext.current.chart.updateSpecSync(parseSpec(props), void 0, {
             morph: !1,
             enableExitAnimation: !1
-        }), handleChartRender()), chartContext.current = Object.assign(Object.assign({}, chartContext.current), {
-            isChildrenUpdated: !1
-        });
+        }), handleChartRender());
     }), [ props ]), (0, react_1.useEffect)((() => () => {
-        chartContext && (chartContext.current.chart && chartContext.current.chart.release(), 
-        chartContext.current = null), isUnmount.current = !0;
+        chartContext && chartContext.current && chartContext.current.chart && (chartContext.current.chart.release(), 
+        chartContext.current.chart = null), isUnmount.current = !0;
     }), []), react_1.default.createElement(chart_1.default.Provider, {
         value: chartContext.current
     }, react_1.default.createElement(view_1.default.Provider, {
         value: view
     }, (0, util_1.toArray)(props.children).map(((child, index) => {
-        var _a, _b, _c;
+        if ("string" == typeof child) return;
+        const childId = `${child && child.type && (child.type.displayName || child.type.name)}-${index}`;
         return react_1.default.createElement(react_1.default.Fragment, {
-            key: null !== (_c = null !== (_b = null === (_a = null == child ? void 0 : child.props) || void 0 === _a ? void 0 : _a.id) && void 0 !== _b ? _b : null == child ? void 0 : child.id) && void 0 !== _c ? _c : `child-${index}`
+            key: childId
         }, react_1.default.cloneElement(child, {
-            updateId: updateId
+            updateId: updateId,
+            componentId: childId
         }));
     }))));
 })), createChart = (componentName, defaultProps, callback) => {

package/cjs/charts/BaseChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/charts/BaseChart.tsx"],"names":[],"mappings":"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","file":"BaseChart.js","sourcesContent":["import type { IVChart, IData, IInitOption, ISpec, IVChartConstructor } from '@visactor/vchart';\nimport React, { useState, useEffect, useRef, useImperativeHandle } from 'react';\nimport withContainer, { ContainerProps } from '../containers/withContainer';\nimport RootChartContext, { ChartContextType } from '../context/chart';\nimport type { IView } from '@visactor/vgrammar-core';\nimport { isEqual, pickWithout } from '@visactor/vutils';\nimport ViewContext from '../context/view';\nimport { toArray } from '../util';\nimport { REACT_PRIVATE_PROPS } from '../constants';\nimport { IMarkElement } from '../components';\nimport {\n  bindEventsToChart,\n  EventsProps,\n  CHART_EVENTS_KEYS,\n  CHART_EVENTS,\n  LegendEventProps,\n  ScrollBarEventProps,\n  BrushEventProps,\n  DataZoomEventProps,\n  PlayerEventProps,\n  DimensionEventProps,\n  HierarchyEventProps,\n  ChartLifeCycleEventProps\n} from '../eventsUtils';\n\nexport type ChartOptions = Omit<IInitOption, 'dom'>;\n\nexport interface BaseChartProps\n  extends EventsProps,\n    LegendEventProps,\n    ScrollBarEventProps,\n    BrushEventProps,\n    DataZoomEventProps,\n    PlayerEventProps,\n    DimensionEventProps,\n    HierarchyEventProps,\n    ChartLifeCycleEventProps {\n  vchartConstrouctor?: IVChartConstructor;\n  type?: string;\n  /** 上层container */\n  container?: HTMLDivElement;\n  /**\n   * used only by <VChart />\n   */\n  spec?: ISpec;\n  /** 数据 */\n  data?: IData;\n  /** 画布宽度 */\n  width?: number;\n  /** 画布高度 */\n  height?: number;\n  /** 图表配置 */\n  options?: ChartOptions;\n  /** skip function diff when component update */\n  skipFunctionDiff?: boolean;\n  /** 图表渲染完成事件 */\n  onReady?: (instance: IVChart, isInitial: boolean) => void;\n  /** throw error when chart run into an error */\n  onError?: (err: Error) => void;\n  /**\n   * use sync render\n   *\n   * @since 1.8.3\n   * @deprecated 1.9.0\n   **/\n  useSyncRender?: boolean;\n}\n\ntype Props = React.PropsWithChildren<BaseChartProps>;\n\nconst notSpecKeys = [\n  ...REACT_PRIVATE_PROPS,\n  ...CHART_EVENTS_KEYS,\n  'skipFunctionDiff',\n  'onError',\n  'onReady',\n  'spec',\n  'container',\n  'options'\n];\n\nconst BaseChart: React.FC<Props> = React.forwardRef((props, ref) => {\n  const [updateId, setUpdateId] = useState<number>(0);\n  const chartContext = useRef<ChartContextType>({\n    specFromChildren: {}\n  });\n  useImperativeHandle(ref, () => chartContext.current?.chart);\n  const hasSpec = !!props.spec;\n  const [view, setView] = useState<IView>(null);\n  const isUnmount = useRef<boolean>(false);\n  const prevSpec = useRef(pickWithout(props, notSpecKeys));\n  const eventsBinded = React.useRef<BaseChartProps>(null);\n  const skipFunctionDiff = !!props.skipFunctionDiff;\n\n  const parseSpec = (props: Props) => {\n    if (hasSpec && props.spec) {\n      return props.spec;\n    }\n\n    return {\n      ...prevSpec.current,\n      ...chartContext.current?.specFromChildren\n    };\n  };\n\n  const createChart = (props: Props) => {\n    const cs = new props.vchartConstrouctor(parseSpec(props), {\n      ...props.options,\n      onError: props.onError,\n      autoFit: true,\n      dom: props.container\n    });\n    chartContext.current = { ...chartContext.current, chart: cs };\n  };\n\n  const handleChartRender = () => {\n    // rebind events after render\n    if (!isUnmount.current) {\n      if (!chartContext.current || !chartContext.current.chart) {\n        return;\n      }\n\n      bindEventsToChart(chartContext.current.chart, props, eventsBinded.current, CHART_EVENTS);\n\n      const newView = chartContext.current.chart.getCompiler().getVGrammarView();\n\n      setUpdateId(updateId + 1);\n      if (props.onReady) {\n        props.onReady(chartContext.current.chart, updateId === 0);\n      }\n      setView(newView);\n    }\n  };\n\n  const renderChart = () => {\n    if (chartContext.current.chart) {\n      chartContext.current.chart.renderSync({\n        reuse: false\n      });\n      handleChartRender();\n    }\n  };\n\n  useEffect(() => {\n    if (!chartContext.current?.chart) {\n      createChart(props);\n      renderChart();\n      bindEventsToChart(chartContext.current.chart, props, null, CHART_EVENTS);\n      chartContext.current = {\n        ...chartContext.current,\n        isChildrenUpdated: false\n      };\n      eventsBinded.current = props;\n      return;\n    }\n\n    if (hasSpec) {\n      if (!isEqual(eventsBinded.current.spec, props.spec, { skipFunction: skipFunctionDiff })) {\n        eventsBinded.current = props;\n        chartContext.current.chart.updateSpecSync(parseSpec(props), undefined, {\n          morph: false,\n          enableExitAnimation: false\n        });\n        handleChartRender();\n      }\n      return;\n    }\n\n    const newSpec = pickWithout(props, notSpecKeys);\n\n    if (\n      !isEqual(newSpec, prevSpec.current, { skipFunction: skipFunctionDiff }) ||\n      chartContext.current.isChildrenUpdated\n    ) {\n      prevSpec.current = newSpec;\n\n      chartContext.current.chart.updateSpecSync(parseSpec(props), undefined, {\n        morph: false,\n        enableExitAnimation: false\n      });\n      handleChartRender();\n    }\n    chartContext.current = {\n      ...chartContext.current,\n      isChildrenUpdated: false\n    };\n  }, [props]);\n\n  useEffect(() => {\n    return () => {\n      if (chartContext) {\n        if (chartContext.current.chart) {\n          chartContext.current.chart.release();\n        }\n        chartContext.current = null;\n      }\n      isUnmount.current = true;\n    };\n  }, []);\n\n  return (\n    <RootChartContext.Provider value={chartContext.current}>\n      <ViewContext.Provider value={view}>\n        {toArray(props.children).map((child, index) => {\n          return (\n            <React.Fragment key={(child as any)?.props?.id ?? (child as any)?.id ?? `child-${index}`}>\n              {React.cloneElement(child as IMarkElement, {\n                updateId: updateId\n              })}\n            </React.Fragment>\n          );\n        })}\n      </ViewContext.Provider>\n    </RootChartContext.Provider>\n  );\n});\n\nexport const createChart = <T extends Props>(\n  componentName: string,\n  defaultProps?: Partial<T>,\n  callback?: (props: T, defaultProps?: Partial<T>) => T\n) => {\n  const Com = withContainer<ContainerProps, T>(BaseChart as any, componentName, (props: T) => {\n    if (callback) {\n      return callback(props, defaultProps);\n    }\n\n    if (defaultProps) {\n      return Object.assign(props, defaultProps);\n    }\n    return props;\n  });\n  Com.displayName = componentName;\n  return Com;\n};\n"]}
+{"version":3,"sources":["../src/charts/BaseChart.tsx"],"names":[],"mappings":"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","file":"BaseChart.js","sourcesContent":["import type { IVChart, IData, IInitOption, ISpec, IVChartConstructor } from '@visactor/vchart';\nimport React, { useState, useEffect, useRef, useImperativeHandle } from 'react';\nimport withContainer, { ContainerProps } from '../containers/withContainer';\nimport RootChartContext, { ChartContextType } from '../context/chart';\nimport type { IView } from '@visactor/vgrammar-core';\nimport { isEqual, pickWithout } from '@visactor/vutils';\nimport ViewContext from '../context/view';\nimport { toArray } from '../util';\nimport { REACT_PRIVATE_PROPS } from '../constants';\nimport {\n  bindEventsToChart,\n  EventsProps,\n  CHART_EVENTS_KEYS,\n  CHART_EVENTS,\n  LegendEventProps,\n  ScrollBarEventProps,\n  BrushEventProps,\n  DataZoomEventProps,\n  PlayerEventProps,\n  DimensionEventProps,\n  HierarchyEventProps,\n  ChartLifeCycleEventProps\n} from '../eventsUtils';\n\nexport type ChartOptions = Omit<IInitOption, 'dom'>;\n\nexport interface BaseChartProps\n  extends EventsProps,\n    LegendEventProps,\n    ScrollBarEventProps,\n    BrushEventProps,\n    DataZoomEventProps,\n    PlayerEventProps,\n    DimensionEventProps,\n    HierarchyEventProps,\n    ChartLifeCycleEventProps {\n  vchartConstrouctor?: IVChartConstructor;\n  type?: string;\n  /** 上层container */\n  container?: HTMLDivElement;\n  /**\n   * used only by <VChart />\n   */\n  spec?: ISpec;\n  /** 数据 */\n  data?: IData;\n  /** 画布宽度 */\n  width?: number;\n  /** 画布高度 */\n  height?: number;\n  /** 图表配置 */\n  options?: ChartOptions;\n  /** skip function diff when component update */\n  skipFunctionDiff?: boolean;\n  /** 图表渲染完成事件 */\n  onReady?: (instance: IVChart, isInitial: boolean) => void;\n  /** throw error when chart run into an error */\n  onError?: (err: Error) => void;\n  /**\n   * use sync render\n   *\n   * @since 1.8.3\n   * @deprecated 1.9.0\n   **/\n  useSyncRender?: boolean;\n}\n\ntype Props = React.PropsWithChildren<BaseChartProps>;\n\nconst notSpecKeys = [\n  ...REACT_PRIVATE_PROPS,\n  ...CHART_EVENTS_KEYS,\n  'vchartConstrouctor',\n  'useSyncRender',\n  'skipFunctionDiff',\n  'onError',\n  'onReady',\n  'spec',\n  'container',\n  'options'\n];\n\nconst parseSpecFromChildren = (props: Props) => {\n  const specFromChildren: Omit<ISpec, 'type' | 'data' | 'width' | 'height'> = {};\n\n  toArray(props.children).map(child => {\n    const parseSpec = child && (child as any).type && (child as any).type.parseSpec;\n\n    if (parseSpec && (child as any).props) {\n      const specResult = parseSpec((child as any).props);\n\n      if (specResult.isSingle) {\n        specFromChildren[specResult.specName] = specResult.spec;\n      } else {\n        if (!specFromChildren[specResult.specName]) {\n          specFromChildren[specResult.specName] = [];\n        }\n\n        specFromChildren[specResult.specName].push(specResult.spec);\n      }\n    }\n  });\n\n  return specFromChildren;\n};\n\nconst BaseChart: React.FC<Props> = React.forwardRef((props, ref) => {\n  const [updateId, setUpdateId] = useState<number>(0);\n  const chartContext = useRef<ChartContextType>({});\n  useImperativeHandle(ref, () => chartContext.current?.chart);\n  const hasSpec = !!props.spec;\n  const [view, setView] = useState<IView>(null);\n  const isUnmount = useRef<boolean>(false);\n  const prevSpec = useRef(pickWithout(props, notSpecKeys));\n  const specFromChildren = useRef<Omit<ISpec, 'type' | 'data' | 'width' | 'height'>>(null);\n  const eventsBinded = React.useRef<BaseChartProps>(null);\n  const skipFunctionDiff = !!props.skipFunctionDiff;\n\n  const parseSpec = (props: Props) => {\n    if (hasSpec && props.spec) {\n      return props.spec;\n    }\n\n    return {\n      ...prevSpec.current,\n      ...specFromChildren.current\n    } as ISpec;\n  };\n\n  const createChart = (props: Props) => {\n    const cs = new props.vchartConstrouctor(parseSpec(props), {\n      ...props.options,\n      onError: props.onError,\n      autoFit: true,\n      dom: props.container\n    });\n    chartContext.current = { ...chartContext.current, chart: cs };\n  };\n\n  const handleChartRender = () => {\n    // rebind events after render\n    if (!isUnmount.current) {\n      if (!chartContext.current || !chartContext.current.chart) {\n        return;\n      }\n\n      bindEventsToChart(chartContext.current.chart, props, eventsBinded.current, CHART_EVENTS);\n\n      const newView = chartContext.current.chart.getCompiler().getVGrammarView();\n\n      setUpdateId(updateId + 1);\n      if (props.onReady) {\n        props.onReady(chartContext.current.chart, updateId === 0);\n      }\n      setView(newView);\n    }\n  };\n\n  const renderChart = () => {\n    if (chartContext.current.chart) {\n      chartContext.current.chart.renderSync({\n        reuse: false\n      });\n      handleChartRender();\n    }\n  };\n\n  useEffect(() => {\n    const newSpecFromChildren = hasSpec ? null : parseSpecFromChildren(props);\n\n    if (!chartContext.current?.chart) {\n      if (!hasSpec) {\n        specFromChildren.current = newSpecFromChildren;\n      }\n\n      createChart(props);\n      renderChart();\n      bindEventsToChart(chartContext.current.chart, props, null, CHART_EVENTS);\n      eventsBinded.current = props;\n      return;\n    }\n\n    if (hasSpec) {\n      if (!isEqual(eventsBinded.current.spec, props.spec, { skipFunction: skipFunctionDiff })) {\n        eventsBinded.current = props;\n        chartContext.current.chart.updateSpecSync(parseSpec(props), undefined, {\n          morph: false,\n          enableExitAnimation: false\n        });\n        handleChartRender();\n      }\n      return;\n    }\n\n    const newSpec = pickWithout(props, notSpecKeys);\n\n    if (\n      !isEqual(newSpec, prevSpec.current, { skipFunction: skipFunctionDiff }) ||\n      !isEqual(newSpecFromChildren, specFromChildren.current)\n    ) {\n      prevSpec.current = newSpec;\n      specFromChildren.current = newSpecFromChildren;\n\n      chartContext.current.chart.updateSpecSync(parseSpec(props), undefined, {\n        morph: false,\n        enableExitAnimation: false\n      });\n      handleChartRender();\n    }\n  }, [props]);\n\n  useEffect(() => {\n    return () => {\n      if (chartContext) {\n        if (chartContext.current && chartContext.current.chart) {\n          chartContext.current.chart.release();\n          chartContext.current.chart = null;\n        }\n      }\n      isUnmount.current = true;\n    };\n  }, []);\n\n  return (\n    <RootChartContext.Provider value={chartContext.current}>\n      <ViewContext.Provider value={view}>\n        {toArray(props.children).map((child, index) => {\n          if (typeof child === 'string') {\n            return;\n          }\n\n          const componentName =\n            child && (child as any).type && ((child as any).type.displayName || (child as any).type.name);\n          const childId = `${componentName}-${index}`;\n\n          return (\n            <React.Fragment key={childId}>\n              {React.cloneElement(child as React.ReactElement<any, React.JSXElementConstructor<any>>, {\n                updateId: updateId,\n                componentId: childId\n              })}\n            </React.Fragment>\n          );\n        })}\n      </ViewContext.Provider>\n    </RootChartContext.Provider>\n  );\n});\n\nexport const createChart = <T extends Props>(\n  componentName: string,\n  defaultProps?: Partial<T>,\n  callback?: (props: T, defaultProps?: Partial<T>) => T\n) => {\n  const Com = withContainer<ContainerProps, T>(BaseChart as any, componentName, (props: T) => {\n    if (callback) {\n      return callback(props, defaultProps);\n    }\n\n    if (defaultProps) {\n      return Object.assign(props, defaultProps);\n    }\n    return props;\n  });\n  Com.displayName = componentName;\n  return Com;\n};\n"]}

package/cjs/components/BaseComponent.d.ts

@@ -4,6 +4,7 @@ export interface BaseComponentProps {
 }
 type ComponentProps = BaseComponentProps & {
     updateId?: number;
+    componentId?: number;
 };
 export declare const createComponent: <T extends ComponentProps>(componentName: string, specName: string, supportedEvents?: Record<string, string> | null, isSingle?: boolean) => React.FC<T>;
 export {};

package/cjs/components/BaseComponent.js

@@ -33,49 +33,23 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.createComponent = void 0;
 
-const react_1 = __importStar(require("react")), vutils_1 = require("@visactor/vutils"), chart_1 = __importDefault(require("../context/chart")), eventsUtils_1 = require("../eventsUtils"), util_1 = require("../util"), createComponent = (componentName, specName, supportedEvents, isSingle) => {
-    const ignoreKeys = [ "id", "updateId" ], notSpecKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys, Comp = props => {
-        const context = (0, react_1.useContext)(chart_1.default), id = react_1.default.useRef((0, 
-        vutils_1.isNil)(props.id) ? (0, util_1.uid)(specName) : props.id), eventsBinded = react_1.default.useRef(null), updateId = react_1.default.useRef(props.updateId), componentSpec = react_1.default.useRef();
+const react_1 = __importStar(require("react")), vutils_1 = require("@visactor/vutils"), chart_1 = __importDefault(require("../context/chart")), eventsUtils_1 = require("../eventsUtils"), createComponent = (componentName, specName, supportedEvents, isSingle) => {
+    const ignoreKeys = [ "id", "updateId", "componentId" ], notSpecKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys, Comp = props => {
+        const context = (0, react_1.useContext)(chart_1.default), eventsBinded = react_1.default.useRef(null), updateId = react_1.default.useRef(props.updateId);
         if (props.updateId !== updateId.current) {
             updateId.current = props.updateId;
             !!supportedEvents && (0, eventsUtils_1.bindEventsToChart)(context.chart, props, eventsBinded.current, supportedEvents) && (eventsBinded.current = props);
-        } else {
-            const newComponentSpec = (0, vutils_1.pickWithout)(props, notSpecKeys);
-            (0, vutils_1.isEqual)(newComponentSpec, componentSpec.current) || (componentSpec.current = newComponentSpec, 
-            updateToContext(context, id.current, specName, isSingle, newComponentSpec));
         }
         return (0, react_1.useEffect)((() => () => {
-            supportedEvents && (0, eventsUtils_1.bindEventsToChart)(context.chart, null, eventsBinded.current, supportedEvents), 
-            deleteToContext(context, id.current, specName, isSingle);
+            supportedEvents && (0, eventsUtils_1.bindEventsToChart)(context.chart, null, eventsBinded.current, supportedEvents);
         }), []), null;
     };
-    return Comp.displayName = componentName, Comp;
+    return Comp.displayName = componentName, Comp.parseSpec = props => ({
+        spec: (0, vutils_1.pickWithout)(props, notSpecKeys),
+        specName: specName,
+        isSingle: isSingle
+    }), Comp;
 };
 
 exports.createComponent = createComponent;
-
-const updateToContext = (context, id, specName, isSingle, props) => {
-    if (context.specFromChildren) {
-        if (isSingle) context.specFromChildren[specName] = Object.assign({}, props); else {
-            context.specFromChildren[specName] || (context.specFromChildren[specName] = []);
-            const comps = context.specFromChildren[specName], index = comps.findIndex((entry => entry.id === id));
-            index >= 0 ? comps[index] = Object.assign({
-                id: id
-            }, props) : context.specFromChildren[specName].push(Object.assign({
-                id: id
-            }, props));
-        }
-        context.isChildrenUpdated = !0;
-    }
-}, deleteToContext = (context, id, specName, isSingle) => {
-    var _a;
-    if (context.specFromChildren) if (isSingle) context.specFromChildren[specName] = null; else {
-        const comps = null !== (_a = context.specFromChildren[specName]) && void 0 !== _a ? _a : [], index = comps.findIndex((entry => entry.id === id));
-        if (index >= 0) {
-            const newComps = comps.slice(0, index - 1).concat(comps.slice(index + 1));
-            context.specFromChildren[specName] = newComps, context.isChildrenUpdated = !0;
-        }
-    }
-};
 //# sourceMappingURL=BaseComponent.js.map

package/cjs/components/BaseComponent.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/components/BaseComponent.tsx"],"names":[],"mappings":"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","file":"BaseComponent.js","sourcesContent":["import React, { useContext, useEffect } from 'react';\nimport { isEqual, isNil, pickWithout } from '@visactor/vutils';\n\nimport RootChartContext, { ChartContextType } from '../context/chart';\nimport { bindEventsToChart } from '../eventsUtils';\nimport { uid } from '../util';\n\nexport interface BaseComponentProps {\n  id?: string | number;\n}\n\ntype ComponentProps = BaseComponentProps & { updateId?: number };\n\nexport const createComponent = <T extends ComponentProps>(\n  componentName: string,\n  specName: string,\n  supportedEvents?: Record<string, string> | null,\n  isSingle?: boolean\n) => {\n  const ignoreKeys = ['id', 'updateId'];\n  const notSpecKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys;\n\n  const Comp: React.FC<T> = (props: T) => {\n    const context = useContext(RootChartContext);\n    const id = React.useRef<string | number>(isNil(props.id) ? uid(specName) : props.id);\n\n    const eventsBinded = React.useRef<T>(null);\n    const updateId = React.useRef<number>(props.updateId);\n    const componentSpec = React.useRef<Partial<T>>();\n\n    if (props.updateId !== updateId.current) {\n      // update triggered by chart when chart is rendered\n      updateId.current = props.updateId;\n\n      // rebind events after chart render\n      const hasPrevEventsBinded = supportedEvents\n        ? bindEventsToChart(context.chart, props, eventsBinded.current, supportedEvents)\n        : false;\n      if (hasPrevEventsBinded) {\n        eventsBinded.current = props;\n      }\n    } else {\n      const newComponentSpec: Partial<T> = pickWithout<T>(props, notSpecKeys);\n\n      if (!isEqual(newComponentSpec, componentSpec.current)) {\n        componentSpec.current = newComponentSpec;\n        updateToContext(context, id.current, specName, isSingle, newComponentSpec);\n      }\n    }\n\n    useEffect(() => {\n      return () => {\n        if (supportedEvents) {\n          bindEventsToChart(context.chart, null, eventsBinded.current, supportedEvents);\n        }\n        deleteToContext(context, id.current, specName, isSingle);\n      };\n    }, []);\n\n    return null;\n  };\n\n  Comp.displayName = componentName;\n  return Comp;\n};\n\nconst updateToContext = (\n  context: ChartContextType,\n  id: string | number,\n  specName: string,\n  isSingle: boolean,\n  props: Partial<ComponentProps>\n) => {\n  if (!context.specFromChildren) {\n    return;\n  }\n\n  if (isSingle) {\n    context.specFromChildren[specName] = { ...props };\n  } else {\n    if (!context.specFromChildren[specName]) {\n      context.specFromChildren[specName] = [];\n    }\n\n    const comps = context.specFromChildren[specName];\n    const index = comps.findIndex((entry: any) => entry.id === id);\n\n    if (index >= 0) {\n      comps[index] = {\n        id,\n        ...props\n      };\n    } else {\n      context.specFromChildren[specName].push({\n        id,\n        ...props\n      });\n    }\n  }\n  context.isChildrenUpdated = true;\n};\n\nconst deleteToContext = (context: ChartContextType, id: string | number, specName: string, isSingle: boolean) => {\n  if (!context.specFromChildren) {\n    return;\n  }\n\n  if (isSingle) {\n    context.specFromChildren[specName] = null;\n  } else {\n    const comps = context.specFromChildren[specName] ?? [];\n    const index = comps.findIndex((entry: any) => entry.id === id);\n\n    if (index >= 0) {\n      const newComps = comps.slice(0, index - 1).concat(comps.slice(index + 1));\n\n      context.specFromChildren[specName] = newComps;\n      context.isChildrenUpdated = true;\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/components/BaseComponent.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAqD;AACrD,6CAA+C;AAE/C,6DAAgD;AAChD,gDAAmD;AAQ5C,MAAM,eAAe,GAAG,CAC7B,aAAqB,EACrB,QAAgB,EAChB,eAA+C,EAC/C,QAAkB,EAClB,EAAE;IACF,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAEnG,MAAM,IAAI,GAAgB,CAAC,KAAQ,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,eAAgB,CAAC,CAAC;QAC7C,MAAM,YAAY,GAAG,eAAK,CAAC,MAAM,CAAI,IAAI,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAS,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,OAAO,EAAE;YAEvC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC;YAGlC,MAAM,mBAAmB,GAAG,eAAe;gBACzC,CAAC,CAAC,IAAA,+BAAiB,EAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC;gBAChF,CAAC,CAAC,KAAK,CAAC;YACV,IAAI,mBAAmB,EAAE;gBACvB,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;aAC9B;SACF;QAED,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,OAAO,GAAG,EAAE;gBACV,IAAI,eAAe,EAAE;oBACnB,IAAA,+BAAiB,EAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;iBAC/E;YACH,CAAC,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,IAAI,CAAC,WAAW,GAAG,aAAa,CAAC;IAChC,IAAY,CAAC,SAAS,GAAG,CAAC,KAAsD,EAAE,EAAE;QACnF,MAAM,gBAAgB,GAAe,IAAA,oBAAW,EAAI,KAAK,EAAE,WAAW,CAAC,CAAC;QAExE,OAAO;YACL,IAAI,EAAE,gBAAgB;YACtB,QAAQ;YACR,QAAQ;SACT,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAjDW,QAAA,eAAe,mBAiD1B","file":"BaseComponent.js","sourcesContent":["import React, { useContext, useEffect } from 'react';\nimport { pickWithout } from '@visactor/vutils';\n\nimport RootChartContext from '../context/chart';\nimport { bindEventsToChart } from '../eventsUtils';\n\nexport interface BaseComponentProps {\n  id?: string | number;\n}\n\ntype ComponentProps = BaseComponentProps & { updateId?: number; componentId?: number };\n\nexport const createComponent = <T extends ComponentProps>(\n  componentName: string,\n  specName: string,\n  supportedEvents?: Record<string, string> | null,\n  isSingle?: boolean\n) => {\n  const ignoreKeys = ['id', 'updateId', 'componentId'];\n  const notSpecKeys = supportedEvents ? Object.keys(supportedEvents).concat(ignoreKeys) : ignoreKeys;\n\n  const Comp: React.FC<T> = (props: T) => {\n    const context = useContext(RootChartContext);\n    const eventsBinded = React.useRef<T>(null);\n    const updateId = React.useRef<number>(props.updateId);\n    if (props.updateId !== updateId.current) {\n      // update triggered by chart when chart is rendered\n      updateId.current = props.updateId;\n\n      // rebind events after chart render\n      const hasPrevEventsBinded = supportedEvents\n        ? bindEventsToChart(context.chart, props, eventsBinded.current, supportedEvents)\n        : false;\n      if (hasPrevEventsBinded) {\n        eventsBinded.current = props;\n      }\n    }\n\n    useEffect(() => {\n      return () => {\n        if (supportedEvents) {\n          bindEventsToChart(context.chart, null, eventsBinded.current, supportedEvents);\n        }\n      };\n    }, []);\n\n    return null;\n  };\n\n  Comp.displayName = componentName;\n  (Comp as any).parseSpec = (props: T & { updateId?: number; componentId?: string }) => {\n    const newComponentSpec: Partial<T> = pickWithout<T>(props, notSpecKeys);\n\n    return {\n      spec: newComponentSpec,\n      specName,\n      isSingle\n    };\n  };\n\n  return Comp;\n};\n"]}

package/cjs/components/Mark.d.ts

@@ -1,14 +1,4 @@
-import React from 'react';
-import type { MarkSpec } from '@visactor/vgrammar-core';
-export interface MarkProps extends Omit<MarkSpec, 'name' | 'id'> {
-    id?: string | number;
-    glyphType?: string;
-}
-export interface IMarkElement extends React.ReactElement<Props, React.JSXElementConstructor<Props>> {
-    id: string | number;
-}
-type Props = MarkProps & {
-    updateId?: number;
-};
-export declare const Mark: React.FC<Props>;
-export {};
+import type { ICustomMarkSpec, EnableMarkType } from '@visactor/vchart';
+import { BaseComponentProps } from './BaseComponent';
+export type MarkProps = ICustomMarkSpec<EnableMarkType> & BaseComponentProps;
+export declare const Mark: import("react").FC<MarkProps>;

package/cjs/components/Mark.js

@@ -1,69 +1,10 @@
 "use strict";
 
-var __createBinding = this && this.__createBinding || (Object.create ? function(o, m, k, k2) {
-    void 0 === k2 && (k2 = k);
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    desc && !("get" in desc ? !m.__esModule : desc.writable || desc.configurable) || (desc = {
-        enumerable: !0,
-        get: function() {
-            return m[k];
-        }
-    }), Object.defineProperty(o, k2, desc);
-} : function(o, m, k, k2) {
-    void 0 === k2 && (k2 = k), o[k2] = m[k];
-}), __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function(o, v) {
-    Object.defineProperty(o, "default", {
-        enumerable: !0,
-        value: v
-    });
-} : function(o, v) {
-    o.default = v;
-}), __importStar = this && this.__importStar || function(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (null != mod) for (var k in mod) "default" !== k && Object.prototype.hasOwnProperty.call(mod, k) && __createBinding(result, mod, k);
-    return __setModuleDefault(result, mod), result;
-}, __rest = this && this.__rest || function(s, e) {
-    var t = {};
-    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
-    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
-        var i = 0;
-        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
-    }
-    return t;
-}, __importDefault = this && this.__importDefault || function(mod) {
-    return mod && mod.__esModule ? mod : {
-        default: mod
-    };
-};
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Mark = void 0;
 
-const react_1 = __importStar(require("react")), vutils_1 = require("@visactor/vutils"), view_1 = __importDefault(require("../context/view")), util_1 = require("../util"), Mark = props => {
-    const context = (0, react_1.useContext)(view_1.default), id = react_1.default.useRef((0, 
-    vutils_1.isNil)(props.id) ? (0, util_1.uid)("mark") : props.id), updateId = react_1.default.useRef(props.updateId);
-    return props.updateId !== updateId.current && (updateId.current = props.updateId, 
-    context && addOrUpdateMark(context, id.current, props)), (0, react_1.useEffect)((() => () => {
-        context && removeMark(context, id.current);
-    }), []), null;
-};
-
-exports.Mark = Mark;
+const BaseComponent_1 = require("./BaseComponent");
 
-const addOrUpdateMark = (view, id, props) => {
-    var _a;
-    if (!view.renderer) return;
-    let mark = view.getMarkById(id);
-    const {group: group, glyphType: glyphType, updateId: updateId} = props, others = __rest(props, [ "group", "glyphType", "updateId" ]);
-    mark || (mark = view.mark(props.type, null !== (_a = props.group) && void 0 !== _a ? _a : view.rootMark, props.glyphType ? {
-        glyphType: props.glyphType
-    } : null).name(id)), mark.parse(others), view.run();
-}, removeMark = (view, id) => {
-    if (view.renderer) {
-        view.getMarkById(id);
-        view.removeGrammar(id);
-    }
-};
+exports.Mark = (0, BaseComponent_1.createComponent)("Mark", "customMark");
 //# sourceMappingURL=Mark.js.map

package/cjs/components/Mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/components/Mark.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAqD;AACrD,6CAAyC;AAGzC,2DAA0C;AAC1C,kCAA8B;AAavB,MAAM,IAAI,GAAoB,CAAC,KAAY,EAAE,EAAE;IACpD,MAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,cAAW,CAAC,CAAC;IACxC,MAAM,EAAE,GAAG,eAAK,CAAC,MAAM,CAAkB,IAAA,cAAK,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAA,UAAG,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAS,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,OAAO,EAAE;QAEvC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC;QAClC,IAAI,OAAO,EAAE;YACX,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC,OAAiB,EAAE,KAAK,CAAC,CAAC;SACvD;KACF;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,IAAI,OAAO,EAAE;gBACX,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,OAAiB,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAtBW,QAAA,IAAI,QAsBf;AAEF,MAAM,eAAe,GAAG,CAAC,IAAW,EAAE,EAAU,EAAE,KAAY,EAAE,EAAE;;IAChE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;QAElB,OAAO;KACR;IAED,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,KAAgB,KAAK,EAAhB,MAAM,UAAK,KAAK,EAAjD,kCAAyC,CAAQ,CAAC;IACxD,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,GAAI,IAAY;aACjB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAA,KAAK,CAAC,KAAK,mCAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aACvG,IAAI,CAAC,EAAE,CAAC,CAAC;KACb;IAED,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,IAAI,CAAC,GAAG,EAAE,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,IAAW,EAAE,EAAU,EAAE,EAAE;IAC7C,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACjC,IAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;KACjC;AACH,CAAC,CAAC","file":"Mark.js","sourcesContent":["import React, { useContext, useEffect } from 'react';\nimport { isNil } from '@visactor/vutils';\nimport type { IView, MarkSpec } from '@visactor/vgrammar-core';\n\nimport ViewContext from '../context/view';\nimport { uid } from '../util';\n\nexport interface MarkProps extends Omit<MarkSpec, 'name' | 'id'> {\n  id?: string | number;\n  glyphType?: string;\n}\n\nexport interface IMarkElement extends React.ReactElement<Props, React.JSXElementConstructor<Props>> {\n  id: string | number;\n}\n\ntype Props = MarkProps & { updateId?: number };\n\nexport const Mark: React.FC<Props> = (props: Props) => {\n  const context = useContext(ViewContext);\n  const id = React.useRef<string | number>(isNil(props.id) ? uid('mark') : props.id);\n  const updateId = React.useRef<number>(props.updateId);\n\n  if (props.updateId !== updateId.current) {\n    // only update mark when chart finished render\n    updateId.current = props.updateId;\n    if (context) {\n      addOrUpdateMark(context, id.current as string, props);\n    }\n  }\n\n  useEffect(() => {\n    return () => {\n      if (context) {\n        removeMark(context, id.current as string);\n      }\n    };\n  }, []);\n\n  return null;\n};\n\nconst addOrUpdateMark = (view: IView, id: string, props: Props) => {\n  if (!view.renderer) {\n    // view has been released\n    return;\n  }\n\n  let mark = view.getMarkById(id);\n  const { group, glyphType, updateId, ...others } = props;\n  if (!mark) {\n    mark = (view as any)\n      .mark(props.type, props.group ?? view.rootMark, props.glyphType ? { glyphType: props.glyphType } : null)\n      .name(id);\n  }\n\n  mark.parse(others);\n  view.run();\n};\n\nconst removeMark = (view: IView, id: string) => {\n  if (view.renderer) {\n    const mark = view.getMarkById(id);\n    (view as any).removeGrammar(id);\n  }\n};\n"]}
+{"version":3,"sources":["../src/components/Mark.tsx"],"names":[],"mappings":";;;AACA,mDAAsE;AAIzD,QAAA,IAAI,GAAG,IAAA,+BAAe,EAAY,MAAM,EAAE,YAAY,CAAC,CAAC","file":"Mark.js","sourcesContent":["import type { ICustomMarkSpec, EnableMarkType } from '@visactor/vchart';\nimport { BaseComponentProps, createComponent } from './BaseComponent';\n\nexport type MarkProps = ICustomMarkSpec<EnableMarkType> & BaseComponentProps;\n\nexport const Mark = createComponent<MarkProps>('Mark', 'customMark');\n"]}

package/cjs/containers/withContainer.d.ts

@@ -5,4 +5,4 @@ export interface ContainerProps {
     width?: number | string;
     height?: number | string;
 }
-export default function withContainer<Props extends ContainerProps, CompProps>(Comp: typeof React.Component<any, CompProps>, name?: string, getProps?: (props: any) => CompProps): React.ForwardRefExoticComponent<React.PropsWithoutRef<CompProps & Props> & React.RefAttributes<any>>;
+export default function withContainer<Props extends ContainerProps, CompProps>(Comp: any, name?: string, getProps?: (props: any) => CompProps): React.ForwardRefExoticComponent<React.PropsWithoutRef<CompProps & Props> & React.RefAttributes<any>>;

package/cjs/containers/withContainer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/containers/withContainer.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiE;AASjE,SAAwB,aAAa,CACnC,IAA4C,EAC5C,IAAI,GAAG,gBAAgB,EACvB,QAAoC;IAEpC,MAAM,GAAG,GAAG,eAAK,CAAC,UAAU,CAAyB,CAAC,KAAwB,EAAE,GAAG,EAAE,EAAE;QACrF,MAAM,SAAS,GAAG,IAAA,cAAM,GAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,KAAiB,KAAK,EAAjB,OAAO,UAAK,KAAK,EAA/C,+BAAuC,CAAQ,CAAC;QAEtD,IAAA,uBAAe,EAAC,GAAG,EAAE;YACnB,SAAS,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,CACL,uCACE,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,KAAK,kBACH,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM,EAC9B,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,MAAM,IACzB,KAAK,KAGT,MAAM,CAAC,CAAC,CAAC,CACR,8BAAC,IAAI,kBAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,IAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,OAAqB,CAAC,EAAI,CAC9G,CAAC,CAAC,CAAC,CACF,6DAAK,CACN,CACG,CACP,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,WAAW,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;IACpC,OAAO,GAAG,CAAC;AACb,CAAC;AAnCD,gCAmCC","file":"withContainer.js","sourcesContent":["import React, { useRef, useState, useLayoutEffect } from 'react';\n\nexport interface ContainerProps {\n  style?: React.CSSProperties;\n  className?: string;\n  width?: number | string;\n  height?: number | string;\n}\n\nexport default function withContainer<Props extends ContainerProps, CompProps>(\n  Comp: typeof React.Component<any, CompProps>,\n  name = 'ChartContainer',\n  getProps?: (props: any) => CompProps\n) {\n  const Cls = React.forwardRef<any, CompProps & Props>((props: CompProps & Props, ref) => {\n    const container = useRef();\n    const [inited, setInited] = useState(false);\n    const { className, style, width, ...options } = props;\n\n    useLayoutEffect(() => {\n      setInited(true);\n    }, []);\n\n    return (\n      <div\n        ref={container}\n        className={className}\n        style={{\n          position: 'relative',\n          height: props.height || '100%',\n          width: props.width || '100%',\n          ...style\n        }}\n      >\n        {inited ? (\n          <Comp ref={ref} container={container.current} {...(getProps ? getProps(options) : (options as CompProps))} />\n        ) : (\n          <></>\n        )}\n      </div>\n    );\n  });\n  Cls.displayName = name || Comp.name;\n  return Cls;\n}\n"]}
+{"version":3,"sources":["../src/containers/withContainer.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiE;AASjE,SAAwB,aAAa,CACnC,IAAS,EACT,IAAI,GAAG,gBAAgB,EACvB,QAAoC;IAEpC,MAAM,GAAG,GAAG,eAAK,CAAC,UAAU,CAAyB,CAAC,KAAwB,EAAE,GAAG,EAAE,EAAE;QACrF,MAAM,SAAS,GAAG,IAAA,cAAM,GAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,KAAiB,KAAK,EAAjB,OAAO,UAAK,KAAK,EAA/C,+BAAuC,CAAQ,CAAC;QAEtD,IAAA,uBAAe,EAAC,GAAG,EAAE;YACnB,SAAS,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,CACL,uCACE,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,KAAK,kBACH,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM,EAC9B,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,MAAM,IACzB,KAAK,KAGT,MAAM,CAAC,CAAC,CAAC,CACR,8BAAC,IAAI,kBAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,OAAO,IAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,OAAqB,CAAC,EAAI,CAC9G,CAAC,CAAC,CAAC,CACF,6DAAK,CACN,CACG,CACP,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,WAAW,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;IACpC,OAAO,GAAG,CAAC;AACb,CAAC;AAnCD,gCAmCC","file":"withContainer.js","sourcesContent":["import React, { useRef, useState, useLayoutEffect } from 'react';\n\nexport interface ContainerProps {\n  style?: React.CSSProperties;\n  className?: string;\n  width?: number | string;\n  height?: number | string;\n}\n\nexport default function withContainer<Props extends ContainerProps, CompProps>(\n  Comp: any,\n  name = 'ChartContainer',\n  getProps?: (props: any) => CompProps\n) {\n  const Cls = React.forwardRef<any, CompProps & Props>((props: CompProps & Props, ref) => {\n    const container = useRef();\n    const [inited, setInited] = useState(false);\n    const { className, style, width, ...options } = props;\n\n    useLayoutEffect(() => {\n      setInited(true);\n    }, []);\n\n    return (\n      <div\n        ref={container}\n        className={className}\n        style={{\n          position: 'relative',\n          height: props.height || '100%',\n          width: props.width || '100%',\n          ...style\n        }}\n      >\n        {inited ? (\n          <Comp ref={ref} container={container.current} {...(getProps ? getProps(options) : (options as CompProps))} />\n        ) : (\n          <></>\n        )}\n      </div>\n    );\n  });\n  Cls.displayName = name || Comp.name;\n  return Cls;\n}\n"]}

package/cjs/context/chart.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 import type { IVChart } from '@visactor/vchart';
 export interface ChartContextType {
     chart?: IVChart;
-    specFromChildren: any;
     isChildrenUpdated?: boolean;
 }
 declare const ChartContext: React.Context<ChartContextType>;

package/cjs/context/chart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/context/chart.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAS1B,MAAM,YAAY,GAAG,eAAK,CAAC,aAAa,CAAmB,IAAI,CAAC,CAAC;AACjE,YAAY,CAAC,WAAW,GAAG,cAAc,CAAC;AAE1C,SAAgB,iBAAiB,CAAI,SAAiC;IACpE,MAAM,GAAG,GAAG,eAAK,CAAC,UAAU,CAAS,CAAC,KAAQ,EAAE,GAAG,EAAE,EAAE;QACrD,OAAO,CACL,8BAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,GAAqB,EAAE,EAAE,CAAC,8BAAC,SAAS,kBAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,IAAM,KAAK,EAAI,CAC1D,CACzB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC;IACjC,OAAO,GAAG,CAAC;AACb,CAAC;AAVD,8CAUC;AAED,kBAAe,YAAY,CAAC","file":"chart.js","sourcesContent":["import React from 'react';\nimport type { IVChart } from '@visactor/vchart';\n\nexport interface ChartContextType {\n  chart?: IVChart;\n  specFromChildren: any;\n  isChildrenUpdated?: boolean;\n}\n\nconst ChartContext = React.createContext<ChartContextType>(null);\nChartContext.displayName = 'ChartContext';\n\nexport function withChartInstance<T>(Component: typeof React.Component) {\n  const Com = React.forwardRef<any, T>((props: T, ref) => {\n    return (\n      <ChartContext.Consumer>\n        {(ctx: ChartContextType) => <Component ref={ref} chart={ctx.chart} {...props} />}\n      </ChartContext.Consumer>\n    );\n  });\n  Com.displayName = Component.name;\n  return Com;\n}\n\nexport default ChartContext;\n"]}
+{"version":3,"sources":["../src/context/chart.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAQ1B,MAAM,YAAY,GAAG,eAAK,CAAC,aAAa,CAAmB,IAAI,CAAC,CAAC;AACjE,YAAY,CAAC,WAAW,GAAG,cAAc,CAAC;AAE1C,SAAgB,iBAAiB,CAAI,SAAiC;IACpE,MAAM,GAAG,GAAG,eAAK,CAAC,UAAU,CAAS,CAAC,KAAQ,EAAE,GAAG,EAAE,EAAE;QACrD,OAAO,CACL,8BAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,GAAqB,EAAE,EAAE,CAAC,8BAAC,SAAS,kBAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,IAAM,KAAK,EAAI,CAC1D,CACzB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC;IACjC,OAAO,GAAG,CAAC;AACb,CAAC;AAVD,8CAUC;AAED,kBAAe,YAAY,CAAC","file":"chart.js","sourcesContent":["import React from 'react';\nimport type { IVChart } from '@visactor/vchart';\n\nexport interface ChartContextType {\n  chart?: IVChart;\n  isChildrenUpdated?: boolean;\n}\n\nconst ChartContext = React.createContext<ChartContextType>(null);\nChartContext.displayName = 'ChartContext';\n\nexport function withChartInstance<T>(Component: typeof React.Component) {\n  const Com = React.forwardRef<any, T>((props: T, ref) => {\n    return (\n      <ChartContext.Consumer>\n        {(ctx: ChartContextType) => <Component ref={ref} chart={ctx.chart} {...props} />}\n      </ChartContext.Consumer>\n    );\n  });\n  Com.displayName = Component.name;\n  return Com;\n}\n\nexport default ChartContext;\n"]}

package/cjs/index.d.ts

@@ -3,5 +3,5 @@ export * from './series';
 export * from './components';
 export * from './VChart';
 export * from './VChartSimple';
-export declare const version = "1.10.0-alpha.0";
+export declare const version = "1.10.0-alpha.4";
 export type { IAreaChartSpec, IBarChartSpec, IBar3dChartSpec, IBoxPlotChartSpec, ICirclePackingChartSpec, ICommonChartSpec, IFunnelChartSpec, IFunnel3dChartSpec, IGaugeChartSpec, IHeatmapChartSpec, IHistogramChartSpec, IHistogram3dChartSpec, ILineChartSpec, IMapChartSpec, IPieChartSpec, IPie3dChartSpec, ICircularProgressChartSpec, ILinearProgressChartSpec, IRadarChartSpec, IRangeColumnChartSpec, IRangeColumn3dChartSpec, IRangeAreaChartSpec, IRoseChartSpec, IScatterChartSpec, ISankeyChartSpec, ISequenceChartSpec, ISunburstChartSpec, ITreemapChartSpec, IWaterfallChartSpec, ICorrelationChartSpec, ILiquidChartSpec, IWordCloud3dChartSpec, IWordCloudChartSpec, IPolarChartSpec, ICartesianChartSpec, ITheme, IInitOption, ISpec, IVChart } from '@visactor/vchart';

package/cjs/index.js

@@ -19,5 +19,5 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.version = void 0, __exportStar(require("./charts"), exports), __exportStar(require("./series"), exports), 
 __exportStar(require("./components"), exports), __exportStar(require("./VChart"), exports), 
-__exportStar(require("./VChartSimple"), exports), exports.version = "1.10.0-alpha.0";
+__exportStar(require("./VChartSimple"), exports), exports.version = "1.10.0-alpha.4";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,2CAAyB;AACzB,+CAA6B;AAC7B,2CAAyB;AACzB,iDAA+B;AAGlB,QAAA,OAAO,GAAG,gBAAgB,CAAC","file":"index.js","sourcesContent":["export * from './charts';\nexport * from './series';\nexport * from './components';\nexport * from './VChart';\nexport * from './VChartSimple';\n\n// export the version, since @1.8.3\nexport const version = \"1.10.0-alpha.0\";\n\nexport type {\n  IAreaChartSpec,\n  IBarChartSpec,\n  IBar3dChartSpec,\n  IBoxPlotChartSpec,\n  ICirclePackingChartSpec,\n  ICommonChartSpec,\n  IFunnelChartSpec,\n  IFunnel3dChartSpec,\n  IGaugeChartSpec,\n  IHeatmapChartSpec,\n  IHistogramChartSpec,\n  IHistogram3dChartSpec,\n  ILineChartSpec,\n  IMapChartSpec,\n  IPieChartSpec,\n  IPie3dChartSpec,\n  ICircularProgressChartSpec,\n  ILinearProgressChartSpec,\n  IRadarChartSpec,\n  IRangeColumnChartSpec,\n  IRangeColumn3dChartSpec,\n  IRangeAreaChartSpec,\n  IRoseChartSpec,\n  IScatterChartSpec,\n  ISankeyChartSpec,\n  ISequenceChartSpec,\n  ISunburstChartSpec,\n  ITreemapChartSpec,\n  IWaterfallChartSpec,\n  ICorrelationChartSpec,\n  ILiquidChartSpec,\n  IWordCloud3dChartSpec,\n  IWordCloudChartSpec,\n  IPolarChartSpec,\n  ICartesianChartSpec,\n  ITheme,\n  IInitOption,\n  ISpec,\n  IVChart\n} from '@visactor/vchart';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,2CAAyB;AACzB,+CAA6B;AAC7B,2CAAyB;AACzB,iDAA+B;AAGlB,QAAA,OAAO,GAAG,gBAAgB,CAAC","file":"index.js","sourcesContent":["export * from './charts';\nexport * from './series';\nexport * from './components';\nexport * from './VChart';\nexport * from './VChartSimple';\n\n// export the version, since @1.8.3\nexport const version = \"1.10.0-alpha.4\";\n\nexport type {\n  IAreaChartSpec,\n  IBarChartSpec,\n  IBar3dChartSpec,\n  IBoxPlotChartSpec,\n  ICirclePackingChartSpec,\n  ICommonChartSpec,\n  IFunnelChartSpec,\n  IFunnel3dChartSpec,\n  IGaugeChartSpec,\n  IHeatmapChartSpec,\n  IHistogramChartSpec,\n  IHistogram3dChartSpec,\n  ILineChartSpec,\n  IMapChartSpec,\n  IPieChartSpec,\n  IPie3dChartSpec,\n  ICircularProgressChartSpec,\n  ILinearProgressChartSpec,\n  IRadarChartSpec,\n  IRangeColumnChartSpec,\n  IRangeColumn3dChartSpec,\n  IRangeAreaChartSpec,\n  IRoseChartSpec,\n  IScatterChartSpec,\n  ISankeyChartSpec,\n  ISequenceChartSpec,\n  ISunburstChartSpec,\n  ITreemapChartSpec,\n  IWaterfallChartSpec,\n  ICorrelationChartSpec,\n  ILiquidChartSpec,\n  IWordCloud3dChartSpec,\n  IWordCloudChartSpec,\n  IPolarChartSpec,\n  ICartesianChartSpec,\n  ITheme,\n  IInitOption,\n  ISpec,\n  IVChart\n} from '@visactor/vchart';\n"]}

package/cjs/series/Area.d.ts

@@ -3,4 +3,5 @@ import type { IAreaSeriesSpec } from '@visactor/vchart';
 export type AreaProps = BaseSeriesProps & Omit<IAreaSeriesSpec, 'type'>;
 export declare const Area: import("react").FC<BaseSeriesProps & Omit<IAreaSeriesSpec, "type"> & {
     updateId?: number;
+    componentId?: string;
 }>;

package/cjs/series/Bar.d.ts

@@ -3,4 +3,5 @@ import type { IBarSeriesSpec } from '@visactor/vchart';
 export type BarProps = BaseSeriesProps & Omit<IBarSeriesSpec, 'type'>;
 export declare const Bar: import("react").FC<BaseSeriesProps & Omit<IBarSeriesSpec, "type"> & {
     updateId?: number;
+    componentId?: string;
 }>;

package/cjs/series/BaseSeries.d.ts

@@ -5,4 +5,5 @@ export interface BaseSeriesProps extends EventsProps {
 }
 export declare const createSeries: <T extends BaseSeriesProps>(componentName: string, markNames: string[], type?: string) => React.FC<T & {
     updateId?: number;
+    componentId?: string;
 }>;

package/cjs/series/BaseSeries.js

@@ -10,11 +10,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.createSeries = void 0;
 
-const react_1 = __importDefault(require("react")), vutils_1 = require("@visactor/vutils"), chart_1 = __importDefault(require("../context/chart")), eventsUtils_1 = require("../eventsUtils"), util_1 = require("../util"), createSeries = (componentName, markNames, type) => {
-    const notSpecKeys = eventsUtils_1.COMMON_EVENTK_KEYS.concat([ "id", "updateId" ]), Comp = props => {
-        const context = react_1.default.useContext(chart_1.default), id = react_1.default.useRef((0, 
-        vutils_1.isNil)(props.id) ? (0, util_1.uid)(null != type ? type : "series") : props.id), seriesSpec = react_1.default.useRef(), bindedEvents = react_1.default.useRef({}), updateId = react_1.default.useRef(props.updateId), handleEvent = e => {
-            const markIds = markNames.map((markName => `${id.current}-${markName}`));
+const react_1 = __importDefault(require("react")), vutils_1 = require("@visactor/vutils"), chart_1 = __importDefault(require("../context/chart")), eventsUtils_1 = require("../eventsUtils"), createSeries = (componentName, markNames, type) => {
+    const notSpecKeys = eventsUtils_1.COMMON_EVENTK_KEYS.concat([ "id", "updateId", "componentId" ]), Comp = props => {
+        var _a;
+        const context = react_1.default.useContext(chart_1.default), id = null !== (_a = props.id) && void 0 !== _a ? _a : props.componentId, bindedEvents = react_1.default.useRef({}), handleEvent = e => {
+            const markIds = markNames.map((markName => `${id}-${markName}`));
             (null == e ? void 0 : e.mark) && markIds.includes(e.mark.getUserId()) && props[eventsUtils_1.VCHART_TO_REACT_EVENTS[e.event.type]](e);
         }, addMarkEvent = events => {
             events && context.chart && (bindedEvents && Object.keys(bindedEvents).forEach((eventKey => {
@@ -24,53 +24,26 @@ const react_1 = __importDefault(require("react")), vutils_1 = require("@visactor
                 (null == bindedEvents ? void 0 : bindedEvents[eventKey]) || (context.chart.on(eventsUtils_1.REACT_TO_VCHART_EVENTS[eventKey], handleEvent), 
                 bindedEvents || (bindedEvents.current = {}), bindedEvents.current[eventKey] = !0);
             })));
-        }, addMarkId = spec => {
-            markNames.forEach((markName => {
-                const defaultMarkId = `${id.current}-${markName}`;
-                (0, vutils_1.isNil)(spec[markName]) ? spec[markName] = {
-                    id: defaultMarkId
-                } : (0, vutils_1.isNil)(spec[markName].id) && (spec[markName].id = defaultMarkId);
-            }));
-        }, insertToContext = props => {
-            if (context.specFromChildren) {
-                context.specFromChildren.series || (context.specFromChildren.series = []);
-                const spec = (0, vutils_1.isNil)(type) ? Object.assign(Object.assign({}, props), {
-                    id: id.current
-                }) : Object.assign(Object.assign({}, props), {
-                    id: id.current,
-                    type: type
-                });
-                addMarkId(spec), context.specFromChildren.series.push(spec), context.isChildrenUpdated = !0;
-            }
         };
-        if (addMarkEvent((0, eventsUtils_1.findEventProps)(props)), props.updateId !== updateId.current) updateId.current = props.updateId; else {
-            const newSeriesSpec = (0, vutils_1.pickWithout)(props, notSpecKeys);
-            addMarkId(newSeriesSpec), (0, vutils_1.isEqual)(newSeriesSpec, seriesSpec.current) || (seriesSpec.current = newSeriesSpec, 
-            (props => {
-                if (!context.specFromChildren) return;
-                if (!context.specFromChildren.series) return void insertToContext(props);
-                const series = context.specFromChildren.series, index = series.findIndex((entry => entry.id === id.current));
-                index >= 0 ? (series[index] = (0, vutils_1.isNil)(type) ? Object.assign(Object.assign({}, props), {
-                    id: id.current
-                }) : Object.assign(Object.assign({}, props), {
-                    id: id.current,
-                    type: type
-                }), addMarkId(series[index])) : insertToContext(props), context.isChildrenUpdated = !0;
-            })(newSeriesSpec));
-        }
-        return react_1.default.useEffect((() => () => {
-            (() => {
-                var _a;
-                if (!context.specFromChildren) return;
-                const series = null !== (_a = context.specFromChildren.series) && void 0 !== _a ? _a : [], index = series.findIndex((entry => entry.id === id.current));
-                if (index >= 0) {
-                    const newSeries = series.slice(0, index - 1).concat(series.slice(index + 1));
-                    context.specFromChildren.series = newSeries, context.isChildrenUpdated = !0;
-                }
-            })(), addMarkEvent({});
+        return addMarkEvent((0, eventsUtils_1.findEventProps)(props)), react_1.default.useEffect((() => () => {
+            addMarkEvent({}), bindedEvents.current = {};
         }), []), null;
     };
-    return Comp.displayName = componentName, Comp;
+    return Comp.displayName = componentName, Comp.parseSpec = compProps => {
+        var _a;
+        const newSeriesSpec = (0, vutils_1.pickWithout)(compProps, notSpecKeys);
+        var spec, seriesId;
+        return spec = newSeriesSpec, seriesId = null !== (_a = compProps.id) && void 0 !== _a ? _a : compProps.componentId, 
+        markNames.forEach((markName => {
+            const defaultMarkId = `${seriesId}-${markName}`;
+            (0, vutils_1.isNil)(spec[markName]) ? spec[markName] = {
+                id: defaultMarkId
+            } : (0, vutils_1.isNil)(spec[markName].id) && (spec[markName].id = defaultMarkId);
+        })), (0, vutils_1.isNil)(type) || (newSeriesSpec.type = type), {
+            spec: newSeriesSpec,
+            specName: "series"
+        };
+    }, Comp;
 };
 
 exports.createSeries = createSeries;

package/cjs/series/BaseSeries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/BaseSeries.tsx"],"names":[],"mappings":"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","file":"BaseSeries.js","sourcesContent":["import React from 'react';\nimport { isNil, isEqual, pickWithout } from '@visactor/vutils';\nimport RootChartContext from '../context/chart';\nimport {\n  REACT_TO_VCHART_EVENTS,\n  EventsProps,\n  findEventProps,\n  COMMON_EVENTK_KEYS,\n  VCHART_TO_REACT_EVENTS\n} from '../eventsUtils';\nimport { uid } from '../util';\n\nexport interface BaseSeriesProps extends EventsProps {\n  id?: string | number;\n}\n\nexport const createSeries = <T extends BaseSeriesProps>(componentName: string, markNames: string[], type?: string) => {\n  const ignoreKeys = ['id', 'updateId'];\n  const notSpecKeys = COMMON_EVENTK_KEYS.concat(ignoreKeys);\n\n  const Comp: React.FC<T & { updateId?: number }> = props => {\n    const context = React.useContext(RootChartContext);\n\n    const id = React.useRef<string | number>(isNil(props.id) ? uid(type ?? 'series') : props.id);\n\n    const seriesSpec = React.useRef<Partial<T>>();\n    const bindedEvents = React.useRef<Record<string, boolean>>({});\n    const updateId = React.useRef<number>(props.updateId);\n\n    const handleEvent = (e: any) => {\n      const markIds = markNames.map(markName => `${id.current}-${markName}`);\n      if (e?.mark && markIds.includes(e.mark.getUserId())) {\n        props[VCHART_TO_REACT_EVENTS[e.event.type]](e);\n      }\n    };\n\n    const addMarkEvent = (events: EventsProps) => {\n      if (!events || !context.chart) {\n        return;\n      }\n\n      if (bindedEvents) {\n        Object.keys(bindedEvents).forEach(eventKey => {\n          if (!events[eventKey]) {\n            context.chart.off(REACT_TO_VCHART_EVENTS[eventKey], handleEvent);\n          }\n          bindedEvents.current[eventKey] = false;\n        });\n      }\n\n      Object.keys(events).forEach(eventKey => {\n        if (!bindedEvents?.[eventKey]) {\n          context.chart.on(REACT_TO_VCHART_EVENTS[eventKey], handleEvent);\n\n          if (!bindedEvents) {\n            bindedEvents.current = {};\n          }\n          bindedEvents.current[eventKey] = true;\n        }\n      });\n    };\n\n    const removeMarkEvent = () => {\n      addMarkEvent({});\n    };\n\n    const addMarkId = (spec: any) => {\n      markNames.forEach(markName => {\n        const defaultMarkId = `${id.current}-${markName}`;\n\n        if (isNil(spec[markName])) {\n          spec[markName] = { id: defaultMarkId };\n        } else if (isNil(spec[markName].id)) {\n          spec[markName].id = defaultMarkId;\n        }\n      });\n    };\n\n    const insertToContext = (props: Partial<T>) => {\n      if (context.specFromChildren) {\n        if (!context.specFromChildren.series) {\n          context.specFromChildren.series = [];\n        }\n\n        const spec = isNil(type) ? { ...props, id: id.current } : { ...props, id: id.current, type };\n\n        addMarkId(spec);\n        context.specFromChildren.series.push(spec);\n        context.isChildrenUpdated = true;\n      }\n    };\n\n    const updateToContext = (props: Partial<T>) => {\n      if (!context.specFromChildren) {\n        return;\n      }\n\n      if (!context.specFromChildren.series) {\n        insertToContext(props);\n        return;\n      }\n\n      const series = context.specFromChildren.series;\n      const index = series.findIndex((entry: any) => entry.id === id.current);\n\n      if (index >= 0) {\n        series[index] = isNil(type) ? { ...props, id: id.current } : { ...props, id: id.current, type };\n        addMarkId(series[index]);\n      } else {\n        insertToContext(props);\n      }\n      context.isChildrenUpdated = true;\n    };\n\n    const deleteToContext = () => {\n      if (!context.specFromChildren) {\n        return;\n      }\n      const series = context.specFromChildren.series ?? [];\n      const index = series.findIndex((entry: any) => entry.id === id.current);\n\n      if (index >= 0) {\n        const newSeries = series.slice(0, index - 1).concat(series.slice(index + 1));\n        context.specFromChildren.series = newSeries;\n        context.isChildrenUpdated = true;\n      }\n    };\n\n    addMarkEvent(findEventProps(props));\n    if (props.updateId !== updateId.current) {\n      // chart render\n      updateId.current = props.updateId;\n    } else {\n      const newSeriesSpec = pickWithout<T>(props, notSpecKeys);\n\n      addMarkId(newSeriesSpec);\n      if (!isEqual(newSeriesSpec, seriesSpec.current)) {\n        seriesSpec.current = newSeriesSpec;\n        updateToContext(newSeriesSpec);\n      }\n    }\n\n    React.useEffect(() => {\n      return () => {\n        deleteToContext();\n        removeMarkEvent();\n      };\n    }, []);\n\n    return null;\n  };\n\n  Comp.displayName = componentName;\n  return Comp;\n};\n"]}
+{"version":3,"sources":["../src/series/BaseSeries.tsx"],"names":[],"mappings":"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","file":"BaseSeries.js","sourcesContent":["import React from 'react';\nimport { isNil, pickWithout } from '@visactor/vutils';\nimport RootChartContext from '../context/chart';\nimport {\n  REACT_TO_VCHART_EVENTS,\n  EventsProps,\n  findEventProps,\n  COMMON_EVENTK_KEYS,\n  VCHART_TO_REACT_EVENTS\n} from '../eventsUtils';\nexport interface BaseSeriesProps extends EventsProps {\n  id?: string | number;\n}\n\nexport const createSeries = <T extends BaseSeriesProps>(componentName: string, markNames: string[], type?: string) => {\n  const ignoreKeys = ['id', 'updateId', 'componentId'];\n  const notSpecKeys = COMMON_EVENTK_KEYS.concat(ignoreKeys);\n\n  const addMarkId = (spec: any, seriesId: string | number) => {\n    markNames.forEach(markName => {\n      const defaultMarkId = `${seriesId}-${markName}`;\n\n      if (isNil(spec[markName])) {\n        spec[markName] = { id: defaultMarkId };\n      } else if (isNil(spec[markName].id)) {\n        spec[markName].id = defaultMarkId;\n      }\n    });\n  };\n\n  const Comp: React.FC<T & { updateId?: number; componentId?: string }> = props => {\n    const context = React.useContext(RootChartContext);\n\n    const id = props.id ?? props.componentId;\n    const bindedEvents = React.useRef<Record<string, boolean>>({});\n\n    const handleEvent = (e: any) => {\n      const markIds = markNames.map(markName => `${id}-${markName}`);\n      if (e?.mark && markIds.includes(e.mark.getUserId())) {\n        props[VCHART_TO_REACT_EVENTS[e.event.type]](e);\n      }\n    };\n\n    const addMarkEvent = (events: EventsProps) => {\n      if (!events || !context.chart) {\n        return;\n      }\n\n      if (bindedEvents) {\n        Object.keys(bindedEvents).forEach(eventKey => {\n          if (!events[eventKey]) {\n            context.chart.off(REACT_TO_VCHART_EVENTS[eventKey], handleEvent);\n          }\n          bindedEvents.current[eventKey] = false;\n        });\n      }\n\n      Object.keys(events).forEach(eventKey => {\n        if (!bindedEvents?.[eventKey]) {\n          context.chart.on(REACT_TO_VCHART_EVENTS[eventKey], handleEvent);\n\n          if (!bindedEvents) {\n            bindedEvents.current = {};\n          }\n          bindedEvents.current[eventKey] = true;\n        }\n      });\n    };\n\n    const removeMarkEvent = () => {\n      addMarkEvent({});\n    };\n\n    addMarkEvent(findEventProps(props));\n\n    React.useEffect(() => {\n      return () => {\n        removeMarkEvent();\n        bindedEvents.current = {};\n      };\n    }, []);\n\n    return null;\n  };\n\n  Comp.displayName = componentName;\n  (Comp as any).parseSpec = (compProps: T & { updateId?: number; componentId?: string }) => {\n    const newSeriesSpec = pickWithout<T>(compProps, notSpecKeys);\n\n    addMarkId(newSeriesSpec, compProps.id ?? compProps.componentId);\n\n    if (!isNil(type)) {\n      (newSeriesSpec as any).type = type;\n    }\n\n    return {\n      spec: newSeriesSpec,\n      specName: 'series'\n    };\n  };\n  return Comp;\n};\n"]}

package/cjs/series/BoxPlot.d.ts

@@ -3,4 +3,5 @@ import type { IBoxPlotSeriesSpec } from '@visactor/vchart';
 export type BoxPlotProps = BaseSeriesProps & Omit<IBoxPlotSeriesSpec, 'type'>;
 export declare const BoxPlot: import("react").FC<BaseSeriesProps & Omit<IBoxPlotSeriesSpec, "type"> & {
     updateId?: number;
+    componentId?: string;
 }>;