@visactor/vrender 0.15.0-alpha.14 → 0.15.0-alpha.15

package/dist/index.js

@@ -9375,7 +9375,7 @@
 	    connectedX: NaN,
 	    connectedY: NaN
 	};
-	const DefaultAttribute = Object.assign(Object.assign({ strokeSeg: null, pickable: true, childrenPickable: true, visible: true, zIndex: 0, layout: null, boundsPadding: 0, pickMode: 'accurate', customPickShape: null, boundsMode: 'accurate', keepDirIn3d: true }, DefaultStyle), DefaultTransform);
+	const DefaultAttribute = Object.assign(Object.assign({ strokeSeg: null, pickable: true, childrenPickable: true, visible: true, zIndex: 0, layout: null, boundsPadding: 0, pickMode: 'accurate', customPickShape: null, boundsMode: 'accurate', keepDirIn3d: true, shadowRootIdx: 1 }, DefaultStyle), DefaultTransform);
 	function addAttributeToPrototype(obj, c, keys) {
 	    keys.forEach(key => {
 	        c.prototype[key] = obj[key];
@@ -10589,12 +10589,34 @@
 	        this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f);
 	        return this;
 	    }
+	    rotateMatrix(angle, center) {
+	        const sMatrix = this.outSourceMatrix;
+	        _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f);
+	        this.outTargetMatrix.reset();
+	        if (center) {
+	            const { x, y } = center;
+	            this.outTargetMatrix.translate(x, y);
+	            this.outTargetMatrix.rotate(angle);
+	            this.outTargetMatrix.translate(-x, -y);
+	        }
+	        else {
+	            this.outTargetMatrix.rotate(angle);
+	        }
+	        this.outTargetMatrix.multiply(_matrix.a, _matrix.b, _matrix.c, _matrix.d, _matrix.e, _matrix.f);
+	        return this;
+	    }
 	    scale(sx, sy, center) {
 	        if (this.mode === TransformMode.matrix) {
 	            return this.scaleMatrix(sx, sy, center);
 	        }
 	        return this;
 	    }
+	    rotate(angle, center) {
+	        if (this.mode === TransformMode.matrix) {
+	            return this.rotateMatrix(angle, center);
+	        }
+	        return this;
+	    }
 	    translateMatrix(dx, dy) {
 	        const sMatrix = this.outSourceMatrix;
 	        _matrix.setValue(sMatrix.a, sMatrix.b, sMatrix.c, sMatrix.d, sMatrix.e, sMatrix.f);
@@ -11926,11 +11948,13 @@
 	            target = this._prePointTargetCache[cacheKey];
 	        }
 	        else {
-	            target = this.pickTarget(e.canvasX, e.canvasY);
-	            this._prePointTargetCache = {
-	                [cacheKey]: target,
-	                stageRenderCount: (_e = target === null || target === void 0 ? void 0 : target.stage.renderCount) !== null && _e !== void 0 ? _e : -1
-	            };
+	            target = this.pickTarget(e.canvasX, e.canvasY, e);
+	            if (!e.pickParams) {
+	                this._prePointTargetCache = {
+	                    [cacheKey]: target,
+	                    stageRenderCount: (_e = target === null || target === void 0 ? void 0 : target.stage.renderCount) !== null && _e !== void 0 ? _e : -1
+	                };
+	            }
 	        }
 	        if (mappers) {
 	            for (let i = 0, j = mappers.length; i < j; i++) {
@@ -12015,7 +12039,7 @@
 	            event.target = target;
 	        }
 	        else {
-	            event.target = this.pickTarget(event.global.x, event.global.y);
+	            event.target = this.pickTarget(event.global.x, event.global.y, event);
 	        }
 	        if (typeof type === 'string') {
 	            event.type = type;
@@ -12029,7 +12053,7 @@
 	        this.copyData(from, event);
 	        event.nativeEvent = from.nativeEvent;
 	        event.originalEvent = from;
-	        event.target = target || this.pickTarget(event.global.x, event.global.y);
+	        event.target = target || this.pickTarget(event.global.x, event.global.y, event);
 	        return event;
 	    }
 	    clonePointerEvent(from, type) {
@@ -12093,6 +12117,7 @@
 	        to.which = from.which;
 	        to.layer.copyFrom(from.layer);
 	        to.page.copyFrom(from.page);
+	        to.pickParams = from.pickParams;
 	    }
 	    trackingData(id) {
 	        if (!this.mappingState.trackingData[id]) {
@@ -12162,7 +12187,7 @@
 	            }
 	        }
 	    }
