sea-chart 2.0.43 → 2.0.44

package/dist/view/wrapper/bar-compare.js

@@ -1,22 +1,13 @@
-"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 d3 = _interopRequireWildcard(require("d3"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _dtableUtils = require("dtable-utils");
-var _constants = require("../../constants");
-var _chartUtils = require("../../utils/chart-utils");
-var _intl = _interopRequireDefault(require("../../intl"));
-var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
-var _chartComponent = _interopRequireDefault(require("./chart-component"));
-class BarCompare extends _chartComponent.default {
+import React from 'react';
+import PropTypes from 'prop-types';
+import * as d3 from 'd3';
+import { getNumberDisplayString } from 'dtable-utils';
+import { CHART_SUMMARY_SHOW, TITLE_AMOUNT, TITLE_INCREASE, CHART_THEME_COLOR } from '../../constants';
+import { BaseUtils } from '../../utils/chart-utils';
+import intl from '../../intl';
+import ToolTip from '../../components/tooltip';
+import ChartComponent from './chart-component';
+class BarCompare extends ChartComponent {
   constructor(props) {
     super(props);
     this.createChart = () => {
@@ -30,8 +21,8 @@ class BarCompare extends _chartComponent.default {
       const initConfig = {
         insertPadding: 30,
         borderRadius: 0.2,
-        marginLeft: y_axis_show_label ? 20 : 0,
-        marginBottom: x_axis_show_label ? 20 : 0
+        marginLeft: y_axis_show_label ? this.getAxisTitleHeight(chart.config.y_axis_label_font_size) : 0,
+        marginBottom: x_axis_show_label ? this.getAxisTitleHeight(chart.config.x_axis_label_font_size) : 0
       };
       this.initChart(this.container, chart === null || chart === void 0 ? void 0 : chart.id, initConfig);
     };
@@ -39,7 +30,7 @@ class BarCompare extends _chartComponent.default {
       let {
         result: data
       } = this.props;
-      data = _chartUtils.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);
@@ -51,7 +42,7 @@ class BarCompare extends _chartComponent.default {
         chartColorTheme,
         columnGroupbyColumn
       } = this.props;
-      const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const theme = CHART_THEME_COLOR[globalTheme];
       const {
         display_increase,
         y_axis_auto_range = true,
@@ -68,9 +59,9 @@ class BarCompare extends _chartComponent.default {
       const y = d3.scaleLinear().domain(y_axis_auto_range ? [0, d3.max(data, d => d.value)] : [y_axis_min, y_axis_max]).range([chartHeight - insertPadding, insertPadding]);
 
       // Y axis
-      this.chart.append('g').attr('class', 'y-axis-wrapper').attr('transform', `translate(${insertPadding},0)`).call(d3.axisLeft(y).tickSizeInner(0).ticks(5).tickFormat(d => _chartUtils.BaseUtils.getSummaryValueDisplayString(columnGroupbyColumn, d, y_axis_summary_method))).call(g => this.drawYaxis(g, theme));
+      this.chart.append('g').attr('class', 'y-axis-wrapper').attr('transform', `translate(${insertPadding},0)`).call(d3.axisLeft(y).tickSizeInner(0).ticks(5).tickFormat(d => BaseUtils.getSummaryValueDisplayString(columnGroupbyColumn, d, y_axis_summary_method))).call(g => this.drawYaxis(g, theme));
       const fx = d3.scaleBand().domain(d3.group(data, d => d.name).keys()).range([insertPadding + this.horizontalOverflowOffset, chartWidth - insertPadding]).paddingInner(0.5).paddingOuter(0.1);
-      const color = d3.scaleOrdinal().domain(d3.group(data, d => d.group_name).keys()).range(_chartUtils.BaseUtils.getCurrentTheme(chartColorTheme).colors).unknown('#ccc');
+      const color = d3.scaleOrdinal().domain(d3.group(data, d => d.group_name).keys()).range(BaseUtils.getCurrentTheme(chartColorTheme).colors).unknown('#ccc');
       const x = d3.scaleBand().domain(d3.group(data, d => d.group_name).keys()).range([0, fx.bandwidth()]).paddingInner(0).paddingOuter(0);
 
       // X axis
@@ -93,14 +84,11 @@ class BarCompare extends _chartComponent.default {
       .selectAll().data(_ref2 => {
         let [a, d] = _ref2;
         return d;
-      }).join('rect').attr('opacity', 1).attr('x', (d, index) => index * x.bandwidth()).attr('y', d => y(d.value)).attr('width', x.bandwidth()).attr('height', d => y(0) - y(d.value) === 0 ? 0 : y(0) - y(d.value)).attr('fill', d => color(d.group_name)).attr('data-value', d => d.value).attr('data-groupName', d => d.name).attr('data-slugid', d => d.slugId).call(g => {
+      }).join('rect').attr('opacity', 1).attr('x', (d, index) => index * x.bandwidth()).attr('y', d => y(d.value)).attr('width', x.bandwidth()).attr('height', d => y(0) - y(d.value) === 0 ? 0 : y(0) - y(d.value)).attr('fill', d => color(d.group_name)).attr('data-value', d => d.value).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
           });
         });
       }).on('click', (event, data) => {
@@ -113,6 +101,9 @@ class BarCompare extends _chartComponent.default {
       }).on('mouseleave', event => {
         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);
       });
       if (display_increase) {
         const increaseData = this.getIncreaseData(data);
@@ -140,7 +131,7 @@ class BarCompare extends _chartComponent.default {
       if (isCircle) {
         const circleEl = event.target;
         newTooltipData = {
-          title: _intl.default.get(_constants.TITLE_INCREASE),
+          title: intl.get(TITLE_INCREASE),
           items: [{
             color: increase_line_color || '#fbd44a',
             name: circleEl.getAttribute('data-name'),
@@ -151,7 +142,7 @@ class BarCompare extends _chartComponent.default {
         const curGroup = event.target.parentNode;
         const [, data] = curGroup.__data__;
         newTooltipData = {
-          title: y_axis_summary_type === 'count' ? _intl.default.get(_constants.TITLE_AMOUNT) : _intl.default.get(_constants.CHART_SUMMARY_SHOW[y_axis_summary_method]),
+          title: y_axis_summary_type === 'count' ? intl.get(TITLE_AMOUNT) : intl.get(CHART_SUMMARY_SHOW[y_axis_summary_method]),
           items: data.map(item => {
             return {
               color: colorScale(item.group_name),
@@ -193,7 +184,7 @@ class BarCompare extends _chartComponent.default {
         chart,
         globalTheme
       } = this.props;
-      const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const theme = CHART_THEME_COLOR[globalTheme];
       const {
         label_font_size,
         y_axis_min,
@@ -248,7 +239,7 @@ class BarCompare extends _chartComponent.default {
           // circle label
           if (display_increase_percentage) {
             const curCircleEl = g.node();
-            wrapper.append('text').attr('stroke', '#fff').attr('stroke-width', 1).attr('paint-order', 'stroke').attr('fill', theme.labelColor).attr('font-size', _chartUtils.BaseUtils.getLabelFontSize(label_font_size)).text(curCircleEl.getAttribute('data-text')).call(g => {
+            wrapper.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(curCircleEl.getAttribute('data-text')).call(g => {
               const {
                 width
               } = g.node().getBoundingClientRect();
@@ -275,7 +266,7 @@ class BarCompare extends _chartComponent.default {
         const increaseValue = value.filter(d => (d === null || d === void 0 ? void 0 : d.increase_value) !== undefined) || [{
           increaseValue: 0
         }];
-        const formatValue = (0, _dtableUtils.getNumberDisplayString)((_increaseValue$ = increaseValue[0]) === null || _increaseValue$ === void 0 ? void 0 : _increaseValue$.increase_value, {
+        const formatValue = getNumberDisplayString((_increaseValue$ = increaseValue[0]) === null || _increaseValue$ === void 0 ? void 0 : _increaseValue$.increase_value, {
           format: 'percent'
         });
         const data = {
@@ -311,10 +302,11 @@ class BarCompare extends _chartComponent.default {
   componentDidMount() {
     this.createChart();
     this.drawChart();
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
-    if (_chartUtils.BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
+    if (BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
       this.destroyChart();
       this.createChart();
       this.drawChart();
@@ -322,22 +314,17 @@ class BarCompare extends _chartComponent.default {
   }
   componentWillUnmount() {
     this.destroyChart();
+    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-label': this.isShowYAxisLabel(chart)
-      })
-    }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      className: "sea-chart-container"
+    }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,
       chart: this.chart
@@ -345,15 +332,15 @@ class BarCompare extends _chartComponent.default {
   }
 }
 BarCompare.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 = BarCompare;
+export default BarCompare;

package/dist/view/wrapper/bar-custom-stack.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 _lodashEs = require("lodash-es");
-var d3 = _interopRequireWildcard(require("d3"));
-var _slugid = _interopRequireDefault(require("slugid"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _intl = _interopRequireDefault(require("../../intl"));
-var _chartUtils = require("../../utils/chart-utils");
-var _constants = require("../../constants");
-var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
-var _chartComponent = _interopRequireDefault(require("./chart-component"));
-class BarCustom extends _chartComponent.default {
+import React from 'react';
+import PropTypes from 'prop-types';
+import * as d3 from 'd3';
+import slugid from 'slugid';
+import intl from '../../intl';
+import { BaseUtils } from '../../utils/chart-utils';
+import { EMPTY_NAME, CHART_THEME_COLOR } from '../../constants';
+import ToolTip from '../../components/tooltip';
+import ChartComponent from './chart-component';
+class BarCustom extends ChartComponent {
   constructor(props) {
     super(props);
-    this.handleResize = (0, _lodashEs.debounce)(() => {
-      this.destroyChart();
-      this.createChart();
-      this.drawChart();
-    }, 300);
     this.createChart = () => {
       const {
         chart
@@ -36,8 +21,8 @@ class BarCustom extends _chartComponent.default {
       const initConfig = {
         insertPadding: 30,
         borderRadius: 0.2,
-        marginLeft: y_axis_show_label ? 20 : 0,
-        marginBottom: x_axis_show_label ? 20 : 0
+        marginLeft: y_axis_show_label ? this.getAxisTitleHeight(chart.config.y_axis_label_font_size) : 0,
+        marginBottom: x_axis_show_label ? this.getAxisTitleHeight(chart.config.x_axis_label_font_size) : 0
       };
       this.initChart(this.container, chart === null || chart === void 0 ? void 0 : chart.id, initConfig);
     };
@@ -45,7 +30,7 @@ class BarCustom extends _chartComponent.default {
       let {
         result: data
       } = this.props;
-      data = _chartUtils.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);
@@ -106,7 +91,7 @@ class BarCustom extends _chartComponent.default {
             key: itemKey,
             value,
             series,
-            slugid: _slugid.default.nice()
+            slugid: slugid.nice()
           });
         });
         stacksData.push({
@@ -133,7 +118,7 @@ class BarCustom extends _chartComponent.default {
         globalTheme,
         chartColorTheme
       } = this.props;
-      const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const theme = CHART_THEME_COLOR[globalTheme];
       const {
         display_each_block_data
       } = chart.config;
@@ -148,7 +133,7 @@ class BarCustom extends _chartComponent.default {
         insertPadding
       } = this.chartBoundingClientRect;
       const organizedData = this.organizeData(data);
-      const color = d3.scaleOrdinal().domain(d3.group(data, d => d.group_name).keys()).range(_chartUtils.BaseUtils.getCurrentTheme(chartColorTheme).colors).unknown('#ccc');
+      const color = d3.scaleOrdinal().domain(d3.group(data, d => d.group_name).keys()).range(BaseUtils.getCurrentTheme(chartColorTheme).colors).unknown('#ccc');
       const allSeries = this.getAllSeries(organizedData);
       const niceEnd = d3.nice(0, d3.max(allSeries, d => d[1]), 5)[1];
       const y = d3.scaleLinear().domain([0, niceEnd]).range([chartHeight - insertPadding, insertPadding]);
@@ -182,9 +167,6 @@ class BarCustom extends _chartComponent.default {
         const height = y(d[0][0]) - y(d[0][1]);
         return isNaN(height) ? 0 : height;
       }).attr('fill', d => color(d.key)).attr('data-value', d => d.stackData.value).attr('data-rectId', d => d.stackData.slugId).attr('data-groupName', d => d.stackData.group_name).attr('data-title', d => d.stackData.name).call(g => {
-        const {
-          borderRadius
-        } = this.chartBoundingClientRect;
         const xWidth = x.bandwidth();
         const stackGroupNodes = Array.from(g._parents);
         const nameGroups = [];
@@ -196,28 +178,19 @@ class BarCustom extends _chartComponent.default {
         });
         nameGroups.forEach(nameGroup => {
           const stackGroups = Array.from(nameGroup.children);
-          let groupBorderRadius = Infinity;
           stackGroups.forEach(stackGroup => {
             const topRect = Array.from(stackGroup.children).reverse().find(rect => Number(rect.getAttribute('height')) !== 0);
             if (!topRect) return;
-            const rectHeight = Number(topRect.getAttribute('height'));
-            const computedBorderRadius = Math.min(xWidth * borderRadius, rectHeight / 2, xWidth / 2);
-            groupBorderRadius = Math.min(groupBorderRadius, computedBorderRadius);
-          });
-          if (!Number.isFinite(groupBorderRadius)) {
-            groupBorderRadius = 0;
-          }
-          stackGroups.forEach(stackGroup => {
-            const topRect = Array.from(stackGroup.children).reverse().find(rect => Number(rect.getAttribute('height')) !== 0);
-            if (!topRect) return;
-            this.addMaskRect(stackGroup, topRect, xWidth, color, groupBorderRadius);
+            this.addMaskRect(stackGroup, topRect, xWidth);
           });
         });
         if (display_each_block_data) {
           this.handleLabelToRectCenter(g, xWidth);
         }
+        this.animateFadeIn(this.chart.select('.content-wrapper').selectAll('text'), this.transitionDuration, this.transitionDuration * 0.5);
+        this.animateStackGrowInY(g, rect => rect.parentNode.getAttribute('data-slugid'));
       }).on('click', (event, data) => {
-        this.props.toggleRecords(data);
+        this.props.toggleRecords(data.stackData);
       }).on('mouseover', event => {
         this.showTooltip(event, color);
         this.handleStacksAcitveAndInActiveState('inActive', event);
@@ -246,10 +219,9 @@ class BarCustom extends _chartComponent.default {
       const {
         label_font_size
       } = chart.config;
-      const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const theme = CHART_THEME_COLOR[globalTheme];
       Array.from(g._parents).forEach(group => {
         Array.from(group.children).forEach(rect => {
-          // The height is 0, and the label is not displayed.
           if (Number(rect.getAttribute('height')) === 0) return;
           this.addLabelToRectCenter({
             container: rect.parentNode,
@@ -264,28 +236,8 @@ class BarCustom extends _chartComponent.default {
         });
       });
     };
-    this.addMaskRect = (topG, rect, xWidth, colorScale, borderRadiusVal) => {
-      const {
-        borderRadius
-      } = this.chartBoundingClientRect;
-      const rectHeight = Number(rect.getAttribute('height'));
-      const computedBorderRadius = Math.min(xWidth * borderRadius, rectHeight / 2, xWidth / 2);
-      const safeBorderRadius = Math.min(borderRadiusVal !== null && borderRadiusVal !== void 0 ? borderRadiusVal : computedBorderRadius, rectHeight / 2, xWidth / 2);
-      // Add mask rect
-      d3.select(topG).append('foreignObject').attr('class', 'stack-wrapper').attr('opacity', rect.getAttribute('opacity')).attr('x', rect.getAttribute('x')).attr('data-x', topG.parentNode.getAttribute('data-transform')).attr('y', rect.getAttribute('y')).attr('width', xWidth).attr('height', rect.getAttribute('height')).attr('data-groupName', rect.getAttribute('data-groupName')).attr('data-value', rect.getAttribute('data-value')).attr('data-title', rect.getAttribute('data-title')).attr('data-rectId', rect.getAttribute('data-rectId')).on('click', (event, data) => {
-        this.props.toggleRecords(data);
-      }).on('mouseover', event => {
-        this.showTooltip(event, colorScale, true);
-        this.handleStacksAcitveAndInActiveState('inActive', event);
-      }).on('mousemove', event => {
-        this.moveTooltip(event, true);
-      }).on('mouseleave', (event, data) => {
-        this.hiddenTooltip();
-        this.handleStacksAcitveAndInActiveState('active', event);
-      }).append('xhtml:div').attr('class', 'stack').attr('data-rectId', rect.getAttribute('data-rectId')).attr('style', `width: 100%; height: 100%; background-color: ${rect.getAttribute('fill')}; border-radius: ${safeBorderRadius}px ${safeBorderRadius}px 0px 0px`);
-
-      // Remove old rect
-      d3.select(rect).remove();
+    this.addMaskRect = (topG, rect, xWidth) => {
+      return this.addRoundedClip(rect, 'y', xWidth);
     };
     this.handleStacksAcitveAndInActiveState = (state, event) => {
       const rectsWrapper = event.currentTarget.parentNode.parentNode.parentNode;
@@ -294,10 +246,8 @@ class BarCustom extends _chartComponent.default {
         allGroup.forEach(group => {
           Array.from(group.children).forEach(rectGroup => {
             Array.from(rectGroup.children).forEach(rect => {
-              const isDiv = rect.getAttribute('class') === 'stack-wrapper';
-              const curRect = isDiv ? rect.children[0] : rect;
-              if (curRect.getAttribute('class') === 'stack') {
-                isDiv ? d3.select(curRect.parentNode).transition().duration(this.transitionDuration).attr('opacity', 1) : d3.select(curRect).transition().duration(this.transitionDuration).attr('opacity', 1);
+              if (rect.getAttribute('class') === 'stack') {
+                d3.select(rect).transition().duration(this.interactionDuration).attr('opacity', 1);
               }
             });
           });
@@ -308,35 +258,27 @@ class BarCustom extends _chartComponent.default {
         allGroup.forEach(group => {
           Array.from(group.children).forEach(rectGroup => {
             Array.from(rectGroup.children).forEach(rect => {
-              const isDiv = rect.getAttribute('class') === 'stack-wrapper';
-              const curRect = isDiv ? rect.children[0] : rect;
-              if (curRect.getAttribute('class') === 'stack' && curRect.getAttribute('data-rectId') !== curRectId) {
-                isDiv ? d3.select(curRect.parentNode).transition().duration(this.transitionDuration).attr('opacity', 0.3) : d3.select(curRect).transition().duration(this.transitionDuration).attr('opacity', 0.3);
+              if (rect.getAttribute('class') === 'stack' && rect.getAttribute('data-rectId') !== curRectId) {
+                d3.select(rect).transition().duration(this.interactionDuration).attr('opacity', 0.3);
               }
             });
           });
         });
       }
     };
-    this.showTooltip = (event, colorScale, isDiv) => {
-      let {
+    this.showTooltip = (event, colorScale) => {
+      const {
         offsetX,
         offsetY
       } = event;
-      if (isDiv) {
-        const initX = Number(event.currentTarget.getAttribute('data-x'));
-        const initY = Number(event.currentTarget.getAttribute('y'));
-        offsetX = offsetX + initX;
-        offsetY = offsetY + initY;
-      }
       const title = event.currentTarget.getAttribute('data-title');
       const name = event.currentTarget.getAttribute('data-groupName');
       const value = event.currentTarget.getAttribute('data-value');
       const newTooltipData = {
-        title: !title && typeof title !== 'number' ? _intl.default.get(_constants.EMPTY_NAME) : title,
+        title: !title && typeof title !== 'number' ? intl.get(EMPTY_NAME) : title,
         items: [{
           color: colorScale(name),
-          name: !name && typeof name !== 'number' ? _intl.default.get(_constants.EMPTY_NAME) : name,
+          name: !name && typeof name !== 'number' ? intl.get(EMPTY_NAME) : name,
           value
         }]
       };
@@ -350,17 +292,11 @@ class BarCustom 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('y'));
-        offsetX = offsetX + initX;
-        offsetY = offsetY + initY;
-      }
       this.setState({
         toolTipPosition: {
           offsetX,
@@ -382,11 +318,11 @@ class BarCustom extends _chartComponent.default {
   componentDidMount() {
     this.createChart();
     this.drawChart();
-    window.addEventListener('resize', this.handleResize);
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
-    if (_chartUtils.BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
+    if (BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
       this.destroyChart();
       this.createChart();
       this.drawChart();
@@ -394,23 +330,17 @@ class BarCustom extends _chartComponent.default {
   }
   componentWillUnmount() {
     this.destroyChart();
-    window.removeEventListener('resize', this.handleResize);
+    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-label': this.isShowYAxisLabel(chart)
-      })
-    }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      className: "sea-chart-container"
+    }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,
       chart: this.chart
@@ -418,15 +348,15 @@ class BarCustom extends _chartComponent.default {
   }
 }
 BarCustom.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 = BarCustom;
+export default BarCustom;