sea-chart 2.0.43 → 2.0.44

package/dist/view/wrapper/combination.js

@@ -1,30 +1,15 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var _dtableUtils = require("dtable-utils");
-var _lodashEs = require("lodash-es");
-var d3 = _interopRequireWildcard(require("d3"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _intl = _interopRequireDefault(require("../../intl"));
-var _constants = require("../../constants");
-var _utils = require("../../utils");
-var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
-var _chartComponent = _interopRequireDefault(require("./chart-component"));
-class Combination extends _chartComponent.default {
+import React from 'react';
+import PropTypes from 'prop-types';
+import { getTableColumnByKey, getTableById } from 'dtable-utils';
+import * as d3 from 'd3';
+import intl from '../../intl';
+import { EMPTY_NAME, CHART_THEME_COLOR, CHART_LINE_TYPES } from '../../constants';
+import { BaseUtils, isFunction } from '../../utils';
+import ToolTip from '../../components/tooltip';
+import ChartComponent from './chart-component';
+class Combination extends ChartComponent {
   constructor(props) {
     super(props);
-    this.handleResize = () => {
-      this.destroyChart();
-      this.createChart();
-      this.drawChart();
-    };
     this.createChart = () => {
       const {
         chart
@@ -38,9 +23,9 @@ class Combination extends _chartComponent.default {
       const initConfig = {
         insertPadding: 30,
         borderRadius: 0.2,
-        marginLeft: show_y_axis_left_label ? 20 : 0,
-        marginRight: show_y_axis_right_label ? 20 : 0,
-        marginBottom: x_axis_show_label ? 20 : 0,
+        marginLeft: show_y_axis_left_label ? this.getAxisTitleHeight(chart.config.y_axis_left_label_font_size) : 0,
+        marginRight: show_y_axis_right_label ? this.getAxisTitleHeight(chart.config.y_axis_right_label_font_size) : 0,
+        marginBottom: x_axis_show_label ? this.getAxisTitleHeight(chart.config.x_axis_label_font_size) : 0,
         marginTop: display_data ? 15 : 0
       };
       this.initChart(this.container, chart === null || chart === void 0 ? void 0 : chart.id, initConfig);
@@ -52,11 +37,11 @@ class Combination extends _chartComponent.default {
       let {
         result: data
       } = this.props;
-      data = _utils.BaseUtils.formatEmptyName(data, '', _intl.default.get('Empty'));
+      data = BaseUtils.formatEmptyName(data, '', intl.get('Empty'));
       if (!Array.isArray(data)) return;
       this.draw(data);
       this.renderAxisLabel(this.props.chart, this.props.tables, this.container);
-      (0, _utils.isFunction)(customRender) && customRender(this.chart);
+      isFunction(customRender) && customRender(this.chart);
     };
     this.draw = data => {
       const {
@@ -65,8 +50,8 @@ class Combination extends _chartComponent.default {
         tables,
         chartColorTheme
       } = this.props;
-      const theme = _constants.CHART_THEME_COLOR[globalTheme];
-      const currentTheme = _utils.BaseUtils.getCurrentTheme(chartColorTheme);
+      const theme = CHART_THEME_COLOR[globalTheme];
+      const currentTheme = BaseUtils.getCurrentTheme(chartColorTheme);
       const {
         display_goal_line,
         goal_value,
@@ -96,9 +81,9 @@ class Combination extends _chartComponent.default {
         display_data_field,
         label_font_size
       } = chart.config;
-      const table = (0, _dtableUtils.getTableById)(tables, table_id);
-      const leftSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_left_summary_column) || {};
-      const rightSummaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, y_axis_right_summary_column) || {};
+      const table = getTableById(tables, table_id);
+      const leftSummaryColumn = getTableColumnByKey(table, y_axis_left_summary_column) || {};
+      const rightSummaryColumn = getTableColumnByKey(table, y_axis_right_summary_column) || {};
       const leftTitle = this.getTitle(tables, table_id, y_axis_left_summary_type, y_axis_left_summary_column);
       const rightTitle = this.getTitle(tables, table_id, y_axis_right_summary_type, y_axis_right_summary_column);
       const showLeftValue = display_data && this.valueFieldMap['value_left'].includes(display_data_field);
@@ -108,11 +93,11 @@ class Combination extends _chartComponent.default {
         showRightValue = true;
       }
       this.setCombinationColorMap(data, leftSummaryColumn, rightSummaryColumn);
-      const rightNiceEnd = d3.nice(0, d3.max(data, d => d.value_right), 5)[1];
+      const rightNiceEnd = d3.nice(0, d3.max(data, d => d.value_right) || 0, 5)[1];
       const rightY = d3.scaleLinear().domain(y_axis_auto_range_right ? [d3.min(data, d => d.value_right), rightNiceEnd] : [y_axis_min_right, y_axis_max_right]).range([chartHeight - insertPadding, insertPadding + marginTop]);
 
       // Y axis (right)
-      const rightAxisWrapper = this.chart.append('g').attr('class', 'y-axis-wrapper-right').attr('transform', `translate(${chartWidth - insertPadding},0)`).call(d3.axisRight(rightY).tickSizeInner(0).ticks(5).tickFormat(d => _utils.BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, d, y_axis_right_summary_column))).call(g => {
+      const rightAxisWrapper = this.chart.append('g').attr('class', 'y-axis-wrapper-right').attr('transform', `translate(${chartWidth - insertPadding},0)`).call(d3.axisRight(rightY).tickSizeInner(0).ticks(5).tickFormat(d => BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, d, y_axis_right_summary_column))).call(g => {
         g.select('.domain').remove();
         g.selectAll('text').attr('font-size', theme.fontSize);
         g.selectAll('text').attr('fill', theme.textColor);
@@ -122,7 +107,7 @@ class Combination extends _chartComponent.default {
       const leftY = d3.scaleLinear().domain(y_axis_auto_range_left ? [0, leftNiceEnd] : [y_axis_min_left, y_axis_max_left]).range([chartHeight - insertPadding, insertPadding + marginTop]);
 
       // Y axis (left)
-      this.chart.append('g').attr('class', 'y-axis-wrapper-left').attr('transform', `translate(${insertPadding},0)`).call(d3.axisLeft(leftY).tickSizeInner(0).ticks(5).tickFormat(d => _utils.BaseUtils.getSummaryValueDisplayString(leftSummaryColumn, d, y_axis_left_summary_method))).call(g => this.drawYaxis(g, theme, rightAxisOffset));
+      this.chart.append('g').attr('class', 'y-axis-wrapper-left').attr('transform', `translate(${insertPadding},0)`).call(d3.axisLeft(leftY).tickSizeInner(0).ticks(5).tickFormat(d => BaseUtils.getSummaryValueDisplayString(leftSummaryColumn, d, y_axis_left_summary_method))).call(g => this.drawYaxis(g, theme, rightAxisOffset));
       const fx = d3.scaleBand().domain(new Set(data.map(d => d.name))).range([insertPadding + this.horizontalOverflowOffset, chartWidth - insertPadding - rightAxisOffset]).paddingInner(0.5).paddingOuter(0.1);
       const x = d3.scaleBand().domain(y_axis_left_group_by_multiple_numeric_column ? new Set(data.map(d => d.group_name)) : new Set([data[0]])).range([0, fx.bandwidth()]).paddingInner(y_axis_left_group_by_multiple_numeric_column ? 0.2 : 0).paddingOuter(0);
 
@@ -154,14 +139,12 @@ class Combination extends _chartComponent.default {
           return currentTheme.colors[0];
         }
         return d.color;
-      }).attr('data-value', d => _utils.BaseUtils.getSummaryValueDisplayString(leftSummaryColumn, d.value_left, y_axis_left_summary_method)).attr('data-groupName', d => d.name).attr('data-slugid', d => d.slugId).call(g => {
+      }).attr('data-value', d => BaseUtils.getSummaryValueDisplayString(leftSummaryColumn, d.value_left, y_axis_left_summary_method)).attr('data-groupName', d => d.name).call(g => {
         g.nodes().forEach(rect => {
           const parentNode = rect.parentNode;
           // add rect borderRadius
           this.addClipPath({
-            rect,
-            parentNode,
-            rectId: rect.getAttribute('data-slugid')
+            rect
           });
 
           // Add label
@@ -193,6 +176,9 @@ class Combination extends _chartComponent.default {
       }).on('mouseleave', (event, data) => {
         this.hiddenTooltip();
         this.handleAcitveAndInActiveState('active', event);
+      }).call(g => {
+        this.animateRectGrowInY(g);
+        this.animateFadeIn(this.chart.select('.content-wrapper').selectAll('text'), this.transitionDuration, this.transitionDuration * 0.5);
       });
 
       // Line group
@@ -244,14 +230,14 @@ class Combination extends _chartComponent.default {
           });
         });
       } else {
-        if (leftSummaryColumn !== null && leftSummaryColumn !== void 0 && leftSummaryColumn.name) {
+        if (leftSummaryColumn === null || leftSummaryColumn === void 0 ? void 0 : leftSummaryColumn.name) {
           newData.push({
             group_name: leftSummaryColumn.name
           });
         }
       }
       // right legend item
-      if (rightSummaryColumn !== null && rightSummaryColumn !== void 0 && rightSummaryColumn.name) {
+      if (rightSummaryColumn === null || rightSummaryColumn === void 0 ? void 0 : rightSummaryColumn.name) {
         newData.push({
           group_name: String(rightSummaryColumn.name) + ' '
         }); // Add a space character to avoid merging with the previous left legend
@@ -266,7 +252,7 @@ class Combination extends _chartComponent.default {
       const {
         y_axis_left_group_by_multiple_numeric_column
       } = chart.config;
-      const currentTheme = _utils.BaseUtils.getCurrentTheme(chartColorTheme);
+      const currentTheme = BaseUtils.getCurrentTheme(chartColorTheme);
 
       // left color map
       if (y_axis_left_group_by_multiple_numeric_column) {
@@ -292,8 +278,8 @@ class Combination extends _chartComponent.default {
         chartColorTheme,
         globalTheme
       } = this.props;
-      const theme = _constants.CHART_THEME_COLOR[globalTheme];
-      const currentTheme = _utils.BaseUtils.getCurrentTheme(chartColorTheme);
+      const theme = CHART_THEME_COLOR[globalTheme];
+      const currentTheme = BaseUtils.getCurrentTheme(chartColorTheme);
       const {
         line_type,
         label_font_size,
@@ -310,11 +296,11 @@ class Combination extends _chartComponent.default {
         circleData[index]['y'] = y;
         circleData[index]['value'] = d.value_right;
         return y;
-      }).curve(line_type === _constants.CHART_LINE_TYPES[1] ? d3.curveBumpX : d3.curveLinear);
+      }).curve(line_type === CHART_LINE_TYPES[1] ? d3.curveBumpX : d3.curveLinear);
       const rightContentWrapper = this.chart.append('g').attr('class', 'lines-wrapper');
 
       // line
-      rightContentWrapper.append('path').attr('fill', 'none').attr('stroke', currentTheme.colors[1]).attr('stroke-width', 2).attr('d', () => line(data));
+      rightContentWrapper.append('path').attr('fill', 'none').attr('stroke', currentTheme.colors[1]).attr('stroke-width', 2).attr('d', () => line(data)).call(g => this.animateFadeIn(g));
 
       // circle
       circleData.forEach(item => {
@@ -322,7 +308,7 @@ class Combination extends _chartComponent.default {
           // circle label
           if (showRightValue) {
             const curCircleEl = g.node();
-            rightContentWrapper.append('text').attr('stroke', '#fff').attr('stroke-width', 1).attr('paint-order', 'stroke').attr('fill', theme.labelColor).attr('font-size', _utils.BaseUtils.getLabelFontSize(label_font_size)).text(_utils.BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, Number(curCircleEl.getAttribute('data-text')), y_axis_right_summary_column)).call(g => {
+            rightContentWrapper.append('text').attr('stroke', '#fff').attr('stroke-width', 1).attr('paint-order', 'stroke').attr('fill', theme.labelColor).attr('font-size', BaseUtils.getLabelFontSize(label_font_size)).text(BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, Number(curCircleEl.getAttribute('data-text')), y_axis_right_summary_column)).call(g => {
               const {
                 width
               } = g.node().getBoundingClientRect();
@@ -345,6 +331,8 @@ class Combination extends _chartComponent.default {
           this.updateCombinationCircleStyle(event, 'zoomOut');
         });
       });
+      this.animateFadeIn(rightContentWrapper.selectAll('circle'), this.transitionDuration, this.transitionDuration * 0.5);
+      this.animateFadeIn(rightContentWrapper.selectAll('text'), this.transitionDuration, this.transitionDuration * 0.5);
     };
     this.showTooltip = (event, _ref4) => {
       let {
@@ -363,28 +351,28 @@ class Combination extends _chartComponent.default {
         y_axis_left_group_by_multiple_numeric_column,
         y_axis_right_summary_method
       } = chart.config;
-      const currentTheme = _utils.BaseUtils.getCurrentTheme(chartColorTheme);
+      const currentTheme = BaseUtils.getCurrentTheme(chartColorTheme);
       const {
         offsetX,
         offsetY
       } = event;
       const newTooltipData = {};
       if (isCircle) {
-        newTooltipData['title'] = !rightTitle && typeof rightTitle !== 'number' ? _intl.default.get(_constants.EMPTY_NAME) : rightTitle;
+        newTooltipData['title'] = !rightTitle && typeof rightTitle !== 'number' ? intl.get(EMPTY_NAME) : rightTitle;
         newTooltipData['items'] = [{
           color: currentTheme.colors[1],
           name: event.target.getAttribute('data-name'),
-          value: _utils.BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, Number(event.target.getAttribute('data-text')), y_axis_right_summary_method)
+          value: BaseUtils.getSummaryValueDisplayString(rightSummaryColumn, Number(event.target.getAttribute('data-text')), y_axis_right_summary_method)
         }];
       } else {
         const curGroup = event.target.parentNode;
         const [curGroupName, data] = curGroup.__data__;
-        newTooltipData['title'] = !curGroupName && typeof curGroupName !== 'number' ? _intl.default.get(_constants.EMPTY_NAME) : curGroupName;
+        newTooltipData['title'] = !curGroupName && typeof curGroupName !== 'number' ? intl.get(EMPTY_NAME) : curGroupName;
         newTooltipData['items'] = data.map(item => {
           return {
             color: y_axis_left_group_by_multiple_numeric_column ? this.colorMap[item.group_name] : currentTheme.colors[0],
             name: y_axis_left_group_by_multiple_numeric_column ? item.group_name : leftTitle,
-            value: _utils.BaseUtils.getSummaryValueDisplayString(leftSummaryColumn, Number(item.value_left), y_axis_left_summary_method)
+            value: BaseUtils.getSummaryValueDisplayString(leftSummaryColumn, Number(item.value_left), y_axis_left_summary_method)
           };
         });
       }
@@ -423,11 +411,11 @@ class Combination extends _chartComponent.default {
     };
     this.updateCombinationCircleStyle = (event, state) => {
       if (state === 'zoomIn') {
-        d3.select(event.currentTarget).transition().duration(this.transitionDuration).attr('r', 5);
+        d3.select(event.currentTarget).transition().duration(this.interactionDuration).attr('r', 5);
         return;
       }
       const circles = d3.select(event.currentTarget.parentNode).selectAll('circle').nodes();
-      circles.forEach(circle => d3.select(circle).transition().duration(this.transitionDuration).attr('r', 3));
+      circles.forEach(circle => d3.select(circle).transition().duration(this.interactionDuration).attr('r', 3));
     };
     this.updateLastLegendToCircle = () => {
       const legendWrapper = this.chart.select('.legend-wrapper').node();
@@ -452,12 +440,11 @@ class Combination extends _chartComponent.default {
   componentDidMount() {
     this.createChart();
     this.drawChart();
-    this.debouncedHandleResize = (0, _lodashEs.debounce)(this.handleResize, 300);
-    window.addEventListener('resize', this.debouncedHandleResize);
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
-    if (_utils.BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
+    if (BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
       this.destroyChart();
       this.createChart();
       this.drawChart();
@@ -465,24 +452,17 @@ class Combination extends _chartComponent.default {
   }
   componentWillUnmount() {
     this.destroyChart();
-    window.removeEventListener('resize', this.debouncedHandleResize);
+    super.componentWillUnmount();
   }
   render() {
-    const {
-      chart
-    } = this.props;
     const {
       tooltipData,
       toolTipPosition
     } = this.state;
-    return /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
       ref: ref => this.container = ref,
-      className: (0, _classnames.default)('sea-chart-container', {
-        'show-x-axis-label': this.isShowXAxisLabel(chart),
-        'show-y-axis-left-label': this.isShowYAxisLeftLabel(chart),
-        'show-y-axis-right-label': this.isShowYAxisRightLabel(chart)
-      })
-    }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      className: "sea-chart-container"
+    }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,
       chart: this.chart
@@ -490,16 +470,16 @@ class Combination extends _chartComponent.default {
   }
 }
 Combination.propTypes = {
-  canvasStyle: _propTypes.default.object,
-  chart: _propTypes.default.object,
-  groupbyColumn: _propTypes.default.object,
-  columnGroupbyColumn: _propTypes.default.object,
-  summaryColumn: _propTypes.default.object,
-  result: _propTypes.default.array,
-  tables: _propTypes.default.array,
-  globalTheme: _propTypes.default.string,
-  chartColorTheme: _propTypes.default.string,
-  toggleRecords: _propTypes.default.func,
-  customRender: _propTypes.default.func
+  canvasStyle: PropTypes.object,
+  chart: PropTypes.object,
+  groupbyColumn: PropTypes.object,
+  columnGroupbyColumn: PropTypes.object,
+  summaryColumn: PropTypes.object,
+  result: PropTypes.array,
+  tables: PropTypes.array,
+  globalTheme: PropTypes.string,
+  chartColorTheme: PropTypes.string,
+  toggleRecords: PropTypes.func,
+  customRender: PropTypes.func
 };
-var _default = exports.default = Combination;
+export default Combination;

package/dist/view/wrapper/completeness-group.js

@@ -1,29 +1,15 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var _lodashEs = require("lodash-es");
-var d3 = _interopRequireWildcard(require("d3"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _constants = require("../../constants");
-var _utils = require("../../utils");
-var _intl = _interopRequireDefault(require("../../intl"));
-var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
-var _chartComponent = _interopRequireDefault(require("./chart-component"));
-class Completeness extends _chartComponent.default {
+import React from 'react';
+import PropTypes from 'prop-types';
+import { cloneDeep } from 'lodash-es';
+import * as d3 from 'd3';
+import { CHART_THEME_COLOR } from '../../constants';
+import { BaseUtils } from '../../utils';
+import intl from '../../intl';
+import ToolTip from '../../components/tooltip';
+import ChartComponent from './chart-component';
+class Completeness extends ChartComponent {
   constructor(props) {
     super(props);
-    this.handleResize = () => {
-      this.destroyChart();
-      this.createChart();
-      this.drawChart();
-    };
     this.createChart = () => {
       const {
         chart
@@ -43,7 +29,7 @@ class Completeness extends _chartComponent.default {
       let {
         result: data
       } = this.props;
-      data = _utils.BaseUtils.formatEmptyName(data, (_this$props$chart = this.props.chart) === null || _this$props$chart === void 0 ? void 0 : (_this$props$chart$con = _this$props$chart.config) === null || _this$props$chart$con === void 0 ? void 0 : _this$props$chart$con.column_groupby_column_key, _intl.default.get('Empty'));
+      data = BaseUtils.formatEmptyName(data, (_this$props$chart = this.props.chart) === null || _this$props$chart === void 0 ? void 0 : (_this$props$chart$con = _this$props$chart.config) === null || _this$props$chart$con === void 0 ? void 0 : _this$props$chart$con.column_groupby_column_key, intl.get('Empty'));
       if (!Array.isArray(data)) return;
       this.draw(data);
     };
@@ -54,7 +40,7 @@ class Completeness extends _chartComponent.default {
         chartColorTheme,
         columnGroupbyColumn
       } = this.props;
-      const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const theme = CHART_THEME_COLOR[globalTheme];
       const {
         y_axis_auto_range,
         y_axis_min,
@@ -70,7 +56,7 @@ class Completeness extends _chartComponent.default {
         marginRight
       } = this.chartBoundingClientRect;
       this.markLastForCompleteness(data);
-      const colors = _utils.BaseUtils.getCurrentTheme(chartColorTheme).colors;
+      const colors = BaseUtils.getCurrentTheme(chartColorTheme).colors;
       // Normalize groupby to string before setColorMap to ensure consistent keys
       data.forEach(item => {
         if (Array.isArray(item.groupby)) {
@@ -147,7 +133,7 @@ class Completeness extends _chartComponent.default {
         }).selectAll().data(_ref6 => {
           let [_, d] = _ref6;
           return d;
-        }).join('rect').attr('class', 'rect').attr('opacity', 1).attr('x', d => x(d[0]) - Number(yAxis.node().getAttribute('data-axisWidth'))).attr('y', d => localY(d.groupby)).attr('data-y', d => localY(d.groupby)).attr('width', d => x(d[1]) - x(d[0])).attr('height', localY.bandwidth()).attr('fill', d => {
+        }).join('rect').attr('class', 'rect').attr('opacity', 1).attr('x', d => x(d[0]) - Number(yAxis.node().getAttribute('data-axisWidth'))).attr('y', d => localY(d.groupby)).attr('width', d => x(d[1]) - x(d[0])).attr('height', localY.bandwidth()).attr('fill', d => {
           const key = d.key;
           const groupby = d.groupby;
           if (key === 'rest') {
@@ -158,7 +144,7 @@ class Completeness extends _chartComponent.default {
           }
           return colors[0];
         }).attr('data-value', d => d.rawData.value).attr('data-groupName', d => d.rawData.slugId).attr('data-tooltipTitle', d => d.rawData.name).attr('data-tooltipName', d => d.key).attr('data-groupBy', d => d.groupby).on('click', (event, data) => {
-          self.props.toggleRecords(data);
+          self.toggleRecords(data.rawData);
         }).on('mouseover', event => {
           self.showTooltip(event);
           self.handleAcitveAndInActiveState('inActive', event);
@@ -199,6 +185,8 @@ class Completeness extends _chartComponent.default {
           });
         }
       });
+      this.animateStackGrowInX(contentWrapper.selectAll('rect'));
+      this.animateFadeIn(contentWrapper.selectAll('text'), this.transitionDuration, this.transitionDuration * 0.5);
       this.setLegend({
         legendName: 'groupby',
         theme,
@@ -225,23 +213,17 @@ class Completeness extends _chartComponent.default {
       const curGroupName = event.currentTarget.getAttribute('data-groupName');
       this.setActiveAndInActiveState(state, allGroup, curGroupName);
     };
-    this.showTooltip = (event, isDiv) => {
-      let {
+    this.showTooltip = event => {
+      const {
         offsetX,
         offsetY
       } = event;
-      if (isDiv) {
-        const initX = Number(event.currentTarget.getAttribute('data-x'));
-        const initY = Number(event.currentTarget.getAttribute('data-y'));
-        offsetX = offsetX + initX;
-        offsetY = offsetY + initY;
-      }
       const groupby = event.currentTarget.getAttribute('data-groupBy');
       const newTooltipData = {
         title: event.currentTarget.getAttribute('data-tooltipTitle'),
         items: [{
           color: event.currentTarget.getAttribute('data-tooltipName') === 'rest' ? '#bdbdbd' : this.colorMap[groupby],
-          name: _intl.default.get(event.currentTarget.getAttribute('data-tooltipName')),
+          name: intl.get(event.currentTarget.getAttribute('data-tooltipName')),
           value: event.currentTarget.getAttribute('data-value')
         }]
       };
@@ -255,17 +237,11 @@ class Completeness extends _chartComponent.default {
         }
       });
     };
-    this.moveTooltip = (event, isDiv) => {
-      let {
+    this.moveTooltip = event => {
+      const {
         offsetX,
         offsetY
       } = event;
-      if (isDiv) {
-        const initX = Number(event.currentTarget.getAttribute('data-x'));
-        const initY = Number(event.currentTarget.getAttribute('data-y'));
-        offsetX = offsetX + initX;
-        offsetY = offsetY + initY;
-      }
       this.setState({
         toolTipPosition: {
           offsetX,
@@ -279,7 +255,7 @@ class Completeness extends _chartComponent.default {
       });
     };
     this.getGroupSeries = (data, columnGroupbyColumn, chart) => {
-      const sortedData = _utils.BaseUtils.sortDataByGroupName((0, _lodashEs.cloneDeep)(data), 'groupby', columnGroupbyColumn, chart);
+      const sortedData = BaseUtils.sortDataByGroupName(cloneDeep(data), 'groupby', columnGroupbyColumn, chart);
       sortedData.forEach(item => {
         if (Array.isArray(item.groupby)) {
           item.groupby = item.groupby.join(', ');
@@ -289,7 +265,7 @@ class Completeness extends _chartComponent.default {
       // Sort main groups by name for stable order
       groups.sort((a, b) => String(a[0]).localeCompare(String(b[0])));
       groups.forEach((item, index) => {
-        const itemData = (0, _lodashEs.cloneDeep)(item[1]);
+        const itemData = cloneDeep(item[1]);
         const valueMap = d3.rollup(itemData, v => d3.sum(v, d => d.value), d => d.groupby, d => d.group_name);
         const rawDataMap = d3.rollup(itemData, v => v[0], d => d.groupby, d => d.group_name);
 
@@ -373,28 +349,7 @@ class Completeness extends _chartComponent.default {
       return allGroup;
     };
     this.addMaskRect = (topG, rect, yAxis) => {
-      const xWidth = Number(rect.getAttribute('height'));
-      const {
-        borderRadius
-      } = this.chartBoundingClientRect;
-      // Add mask rect
-      d3.select(topG).append('foreignObject').attr('class', rect.getAttribute('class')).attr('opacity', rect.getAttribute('opacity')).attr('x', rect.getAttribute('x')).attr('y', rect.getAttribute('y')).attr('data-y', rect.parentNode.parentNode.getAttribute('data-transform')).attr('width', rect.getAttribute('width')).attr('height', rect.getAttribute('height')).attr('data-groupName', rect.getAttribute('data-groupName')).attr('data-value', rect.getAttribute('data-value')).attr('data-tooltipTitle', rect.getAttribute('data-tooltipTitle')).attr('data-tooltipName', rect.getAttribute('data-tooltipName')).attr('data-groupBy', rect.getAttribute('data-groupBy')).attr('data-x', () => {
-        const x = Number(rect.getAttribute('x'));
-        return x + Number(yAxis.node().getAttribute('data-axisWidth'));
-      }).on('click', (event, data) => {
-        this.props.toggleRecords(data);
-      }).on('mouseover', event => {
-        this.showTooltip(event, true);
-        this.handleAcitveAndInActiveState('inActive', event);
-      }).on('mousemove', event => {
-        this.moveTooltip(event, true);
-      }).on('mouseleave', event => {
-        this.hiddenTooltip();
-        this.handleAcitveAndInActiveState('active', event);
-      }).append('xhtml:div').attr('style', `width: 100%; height: 100%; background-color: ${rect.getAttribute('fill')}; border-radius: 0px ${xWidth * borderRadius}px ${xWidth * borderRadius}px 0px`);
-
-      // Remove old rect
-      d3.select(rect).remove();
+      return this.addRoundedClip(rect, 'x');
     };
     this.chart = null;
     this.state = {
@@ -403,40 +358,31 @@ class Completeness extends _chartComponent.default {
     };
   }
   componentDidMount() {
-    super.componentDidMount();
     this.createChart();
     this.drawChart();
-    this.debouncedHandleResize = (0, _lodashEs.debounce)(this.handleResize, 300);
-    window.addEventListener('resize', this.debouncedHandleResize);
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
-    if (_utils.BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
+    if (BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
       this.destroyChart();
       this.createChart();
       this.drawChart();
     }
   }
   componentWillUnmount() {
-    super.componentWillUnmount();
     this.destroyChart();
-    window.removeEventListener('resize', this.debouncedHandleResize);
+    super.componentWillUnmount();
   }
   render() {
-    const {
-      chart
-    } = this.props;
     const {
       tooltipData,
       toolTipPosition
     } = this.state;
-    return /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
       ref: ref => this.container = ref,
-      className: (0, _classnames.default)('sea-chart-container', {
-        'show-x-axis-label': this.isShowHorizontalAxisLabel(chart),
-        'show-y-axis-label': this.isShowVerticalAxisLabel(chart)
-      })
-    }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      className: "sea-chart-container"
+    }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,
       chart: this.chart
@@ -444,15 +390,15 @@ class Completeness extends _chartComponent.default {
   }
 }
 Completeness.propTypes = {
-  canvasStyle: _propTypes.default.object,
-  chart: _propTypes.default.object,
-  groupbyColumn: _propTypes.default.object,
-  columnGroupbyColumn: _propTypes.default.object,
-  summaryColumn: _propTypes.default.object,
-  result: _propTypes.default.array,
-  tables: _propTypes.default.array,
-  globalTheme: _propTypes.default.string,
-  chartColorTheme: _propTypes.default.string,
-  toggleRecords: _propTypes.default.func
+  canvasStyle: PropTypes.object,
+  chart: PropTypes.object,
+  groupbyColumn: PropTypes.object,
+  columnGroupbyColumn: PropTypes.object,
+  summaryColumn: PropTypes.object,
+  result: PropTypes.array,
+  tables: PropTypes.array,
+  globalTheme: PropTypes.string,
+  chartColorTheme: PropTypes.string,
+  toggleRecords: PropTypes.func
 };
-var _default = exports.default = Completeness;
+export default Completeness;