@visactor/react-vchart 0.0.1-alpha.1 → 0.10.0-alpha.2

package/README.md

@@ -1,17 +1,27 @@
-# React-VChart
+# @visactor/react-vchart
 
----
+`@visactor/react-vchart` 是由 [VisActor](visactor.io) 为您提供的 React 封装版本 VChart 图表库。它提供了一系列易于使用的 React 组件，用于方便的在 React 开发环境中创建各种类型的图表，包括折线图、柱状图、饼图等。`@visactor/react-vchart` 的组件具有高度的可定制性和可扩展性，可以通过传递不同的参数和配置来实现不同的图表效果。
 
-## Usage:
+`@visactor/react-vchart` 的主要特点包括：
 
-### build
+- **易于使用**：`@visactor/react-vchart` 提供了一系列易于使用的 React 组件，可以快速创建各种类型的图表。
+- **可定制性强**：`@visactor/react-vchart` 的组件具有高度的可定制性，可以通过传递不同的参数和配置来实现不同的图表效果。
+- **可扩展性强**：`@visactor/react-vchart` 的组件可以轻松地扩展和定制，可以根据需要添加新的功能和特性。
+- **兼容性好**：`@visactor/react-vchart` 完全继承了 VChart 的可视化能力，可以在不同的浏览器和设备上运行。
+- **支持多种图表类型**：`@visactor/react-vchart` 支持多种类型的图表，包括折线图、柱状图、饼图、雷达图等。
+
+`@visactor/react-vchart` 在能力上完全对齐 VChart，并且 API 配置也与 VChart 几乎一致，关于图表的定义和配置可参考[VChart](https://www.visactor.io/vchart)。
+
+## 开发指引
+
+### Build
 
 ```bash
 # root directory
 $ rush build
 ```
 
-### Run demo：
+### Development
 
 ```bash
 # root directory
@@ -24,3 +34,21 @@ or
 $ cd packages/react-vchart
 $ rushx start
 ```
+
+## 文档指引
+
+项目文档位于 `@visactor/react-vchart` 目录中的 [docs](./docs) 路径。
+
+1. [快速开始](./docs/1.%20%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B.md)
+   - 环境要求
+   - 安装
+   - 引入 `@visactor/react-vchart`
+   - 绘制一个简单的柱状图
+2. 入门
+   - [API 设计](./docs/2.1%20API%E8%AE%BE%E8%AE%A1.md)
+   - [统一图表标签](./docs//2.2%20%E7%BB%9F%E4%B8%80%E5%9B%BE%E8%A1%A8%E6%A0%87%E7%AD%BE.md)
+   - [语法化标签](./docs/2.3%20%E8%AF%AD%E6%B3%95%E5%8C%96%E6%A0%87%E7%AD%BE.md)
+3. [事件交互](./docs/3.%20%E4%BA%8B%E4%BB%B6%E4%BA%A4%E4%BA%92.md)
+4. [主题样式](./docs/4.%20%E4%B8%BB%E9%A2%98%E6%A0%B7%E5%BC%8F.md)
+5. [FAQ](./docs/5.%20FAQ.md)
+6. [更新日志](./docs/6.%20%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97.md)

package/cjs/VChart.d.ts

@@ -1,3 +1,5 @@
 import { BaseChartProps } from './charts/BaseChart';
-export type VChartProps = Omit<BaseChartProps, 'container'>;
-export declare const VChart: import("react").ForwardRefExoticComponent<import("./containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+import VChartCore from '@visactor/vchart';
+export { VChartCore };
+export type VChartProps = Omit<BaseChartProps, 'container' | 'data' | 'width' | 'height' | 'type'>;
+export declare const VChart: import("react").ForwardRefExoticComponent<VChartProps & import("./containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;

package/cjs/VChart.js

@@ -1,9 +1,17 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.VChart = void 0;
+}), exports.VChart = exports.VChartCore = void 0;
 
-const BaseChart_1 = require("./charts/BaseChart");
+const BaseChart_1 = require("./charts/BaseChart"), vchart_1 = __importDefault(require("@visactor/vchart"));
 
-exports.VChart = (0, BaseChart_1.createChart)("VChart");
+exports.VChartCore = vchart_1.default, exports.VChart = (0, BaseChart_1.createChart)("VChart", {
+    vchartConstrouctor: vchart_1.default
+});

package/cjs/VChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["VChart.tsx"],"names":[],"mappings":";;;AAAA,kDAAiE;AAIpD,QAAA,MAAM,GAAG,IAAA,uBAAW,EAAc,QAAQ,CAAC,CAAC","file":"VChart.js","sourcesContent":["import { BaseChartProps, createChart } from './charts/BaseChart';\n\nexport type VChartProps = Omit<BaseChartProps, 'container'>;\n\nexport const VChart = createChart<VChartProps>('VChart');\n"]}
+{"version":3,"sources":["../src/VChart.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAiE;AAEjE,8DAA0C;AACjC,qBADF,gBAAU,CACE;AAIN,QAAA,MAAM,GAAG,IAAA,uBAAW,EAAc,QAAQ,EAAE;IACvD,kBAAkB,EAAE,gBAAU;CAC/B,CAAC,CAAC","file":"VChart.js","sourcesContent":["import { BaseChartProps, createChart } from './charts/BaseChart';\nimport type { IVChartConstructor } from '@visactor/vchart';\nimport VChartCore from '@visactor/vchart';\nexport { VChartCore };\n\nexport type VChartProps = Omit<BaseChartProps, 'container' | 'data' | 'width' | 'height' | 'type'>;\n\nexport const VChart = createChart<VChartProps>('VChart', {\n  vchartConstrouctor: VChartCore\n});\n"]}

package/cjs/VChartSimple.d.ts

@@ -0,0 +1,6 @@
+import type { IVChartConstructor } from '@visactor/vchart';
+import { BaseChartProps } from './charts/BaseChart';
+export type VChartSimpleProps = Omit<BaseChartProps, 'container' | 'data' | 'width' | 'height' | 'vchartConstrouctor'>;
+export declare const VChartSimple: import("react").ForwardRefExoticComponent<VChartSimpleProps & {
+    vchartConstrouctor: IVChartConstructor;
+} & import("./containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;

package/cjs/VChartSimple.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.VChartSimple = void 0;
+
+const BaseChart_1 = require("./charts/BaseChart");
+
+exports.VChartSimple = (0, BaseChart_1.createChart)("VChartSimple");
+//# sourceMappingURL=VChartSimple.js.map

package/cjs/VChartSimple.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/VChartSimple.tsx"],"names":[],"mappings":";;;AACA,kDAAiE;AAIpD,QAAA,YAAY,GAAG,IAAA,uBAAW,EAAiE,cAAc,CAAC,CAAC","file":"VChartSimple.js","sourcesContent":["import type { IVChartConstructor } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './charts/BaseChart';\n\nexport type VChartSimpleProps = Omit<BaseChartProps, 'container' | 'data' | 'width' | 'height' | 'vchartConstrouctor'>;\n\nexport const VChartSimple = createChart<VChartSimpleProps & { vchartConstrouctor: IVChartConstructor }>('VChartSimple');\n"]}

package/cjs/charts/AreaChart.d.ts

@@ -1,5 +1,10 @@
-import { IAreaChartSpec } from '@visactor/vchart';
+import React from 'react';
+import type { IAreaChartSpec } from '@visactor/vchart';
 import { BaseChartProps } from './BaseChart';
 export interface AreaChartProps extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>, Omit<IAreaChartSpec, 'type'> {
 }
-export declare const AreaChart: import("react").ForwardRefExoticComponent<import("../containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+export declare const AreaChart: React.ForwardRefExoticComponent<AreaChartProps & {
+    children?: React.ReactNode;
+} & {
+    type: 'area';
+} & import("../containers/withContainer").ContainerProps & React.RefAttributes<any>>;

package/cjs/charts/AreaChart.js

@@ -1,10 +1,19 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.AreaChart = void 0;
 
-const BaseChart_1 = require("./BaseChart");
+const vchart_1 = __importDefault(require("@visactor/vchart")), BaseChart_1 = require("./BaseChart");
 
-exports.AreaChart = (0, BaseChart_1.createChart)("AreaChart", "area");
+exports.AreaChart = (0, BaseChart_1.createChart)("AreaChart", {
+    type: "area",
+    vchartConstrouctor: vchart_1.default
+});
 //# sourceMappingURL=AreaChart.js.map

package/cjs/charts/AreaChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["charts/AreaChart.tsx"],"names":[],"mappings":";;;AACA,2CAA0D;AAM7C,QAAA,SAAS,GAAG,IAAA,uBAAW,EAAiB,WAAW,EAAE,MAAM,CAAC,CAAC","file":"AreaChart.js","sourcesContent":["import { IAreaChartSpec } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface AreaChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IAreaChartSpec, 'type'> {}\n\nexport const AreaChart = createChart<AreaChartProps>('AreaChart', 'area');\n"]}
+{"version":3,"sources":["../src/charts/AreaChart.tsx"],"names":[],"mappings":";;;;;;AAEA,8DAAqD;AACrD,2CAA0D;AAM7C,QAAA,SAAS,GAAG,IAAA,uBAAW,EAA6D,WAAW,EAAE;IAC5G,IAAI,EAAE,MAAM;IACZ,kBAAkB,EAAE,gBAAM;CAC3B,CAAC,CAAC","file":"AreaChart.js","sourcesContent":["import React from 'react';\nimport type { IAreaChartSpec } from '@visactor/vchart';\nimport { default as VChart } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface AreaChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IAreaChartSpec, 'type'> {}\n\nexport const AreaChart = createChart<React.PropsWithChildren<AreaChartProps> & { type: 'area' }>('AreaChart', {\n  type: 'area',\n  vchartConstrouctor: VChart\n});\n"]}

package/cjs/charts/BarChart.d.ts

@@ -1,5 +1,10 @@
-import { IBarChartSpec } from '@visactor/vchart';
+import React from 'react';
+import type { IBarChartSpec } from '@visactor/vchart';
 import { BaseChartProps } from './BaseChart';
 export interface BarChartProps extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>, Omit<IBarChartSpec, 'type'> {
 }
-export declare const BarChart: import("react").ForwardRefExoticComponent<import("../containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+export declare const BarChart: React.ForwardRefExoticComponent<BarChartProps & {
+    children?: React.ReactNode;
+} & {
+    type: 'bar';
+} & import("../containers/withContainer").ContainerProps & React.RefAttributes<any>>;

package/cjs/charts/BarChart.js

@@ -1,10 +1,19 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BarChart = void 0;
 
-const BaseChart_1 = require("./BaseChart");
+const vchart_1 = __importDefault(require("@visactor/vchart")), BaseChart_1 = require("./BaseChart");
 
-exports.BarChart = (0, BaseChart_1.createChart)("BarChart", "bar");
+exports.BarChart = (0, BaseChart_1.createChart)("BarChart", {
+    type: "bar",
+    vchartConstrouctor: vchart_1.default
+});
 //# sourceMappingURL=BarChart.js.map

package/cjs/charts/BarChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["charts/BarChart.tsx"],"names":[],"mappings":";;;AACA,2CAA0D;AAQ7C,QAAA,QAAQ,GAAG,IAAA,uBAAW,EAAgB,UAAU,EAAE,KAAK,CAAC,CAAC","file":"BarChart.js","sourcesContent":["import { IBarChartSpec } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface BarChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IBarChartSpec, 'type'> {\n  //\n}\n\nexport const BarChart = createChart<BarChartProps>('BarChart', 'bar');\n"]}
+{"version":3,"sources":["../src/charts/BarChart.tsx"],"names":[],"mappings":";;;;;;AAEA,8DAAqD;AACrD,2CAA0D;AAQ7C,QAAA,QAAQ,GAAG,IAAA,uBAAW,EAA2D,UAAU,EAAE;IACxG,IAAI,EAAE,KAAK;IACX,kBAAkB,EAAE,gBAAM;CAC3B,CAAC,CAAC","file":"BarChart.js","sourcesContent":["import React from 'react';\nimport type { IBarChartSpec } from '@visactor/vchart';\nimport { default as VChart } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface BarChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IBarChartSpec, 'type'> {\n  //\n}\n\nexport const BarChart = createChart<React.PropsWithChildren<BarChartProps> & { type: 'bar' }>('BarChart', {\n  type: 'bar',\n  vchartConstrouctor: VChart\n});\n"]}

package/cjs/charts/BaseChart.d.ts

@@ -1,18 +1,22 @@
-import VChart, { IData, IInitOption } from '@visactor/vchart';
+import type { IVChart, IData, IInitOption, ISpec, IVChartConstructor } from '@visactor/vchart';
 import React from 'react';
 import { ContainerProps } from '../containers/withContainer';
-import { EventsProps } from '../eventsUtils';
+import { EventsProps, LegendEventProps, ScrollBarEventProps, BrushEventProps, DataZoomEventProps, PlayerEventProps, DimensionEventProps, HierarchyEventProps, ChartLifeCycleEventProps } from '../eventsUtils';
 export type ChartOptions = Omit<IInitOption, 'dom'>;
-export interface BaseChartProps extends EventsProps {
+export interface BaseChartProps extends EventsProps, LegendEventProps, ScrollBarEventProps, BrushEventProps, DataZoomEventProps, PlayerEventProps, DimensionEventProps, HierarchyEventProps, ChartLifeCycleEventProps {
+    vchartConstrouctor?: IVChartConstructor;
     type?: string;
     container?: HTMLDivElement;
-    spec?: any;
+    spec?: ISpec;
     data?: IData;
     width?: number;
     height?: number;
     options?: ChartOptions;
-    onReady?: (instance: VChart, isInitial: boolean) => void;
+    skipFunctionDiff?: boolean;
+    onReady?: (instance: IVChart, isInitial: boolean) => void;
+    onError?: (err: Error) => void;
+    useSyncRender?: boolean;
 }
 type Props = React.PropsWithChildren<BaseChartProps>;
-export declare const createChart: <T extends Props>(componentName: string, type?: string, callback?: (props: T) => T) => React.ForwardRefExoticComponent<ContainerProps & React.RefAttributes<any>>;
+export declare const createChart: <T extends Props>(componentName: string, defaultProps?: Partial<T>, callback?: (props: T, defaultProps?: Partial<T>) => T) => React.ForwardRefExoticComponent<React.PropsWithoutRef<T & ContainerProps> & React.RefAttributes<any>>;
 export {};

package/cjs/charts/BaseChart.js

@@ -33,60 +33,83 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.createChart = void 0;
 
-const vchart_1 = __importDefault(require("@visactor/vchart")), 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, "spec", "container", "options" ], BaseChart = react_1.default.forwardRef(((props, ref) => {
-    const [updateId, setUpdateId] = (0, react_1.useState)(0), chartContext = (0, react_1.useRef)({
-        specFromChildren: {}
-    });
-    (0, react_1.useImperativeHandle)(ref, (() => chartContext.current.chart));
+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), parseSpec = props => hasSpec && props.spec ? props.spec : Object.assign(Object.assign({}, prevSpec.current), chartContext.current.specFromChildren), handleChartRender = () => {
-        const newView = chartContext.current.chart.getCompiler().getVGrammarView();
-        newView === view || isUnmount.current || (setUpdateId(updateId + 1), props.onReady && props.onReady(chartContext.current.chart, 0 === updateId)), 
-        setView(newView);
+    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);
+            const newView = chartContext.current.chart.getCompiler().getVGrammarView();
+            setUpdateId(updateId + 1), props.onReady && props.onReady(chartContext.current.chart, 0 === updateId), 
+            setView(newView);
+        }
     };
     return (0, react_1.useEffect)((() => {
-        if (!chartContext.current.chart) return (props => {
-            const cs = new vchart_1.default(parseSpec(props), Object.assign(Object.assign({}, props.options), {
+        var _a;
+        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,
-                mode: "desktop-browser",
                 dom: props.container
             }));
             chartContext.current = Object.assign(Object.assign({}, chartContext.current), {
                 chart: cs
             });
-        })(props), chartContext.current.chart && chartContext.current.chart.renderAsync().then(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);
-        if ((0, eventsUtils_1.bindEventsToChart)(chartContext.current.chart, props, eventsBinded.current, eventsUtils_1.CHART_EVENTS), 
-        hasSpec) return void ((0, vutils_1.isEqual)(eventsBinded.current.spec, props.spec) || chartContext.current.chart.updateSpec(parseSpec(props)).then(handleChartRender));
+        })(props), chartContext.current.chart && (chartContext.current.chart.renderSync({
+            reuse: !1
+        }), handleChartRender()), (0, eventsUtils_1.bindEventsToChart)(chartContext.current.chart, props, null, eventsUtils_1.CHART_EVENTS), 
+        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, {
+            morph: !1,
+            enableExitAnimation: !1
+        }), handleChartRender()));
         const newSpec = (0, vutils_1.pickWithout)(props, notSpecKeys);
