@visactor/react-vchart 2.0.13-alpha.8 → 2.0.13

package/build/index.js

@@ -14995,6 +14995,7 @@
         var _a;
         if (!states.length) return void this.clearStates(hasAnimation);
         if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
+        this.stateSort && (states = states.sort(this.stateSort));
         const stateAttrs = {};
         states.forEach(stateName => {
           var _a;
@@ -17023,7 +17024,7 @@
         var _a;
         if (!states.length) return void this.clearStates(hasAnimation);
         if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
-        this.stopStateAnimates();
+        this.stopStateAnimates(), this.stateSort && (states = states.sort(this.stateSort));
         const stateAttrs = {},
           subAttrs = this.subGraphic.map(() => ({}));
         states.forEach(stateName => {
@@ -31193,8 +31194,8 @@
       }
       parseParams(params, isTimeline, child) {
         var _a, _b;
-        const totalTime = this.resolveValue(params.totalTime, void 0, void 0),
-          startTime = this.resolveValue(params.startTime, void 0, 0),
+        const totalTime = this.resolveValue(params.totalTime, child, void 0),
+          startTime = this.resolveValue(params.startTime, child, 0),
           parsedParams = Object.assign({}, params);
         parsedParams.oneByOneDelay = 0, parsedParams.startTime = startTime, parsedParams.totalTime = totalTime;
         const oneByOne = this.resolveValue(params.oneByOne, child, !1);
@@ -31243,11 +31244,10 @@
           let oneByOneDelay = 0;
           oneByOne && (oneByOneDelay = "number" == typeof oneByOne ? oneByOne : oneByOne ? delay + delayAfter + duration : 0), parsedParams.oneByOneDelay = oneByOneDelay, parsedParams.custom = null !== (_a = params.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = params.type) && void 0 !== _b ? _b : "fromTo"];
           const customType = getCustomType(parsedParams.custom);
-          if (parsedParams.customType = customType, totalTime) {
-            const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
-              scale = totalTime ? totalTime / _totalTime : 1;
-            parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
-          }
+          parsedParams.customType = customType;
+          const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
+            scale = isValidNumber$1(totalTime) ? totalTime / _totalTime : 1;
+          parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
         }
         return parsedParams;
       }
@@ -49936,7 +49936,7 @@
         });
         const graphicCount = allGraphics.length;
         allGraphics.forEach((g, index) => {
-          g.context.graphicCount = graphicCount, g.context.graphicIndex = index;
+          g.context.graphicCount = graphicCount, g.context.graphicIndex = index, g.stateSort = this._stateSort;
         }), this._dataByKey = newGroupedData, this._graphics = allGraphics, this.needClear = !0;
       }
       _runEncoderOfGraphic(styles, g, attrs = {}) {
@@ -49969,9 +49969,13 @@
         var _a;
         const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.group);
         graphics.forEach((g, index) => {
-          var _a;
-          const attrs = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.update, g);
-          isNil$1(this._markConfig.interactive) || (attrs.pickable = this._markConfig.interactive);
+          var _a, _b;
+          let attrs = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.update, g);
+          null === (_b = g.currentStates) || void 0 === _b || _b.forEach(_state => {
+            var _a;
+            const stateAttr = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a[_state], g);
+            attrs = Object.assign(Object.assign({}, attrs), stateAttr);
+          }), isNil$1(this._markConfig.interactive) || (attrs.pickable = this._markConfig.interactive);
           const finalAttrs = this._transformGraphicAttributes(g, attrs, null == attrsByGroup ? void 0 : attrsByGroup[g.context.groupKey]);
           g.context.finalAttrs = finalAttrs;
         });
