@visactor/vrender-components 0.15.3 → 0.16.0-alpha.1

package/dist/index.js

@@ -896,35 +896,6 @@
         padding: 10
     };
 
-    var PARAM_TYPES = "inversify:paramtypes";
-    var DESIGN_PARAM_TYPES = "design:paramtypes";
-
-    var idCounter = 0;
-    function id() {
-      return idCounter++;
-    }
-
-    var DUPLICATED_INJECTABLE_DECORATOR = "Cannot apply @injectable decorator multiple times.";
-
-    var ContainerModule = function () {
-      function ContainerModule(registry) {
-        this.id = id();
-        this.registry = registry;
-      }
-      return ContainerModule;
-    }();
-
-    function injectable() {
-      return function (target) {
-        if (Reflect.hasOwnMetadata(PARAM_TYPES, target)) {
-          throw new Error(DUPLICATED_INJECTABLE_DECORATOR);
-        }
-        var types = Reflect.getMetadata(DESIGN_PARAM_TYPES, target) || [];
-        Reflect.defineMetadata(PARAM_TYPES, types, target);
-        return target;
-      };
-    }
-
     const DEFAULT_THEME = {
         visible: true,
         position: 'auto',
@@ -995,7 +966,7 @@
         }
     };
     PopTipRenderContribution = __decorate([
-        injectable()
+        vrender.injectable()
     ], PopTipRenderContribution);
 
     let PopTipPlugin = class PopTipPlugin {
@@ -1048,7 +1019,7 @@
         }
     };
     PopTipPlugin = __decorate([
-        injectable()
+        vrender.injectable()
     ], PopTipPlugin);
     let PopTipForClipedTextPlugin = class PopTipForClipedTextPlugin {
         constructor() {
@@ -1100,10 +1071,10 @@
         }
     };
     PopTipForClipedTextPlugin = __decorate([
-        injectable()
+        vrender.injectable()
     ], PopTipForClipedTextPlugin);
 
-    const popTipModule = new ContainerModule((bind, unbind, isBound, rebind) => {
+    const popTipModule = new vrender.ContainerModule((bind, unbind, isBound, rebind) => {
         if (!isBound(PopTipRenderContribution)) {
             bind(PopTipRenderContribution).toSelf().inSingletonScope();
             bind(vrender.InteractiveSubRenderContribution).toService(PopTipRenderContribution);
@@ -2473,7 +2444,7 @@
             const arcs = this.layoutArcLabels(this.attribute.position, this.attribute, Array.from(this._idToGraphic.values()), data, textBoundsArray, ellipsisWidth);
             for (let i = 0; i < data.length; i++) {
                 const textData = data[i];
-                const basedArc = arcs.find(arc => { var _a; return ((_a = arc.refDatum) === null || _a === void 0 ? void 0 : _a.id) === textData.id; });
+                const basedArc = arcs.find(arc => arc.refDatum.id === textData.id);
                 const labelAttribute = {
                     visible: basedArc.labelVisible,
                     x: basedArc.labelPosition.x,
@@ -2503,26 +2474,24 @@
                 var _a, _b;
                 const graphicAttribute = currentMark.attribute;
                 const center = { x: (_a = graphicAttribute === null || graphicAttribute === void 0 ? void 0 : graphicAttribute.x) !== null && _a !== void 0 ? _a : 0, y: (_b = graphicAttribute === null || graphicAttribute === void 0 ? void 0 : graphicAttribute.y) !== null && _b !== void 0 ? _b : 0 };
-                if (!vutils.isNil(data[index]) && !vutils.isNil(textBoundsArray[index])) {
-                    const item = data[index] ? data[index] : null;
-                    const textBounds = textBoundsArray[index] ? textBoundsArray[index] : { x1: 0, x2: 0, y1: 0, y2: 0 };
-                    const arcMiddleAngle = (graphicAttribute.startAngle + graphicAttribute.endAngle) / 2;
-                    const intervalAngle = graphicAttribute.endAngle - graphicAttribute.startAngle;
-                    const arcQuadrant = computeQuadrant(graphicAttribute.endAngle - intervalAngle / 2);
-                    const arcMiddle = circlePoint(center.x, center.y, graphicAttribute.outerRadius, arcMiddleAngle);
-                    const outerArcMiddle = circlePoint(center.x, center.y, maxRadius + attribute.line.line1MinLength, arcMiddleAngle);
-                    const arc = new ArcInfo(item, arcMiddle, outerArcMiddle, arcQuadrant, intervalAngle, arcMiddleAngle, graphicAttribute.innerRadius, graphicAttribute.outerRadius, center);
-                    arc.pointA = circlePoint(center.x, center.y, this.computeDatumRadius(center.x * 2, center.y * 2, graphicAttribute.outerRadius), arc.middleAngle);
-                    arc.labelSize = {
-                        width: textBounds.x2 - textBounds.x1,
-                        height: textBounds.y2 - textBounds.y1
-                    };
-                    if (isQuadrantRight(arc.quadrant)) {
-                        this._arcRight.set(arc.refDatum, arc);
-                    }
-                    else if (isQuadrantLeft(arc.quadrant)) {
-                        this._arcLeft.set(arc.refDatum, arc);
-                    }
+                const item = data[index];
+                const textBounds = textBoundsArray[index];
+                const arcMiddleAngle = (graphicAttribute.startAngle + graphicAttribute.endAngle) / 2;
+                const intervalAngle = graphicAttribute.endAngle - graphicAttribute.startAngle;
+                const arcQuadrant = computeQuadrant(graphicAttribute.endAngle - intervalAngle / 2);
+                const arcMiddle = circlePoint(center.x, center.y, graphicAttribute.outerRadius, arcMiddleAngle);
+                const outerArcMiddle = circlePoint(center.x, center.y, maxRadius + attribute.line.line1MinLength, arcMiddleAngle);
+                const arc = new ArcInfo(item, arcMiddle, outerArcMiddle, arcQuadrant, intervalAngle, arcMiddleAngle, graphicAttribute.innerRadius, graphicAttribute.outerRadius, center);
+                arc.pointA = circlePoint(center.x, center.y, this.computeDatumRadius(center.x * 2, center.y * 2, graphicAttribute.outerRadius), arc.middleAngle);
+                arc.labelSize = {
+                    width: textBounds.x2 - textBounds.x1,
+                    height: textBounds.y2 - textBounds.y1
+                };
+                if (isQuadrantRight(arc.quadrant)) {
+                    this._arcRight.set(arc.refDatum, arc);
+                }
+                else if (isQuadrantLeft(arc.quadrant)) {
+                    this._arcLeft.set(arc.refDatum, arc);
                 }
             });
             const leftArcs = Array.from(this._arcLeft.values());
@@ -2729,8 +2698,7 @@
             return vutils.isNil(textAlign) || textAlign === 'auto' ? 'center' : textAlign;
         }
         _getFormatLabelText(value, limit) {
-            var _a;
-            return (_a = value === null || value === void 0 ? void 0 : value.text) !== null && _a !== void 0 ? _a : '';
+            return value.text;
         }
         _adjustY(arcs, maxLabels, attribute, currentMarks) {
             var _a, _b, _c, _d;
@@ -5526,7 +5494,6 @@
                         end: this.state.end
                     });
                     this._updateStateCallback && this._updateStateCallback(this.state.start, this.state.end);
-                    this._dispatchChangeEvent(this.state.start, this.state.end);
                 }
             };
             const { start, end, size, orient, showDetail, position, previewData, previewCallbackX, previewCallbackY, previewCallbackX1, previewCallbackY1, updateStateCallback } = this.attribute;
@@ -5626,7 +5593,6 @@
                     end: this.state.end
                 });
                 this._updateStateCallback && this._updateStateCallback(this.state.start, this.state.end);
