sea-chart 2.0.26 → 2.0.27

package/dist/components/types-dialog/index.js

@@ -70,8 +70,6 @@ const TypesDialog = _ref => {
   const handleFilterTypes = (0, _react.useCallback)(() => {
     if (hideTypeToggle) {
       const newChartTypes = _constants.CHART_TYPES.filter(item => ['Histogram', 'Bar_chart', 'Line_chart', 'Area', 'Pie_chart', 'Scatter_chart', 'Combination_chart', 'Map'].includes(item.name));
-      const newMapChildren = newChartTypes[newChartTypes.length - 1].children.slice(0, 2);
-      newChartTypes[newChartTypes.length - 1].children = newMapChildren;
       return newChartTypes;
     }
     return _constants.CHART_TYPES;

package/dist/view/wrapper/chart-component.js

@@ -667,7 +667,7 @@ class ChartComponent extends _react.Component {
       const legendRectHeight = legendDirection === 'vertical' ? Math.min(legendSize * 100, chartHeight - insertPadding * 2) : 12;
       const legendTextOffset = 2;
       const legendTextHeightSpace = legendDirection === 'vertical' ? 0 : 14 + legendTextOffset;
-      if (type !== _constants.CHART_TYPE.MAP_BUBBLE) {
+      if (![_constants.CHART_TYPE.MAP_BUBBLE, _constants.CHART_TYPE.WORLD_MAP_BUBBLE].includes(type)) {
         var _this$chart$node;
         // add linearGradient
         const gradient = this.chart.append('defs').attr('class', 'linear-gradient-wrapper').append('linearGradient').attr("id", "gradient-".concat((_this$chart$node = this.chart.node()) === null || _this$chart$node === void 0 ? void 0 : _this$chart$node.id, "-").concat(previewType)).attr("x1", '0%').attr("y1", '0%').attr("x2", legendDirection === 'vertical' ? '0%' : '100%').attr("y2", legendDirection === 'vertical' ? '100%' : '0%');
@@ -678,8 +678,8 @@ class ChartComponent extends _react.Component {
 
       // add legend
       const continuousLegendWrapper = this.chart.append('g').attr('class', 'legend-continuous-wrapper').attr('transform', "translate(".concat(insertPadding, ", ").concat(chartHeight - legendRectHeight - legendTextHeightSpace, ")"));
-      continuousLegendWrapper.append('rect').attr('width', legendRectWidth).attr('height', legendRectHeight).attr('fill', type === _constants.CHART_TYPE.MAP_BUBBLE ? bubbleColor : "url(#gradient-".concat((_this$chart$node2 = this.chart.node()) === null || _this$chart$node2 === void 0 ? void 0 : _this$chart$node2.id, "-").concat(previewType, ")")).call(g => {
-        if (type === _constants.CHART_TYPE.MAP_BUBBLE) {
+      continuousLegendWrapper.append('rect').attr('width', legendRectWidth).attr('height', legendRectHeight).attr('fill', [_constants.CHART_TYPE.MAP_BUBBLE, _constants.CHART_TYPE.WORLD_MAP_BUBBLE].includes(type) ? bubbleColor : "url(#gradient-".concat((_this$chart$node2 = this.chart.node()) === null || _this$chart$node2 === void 0 ? void 0 : _this$chart$node2.id, "-").concat(previewType, ")")).call(g => {
+        if ([_constants.CHART_TYPE.MAP_BUBBLE, _constants.CHART_TYPE.WORLD_MAP_BUBBLE].includes(type)) {
           continuousLegendWrapper.append('polygon').attr('points', "0,0  ".concat(legendRectWidth - 0.5, ",0  0,").concat(legendRectHeight - 0.5)).attr('fill', '#fff').attr('stroke', '#fff');
         }
       });
@@ -1140,6 +1140,13 @@ class ChartComponent extends _react.Component {
       if (!mapData.features) return [];
       let statisticNewData = [];
       let sum = 0;
+
+      // Modify the map json data of type Topology
+      mapData.features.forEach(feature => {
+        if (feature.properties.fullname) {
+          feature.properties.name = feature.properties.fullname;
+        }
+      });
       statisticData.forEach((item, index) => {
         if (item && item.name) {
           let matchFeature = mapData.features.find(feature => feature.properties.name.indexOf(item.name) > -1);
@@ -1159,6 +1166,55 @@ class ChartComponent extends _react.Component {
       }
       return statisticNewData;
     };
+    this.formatWorldMapStatisticData = (statisticData, mapData, type) => {
+      if (!statisticData) return [];
+      if (!mapData.features) return [];
+      const reg = /^([A-Za-z])/;
+      const countryMap = new Map();
+      mapData.features.forEach(item => {
+        countryMap.set(item.properties.name, item.properties.name_cn);
+        countryMap.set(item.properties.name_cn, item.properties.name);
+      });
+      let sum = 0;
+      let statisticNewData = [];
+      statisticData.forEach(item => {
+        if (item && item.name) {
+          let nameType, name, name_cn;
+          if (reg.test(item.name)) {
+            nameType = 'en';
+            name = item.name;
+            name_cn = countryMap.get(name);
+          } else {
+            nameType = 'zh-cn';
+            name = countryMap.get(item.name);
+            name_cn = item.name;
+          }
+          const value = item.value;
+          if (name_cn && name) {
+            const existedData = statisticNewData.find(i => i.name === name);
+            if (existedData) {
+              existedData.value += value;
+              existedData.formatted_value = parseInt(existedData.formatted_value) + parseInt(item.formatted_value) + '';
+            } else {
+              statisticNewData.push({
+                name_cn,
+                name,
+                nameType,
+                value: value || 0,
+                formatted_value: item.formatted_value + ''
+              });
+            }
+            if (type === _constants.CHART_TYPE.WORLD_MAP_BUBBLE) {
+              sum += item.value;
+            }
+          }
+        }
+      });
+      if (type === _constants.CHART_TYPE.WORLD_MAP_BUBBLE) {
+        statisticNewData.sum = sum;
+      }
+      return statisticNewData;
+    };
     this.getToolTipSettings = (isGroup, summaryColumn, y_axis_summary_method, useSingleSelectColumnColor) => {
       const obj = {
         showMarkers: false,

package/dist/view/wrapper/index.js

@@ -32,6 +32,8 @@ var _basicNumberCard = _interopRequireDefault(require("./basic-number-card"));
 var _combination = _interopRequireDefault(require("./combination"));
 var _map = _interopRequireDefault(require("./map"));
 var _mapBubble = _interopRequireDefault(require("./map-bubble"));
+var _mapWorld = _interopRequireDefault(require("./map-world"));
+var _mapWorldBubble = _interopRequireDefault(require("./map-world-bubble"));
 var _trend = _interopRequireDefault(require("./trend"));
 var _tableElement = _interopRequireDefault(require("./table-element"));
 const Wrapper = _ref => {
@@ -265,6 +267,18 @@ const Wrapper = _ref => {
             canvasStyle: canvasStyle
           }));
         }
+      case _constants.CHART_TYPE.WORLD_MAP:
+        {
+          return /*#__PURE__*/_react.default.createElement(_mapWorld.default, Object.assign({}, baseProps, {
+            canvasStyle: canvasStyle
+          }));
+        }
+      case _constants.CHART_TYPE.WORLD_MAP_BUBBLE:
+        {
+          return /*#__PURE__*/_react.default.createElement(_mapWorldBubble.default, Object.assign({}, baseProps, {
+            canvasStyle: canvasStyle
+          }));
+        }
       case _constants.CHART_TYPE.BASIC_NUMBER_CARD:
         {
           return /*#__PURE__*/_react.default.createElement(_basicNumberCard.default, Object.assign({}, baseProps, {

package/dist/view/wrapper/map-bubble.js

@@ -49,8 +49,9 @@ class MapBubble extends _chartComponent.default {
       const mediaUrl = _context.default.getSetting('mediaUrl');
       const mapJson = await (0, _mapJson.default)(map_level, map_location, mediaUrl);
       if (!mapJson) return;
-      const statisticNewData = this.formatMapStatisticData(data, mapJson, type);
-      this.draw(statisticNewData, mapJson);
+      const newMapJson = map_level === _constants.MAP_LEVEL.COUNTRY ? (0, _topojson.feature)(mapJson, mapJson.objects) : mapJson;
+      const statisticNewData = this.formatMapStatisticData(data, newMapJson, type);
+      this.draw(statisticNewData, newMapJson);
     };
     this.showTooltip = event => {
       const title = event.currentTarget.getAttribute('data-name');
@@ -102,7 +103,6 @@ class MapBubble extends _chartComponent.default {
       } = this.props;
       const theme = _constants.CHART_THEME_COLOR[globalTheme];
       const {
-        map_level = _constants.MAP_LEVEL.COUNTRY,
         legend_size,
         legend_direction,
         summary_method,
@@ -114,21 +114,20 @@ class MapBubble extends _chartComponent.default {
         height: chartHeight,
         insertPadding
       } = this.chartBoundingClientRect;
-      const newMapData = map_level === _constants.MAP_LEVEL.COUNTRY ? (0, _topojson.feature)(mapJson, mapJson.objects) : mapJson;
 
       // 1. Setting up projection
-      const projection = d3.geoMercator().fitSize([chartWidth - insertPadding, chartHeight - insertPadding], newMapData);
+      const projection = d3.geoMercator().fitSize([chartWidth - insertPadding, chartHeight - insertPadding], mapJson);
 
       // 2. Generate a path based on projection
       const pathGenerator = d3.geoPath(projection);
 
       // 3. Rendering map
-      this.chart.append('g').attr('class', 'map-wrapper').selectAll().data(newMapData.features).join('g').append('path').attr('d', d => {
+      this.chart.append('g').attr('class', 'map-wrapper').selectAll().data(mapJson.features).join('g').append('path').attr('d', d => {
         return pathGenerator(d);
       }).attr('stroke-width', 1).attr('stroke', '#bdbdbd').attr('stroke-opacity', 1).attr('fill', '#e2e2e2').attr('opacity', 1).attr('data-name', d => d.properties.name);
 
       // draw bubble circle
-      this.drawCircle(data, newMapData, pathGenerator);
+      this.drawCircle(data, mapJson, pathGenerator);
 
       // draw legend
       const columnData = this.getColumnData();

package/dist/view/wrapper/map-world-bubble.js

@@ -0,0 +1,266 @@
+"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 _topojson = require("topojson");
+var _dtableUtils = require("dtable-utils");
+var _constants = require("../../constants");
+var _utils = require("../../utils");
+var _context = _interopRequireDefault(require("../../context"));
+var _mapJson = _interopRequireDefault(require("../../services/map-json"));
+var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
+var _chartComponent = _interopRequireDefault(require("./chart-component"));
+class MapBubble extends _chartComponent.default {
+  constructor(props) {
+    super(props);
+    this.handleResize = () => {
+      this.chart.node() && this.chart.node().remove();
+      this.createChart();
+      this.drawChart();
+    };
+    this.createChart = () => {
+      const {
+        chart
+      } = this.props;
+      const initConfig = {
+        insertPadding: 30
+      };
+      this.initChart(this.container, chart === null || chart === void 0 ? void 0 : chart.id, initConfig);
+    };
+    this.drawChart = async () => {
+      let {
+        result: data,
+        chart
+      } = this.props;
+      if (!Array.isArray(data)) return;
+      const {
+        type
+      } = chart.config;
+      const mediaUrl = _context.default.getSetting('mediaUrl');
+      const mapJson = await (0, _mapJson.default)(_constants.MAP_LEVEL.WORLD, '', mediaUrl);
+      if (!mapJson) return;
+      const newMapJson = (0, _topojson.feature)(mapJson, mapJson.objects);
+      const statisticNewData = this.formatWorldMapStatisticData(data, newMapJson, type);
+      this.draw(statisticNewData, newMapJson);
+    };
+    this.showTooltip = (event, data) => {
+      const curData = data.find(item => item.name.includes(event.currentTarget.getAttribute('data-name')));
+      const title = curData.nameType === 'en' ? curData.name : curData.name_cn;
+      const value = Number(event.currentTarget.getAttribute('data-value'));
+      const {
+        offsetX,
+        offsetY
+      } = event;
+      const newTooltipData = {
+        title,
+        items: [{
+          color: '',
+          name: '数量',
+          value
+        }]
+      };
+      this.setState({
+        tooltipData: newTooltipData
+      });
+      this.setState({
+        toolTipPosition: {
+          offsetX,
+          offsetY
+        }
+      });
+    };
+    this.moveTooltip = event => {
+      const {
+        offsetX,
+        offsetY
+      } = event;
+      this.setState({
+        toolTipPosition: {
+          offsetX,
+          offsetY
+        }
+      });
+    };
+    this.hiddenTooltip = event => {
+      this.setState({
+        toolTipPosition: null
+      });
+    };
+    this.draw = (data, mapJson) => {
+      const {
+        chart,
+        globalTheme,
+        canvasStyle
+      } = this.props;
+      const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const {
+        legend_size,
+        legend_direction,
+        summary_method,
+        type,
+        bubble_color
+      } = chart.config;
+      const {
+        width: chartWidth,
+        height: chartHeight,
+        insertPadding
+      } = this.chartBoundingClientRect;
+
+      // 1. Setting up projection
+      const projection = d3.geoMercator().fitSize([chartWidth - insertPadding, chartHeight - insertPadding], mapJson);
+
+      // 2. Generate a path based on projection
+      const pathGenerator = d3.geoPath(projection);
+
+      // 3. Rendering map
+      this.chart.append('g').attr('class', 'map-wrapper').selectAll().data(mapJson.features).join('g').append('path').attr('d', d => {
+        return pathGenerator(d);
+      }).attr('stroke-width', 1).attr('stroke', '#bdbdbd').attr('stroke-opacity', 1).attr('fill', '#e2e2e2').attr('opacity', 1).attr('data-name', d => d.properties.name);
+
+      // draw bubble circle
+      this.drawCircle(data, mapJson, pathGenerator);
+
+      // draw legend
+      const columnData = this.getColumnData();
+      this.setContinuousLegend({
+        previewType: canvasStyle.previewType,
+        theme,
+        legendDirection: legend_direction,
+        legendSize: legend_size,
+        legendTextRange: [_utils.BaseUtils.getSummaryValueDisplayString(columnData, d3.min(data, d => d.value), summary_method), _utils.BaseUtils.getSummaryValueDisplayString(columnData, d3.max(data, d => d.value), summary_method)],
+        type,
+        bubbleColor: bubble_color || '#2a67d1'
+      });
+    };
+    this.handleAcitveAndInActiveState = (state, event, highlightedBorderColor) => {
+      if (state === 'active') {
+        d3.select(event.currentTarget).transition().duration(this.transitionDuration).attr('fill-opacity', 0.9);
+        return;
+      }
+      d3.select(event.currentTarget).transition().duration(this.transitionDuration).attr('fill-opacity', 0.6);
+    };
+    this.getColumnData = () => {
+      const {
+        chart
+      } = this.props;
+      const {
+        summary_type,
+        summary_column_key,
+        table_id
+      } = chart.config;
+      let columnData = _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
+      if (summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
+        const table = (0, _dtableUtils.getTableById)(table_id);
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key) || {};
+        columnData = summaryColumn.data || _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
+      }
+      return columnData;
+    };
+    this.drawCircle = (data, mapData, geoPath) => {
+      const {
+        chart
+      } = this.props;
+      const {
+        bubble_color
+      } = chart.config;
+      const circleData = [];
+      mapData.features.forEach(item => {
+        const curName = item.properties.name;
+        const curData = data.find(item => item.name.includes(curName));
+        if (curData) {
+          circleData.push({
+            feature: item,
+            value: curData.value,
+            name: curName
+          });
+        }
+      });
+      const bubbleWrapper = this.chart.append('g').attr('class', 'bubble-wrapper');
+      circleData.forEach(_ref => {
+        let {
+          feature,
+          value,
+          name
+        } = _ref;
+        const centroid = geoPath.centroid(feature);
+        if (centroid && centroid[0] && centroid[1]) {
+          bubbleWrapper.append('circle').attr('cx', centroid[0]).attr('cy', centroid[1]).attr('r', () => {
+            const percent = value / data.sum;
+            let size = percent * 100;
+            return size;
+          }).attr('fill', bubble_color || '#2a67d1').attr('fill-opacity', 0.6).attr('stroke', bubble_color || '#2a67d1').attr('stroke-opacity', 0.9).attr('data-value', value).attr('data-name', name).on('click', event => {
+            const name = event.target.getAttribute('data-name');
+            const newData = data.find(item => item.name.includes(name));
+            newData && this.props.toggleRecords(newData);
+          }).on('mouseover', event => {
+            this.showTooltip(event, data);
+            this.handleAcitveAndInActiveState('active', event);
+          }).on('mousemove', event => {
+            this.moveTooltip(event);
+          }).on('mouseleave', event => {
+            this.hiddenTooltip(event);
+            this.handleAcitveAndInActiveState('inActive', event);
+          });
+        }
+      });
+    };
+    this.chart = null;
+    this.state = {
+      tooltipData: null,
+      toolTipPosition: null
+    };
+  }
+  componentDidMount() {
+    this.createChart();
+    this.drawChart();
+    this.debouncedHandleResize = (0, _lodashEs.debounce)(this.handleResize, 300);
+    window.addEventListener('resize', this.debouncedHandleResize);
+  }
+  componentDidUpdate(prevProps) {
+    super.componentDidUpdate(prevProps);
+    if (_utils.BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
+      this.createChart();
+      this.drawChart();
+    }
+  }
+  componentWillUnmount() {
+    this.chart.node() && this.chart.node().remove();
+    window.removeEventListener('resize', this.debouncedHandleResize);
+  }
+  render() {
+    const {
+      tooltipData,
+      toolTipPosition
+    } = this.state;
+    return /*#__PURE__*/_react.default.createElement("div", {
+      ref: ref => this.container = ref,
+      className: "sea-chart-container"
+    }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      tooltipData: tooltipData,
+      toolTipPosition: toolTipPosition,
+      chart: this.chart
+    }));
+  }
+}
+MapBubble.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
+};
+var _default = exports.default = MapBubble;

package/dist/view/wrapper/map-world.js

@@ -0,0 +1,279 @@
+"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 _topojson = require("topojson");
+var _dtableUtils = require("dtable-utils");
+var _constants = require("../../constants");
+var _utils = require("../../utils");
+var _colorRules = require("../../constants/color-rules");
+var _context = _interopRequireDefault(require("../../context"));
+var _mapJson = _interopRequireDefault(require("../../services/map-json"));
+var _tooltip = _interopRequireDefault(require("../../components/tooltip"));
+var _chartComponent = _interopRequireDefault(require("./chart-component"));
+class Map extends _chartComponent.default {
+  constructor(props) {
+    super(props);
+    this.handleResize = () => {
+      this.chart.node() && this.chart.node().remove();
+      this.createChart();
+      this.drawChart();
+    };
+    this.createChart = () => {
+      const {
+        chart
+      } = this.props;
+      const initConfig = {
+        insertPadding: 30
+      };
+      this.initChart(this.container, chart === null || chart === void 0 ? void 0 : chart.id, initConfig);
+    };
+    this.drawChart = async () => {
+      let {
+        result: data,
+        chart
+      } = this.props;
+      if (!Array.isArray(data)) return;
+      const {
+        type
+      } = chart.config;
+      const mediaUrl = _context.default.getSetting('mediaUrl');
+      const mapJson = await (0, _mapJson.default)(_constants.MAP_LEVEL.WORLD, '', mediaUrl);
+      if (!mapJson) return;
+      const newMapJson = (0, _topojson.feature)(mapJson, mapJson.objects);
+      const statisticNewData = this.formatWorldMapStatisticData(data, newMapJson, type);
+      this.draw(statisticNewData, newMapJson);
+    };
+    this.showTooltip = (event, data) => {
+      const curData = data.find(item => item.name.includes(event.target.parentNode.getAttribute('data-name')));
+      const title = curData.nameType === 'en' ? curData.name : curData.name_cn;
+      const value = Number(event.target.parentNode.getAttribute('data-value'));
+      const {
+        offsetX,
+        offsetY
+      } = event;
+      const newTooltipData = {
+        title,
+        items: [{
+          color: '',
+          name: '数量',
+          value
+        }]
+      };
+      this.setState({
+        tooltipData: newTooltipData
+      });
+      this.setState({
+        toolTipPosition: {
+          offsetX,
+          offsetY
+        }
+      });
+    };
+    this.moveTooltip = event => {
+      const {
+        offsetX,
+        offsetY
+      } = event;
+      this.setState({
+        toolTipPosition: {
+          offsetX,
+          offsetY
+        }
+      });
+    };
+    this.hiddenTooltip = event => {
+      this.setState({
+        toolTipPosition: null
+      });
+    };
+    this.draw = (data, mapJson) => {
+      const {
+        chart,
+        globalTheme,
+        canvasStyle,
+        isCalculateByView
+      } = this.props;
+      const theme = _constants.CHART_THEME_COLOR[globalTheme];
+      const {
+        data_color,
+        legend_size,
+        legend_direction,
+        summary_method
+      } = chart.config;
+      const {
+        width: chartWidth,
+        height: chartHeight,
+        insertPadding
+      } = this.chartBoundingClientRect;
+      const currentColorOption = _colorRules.COLOR_OPTIONS.filter(item => item.name === data_color)[0] || _colorRules.COLOR_OPTIONS[0];
+      const {
+        exampleColors,
+        highlightedBorderColor
+      } = currentColorOption;
+
+      // Color scale
+      const minVal = d3.min(data, d => d.value);
+      const maxVal = d3.max(data, d => d.value);
+      const color = d3.scaleSequential([minVal, maxVal], d3.interpolateRgbBasis(exampleColors)).unknown('#e2e2e2');
+
+      // 1. Setting up projection
+      const projection = d3.geoMercator().fitSize([chartWidth - insertPadding, chartHeight - insertPadding], mapJson);
+
+      // 2. Generate a path based on projection
+      const pathGenerator = d3.geoPath(projection);
+
+      // 3. Rendering map
+      this.chart.append('g').attr('class', 'map-wrapper').on('click', event => {
+        if (isCalculateByView) {
+          const value = Number(event.target.parentNode.getAttribute('data-value'));
+          if (value) {
+            const name = event.target.parentNode.getAttribute('data-name');
+            const newData = data.find(item => item.name.includes(name));
+            newData && this.props.toggleRecords([newData]);
+          }
+        }
+      }).on('mousemove', event => {
+        console.log(data);
+        const value = Number(event.target.parentNode.getAttribute('data-value'));
+        if (this.curElement) {
+          this.handleAcitveAndInActiveState('inActive', event, highlightedBorderColor);
+          this.curElement = null;
+        }
+        if (value) {
+          this.curElement = event.target.parentNode;
+          this.showTooltip(event, data);
+          this.handleAcitveAndInActiveState('active', event, highlightedBorderColor);
+        } else {
+          this.hiddenTooltip(event);
+        }
+      }).on('mouseleave', event => {
+        if (this.curElement) {
+          this.hiddenTooltip(event);
+          this.handleAcitveAndInActiveState('inActive', event, highlightedBorderColor);
+          this.curElement = null;
+        }
+      }).selectAll().data(mapJson.features).join('g').attr('data-name', d => d.properties.name).attr('stroke-width', 1).attr('stroke', '#bdbdbd').attr('stroke-opacity', 1).attr('opacity', 1).append('path').attr('d', d => {
+        return pathGenerator(d);
+      }).attr('data-name', d => d.properties.name).call(g => {
+        var _g$nodes$find;
+        const chinaGroup = (_g$nodes$find = g.nodes().find(item => item.getAttribute('data-name').includes('China'))) === null || _g$nodes$find === void 0 ? void 0 : _g$nodes$find.parentNode;
+        const chinaTaiwan = g.nodes().find(item => item.getAttribute('data-name').includes('Taiwan'));
+        if (chinaGroup) {
+          (chinaTaiwan === null || chinaTaiwan === void 0 ? void 0 : chinaTaiwan.parentNode) && chinaTaiwan.parentNode.remove();
+          chinaGroup.append(chinaTaiwan);
+        }
+      }).call(g => {
+        g.nodes().forEach(item => {
+          const curGroup = item.parentNode;
+          const curName = curGroup.getAttribute('data-name');
+          const curItemData = data.find(d => d.name.includes(curName));
+          if (curItemData) {
+            d3.select(curGroup).attr('fill', color(curItemData.value));
+            d3.select(curGroup).attr('data-value', curItemData.value);
+          } else {
+            d3.select(curGroup).attr('fill', color());
+          }
+        });
+      });
+      const columnData = this.getColumnData();
+      this.setContinuousLegend({
+        previewType: canvasStyle.previewType,
+        theme,
+        colorRange: exampleColors,
+        legendDirection: legend_direction,
+        legendSize: legend_size,
+        legendTextRange: [_utils.BaseUtils.getSummaryValueDisplayString(columnData, minVal, summary_method), _utils.BaseUtils.getSummaryValueDisplayString(columnData, maxVal, summary_method)]
+      });
+    };
+    this.handleAcitveAndInActiveState = (state, event, highlightedBorderColor) => {
+      if (state === 'active') {
+        const lastElement = Array.from(event.target.parentNode.parentNode.children).at(-1);
+
+        // Add element to the end
+        d3.select(this.curElement).transition().duration(this.transitionDuration).attr('stroke-opacity', 0.7).attr('stroke-width', 0.5).attr('stroke', highlightedBorderColor);
+        lastElement.after(this.curElement);
+        return;
+      }
+      if (this.curElement) {
+        d3.select(this.curElement).transition().duration(this.transitionDuration).attr('stroke-opacity', 1).attr('stroke-width', 1).attr('stroke', '#bdbdbd');
+      }
+    };
+    this.getColumnData = () => {
+      const {
+        chart
+      } = this.props;
+      const {
+        summary_type,
+        summary_column_key,
+        table_id
+      } = chart.config;
+      let columnData = _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
+      if (summary_type === _constants.CHART_SUMMARY_TYPE.ADVANCED) {
+        const table = (0, _dtableUtils.getTableById)(table_id);
+        const summaryColumn = (0, _dtableUtils.getTableColumnByKey)(table, summary_column_key) || {};
+        columnData = summaryColumn.data || _constants.DEFAULT_NUMBER_FORMAT_OBJECT;
+      }
+      return columnData;
+    };
+    this.chart = null;
+    this.state = {
+      tooltipData: null,
+      toolTipPosition: null
+    };
+    this.curElement = null; // Regions that currently contain data
+  }
+  componentDidMount() {
+    this.createChart();
+    this.drawChart();
+    this.debouncedHandleResize = (0, _lodashEs.debounce)(this.handleResize, 300);
+    window.addEventListener('resize', this.debouncedHandleResize);
+  }
+  componentDidUpdate(prevProps) {
+    super.componentDidUpdate(prevProps);
+    if (_utils.BaseUtils.shouldChartComponentUpdate(prevProps, this.props)) {
+      this.createChart();
+      this.drawChart();
+    }
+  }
+  componentWillUnmount() {
+    this.chart.node() && this.chart.node().remove();
+    window.removeEventListener('resize', this.debouncedHandleResize);
+  }
+  render() {
+    const {
+      tooltipData,
+      toolTipPosition
+    } = this.state;
+    return /*#__PURE__*/_react.default.createElement("div", {
+      ref: ref => this.container = ref,
+      className: "sea-chart-container"
+    }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      tooltipData: tooltipData,
+      toolTipPosition: toolTipPosition,
+      chart: this.chart
+    }));
+  }
+}
+Map.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
+};
+var _default = exports.default = Map;

package/dist/view/wrapper/map.js

@@ -50,8 +50,9 @@ class Map extends _chartComponent.default {
       const mediaUrl = _context.default.getSetting('mediaUrl');
       const mapJson = await (0, _mapJson.default)(map_level, map_location, mediaUrl);
       if (!mapJson) return;
-      const statisticNewData = this.formatMapStatisticData(data, mapJson, type);
-      this.draw(statisticNewData, mapJson);
+      const newMapJson = map_level === _constants.MAP_LEVEL.COUNTRY ? (0, _topojson.feature)(mapJson, mapJson.objects) : mapJson;
+      const statisticNewData = this.formatMapStatisticData(data, newMapJson, type);
+      this.draw(statisticNewData, newMapJson);
     };
     this.showTooltip = event => {
       const title = event.target.getAttribute('data-name');
@@ -103,7 +104,6 @@ class Map extends _chartComponent.default {
       } = this.props;
       const theme = _constants.CHART_THEME_COLOR[globalTheme];
       const {
-        map_level = _constants.MAP_LEVEL.COUNTRY,
         data_color,
         legend_size,
         legend_direction,
@@ -114,7 +114,6 @@ class Map extends _chartComponent.default {
         height: chartHeight,
         insertPadding
       } = this.chartBoundingClientRect;
-      const newMapData = map_level === _constants.MAP_LEVEL.COUNTRY ? (0, _topojson.feature)(mapJson, mapJson.objects) : mapJson;
       const currentColorOption = _colorRules.COLOR_OPTIONS.filter(item => item.name === data_color)[0] || _colorRules.COLOR_OPTIONS[0];
       const {
         exampleColors,
@@ -127,7 +126,7 @@ class Map extends _chartComponent.default {
       const color = d3.scaleSequential([minVal, maxVal], d3.interpolateRgbBasis(exampleColors)).unknown('#e2e2e2');
 
       // 1. Setting up projection
-      const projection = d3.geoMercator().fitSize([chartWidth - insertPadding, chartHeight - insertPadding], newMapData);
+      const projection = d3.geoMercator().fitSize([chartWidth - insertPadding, chartHeight - insertPadding], mapJson);
 
       // 2. Generate a path based on projection
       const pathGenerator = d3.geoPath(projection);
@@ -159,7 +158,7 @@ class Map extends _chartComponent.default {
           this.handleAcitveAndInActiveState('inActive', event, highlightedBorderColor);
           this.curElement = null;
         }
-      }).selectAll().data(newMapData.features).join('g').append('path').attr('d', d => {
+      }).selectAll().data(mapJson.features).join('g').append('path').attr('d', d => {
         return pathGenerator(d);
       }).attr('stroke-width', 1).attr('stroke', '#bdbdbd').attr('stroke-opacity', 1).attr('opacity', 1).attr('data-name', d => d.properties.name).call(g => {
         g.nodes().forEach(item => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "main": "./dist/index.js",
   "dependencies": {
     "@dnd-kit/core": "^6.1.0",