@@ -49987,7 +49991,7 @@
             g.context.diffAttrs = diffAttrs, g.context.reusing ? (g.context.lastAttrs = g.attribute, g.initAttributes({}), g.context.reusing = !1) : hasStateAnimation || (hasAnimation ? g.setAttributesAndPreventAnimate(diffAttrs) : g.setAttributes(diffAttrs)), hasAnimation && g.setFinalAttributes(finalAttrs);
           } else {
             const mockGraphic = g;
-            g = this._createGraphic(finalAttrs), hasAnimation && (null === (_a = g.setFinalAttributes) || void 0 === _a || _a.call(g, finalAttrs)), g.context = mockGraphic.context, g.context.diffAttrs = finalAttrs;
+            g = this._createGraphic(finalAttrs), hasAnimation && (null === (_a = g.setFinalAttributes) || void 0 === _a || _a.call(g, finalAttrs)), g.context = mockGraphic.context, g.context.diffAttrs = finalAttrs, g.stateSort = this._stateSort;
             const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
             if (gIndex >= 0 && (this._graphics[gIndex] = g), null === (_b = this.renderContext) || void 0 === _b ? void 0 : _b.progressive) {
               const groupIndex = this._dataByGroup ? this._dataByGroup.keys.indexOf(g.context.groupKey) : 0,
@@ -77306,7 +77310,7 @@
       datumContainsArray = (fields, data) => datum => fields.every((key, i) => datum[key] === (null == data ? void 0 : data[i])),
       hasData = data => !isNil$1(data) && (isArray$1(data) ? data.length > 0 && data.every(isValid$1) : Object.keys(data).length > 0);
     function showTooltip(datum, options, component) {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e, _f, _g;
       const opt = Object.assign({
           regionIndex: 0
         }, options),
@@ -77325,24 +77329,36 @@
         getOriginDatum = info => {
           var _a;
           const {
-              dimensionFields: dimensionFields,
-              dimensionData: dimensionData,
-              measureFields: measureFields,
-              measureData: measureData,
-              groupField: groupField,
-              groupData: groupData
-            } = info.data,
-            originDatum = null === (_a = info.series.getViewData()) || void 0 === _a ? void 0 : _a.latestData.find(datum => datumContainsArray(dimensionFields, dimensionData)(datum) && datumContainsArray(measureFields, measureData)(datum) && (isNil$1(groupField) || datumContainsArray([groupField], [groupData])(datum)));
-          return originDatum;
+            dimensionFields: dimensionFields,
+            dimensionData: dimensionData,
+            measureFields: measureFields,
+            measureData: measureData,
+            groupField: groupField,
+            groupData: groupData
+          } = info.data;
+          return null === (_a = info.series.getViewData()) || void 0 === _a ? void 0 : _a.latestData.find(datum => datumContainsArray(dimensionFields, dimensionData)(datum) && datumContainsArray(measureFields, measureData)(datum) && (isNil$1(groupField) || datumContainsArray([groupField], [groupData])(datum)));
         },
+        transform = region.getOption().globalInstance.getStage().window.getViewBoxTransform().getInverse(),
         getMockEvent = originPos => {
           var _a, _b;
           const pos = (pos => ({
               x: Math.min(Math.max(pos.x, 0), regionRect.width),
               y: Math.min(Math.max(pos.y, 0), regionRect.height)
             }))(originPos),
-            canvasX = null !== (_a = opt.x) && void 0 !== _a ? _a : regionPos.x + pos.x,
-            canvasY = null !== (_b = opt.y) && void 0 !== _b ? _b : regionPos.y + pos.y;
+            tempX = null !== (_a = opt.x) && void 0 !== _a ? _a : regionPos.x + pos.x,
+            tempY = null !== (_b = opt.y) && void 0 !== _b ? _b : regionPos.y + pos.y,
+            canvasPoint = {
+              x: 0,
+              y: 0
+            };
+          transform.transformPoint({
+            x: tempX,
+            y: tempY
+          }, canvasPoint);
+          const {
+            x: canvasX,
+            y: canvasY
+          } = canvasPoint;
           return {
             canvasX: canvasX,
             canvasY: canvasY,
@@ -77391,7 +77407,7 @@
       if ("mark" === activeType) {
         const info = markInfoList[0];
         if (!info) return "none";
-        const mockDatum = Object.assign(Object.assign({}, getOriginDatum(info)), datum),
+        const mockDatum = null !== (_f = info.data.originDatum) && void 0 !== _f ? _f : Object.assign(Object.assign({}, getOriginDatum(info)), datum),
           mockDimensionData = [{
             datum: [mockDatum],
             series: info.series
@@ -77403,7 +77419,7 @@
               value: mockDatum[info.data.dimensionFields[0]],
               data: mockDimensionData
             }],
-            chart: null !== (_f = componentOptions.globalInstance.getChart()) && void 0 !== _f ? _f : void 0,
+            chart: null !== (_g = componentOptions.globalInstance.getChart()) && void 0 !== _g ? _g : void 0,
             datum: mockDatum,
             model: info.series,
             source: Event_Source_Type.chart,
@@ -77537,7 +77553,30 @@
               });
             } else parseMarkInfoOfSimpleSeries();
           }
-        } else "geo" === series.coordinate && parseMarkInfoOfSimpleSeries();
+        } else "geo" === series.coordinate && (() => {
+          var _a, _b;
+          const originDatum = null === (_b = null === (_a = series.getMapViewData) || void 0 === _a ? void 0 : _a.call(series)) || void 0 === _b ? void 0 : _b.latestData.find(datum => dimensionFields.every((key, i) => datum.properties[key] === (null == dimensionData ? void 0 : dimensionData[i])));
+          let markInfoMeasureData = measureData;
+          if (!hasMeasureData) {
+            if (measureData = getDataArrayFromFieldArray(measureFields, originDatum), markInfoMeasureData = measureData, !hasData(measureData) && !originDatum) return;
+            measureData = Object.assign({}, originDatum.properties);
+          }
+          const pos = series.type === SeriesTypeEnum.pie ? series.dataToCentralPosition(originDatum.properties) : series.dataToPosition(originDatum.properties);
+          isNil$1(pos) || isNaN(pos.x) || isNaN(pos.y) || markInfoList.push({
+            pos: pos,
+            data: {
+              dimensionFields: dimensionFields,
+              dimensionData: dimensionData,
+              measureFields: measureFields,
+              measureData: markInfoMeasureData,
+              hasMeasureData: hasMeasureData,
+              groupField: groupField,
+              groupData: groupData,
+              originDatum: originDatum
+            },
+            series: series
+          });
+        })();
       }), markInfoList;
     };
 
@@ -88573,7 +88612,7 @@
 
     const VChartSimple = createChart('VChartSimple');
 
-    const version = "2.0.12";
+    const version = "2.0.13";
 
     exports.Area = Area;
     exports.AreaChart = AreaChart;