-                this._dispatchChangeEvent(this.state.start, this.state.end);
             }
         }
         _onHandlerPointerEnter(e) {
@@ -5986,15 +5952,6 @@
             container.add(labelShape);
             return labelShape;
         }
-        _dispatchChangeEvent(start, end) {
-            var _a;
-            const changeEvent = new vrender.CustomEvent('change', {
-                start,
-                end
-            });
-            changeEvent.manager = (_a = this.stage) === null || _a === void 0 ? void 0 : _a.eventSystem.manager;
-            this.dispatchEvent(changeEvent);
-        }
         setStartAndEnd(start, end) {
             const { start: startAttr, end: endAttr } = this.attribute;
             if (vutils.isValid(start) && vutils.isValid(end) && (start !== this.state.start || end !== this.state.end)) {
@@ -6003,7 +5960,6 @@
                 if (startAttr !== this.state.start || endAttr !== this.state.end) {
                     this.setAttributes({ start, end });
                     this._updateStateCallback && this._updateStateCallback(start, end);
-                    this._dispatchChangeEvent(start, end);
                 }
             }
         }
@@ -9796,11 +9752,6 @@
     })(exports.IOperateType || (exports.IOperateType = {}));
 
     const DEFAULT_BRUSH_ATTRIBUTES = {
-        trigger: 'pointerdown',
-        updateTrigger: 'pointermove',
-        endTrigger: 'pointerup',
-        resetTrigger: 'pointerupoutside',
-        hasMask: true,
         brushMode: 'single',
         brushType: 'rect',
         brushStyle: {
@@ -9862,7 +9813,6 @@
                 const { removeOnClick = true } = this.attribute;
                 if (this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick) {
                     this._container.incrementalClearChild();
-                    this._brushMaskAABBBoundsDict = {};
                     this._updateDragMaskCallback &&
                         this._updateDragMaskCallback({
                             operateType: exports.IOperateType.brushClear,
@@ -9885,11 +9835,11 @@
             };
         }
         bindBrushEvents() {
-            const { delayType = 'throttle', delayTime = 0, trigger = DEFAULT_BRUSH_ATTRIBUTES.trigger, updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger, endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger, resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger } = this.attribute;
-            this.stage.addEventListener(trigger, this._onBrushStart);
-            this.stage.addEventListener(updateTrigger, delayMap[delayType](this._onBrushing, delayTime));
-            this.stage.addEventListener(endTrigger, this._onBrushEnd);
-            this.stage.addEventListener(resetTrigger, this._onBrushEnd);
+            const { delayType = 'throttle', delayTime = 0 } = this.attribute;
+            this.stage.addEventListener('pointerdown', this._onBrushStart);
+            this.stage.addEventListener('pointermove', delayMap[delayType](this._onBrushing, delayTime));
+            this.stage.addEventListener('pointerup', this._onBrushEnd);
+            this.stage.addEventListener('pointerupoutside', this._onBrushEnd);
         }
         _isPosInBrushMask(e) {
             const pos = this.eventPosToStagePos(e);
@@ -9915,7 +9865,6 @@
             this._cacheDrawPoints = [pos];
             this._isDrawedBeforeEnd = false;
             if (brushMode === 'single') {
-                this._brushMaskAABBBoundsDict = {};
                 this._container.incrementalClearChild();
             }
             this._addBrushMask();
@@ -9952,21 +9901,15 @@
             var _a;
             const pos = this.eventPosToStagePos(e);
             const { x1 = 0, x2 = 0, y1 = 0, y2 = 0 } = (_a = this._operatingMask) === null || _a === void 0 ? void 0 : _a._AABBBounds;
-            const { sizeThreshold = DEFAULT_SIZE_THRESHOLD, brushType } = this.attribute;
-            const cacheLength = this._cacheDrawPoints.length;
+            const { sizeThreshold = DEFAULT_SIZE_THRESHOLD } = this.attribute;
             this._isDrawedBeforeEnd = !!(Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold);
-            if (cacheLength > 0) {
+            if (this._cacheDrawPoints.length > 0) {
                 const lastPos = this._cacheDrawPoints[this._cacheDrawPoints.length - 1];
                 if (pos.x === (lastPos === null || lastPos === void 0 ? void 0 : lastPos.x) && pos.y === (lastPos === null || lastPos === void 0 ? void 0 : lastPos.y)) {
                     return;
                 }
             }
-            if (brushType === 'polygon' || cacheLength <= 1) {
-                this._cacheDrawPoints.push(pos);
-            }
-            else {
-                this._cacheDrawPoints[cacheLength - 1] = pos;
-            }
+            this._cacheDrawPoints.push(pos);
             const maskPoints = this._computeMaskPoints();
             this._operatingMask.setAttribute('points', maskPoints);
             this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds;
@@ -10066,9 +10009,8 @@
             return maskPoints;
         }
         _addBrushMask() {
-            var _a;
-            const { brushStyle, hasMask } = this.attribute;
-            const brushMask = vrender.createPolygon(Object.assign(Object.assign({ points: vutils.cloneDeep(this._cacheDrawPoints), cursor: 'move', pickable: false }, brushStyle), { opacity: hasMask ? (_a = brushStyle.opacity) !== null && _a !== void 0 ? _a : 1 : 0 }));
+            const { brushStyle } = this.attribute;
+            const brushMask = vrender.createPolygon(Object.assign({ points: vutils.cloneDeep(this._cacheDrawPoints), cursor: 'move', pickable: false }, brushStyle));
             brushMask.name = `brush-${Date.now()}`;
             this._operatingMask = brushMask;
             this._container.add(brushMask);
@@ -10100,11 +10042,11 @@
             vutils.isFunction(callback) && (this._updateDragMaskCallback = callback);
         }
         releaseBrushEvents() {
-            const { delayType = 'throttle', delayTime = 0, trigger = DEFAULT_BRUSH_ATTRIBUTES.trigger, updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger, endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger, resetTrigger = DEFAULT_BRUSH_ATTRIBUTES.resetTrigger } = this.attribute;
-            this.stage.removeEventListener(trigger, this._onBrushStart);
-            this.stage.removeEventListener(updateTrigger, delayMap[delayType](this._onBrushing, delayTime));
-            this.stage.removeEventListener(endTrigger, this._onBrushEnd);
-            this.stage.removeEventListener(resetTrigger, this._onBrushEnd);
+            const { delayType = 'throttle', delayTime = 0 } = this.attribute;
+            this.stage.removeEventListener('pointerdown', this._onBrushStart);
+            this.stage.removeEventListener('pointermove', delayMap[delayType](this._onBrushing, delayTime));
+            this.stage.removeEventListener('pointerup', this._onBrushEnd);
+            this.stage.removeEventListener('pointerupoutside', this._onBrushEnd);
         }
     }
     Brush.defaultAttributes = DEFAULT_BRUSH_ATTRIBUTES;
@@ -10495,7 +10437,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.15.3";
+    const version = "0.16.0-alpha.1";
 
     exports.AbstractComponent = AbstractComponent;
     exports.ArcInfo = ArcInfo;