-	    pickTarget(x, y) {
+	    pickTarget(x, y, e) {
 	        let target;
 	        const pickResult = this.rootTarget.pick(x, y);
 	        if (pickResult && pickResult.graphic) {
@@ -12177,6 +12202,9 @@
 	        else {
 	            target = null;
 	        }
+	        if (e) {
+	            e.pickParams = pickResult.params;
+	        }
 	        return target;
 	    }
 	}
@@ -17453,20 +17481,30 @@
 	        this.onAttributeUpdate(context);
 	        return this;
 	    }
-	    rotate(angle) {
+	    rotate(angle, rotateCenter) {
 	        var _a;
 	        if (angle === 0) {
 	            return this;
 	        }
 	        const context = { type: exports.AttributeUpdateType.ROTATE };
 	        const params = this.onBeforeAttributeUpdate &&
-	            this.onBeforeAttributeUpdate(angle, this.attribute, tempConstantAngleKey, context);
+	            this.onBeforeAttributeUpdate({ angle, rotateCenter }, this.attribute, tempConstantAngleKey, context);
 	        if (params) {
+	            delete params.angle;
 	            this._setAttributes(params, false, context);
-	            return this;
 	        }
 	        const attribute = this.attribute;
-	        attribute.angle = ((_a = attribute.angle) !== null && _a !== void 0 ? _a : DefaultTransform.angle) + angle;
+	        if (!rotateCenter) {
+	            attribute.angle = ((_a = attribute.angle) !== null && _a !== void 0 ? _a : DefaultTransform.angle) + angle;
+	        }
+	        else {
+	            let { postMatrix } = this.attribute;
+	            if (!postMatrix) {
+	                postMatrix = new Matrix();
+	                attribute.postMatrix = postMatrix;
+	            }
+	            application.transformUtil.fromMatrix(postMatrix, postMatrix).rotate(angle, rotateCenter);
+	        }
 	        this.addUpdatePositionTag();
 	        this.addUpdateBoundTag();
 	        this.addUpdateLayoutTag();
@@ -25526,6 +25564,8 @@
 	    injectable()
 	], DefaultPathOuterBorderBoundsContribution);
 
+	const MatrixAllocate = Symbol.for('MatrixAllocate');
+	const Mat4Allocate = Symbol.for('Mat4Allocate');
 	function createMat4() {
 	    return [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
 	}
@@ -29952,6 +29992,46 @@
 	}
 
 	const PickItemInterceptor = Symbol.for('PickItemInterceptor');
