sea-chart 2.0.42 → 2.0.44

package/dist/view/wrapper/combination.js

@@ -1,9 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { getTableColumnByKey, getTableById } from 'dtable-utils';
-import { debounce } from 'lodash-es';
 import * as d3 from 'd3';
-import classNames from 'classnames';
 import intl from '../../intl';
 import { EMPTY_NAME, CHART_THEME_COLOR, CHART_LINE_TYPES } from '../../constants';
 import { BaseUtils, isFunction } from '../../utils';
@@ -12,11 +10,6 @@ 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
@@ -30,9 +23,9 @@ class Combination extends ChartComponent {
       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);
@@ -100,7 +93,7 @@ class Combination extends ChartComponent {
         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)
@@ -146,14 +139,12 @@ class Combination extends ChartComponent {
           return currentTheme.colors[0];
         }
         return d.color;
-      }).attr('data-value', d => 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
@@ -185,6 +176,9 @@ class Combination extends ChartComponent {
       }).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
@@ -306,7 +300,7 @@ class Combination extends ChartComponent {
       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 => {
@@ -337,6 +331,8 @@ class Combination extends ChartComponent {
           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 {
@@ -415,11 +411,11 @@ class Combination extends ChartComponent {
     };
     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();
@@ -444,8 +440,7 @@ class Combination extends ChartComponent {
   componentDidMount() {
     this.createChart();
     this.drawChart();
-    this.debouncedHandleResize = debounce(this.handleResize, 300);
-    window.addEventListener('resize', this.debouncedHandleResize);
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
@@ -457,23 +452,16 @@ class Combination extends ChartComponent {
   }
   componentWillUnmount() {
     this.destroyChart();
-    window.removeEventListener('resize', this.debouncedHandleResize);
+    super.componentWillUnmount();
   }
   render() {
-    const {
-      chart
-    } = this.props;
     const {
       tooltipData,
       toolTipPosition
     } = this.state;
     return /*#__PURE__*/React.createElement("div", {
       ref: ref => this.container = ref,
-      className: classNames('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)
-      })
+      className: "sea-chart-container"
     }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,

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

@@ -1,8 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { debounce, cloneDeep } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 import * as d3 from 'd3';
-import classNames from 'classnames';
 import { CHART_THEME_COLOR } from '../../constants';
 import { BaseUtils } from '../../utils';
 import intl from '../../intl';
@@ -11,11 +10,6 @@ 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
@@ -139,7 +133,7 @@ class Completeness extends ChartComponent {
         }).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') {
@@ -150,7 +144,7 @@ class Completeness extends ChartComponent {
           }
           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);
@@ -191,6 +185,8 @@ class Completeness extends ChartComponent {
           });
         }
       });
+      this.animateStackGrowInX(contentWrapper.selectAll('rect'));
+      this.animateFadeIn(contentWrapper.selectAll('text'), this.transitionDuration, this.transitionDuration * 0.5);
       this.setLegend({
         legendName: 'groupby',
         theme,
@@ -217,17 +213,11 @@ class Completeness extends ChartComponent {
       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'),
@@ -247,17 +237,11 @@ class Completeness extends ChartComponent {
         }
       });
     };
-    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,
@@ -365,28 +349,7 @@ class Completeness extends ChartComponent {
       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 = {
@@ -395,11 +358,9 @@ class Completeness extends ChartComponent {
     };
   }
   componentDidMount() {
-    super.componentDidMount();
     this.createChart();
     this.drawChart();
-    this.debouncedHandleResize = debounce(this.handleResize, 300);
-    window.addEventListener('resize', this.debouncedHandleResize);
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
@@ -410,24 +371,17 @@ class Completeness extends ChartComponent {
     }
   }
   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.createElement("div", {
       ref: ref => this.container = ref,
-      className: classNames('sea-chart-container', {
-        'show-x-axis-label': this.isShowHorizontalAxisLabel(chart),
-        'show-y-axis-label': this.isShowVerticalAxisLabel(chart)
-      })
+      className: "sea-chart-container"
     }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,

package/dist/view/wrapper/completeness.js

@@ -1,8 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { debounce } from 'lodash-es';
 import * as d3 from 'd3';
-import classNames from 'classnames';
 import { CHART_THEME_COLOR } from '../../constants';
 import { BaseUtils } from '../../utils';
 import intl from '../../intl';
@@ -11,11 +9,6 @@ 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
@@ -83,7 +76,7 @@ class Completeness extends ChartComponent {
       });
 
       // X axis
-      const niceEnd = d3.nice(0, d3.max(newSeries, d => d[1].sumValue), 5)[1];
+      const niceEnd = d3.nice(0, d3.max(newSeries, d => d[1].sumValue) || 0, 5)[1];
       const x = d3.scaleLinear().domain(y_axis_auto_range ? [0, niceEnd] : [y_axis_min || 0, y_axis_max || niceEnd]).range([Number(yAxis.node().getAttribute('data-axisWidth')), chartWidth - insertPadding - marginRight]);
       this.chart.append('g').attr('class', 'x-axis-wrapper').attr('transform', `translate(0, ${chartHeight - insertPadding})`).call(d3.axisBottom(x).tickSizeInner(0).ticks(5)).call(g => {
         g.selectAll('.domain').remove();
@@ -134,7 +127,7 @@ class Completeness extends ChartComponent {
           });
         }
       }).on('click', (event, data) => {
-        this.props.toggleRecords(data);
+        this.toggleRecords(data.data);
       }).on('mouseover', event => {
         this.showTooltip(event);
         this.handleAcitveAndInActiveState('inActive', event);
@@ -143,6 +136,9 @@ class Completeness extends ChartComponent {
       }).on('mouseleave', (event, data) => {
         this.hiddenTooltip();
         this.handleAcitveAndInActiveState('active', event);
+      }).call(g => {
+        this.animateStackGrowInX(g);
+        this.animateFadeIn(contentWrapper.selectAll('text'), this.transitionDuration, this.transitionDuration * 0.5);
       });
       this.setLegend({
         legendName: 'group_name',
@@ -157,17 +153,11 @@ class Completeness extends ChartComponent {
       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('y'));
-        offsetX = offsetX + initX;
-        offsetY = offsetY + initY;
-      }
       const {
         chartColorTheme
       } = this.props;
@@ -175,7 +165,7 @@ class Completeness extends ChartComponent {
       const newTooltipData = {
         title: event.currentTarget.getAttribute('data-tooltipTitle'),
         items: [{
-          color: event.currentTarget.getAttribute('data-tooltipTitle') === 'rest' ? '#bdbdbd' : colors[0],
+          color: event.currentTarget.getAttribute('data-tooltipName') === 'rest' ? '#bdbdbd' : colors[0],
           name: intl.get(event.currentTarget.getAttribute('data-tooltipName')),
           value: event.currentTarget.getAttribute('data-value')
         }]
@@ -190,17 +180,11 @@ class Completeness extends ChartComponent {
         }
       });
     };
-    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,
@@ -253,28 +237,7 @@ class Completeness extends ChartComponent {
       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('opacity', rect.getAttribute('opacity')).attr('x', rect.getAttribute('x')).attr('y', rect.getAttribute('y')).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-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 = {
@@ -283,11 +246,9 @@ class Completeness extends ChartComponent {
     };
   }
   componentDidMount() {
-    super.componentDidMount();
     this.createChart();
     this.drawChart();
-    this.debouncedHandleResize = debounce(this.handleResize, 300);
-    window.addEventListener('resize', this.debouncedHandleResize);
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
@@ -298,24 +259,17 @@ class Completeness extends ChartComponent {
     }
   }
   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.createElement("div", {
       ref: ref => this.container = ref,
-      className: classNames('sea-chart-container', {
-        'show-x-axis-label': this.isShowHorizontalAxisLabel(chart),
-        'show-y-axis-label': this.isShowVerticalAxisLabel(chart)
-      })
+      className: "sea-chart-container"
     }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,

package/dist/view/wrapper/dashboard.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { debounce } from 'lodash-es';
 import * as d3 from 'd3';
 import { CHART_THEME_COLOR } from '../../constants';
 import { BaseUtils, isFunction } from '../../utils';
@@ -25,17 +24,6 @@ class Dashboard extends ChartComponent {
         });
       }
     };