-        (0, vutils_1.isEqual)(newSpec, prevSpec.current) && !chartContext.current.isChildrenUpdated || (prevSpec.current = newSpec, 
-        chartContext.current.chart.updateSpec(parseSpec(props)).then(handleChartRender)), 
-        chartContext.current = Object.assign(Object.assign({}, chartContext.current), {
-            isChildrenUpdated: !1
-        });
+        (0, vutils_1.isEqual)(newSpec, prevSpec.current, {
+            skipFunction: skipFunctionDiff
+        }) && (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());
     }), [ 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, type, callback) => {
-    const Com = (0, withContainer_1.default)(BaseChart, componentName, (props => (props.type = type, 
-    callback ? callback(props) : type ? Object.assign(Object.assign({}, props), {
-        type: type
-    }) : props)));
+})), createChart = (componentName, defaultProps, callback) => {
+    const Com = (0, withContainer_1.default)(BaseChart, componentName, (props => callback ? callback(props, defaultProps) : defaultProps ? Object.assign(props, defaultProps) : props));
     return Com.displayName = componentName, Com;
 };
 

package/cjs/charts/BaseChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["charts/BaseChart.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA8D;AAC9D,+CAAgF;AAChF,gFAA4E;AAC5E,6DAAsE;AAEtE,6CAAwD;AACxD,2DAA0C;AAC1C,kCAAkC;AAClC,4CAAmD;AAEnD,gDAAiG;AA2BjG,MAAM,WAAW,GAAG,CAAC,GAAG,+BAAmB,EAAE,GAAG,+BAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AAEnG,MAAM,SAAS,GAAoB,eAAK,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACjE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAS,CAAC,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,IAAA,cAAM,EAAmB;QAC5C,gBAAgB,EAAE,EAAE;KACrB,CAAC,CAAC;IAEH,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAE3D,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAQ,IAAI,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,IAAA,cAAM,EAAU,KAAK,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,eAAK,CAAC,MAAM,CAAiB,IAAI,CAAC,CAAC;IAExD,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,EAAE;QACjC,IAAI,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE;YACzB,OAAO,KAAK,CAAC,IAAI,CAAC;SACnB;QAED,uCACK,QAAQ,CAAC,OAAO,GAChB,YAAY,CAAC,OAAO,CAAC,gBAAgB,EACxC;IACJ,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,EAAE;QACnC,MAAM,EAAE,GAAG,IAAI,gBAAM,CAAC,SAAS,CAAC,KAAK,CAAC,kCACjC,KAAK,CAAC,OAAO,KAChB,OAAO,EAAE,IAAI,EACb,IAAI,EAAE,iBAAiB,EACvB,GAAG,EAAE,KAAK,CAAC,SAAS,IACpB,CAAC;QACH,YAAY,CAAC,OAAO,mCAAQ,YAAY,CAAC,OAAO,KAAE,KAAK,EAAE,EAAE,GAAE,CAAC;IAChE,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC7B,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,eAAe,EAAE,CAAC;QAC3E,IAAI,OAAO,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YAC1C,WAAW,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YAC1B,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,KAAK,CAAC,CAAC,CAAC;aAC3D;SACF;QACD,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE;YAE9B,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAClE;IACH,CAAC,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE;YAC/B,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,WAAW,EAAE,CAAC;YACd,IAAA,+BAAiB,EAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,0BAAY,CAAC,CAAC;YACzE,YAAY,CAAC,OAAO,mCACf,YAAY,CAAC,OAAO,KACvB,iBAAiB,EAAE,KAAK,GACzB,CAAC;YACF,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;YAC7B,OAAO;SACR;QAED,IAAA,+BAAiB,EAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,0BAAY,CAAC,CAAC;QAEzF,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,IAAA,gBAAO,EAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;gBAEnD,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aACjF;YACD,OAAO;SACR;QAED,MAAM,OAAO,GAAG,IAAA,oBAAW,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAEhD,IAAI,CAAC,IAAA,gBAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,iBAAiB,EAAE;YACjF,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;YAE3B,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACjF;QACD,YAAY,CAAC,OAAO,mCACf,YAAY,CAAC,OAAO,KACvB,iBAAiB,EAAE,KAAK,GACzB,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,IAAI,YAAY,EAAE;gBAChB,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE;oBAC9B,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;iBACtC;gBACD,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;aAC7B;YACD,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QAC3B,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,8BAAC,eAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY,CAAC,OAAO;QACpD,8BAAC,cAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,IAC9B,IAAA,cAAO,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;;YAC5C,OAAO,CACL,8BAAC,eAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,MAAA,MAAA,MAAC,KAAa,aAAb,KAAK,uBAAL,KAAK,CAAU,KAAK,0CAAE,EAAE,mCAAK,KAAa,aAAb,KAAK,uBAAL,KAAK,CAAU,EAAE,mCAAI,SAAS,KAAK,EAAE,IACrF,eAAK,CAAC,YAAY,CAAC,KAAqB,EAAE;gBACzC,QAAQ,EAAE,QAAQ;aACnB,CAAC,CACa,CAClB,CAAC;QACJ,CAAC,CAAC,CACmB,CACG,CAC7B,CAAC;AACJ,CAAC,CAAC,CAAC;AAEI,MAAM,WAAW,GAAG,CAAkB,aAAqB,EAAE,IAAa,EAAE,QAA0B,EAAE,EAAE;IAC/G,MAAM,GAAG,GAAG,IAAA,uBAAa,EAAoB,SAAgB,EAAE,aAAa,EAAE,CAAC,KAAU,EAAE,EAAE;QAC3F,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAElB,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;SACxB;QAED,IAAI,IAAI,EAAE;YACR,uCAAY,KAAK,KAAE,IAAI,IAAG;SAC3B;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,WAAW,GAAG,aAAa,CAAC;IAChC,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAfW,QAAA,WAAW,eAetB","file":"BaseChart.js","sourcesContent":["import VChart, { IData, IInitOption } 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';\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 { bindEventsToChart, EventsProps, CHART_EVENTS_KEYS, CHART_EVENTS } from '../eventsUtils';\n\nexport type ChartOptions = Omit<IInitOption, 'dom'>;\n\nexport interface BaseChartProps extends EventsProps {\n  type?: string;\n  /** 上层container */\n  container?: HTMLDivElement;\n  /**\n   * used only by <VChart />\n   */\n  spec?: any;\n  /** 数据 */\n  data?: IData;\n  /** 画布宽度 */\n  width?: number;\n  /** 画布高度 */\n  height?: number;\n  /** 图表配置 */\n  options?: ChartOptions;\n\n  /** 图表渲染完成事件 */\n  onReady?: (instance: VChart, isInitial: boolean) => void;\n}\n\ntype Props = React.PropsWithChildren<BaseChartProps>;\n\nconst notSpecKeys = [...REACT_PRIVATE_PROPS, ...CHART_EVENTS_KEYS, 'spec', 'container', 'options'];\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\n  useImperativeHandle(ref, () => chartContext.current.chart);\n\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\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 VChart(parseSpec(props), {\n      ...props.options,\n      autoFit: true,\n      mode: 'desktop-browser',\n      dom: props.container\n    });\n    chartContext.current = { ...chartContext.current, chart: cs };\n  };\n\n  const handleChartRender = () => {\n    const newView = chartContext.current.chart.getCompiler().getVGrammarView();\n    if (newView !== view && !isUnmount.current) {\n      setUpdateId(updateId + 1);\n      if (props.onReady) {\n        props.onReady(chartContext.current.chart, updateId === 0);\n      }\n    }\n    setView(newView);\n  };\n\n  const renderChart = () => {\n    if (chartContext.current.chart) {\n      // eslint-disable-next-line promise/catch-or-return\n      chartContext.current.chart.renderAsync().then(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    bindEventsToChart(chartContext.current.chart, props, eventsBinded.current, CHART_EVENTS);\n\n    if (hasSpec) {\n      if (!isEqual(eventsBinded.current.spec, props.spec)) {\n        // eslint-disable-next-line promise/catch-or-return\n        chartContext.current.chart.updateSpec(parseSpec(props)).then(handleChartRender);\n      }\n      return;\n    }\n\n    const newSpec = pickWithout(props, notSpecKeys);\n\n    if (!isEqual(newSpec, prevSpec.current) || chartContext.current.isChildrenUpdated) {\n      prevSpec.current = newSpec;\n      // eslint-disable-next-line promise/catch-or-return\n      chartContext.current.chart.updateSpec(parseSpec(props)).then(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>(componentName: string, type?: string, callback?: (props: T) => T) => {\n  const Com = withContainer<ContainerProps, T>(BaseChart as any, componentName, (props: any) => {\n    props.type = type;\n\n    if (callback) {\n      return callback(props);\n    }\n\n    if (type) {\n      return { ...props, type };\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/charts/BoxPlotChart.d.ts

@@ -1,5 +1,10 @@
+import React from 'react';
 import { IBoxPlotChartSpec } from '@visactor/vchart';
 import { BaseChartProps } from './BaseChart';
 export interface BoxPlotChartProps extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>, Omit<IBoxPlotChartSpec, 'type'> {
 }
-export declare const BoxPlotChart: import("react").ForwardRefExoticComponent<import("../containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+export declare const BoxPlotChart: React.ForwardRefExoticComponent<BoxPlotChartProps & {
+    children?: React.ReactNode;
+} & {
+    type: 'boxPlot';
+} & import("../containers/withContainer").ContainerProps & React.RefAttributes<any>>;

package/cjs/charts/BoxPlotChart.js

@@ -1,10 +1,19 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BoxPlotChart = void 0;
 
-const BaseChart_1 = require("./BaseChart");
+const vchart_1 = __importDefault(require("@visactor/vchart")), BaseChart_1 = require("./BaseChart");
 
-exports.BoxPlotChart = (0, BaseChart_1.createChart)("BoxPlotChart", "boxPlot");
+exports.BoxPlotChart = (0, BaseChart_1.createChart)("BoxPlotChart", {
+    type: "boxPlot",
+    vchartConstrouctor: vchart_1.default
+});
 //# sourceMappingURL=BoxPlotChart.js.map

package/cjs/charts/BoxPlotChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["charts/BoxPlotChart.tsx"],"names":[],"mappings":";;;AACA,2CAA0D;AAM7C,QAAA,YAAY,GAAG,IAAA,uBAAW,EAAoB,cAAc,EAAE,SAAS,CAAC,CAAC","file":"BoxPlotChart.js","sourcesContent":["import { IBoxPlotChartSpec } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface BoxPlotChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IBoxPlotChartSpec, 'type'> {}\n\nexport const BoxPlotChart = createChart<BoxPlotChartProps>('BoxPlotChart', 'boxPlot');\n"]}
+{"version":3,"sources":["../src/charts/BoxPlotChart.tsx"],"names":[],"mappings":";;;;;;AAEA,8DAAqD;AACrD,2CAA0D;AAM7C,QAAA,YAAY,GAAG,IAAA,uBAAW,EACrC,cAAc,EACd;IACE,IAAI,EAAE,SAAS;IACf,kBAAkB,EAAE,gBAAM;CAC3B,CACF,CAAC","file":"BoxPlotChart.js","sourcesContent":["import React from 'react';\nimport { IBoxPlotChartSpec } from '@visactor/vchart';\nimport { default as VChart } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface BoxPlotChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IBoxPlotChartSpec, 'type'> {}\n\nexport const BoxPlotChart = createChart<React.PropsWithChildren<BoxPlotChartProps> & { type: 'boxPlot' }>(\n  'BoxPlotChart',\n  {\n    type: 'boxPlot',\n    vchartConstrouctor: VChart\n  }\n);\n"]}

package/cjs/charts/CircularProgressChart.d.ts

@@ -1,5 +1,10 @@
+import React from 'react';
 import { ICircularProgressChartSpec } from '@visactor/vchart';
 import { BaseChartProps } from './BaseChart';
 export interface CircularProgressChartProps extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>, Omit<ICircularProgressChartSpec, 'type'> {
 }
-export declare const CircularProgressChart: import("react").ForwardRefExoticComponent<import("../containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+export declare const CircularProgressChart: React.ForwardRefExoticComponent<CircularProgressChartProps & {
+    children?: React.ReactNode;
+} & {
+    type: 'circularProgress';
+} & import("../containers/withContainer").ContainerProps & React.RefAttributes<any>>;

package/cjs/charts/CircularProgressChart.js

@@ -1,10 +1,19 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.CircularProgressChart = void 0;
 
-const BaseChart_1 = require("./BaseChart");
+const vchart_1 = __importDefault(require("@visactor/vchart")), BaseChart_1 = require("./BaseChart");
 
-exports.CircularProgressChart = (0, BaseChart_1.createChart)("CircularProgressChart", "circularProgress");
+exports.CircularProgressChart = (0, BaseChart_1.createChart)("CircularProgressChart", {
+    type: "circularProgress",
+    vchartConstrouctor: vchart_1.default
+});
 //# sourceMappingURL=CircularProgressChart.js.map

package/cjs/charts/CircularProgressChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["charts/CircularProgressChart.tsx"],"names":[],"mappings":";;;AACA,2CAA0D;AAM7C,QAAA,qBAAqB,GAAG,IAAA,uBAAW,EAC9C,uBAAuB,EACvB,kBAAkB,CACnB,CAAC","file":"CircularProgressChart.js","sourcesContent":["import { ICircularProgressChartSpec } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface CircularProgressChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<ICircularProgressChartSpec, 'type'> {}\n\nexport const CircularProgressChart = createChart<CircularProgressChartProps>(\n  'CircularProgressChart',\n  'circularProgress'\n);\n"]}
+{"version":3,"sources":["../src/charts/CircularProgressChart.tsx"],"names":[],"mappings":";;;;;;AAEA,8DAAqD;AACrD,2CAA0D;AAM7C,QAAA,qBAAqB,GAAG,IAAA,uBAAW,EAE9C,uBAAuB,EAAE;IACzB,IAAI,EAAE,kBAAkB;IACxB,kBAAkB,EAAE,gBAAM;CAC3B,CAAC,CAAC","file":"CircularProgressChart.js","sourcesContent":["import React from 'react';\nimport { ICircularProgressChartSpec } from '@visactor/vchart';\nimport { default as VChart } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface CircularProgressChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<ICircularProgressChartSpec, 'type'> {}\n\nexport const CircularProgressChart = createChart<\n  React.PropsWithChildren<CircularProgressChartProps> & { type: 'circularProgress' }\n>('CircularProgressChart', {\n  type: 'circularProgress',\n  vchartConstrouctor: VChart\n});\n"]}