+	let ShadowRootPickItemInterceptorContribution = class ShadowRootPickItemInterceptorContribution {
+	    constructor() {
+	        this.order = 1;
+	    }
+	    afterPickItem(graphic, pickerService, point, pickParams, params) {
+	        if (graphic.attribute.shadowRootIdx > 0 || !graphic.attribute.shadowRootIdx) {
+	            return this._pickItem(graphic, pickerService, point, pickParams, params);
+	        }
+	        return false;
+	    }
+	    beforePickItem(graphic, pickerService, point, pickParams, params) {
+	        if (graphic.attribute.shadowRootIdx < 0) {
+	            return this._pickItem(graphic, pickerService, point, pickParams, params);
+	        }
+	        return false;
+	    }
+	    _pickItem(graphic, pickerService, point, pickParams, params) {
+	        if (!graphic.shadowRoot) {
+	            return false;
+	        }
+	        const { parentMatrix } = params || {};
+	        if (!parentMatrix) {
+	            return false;
+	        }
+	        const context = pickerService.pickContext;
+	        context.highPerformanceSave();
+	        const g = graphic.shadowRoot;
+	        const currentGroupMatrix = matrixAllocate.allocateByObj(parentMatrix);
+	        const newPoint = new Point(point.x, point.y);
+	        parentMatrix.transformPoint(newPoint, newPoint);
+	        const transMatrix = graphic.transMatrix;
+	        currentGroupMatrix.multiply(transMatrix.a, transMatrix.b, transMatrix.c, transMatrix.d, transMatrix.e, transMatrix.f);
+	        const result = pickerService.pickGroup(g, newPoint.clone(), currentGroupMatrix, pickParams);
+	        context.highPerformanceRestore();
+	        return result;
+	    }
+	};
+	ShadowRootPickItemInterceptorContribution = __decorate([
+	    injectable()
+	], ShadowRootPickItemInterceptorContribution);
 	let Canvas3DPickItemInterceptor = class Canvas3DPickItemInterceptor {
 	    constructor() {
 	        this.order = 1;
@@ -30118,7 +30198,7 @@
 	                result = this.pickGroup(graphics[i], point, parentMatrix, params);
 	            }
 	            else {
-	                result.graphic = this.pickItem(graphics[i], point, params);
+	                result.graphic = this.pickItem(graphics[i], point, parentMatrix, params);
 	            }
 	            if (result.graphic) {
 	                break;
@@ -30133,10 +30213,22 @@
 	        if (this.pickContext) {
 	            this.pickContext.inuse = false;
 	        }
+	        if (result.graphic) {
+	            let g = result.graphic;
+	            while (g.parent) {
+	                g = g.parent;
+	            }
+	            if (g.shadowHost) {
+	                result.params = {
+	                    shadowTarget: result.graphic
+	                };
+	                result.graphic = g.shadowHost;
+	            }
+	        }
 	        return result;
 	    }
 	    containsPoint(graphic, point, params) {
-	        return !!this.pickItem(graphic, point, params);
+	        return !!this.pickItem(graphic, point, null, params);
 	    }
 	    pickGroup(group, point, parentMatrix, params) {
 	        let result = {
@@ -30187,9 +30279,13 @@
 	        if (!insideGroup && !group.stage.camera) {
 	            return result;
 	        }
+	        const pickedItem = this.pickItem(group, newPoint.clone(), parentMatrix, params);
+	        if (pickedItem) {
+	            result.graphic = pickedItem;
+	        }
 	        const groupPicked = group.attribute.pickable !== false && insideGroup;
 	        currentGroupMatrix.multiply(transMatrix.a, transMatrix.b, transMatrix.c, transMatrix.d, transMatrix.e, transMatrix.f);
-	        if (group.attribute.childrenPickable !== false) {
+	        if (group.attribute.childrenPickable !== false && !pickedItem) {
 	            foreach(group, DefaultAttribute.zIndex, (graphic) => {
 	                if (graphic.isContainer) {
 	                    const newPoint = new Point(point.x, point.y);
@@ -30206,7 +30302,7 @@
 	                    const { scrollX = theme.scrollX, scrollY = theme.scrollY } = group.attribute;
 	                    newPoint.x -= scrollX;
 	                    newPoint.y -= scrollY;
-	                    const pickedItem = this.pickItem(graphic, newPoint, params);
+	                    const pickedItem = this.pickItem(graphic, newPoint, parentMatrix, params);
 	                    result.graphic = pickedItem;
 	                }
 	                return !!result.graphic || !!result.group;
@@ -30262,7 +30358,7 @@
 	                result = this.pickGroup(graphics[i], point, parentMatrix, params);
 	            }
 	            else {
-	                result.graphic = this.pickItem(graphics[i], point, params);
+	                result.graphic = this.pickItem(graphics[i], point, parentMatrix, params);
 	            }
 	            if (result.graphic) {
 	                break;
@@ -30274,10 +30370,22 @@
 	        if (!result.graphic) {
 	            result.group = group;
 	        }
+	        if (result.graphic) {
+	            let g = result.graphic;
+	            while (g.parent) {
+	                g = g.parent;
+	            }
+	            if (g.shadowHost) {
+	                result.params = {
+	                    shadowTarget: result.graphic
+	                };
+	                result.graphic = g.shadowHost;
+	            }
+	        }
 	        return result;
 	    }
 	    containsPoint(graphic, point, params) {
-	        return !!this.pickItem(graphic, point, params);
+	        return !!this.pickItem(graphic, point, null, params);
 	    }
 	    pickGroup(group, point, parentMatrix, params) {
 	        let result = {
@@ -30304,7 +30412,7 @@
 	                else {
 	                    const newPoint = new Point(point.x, point.y);
 	                    parentMatrix.transformPoint(newPoint, newPoint);
-	                    result.graphic = this.pickItem(graphic, newPoint, params);
+	                    result.graphic = this.pickItem(graphic, newPoint, parentMatrix, params);
 	                }
 	                return !!result.graphic || !!result.group;
 	            });
@@ -30314,7 +30422,7 @@
 	        }
 	        return result;
 	    }
-	    pickItem(graphic, point, params) {
+	    pickItem(graphic, point, parentMatrix, params) {
 	        if (graphic.attribute.pickable === false) {
 	            return null;
 	        }
@@ -31540,6 +31648,7 @@
 	const CanvasPyramid3dPicker = Symbol.for('CanvasPyramid3dPicker');
 	const CanvasRichTextPicker = Symbol.for('CanvasRichTextPicker');
 	const CanvasGlyphPicker = Symbol.for('CanvasGlyphPicker');
+	const CanvasGroupPicker = Symbol.for('CanvasGroupPicker');
 	const CanvasPickerContribution = Symbol.for('CanvasPickerContribution');
 	const MathArcPicker = Symbol.for('MathArcPicker');
 	const MathAreaPicker = Symbol.for('MathAreaPicker');
@@ -31593,7 +31702,7 @@
 	        this.pickCanvas = new exports.BrowserCanvas(options);
 	        this.pickContext = this.pickCanvas.getContext('2d');
 	    }
-	    pickItem(graphic, point, params) {
+	    pickItem(graphic, point, parentMatrix, params) {
 	        if (graphic.attribute.pickable === false) {
 	            return null;
 	        }
@@ -31601,8 +31710,9 @@
 	            for (let i = 0; i < this.InterceptorContributions.length; i++) {
 	                const drawContribution = this.InterceptorContributions[i];
 	                if (drawContribution.beforePickItem) {
-	                    if (drawContribution.beforePickItem(graphic, this, point, params)) {
-	                        return graphic;
+	                    const ret = drawContribution.beforePickItem(graphic, this, point, params, { parentMatrix });
+	                    if (ret) {
+	                        return ret === true ? graphic : ret.graphic;
 	                    }
 	                }
 	            }
@@ -31611,7 +31721,22 @@
 	        if (!picker) {
 	            return null;
 	        }
-	        return picker.contains(graphic, point, params) ? graphic : null;
+	        const data = picker.contains(graphic, point, params) ? graphic : null;
+	        if (data) {
+	            return data;
+	        }
+	        if (this.InterceptorContributions.length) {
+	            for (let i = 0; i < this.InterceptorContributions.length; i++) {
+	                const drawContribution = this.InterceptorContributions[i];
+	                if (drawContribution.afterPickItem) {
+	                    const ret = drawContribution.afterPickItem(graphic, this, point, params, { parentMatrix });
+	                    if (ret) {
+	                        return ret === true ? graphic : ret.graphic;
+	                    }
+	                }
+	            }
+	        }
+	        return data;
 	    }
 	};
 	__decorate([
@@ -31916,7 +32041,7 @@
 	    configure(global, env) {
 	        this.pickContext = new exports.EmptyContext2d(null, 1);
 	    }
-	    pickItem(graphic, point, params) {
+	    pickItem(graphic, point, parentMatrix, params) {
 	        if (graphic.attribute.pickable === false) {
 	            return null;
 	        }
@@ -31951,6 +32076,8 @@
 	    bind(GlobalPickerService).toService(exports.DefaultGlobalPickerService);
 	    bind(Canvas3DPickItemInterceptor).toSelf().inSingletonScope();
 	    bind(PickItemInterceptor).toService(Canvas3DPickItemInterceptor);
+	    bind(ShadowRootPickItemInterceptorContribution).toSelf().inSingletonScope();
+	    bind(PickItemInterceptor).toService(ShadowRootPickItemInterceptorContribution);
 	    bindContributionProvider(bind, PickItemInterceptor);
 	});
 
@@ -33190,7 +33317,7 @@
 	            entries.forEach(entry => {
 	                if (this._canvasIsIntersecting !== entry.isIntersecting) {
 	                    this._canvasIsIntersecting = entry.isIntersecting;
-	                    this._onVisibleChangeCb(entry.isIntersecting);
+	                    this._onVisibleChangeCb && this._onVisibleChangeCb(entry.isIntersecting);
 	                }
 	                else {
 	                    this._canvasIsIntersecting = entry.isIntersecting;
@@ -35270,6 +35397,18 @@
 	        this.order = 1;
 	    }
 	    afterDrawItem(graphic, renderService, drawContext, drawContribution, params) {
+	        if (graphic.attribute.shadowRootIdx > 0 || !graphic.attribute.shadowRootIdx) {
+	            this.drawItem(graphic, renderService, drawContext, drawContribution, params);
+	        }
+	        return false;
+	    }
+	    beforeDrawItem(graphic, renderService, drawContext, drawContribution, params) {
+	        if (graphic.attribute.shadowRootIdx < 0) {
+	            this.drawItem(graphic, renderService, drawContext, drawContribution, params);
+	        }
+	        return false;
+	    }
+	    drawItem(graphic, renderService, drawContext, drawContribution, params) {
 	        if (!graphic.shadowRoot) {
 	            return false;
 	        }
@@ -37680,7 +37819,7 @@
 	                if (picked) {
 	                    return;
 	                }
-	                picked = !!pickerService.pickItem(g, point, params);
+	                picked = !!pickerService.pickItem(g, point, null, params);
 	            });
 	            return picked;
 	        }
@@ -37839,6 +37978,19 @@
 	    __metadata("design:paramtypes", [Object])
 	], DefaultCanvasArc3dPicker);
 
+	let DefaultCanvasGroupPicker = class DefaultCanvasGroupPicker {
+	    constructor() {
+	        this.type = 'group';
+	        this.numberType = GROUP_NUMBER_TYPE;
+	    }
+	    contains(group, point, params) {
+	        return false;
+	    }
+	};
+	DefaultCanvasGroupPicker = __decorate([
+	    injectable()
+	], DefaultCanvasGroupPicker);
+
 	var canvasPickModule = new ContainerModule((bind, unbind, isBound, rebind) => {
 	    bind(DefaultCanvasCirclePicker).toSelf().inSingletonScope();
 	    bind(CanvasCirclePicker).toService(DefaultCanvasCirclePicker);
@@ -37885,6 +38037,9 @@
 	    bind(DefaultCanvasGlyphPicker).toSelf().inSingletonScope();
 	    bind(CanvasGlyphPicker).toService(DefaultCanvasGlyphPicker);
 	    bind(CanvasPickerContribution).toService(CanvasGlyphPicker);
+	    bind(DefaultCanvasGroupPicker).toSelf().inSingletonScope();
+	    bind(CanvasGroupPicker).toService(DefaultCanvasGroupPicker);
+	    bind(CanvasPickerContribution).toService(CanvasGroupPicker);
 	    bindContributionProvider(bind, CanvasPickerContribution);
 	});
 
@@ -38394,7 +38549,7 @@
 	                if (picked) {
 	                    return;
 	                }
-	                picked = !!pickerService.pickItem(g, point, params);
+	                picked = !!pickerService.pickItem(g, point, null, params);
 	            });
 	            return picked;
 	        }
@@ -38768,7 +38923,12 @@
 	    renderGroupHTML(group) {
 	        this.renderGraphicHTML(group);
 	        group.forEachChildren((g) => {
-	            this.renderGraphicHTML(g);
+	            if (g.isContainer) {
+	                this.renderGroupHTML(g);
+	            }
+	            else {
+	                this.renderGraphicHTML(g);
+	            }
 	        });
 	    }
 	    renderGraphicHTML(graphic) {
@@ -40035,7 +40195,7 @@
 	}
 	const Fragment = Group;
 
-	const version = "0.15.0-alpha.14";
+	const version = "0.15.0-alpha.15";
 
 	exports.ACustomAnimate = ACustomAnimate;
 	exports.ARC3D_NUMBER_TYPE = ARC3D_NUMBER_TYPE;
@@ -40087,6 +40247,8 @@
 	exports.DefaultImageAttribute = DefaultImageAttribute;
 	exports.DefaultLayout = DefaultLayout;
 	exports.DefaultLineAttribute = DefaultLineAttribute;
+	exports.DefaultMat4Allocate = DefaultMat4Allocate;
+	exports.DefaultMatrixAllocate = DefaultMatrixAllocate;
 	exports.DefaultMorphingAnimateConfig = DefaultMorphingAnimateConfig;
 	exports.DefaultPathAttribute = DefaultPathAttribute;
 	exports.DefaultPolygonAttribute = DefaultPolygonAttribute;
@@ -40154,6 +40316,8 @@
 	exports.LinearClosed = LinearClosed;
 	exports.ManualTickHandler = ManualTickHandler;
 	exports.ManualTicker = ManualTicker;
+	exports.Mat4Allocate = Mat4Allocate;
+	exports.MatrixAllocate = MatrixAllocate;
 	exports.Meteor = Meteor;
 	exports.MonotoneX = MonotoneX;
 	exports.MonotoneY = MonotoneY;
@@ -40263,6 +40427,7 @@
 	exports.createGroup = createGroup;
 	exports.createImage = createImage;
 	exports.createLine = createLine;
+	exports.createMat4 = createMat4;
 	exports.createPath = createPath;
 	exports.createPolygon = createPolygon;
 	exports.createPyramid3d = createPyramid3d;
@@ -40329,6 +40494,8 @@
 	exports.loadFeishuContributions = loadFeishuContributions;
 	exports.loadTaroContributions = loadTaroContributions;
 	exports.mat3Tomat4 = mat3Tomat4;
+	exports.mat4Allocate = mat4Allocate;
+	exports.matrixAllocate = matrixAllocate;
 	exports.morphPath = morphPath;
 	exports.multiToOneMorph = multiToOneMorph;
 	exports.multiplyMat4Mat3 = multiplyMat4Mat3;