-    this.componentDidMount = () => {
-      this.createChart();
-      this.drawChart();
-      this.debouncedHandleResize = debounce(this.handleResize, 300);
-      window.addEventListener('resize', this.debouncedHandleResize);
-    };
-    this.handleResize = () => {
-      this.destroyChart();
-      this.createChart();
-      this.drawChart();
-    };
     this.createChart = () => {
       const {
         chart
@@ -59,7 +47,7 @@ class Dashboard extends ChartComponent {
         height: chartHeight,
         insertPadding
       } = this.chartBoundingClientRect;
-      const value = Number(data) * 100;
+      const value = (Number(data) || 0) * 100;
       const formatValue = value >= 100 ? 100 : value.toFixed(1);
       const innerRadius = Math.min(chartWidth, chartHeight) / 2 * 0.7;
       const outerRadius = Math.min(chartWidth, chartHeight) / 2 * 0.75;
@@ -98,6 +86,7 @@ class Dashboard extends ChartComponent {
         // Draw total
         this.drawTotal(g.node().parentNode, formatValue);
       });
+      this.animateFadeIn(this.chart.selectAll('path, circle, rect, line, text'));
     };
     this.drawTicks = (left, offsetX, top, offsetY, startAngle, endAngle, arc) => {
       const {
@@ -226,6 +215,11 @@ class Dashboard extends ChartComponent {
       toolTipPosition: null
     };
   }
+  componentDidMount() {
+    this.createChart();
+    this.drawChart();
+    super.componentDidMount();
+  }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
     if (BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
@@ -236,7 +230,7 @@ class Dashboard extends ChartComponent {
   }
   componentWillUnmount() {
     this.destroyChart();
-    window.removeEventListener('resize', this.debouncedHandleResize);
+    super.componentWillUnmount();
   }
   render() {
     const {

package/dist/view/wrapper/funnel.js

@@ -1,8 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { debounce } from 'lodash-es';
 import * as d3 from 'd3';
-import classNames from 'classnames';
 import { FUNNEL_LABEL_FORMAT, FUNNEL_LABEL_POSITIONS, CHART_THEME_COLOR } from '../../constants';
 import { BaseUtils, getSortedDataByGivenOrder } from '../../utils';
 import ToolTip from '../../components/tooltip';
@@ -10,11 +8,6 @@ import ChartComponent from './chart-component';
 class Funnel extends ChartComponent {
   constructor(props) {
     super(props);
-    this.handleResize = () => {
-      this.destroyChart();
-      this.createChart();
-      this.drawChart();
-    };
     this.createChart = () => {
       const {
         chart
@@ -134,7 +127,7 @@ class Funnel extends ChartComponent {
         let points3X = x(curValue) + curOffsetX;
         let points3Y = y(curName) + y.bandwidth();
         let points4X = x(0) + curOffsetX;
-        let points4Y = y(curName) + +y.bandwidth();
+        let points4Y = y(curName) + y.bandwidth();
         const nextD = data[index + 1];
         if (nextD) {
           const {
@@ -210,6 +203,8 @@ class Funnel extends ChartComponent {
           this.hiddenTooltip(event);
         });
       });
+      this.animateFadeIn(contentWrapper.selectAll('polygon'));
+      this.animateFadeIn(contentWrapper.selectAll('text'), this.transitionDuration, this.transitionDuration * 0.5);
       if (funnel_show_legend) {
         this.setLegend({
           legendName: 'name',
@@ -250,8 +245,7 @@ class Funnel extends ChartComponent {
   componentDidMount() {
     this.createChart();
     this.drawChart();
-    this.debouncedHandleResize = debounce(this.handleResize, 300);
-    window.addEventListener('resize', this.debouncedHandleResize);
+    super.componentDidMount();
   }
   componentDidUpdate(prevProps) {
     super.componentDidUpdate(prevProps);
@@ -263,22 +257,16 @@ class Funnel extends ChartComponent {
   }
   componentWillUnmount() {
     this.destroyChart();
-    window.removeEventListener('resize', this.debouncedHandleResize);
+    super.componentWillUnmount();
   }
   render() {
-    const {
-      chart
-    } = this.props;
     const {
       tooltipData,
       toolTipPosition
     } = this.state;
     return /*#__PURE__*/React.createElement("div", {
       ref: ref => this.container = ref,
-      className: classNames('sea-chart-container', {
-        'show-x-axis-label': this.isShowXAxisLabel(chart),
-        'show-y-axis-label': this.isShowYAxisLabel(chart)
-      })
+      className: "sea-chart-container"
     }, /*#__PURE__*/React.createElement(ToolTip, {
       tooltipData: tooltipData,
       toolTipPosition: toolTipPosition,