package/cjs/charts/CommonChart.d.ts

@@ -1,5 +1,10 @@
+import React from 'react';
 import { ICommonChartSpec } from '@visactor/vchart';
 import { BaseChartProps } from './BaseChart';
 export interface CommonChartProps extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>, Omit<ICommonChartSpec, 'type'> {
 }
-export declare const CommonChart: import("react").ForwardRefExoticComponent<import("../containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+export declare const CommonChart: React.ForwardRefExoticComponent<CommonChartProps & {
+    children?: React.ReactNode;
+} & {
+    type: 'common';
+} & import("../containers/withContainer").ContainerProps & React.RefAttributes<any>>;

package/cjs/charts/CommonChart.js

@@ -1,10 +1,19 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.CommonChart = void 0;
 
-const BaseChart_1 = require("./BaseChart");
+const vchart_1 = __importDefault(require("@visactor/vchart")), BaseChart_1 = require("./BaseChart");
 
-exports.CommonChart = (0, BaseChart_1.createChart)("CommonChart", "common");
+exports.CommonChart = (0, BaseChart_1.createChart)("CommonChart", {
+    type: "common",
+    vchartConstrouctor: vchart_1.default
+});
 //# sourceMappingURL=CommonChart.js.map

package/cjs/charts/CommonChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["charts/CommonChart.tsx"],"names":[],"mappings":";;;AACA,2CAA0D;AAM7C,QAAA,WAAW,GAAG,IAAA,uBAAW,EAAmB,aAAa,EAAE,QAAQ,CAAC,CAAC","file":"CommonChart.js","sourcesContent":["import { ICommonChartSpec } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface CommonChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<ICommonChartSpec, 'type'> {}\n\nexport const CommonChart = createChart<CommonChartProps>('CommonChart', 'common');\n"]}
+{"version":3,"sources":["../src/charts/CommonChart.tsx"],"names":[],"mappings":";;;;;;AAEA,8DAAqD;AACrD,2CAA0D;AAM7C,QAAA,WAAW,GAAG,IAAA,uBAAW,EAAiE,aAAa,EAAE;IACpH,IAAI,EAAE,QAAQ;IACd,kBAAkB,EAAE,gBAAM;CAC3B,CAAC,CAAC","file":"CommonChart.js","sourcesContent":["import React from 'react';\nimport { ICommonChartSpec } from '@visactor/vchart';\nimport { default as VChart } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface CommonChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<ICommonChartSpec, 'type'> {}\n\nexport const CommonChart = createChart<React.PropsWithChildren<CommonChartProps> & { type: 'common' }>('CommonChart', {\n  type: 'common',\n  vchartConstrouctor: VChart\n});\n"]}

