@visactor/vrender-core 0.17.4-alpha.0 → 0.17.5-alpha.0

package/dist/index.js

@@ -3154,6 +3154,7 @@
         wordBreak: 'break-all',
         ignoreBuf: false,
         verticalMode: 0,
+        wrap: false,
         whiteSpace: 'no-wrap',
         heightLimit: Infinity,
         lineClamp: Infinity,
@@ -5597,6 +5598,7 @@
     class EventManager {
         constructor(root, config) {
             this.dispatch = new vutils.EventEmitter();
+            this.cursorTarget = null;
             this.mappingState = {
                 trackingData: {}
             };
@@ -5688,6 +5690,7 @@
                 }
                 if (isMouse) {
                     this[propagationMethod](e, 'mousemove');
+                    this.cursorTarget = e.target;
                     this.cursor = ((_b = (_a = e.target) === null || _a === void 0 ? void 0 : _a.attribute) === null || _b === void 0 ? void 0 : _b.cursor) || this.rootTarget.getCursor();
                 }
                 trackingData.overTargets = e.composedPath();
@@ -5707,6 +5710,7 @@
                     this.dispatchEvent(e, 'mouseover');
                 }
                 if (e.pointerType === 'mouse') {
+                    this.cursorTarget = e.target;
                     this.cursor = ((_b = (_a = e.target) === null || _a === void 0 ? void 0 : _a.attribute) === null || _b === void 0 ? void 0 : _b.cursor) || this.rootTarget.getCursor();
                 }
                 const enterEvent = this.clonePointerEvent(e, 'pointerenter');
@@ -5751,6 +5755,7 @@
                     this.freeEvent(outEvent);
                     this.freeEvent(leaveEvent);
                 }