package/cjs/charts/FunnelChart.d.ts

@@ -1,5 +1,10 @@
+import React from 'react';
 import { IFunnelChartSpec } from '@visactor/vchart';
 import { BaseChartProps } from './BaseChart';
 export interface FunnelChartProps extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>, Omit<IFunnelChartSpec, 'type'> {
 }
-export declare const FunnelChart: import("react").ForwardRefExoticComponent<import("../containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+export declare const FunnelChart: React.ForwardRefExoticComponent<FunnelChartProps & {
+    children?: React.ReactNode;
+} & {
+    type: 'funnel';
+} & import("../containers/withContainer").ContainerProps & React.RefAttributes<any>>;

package/cjs/charts/FunnelChart.js

@@ -1,10 +1,19 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.FunnelChart = void 0;
 
-const BaseChart_1 = require("./BaseChart");
+const vchart_1 = __importDefault(require("@visactor/vchart")), BaseChart_1 = require("./BaseChart");
 
-exports.FunnelChart = (0, BaseChart_1.createChart)("FunnelChart", "funnel");
+exports.FunnelChart = (0, BaseChart_1.createChart)("FunnelChart", {
+    type: "funnel",
+    vchartConstrouctor: vchart_1.default
+});
 //# sourceMappingURL=FunnelChart.js.map

package/cjs/charts/FunnelChart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["charts/FunnelChart.tsx"],"names":[],"mappings":";;;AACA,2CAA0D;AAM7C,QAAA,WAAW,GAAG,IAAA,uBAAW,EAAmB,aAAa,EAAE,QAAQ,CAAC,CAAC","file":"FunnelChart.js","sourcesContent":["import { IFunnelChartSpec } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface FunnelChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IFunnelChartSpec, 'type'> {}\n\nexport const FunnelChart = createChart<FunnelChartProps>('FunnelChart', 'funnel');\n"]}
+{"version":3,"sources":["../src/charts/FunnelChart.tsx"],"names":[],"mappings":";;;;;;AAEA,8DAAqD;AACrD,2CAA0D;AAM7C,QAAA,WAAW,GAAG,IAAA,uBAAW,EAAiE,aAAa,EAAE;IACpH,IAAI,EAAE,QAAQ;IACd,kBAAkB,EAAE,gBAAM;CAC3B,CAAC,CAAC","file":"FunnelChart.js","sourcesContent":["import React from 'react';\nimport { IFunnelChartSpec } from '@visactor/vchart';\nimport { default as VChart } from '@visactor/vchart';\nimport { BaseChartProps, createChart } from './BaseChart';\n\nexport interface FunnelChartProps\n  extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>,\n    Omit<IFunnelChartSpec, 'type'> {}\n\nexport const FunnelChart = createChart<React.PropsWithChildren<FunnelChartProps> & { type: 'funnel' }>('FunnelChart', {\n  type: 'funnel',\n  vchartConstrouctor: VChart\n});\n"]}

package/cjs/charts/HistogramChart.d.ts

@@ -1,5 +1,10 @@
+import React from 'react';
 import { IHistogramChartSpec } from '@visactor/vchart';
 import { BaseChartProps } from './BaseChart';
 export interface HistogramChartProps extends Omit<BaseChartProps, 'spec' | 'container' | 'type'>, Omit<IHistogramChartSpec, 'type'> {
 }
-export declare const HistogramChart: import("react").ForwardRefExoticComponent<import("../containers/withContainer").ContainerProps & import("react").RefAttributes<any>>;
+export declare const HistogramChart: React.ForwardRefExoticComponent<HistogramChartProps & {
+    children?: React.ReactNode;
+} & {
+    type: 'histogram';
+} & import("../containers/withContainer").ContainerProps & React.RefAttributes<any>>;