+                this.cursorTarget = null;
                 this.cursor = '';
             };
             this.onPointerUp = (from, target) => {
@@ -6152,7 +6157,7 @@
             else if (pickResult && pickResult.group) {
                 target = pickResult.group;
             }
-            else if (x >= 0 && x <= vutils.get(this.rootTarget, 'width') && y >= 0 && y <= vutils.get(this.rootTarget, 'height')) {
+            else if (this.rootTarget.AABBBounds.contains(x, y)) {
                 target = this.rootTarget;
             }
             else {
@@ -6211,7 +6216,7 @@
                     const federatedEvent = this.bootstrapEvent(this.rootPointerEvent, nativeEvent);
                     this.manager.mapEvent(federatedEvent);
                 }
-                this.setCursor(this.manager.cursor);
+                this.setCursor(this.manager.cursor, this.manager.cursorTarget);
             };
             this.onPointerMove = (nativeEvent) => {
                 if (this.supportsTouchEvents && nativeEvent.pointerType === 'touch') {
@@ -6225,7 +6230,7 @@
                     const event = this.bootstrapEvent(this.rootPointerEvent, normalizedEvents[i]);
                     this.manager.mapEvent(event);
                 }
-                this.setCursor(this.manager.cursor);
+                this.setCursor(this.manager.cursor, this.manager.cursorTarget);
             };
             this.onPointerUp = (nativeEvent) => {
                 if (this.supportsTouchEvents && nativeEvent.pointerType === 'touch') {
@@ -6238,7 +6243,7 @@
                     event.type += outside;
                     this.manager.mapEvent(event);
                 }
-                this.setCursor(this.manager.cursor);
+                this.setCursor(this.manager.cursor, this.manager.cursorTarget);
             };
             this.onPointerOverOut = (nativeEvent) => {
                 if (this.supportsTouchEvents && nativeEvent.pointerType === 'touch') {
@@ -6249,7 +6254,7 @@
                     const event = this.bootstrapEvent(this.rootPointerEvent, normalizedEvents[i]);
                     this.manager.mapEvent(event);
                 }
-                this.setCursor(this.manager.cursor);
+                this.setCursor(this.manager.cursor, this.manager.cursorTarget);
             };
             this.onWheel = (nativeEvent) => {
                 const wheelEvent = this.normalizeWheelEvent(nativeEvent);
@@ -6279,7 +6284,13 @@
         release() {
             this.setTargetElement(null);
         }
-        setCursor(mode = 'default') {
+        setCursor(mode, target) {
+            if (!target && !this.manager.rootTarget.window._handler.canvas.controled) {
+                return;
+            }
+            if (!mode) {
+                mode = 'default';
+            }
             const { applyStyles, domElement } = this;
             if (this.currentCursor === mode) {
                 return;
@@ -8789,7 +8800,7 @@
             if (this.phi == null || this.theta == null) {
                 return;
             }
-            const { center, r } = typeof this.params === 'function' ? this.params() : this.params;
+            const { center, r, cb } = typeof this.params === 'function' ? this.params() : this.params;
             const deltaAngle = Math.PI * 2 * ratio;
             const theta = this.theta + deltaAngle;
             const phi = this.phi;
@@ -8805,6 +8816,7 @@
             }
             out.alpha = vutils.pi2 - out.alpha;
             out.zIndex = out.z * -10000;
+            cb && cb(out);
         }
     }
     class GroupFadeIn extends ACustomAnimate {
@@ -13522,6 +13534,8 @@
         'lineHeight',
         'direction',
         'wordBreak',
+        'heightLimit',
+        'lineClamp',
         ...GRAPHIC_UPDATE_TAG_KEY
     ];
     class Text extends Graphic {
@@ -13584,6 +13598,9 @@
         }
         _isValid() {
             const { text } = this.attribute;
+            if (vutils.isArray(text)) {
+                return !text.every((t) => t == null || t === '');
+            }
             return text != null && text !== '';
         }
         doUpdateAABBBounds() {
@@ -13723,6 +13740,10 @@
         updateHorizontalSinglelineAABBBounds(text) {
             var _a, _b;
             const textTheme = getTheme(this).text;
+            const { wrap = textTheme.wrap } = this.attribute;
+            if (wrap) {
+                return this.updateWrapAABBBounds([text]);
+            }
             const textMeasure = application.graphicUtil.textMeasure;
             let width;
             let str;
@@ -13851,6 +13872,10 @@
         updateHorizontalMultilineAABBBounds(text) {
             var _a, _b;
             const textTheme = getTheme(this).text;
+            const { wrap = textTheme.wrap } = this.attribute;
+            if (wrap) {
+                return this.updateWrapAABBBounds(text);
+            }
             const attribute = this.attribute;
             const { fontFamily = textTheme.fontFamily, textAlign = textTheme.textAlign, textBaseline = textTheme.textBaseline, fontSize = textTheme.fontSize, fontWeight = textTheme.fontWeight, ellipsis = textTheme.ellipsis, maxLineWidth, stroke = textTheme.stroke, lineWidth = textTheme.lineWidth, whiteSpace = textTheme.whiteSpace, suffixPosition = textTheme.suffixPosition } = attribute;
             const lineHeight = (_a = calculateLineHeight(attribute.lineHeight, attribute.fontSize || textTheme.fontSize)) !== null && _a !== void 0 ? _a : (attribute.fontSize || textTheme.fontSize);
@@ -13988,6 +14013,9 @@
 
     const WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp'];
     class WrapText extends Text {
+        constructor(params) {
+            super(Object.assign(Object.assign({}, params), { wrap: true }));
+        }
         _isValid() {
             const { text } = this.attribute;
             if (vutils.isArray(text)) {
@@ -21113,7 +21141,7 @@
                 const p = context.project(x, y, z);
                 const camera = context.camera;
                 context.camera = null;
-                if (parsedPath.draw(context, size, p.x, p.y, undefined, (p, a) => {
+                if (parsedPath.draw(context, vutils.isArray(size) ? [size[0] * scaleX, size[1] * scaleY] : size * scaleX, p.x, p.y, undefined, (p, a) => {
                     var _a, _b, _c;
                     if (symbol._parsedPath.svgCache) {
                         const obj = Object.assign({}, a);
@@ -24041,6 +24069,10 @@
             this.tempBounds = new vutils.AABBBounds();
         }
         tryLayout(graphic) {
+            if (this.layouting) {
+                return;
+            }
+            this.layouting = true;
             const p = graphic.parent;
             if (!p || !graphic.needUpdateLayout()) {
                 return;
@@ -24213,6 +24245,7 @@
             p.addUpdateLayoutTag();
             if (!clip && !this.tempBounds.equals(p.AABBBounds)) {
                 this.tryLayout(p);
+                this.layouting = false;
             }
         }
         layoutMain(p, children, justifyContent, main, mianLenArray, lastIdx, currSeg) {
@@ -24266,6 +24299,13 @@
                     }
                 }
             }
+            else if (justifyContent === 'center') {
+                let pos = (main.len - currSeg.mainLen) / 2;
+                for (let i = lastIdx; i <= currSeg.idx; i++) {
+                    children[i].attribute[main.field] = pos + getPadding(children[i], main.field);
+                    pos += mianLenArray[i].mainLen;
+                }
+            }
         }
         layoutCross(children, alignItem, cross, anchorPos, lenArray, currSeg, lastIdx) {
             if (alignItem === 'flex-end') {
@@ -24292,22 +24332,30 @@
                     graphic = graphic.glyphHost;
                 }
                 this.tryLayout(graphic);
+                this.layouting = false;
             });
             application.graphicService.hooks.beforeUpdateAABBBounds.tap(this.key, (graphic, stage, willUpdate, bounds) => {
                 if (graphic.glyphHost) {
                     graphic = graphic.glyphHost;
                 }
-                if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {
+                if (!(stage && stage === this.pluginService.stage)) {
+                    return;
+                }
+                if (!graphic.isContainer) {
                     return;
                 }
                 _tempBounds.copy(bounds);
             });
             application.graphicService.hooks.afterUpdateAABBBounds.tap(this.key, (graphic, stage, bounds, params, selfChange) => {
-                if (!(stage && stage === this.pluginService.stage && stage.renderCount)) {
+                if (!(stage && stage === this.pluginService.stage)) {
+                    return;
+                }
+                if (!graphic.isContainer) {
                     return;
                 }
                 if (!_tempBounds.equals(bounds)) {
                     this.tryLayout(graphic);
+                    this.layouting = false;
                 }
             });
             application.graphicService.hooks.onSetStage.tap(this.key, graphic => {
@@ -24315,6 +24363,7 @@
                     graphic = graphic.glyphHost;
                 }
                 this.tryLayout(graphic);
+                this.layouting = false;
             });
         }
         deactivate(context) {
@@ -25271,7 +25320,7 @@
         }
         setCursor(mode) {
             this._cursor = mode;
-            this.eventSystem.setCursor(mode);
+            this.eventSystem.setCursor(mode, 'ignore');
         }
         getCursor() {
             return this._cursor;