@visactor/vrender-core 0.17.5-alpha.1 → 0.17.5

package/dist/index.js

@@ -3158,7 +3158,8 @@
         whiteSpace: 'no-wrap',
         heightLimit: Infinity,
         lineClamp: Infinity,
-        suffixPosition: 'end'
+        suffixPosition: 'end',
+        disableAutoClipedPoptip: undefined
     };
     const DefaultPickStyle = {
         pickStrokeBuffer: 0
@@ -5598,6 +5599,7 @@
     class EventManager {
         constructor(root, config) {
             this.dispatch = new vutils.EventEmitter();
+            this.cursorTarget = null;
             this.mappingState = {
                 trackingData: {}
             };
@@ -5689,6 +5691,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();
@@ -5708,6 +5711,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');
@@ -5752,6 +5756,7 @@
                     this.freeEvent(outEvent);
                     this.freeEvent(leaveEvent);
                 }
+                this.cursorTarget = null;
                 this.cursor = '';
             };
             this.onPointerUp = (from, target) => {
@@ -6153,7 +6158,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 {
@@ -6212,7 +6217,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') {
@@ -6226,7 +6231,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') {
@@ -6239,7 +6244,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') {
@@ -6250,7 +6255,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);
@@ -6280,7 +6285,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;
@@ -9753,10 +9764,9 @@
         return res;
     };
 
-    const { Color } = vutils.ColorUtil;
     function colorEqual(color1, color2) {
-        const c1 = Color.parseColorString(color1);
-        const c2 = Color.parseColorString(color2);
+        const c1 = vutils.Color.parseColorString(color1);
+        const c2 = vutils.Color.parseColorString(color2);
         return c1 && c2 ? c1.r === c2.r && c1.g === c2.g && c1.b === c2.b && c1.opacity === c2.opacity : false;
     }
     exports.ColorType = void 0;
@@ -9775,7 +9785,7 @@
                     arr[3] = color[3];
                     return arr;
                 }
-                const c = Color.parseColorString(str);
+                const c = vutils.Color.parseColorString(str);
                 if (c) {
                     const data = [c.r / 255, c.g / 255, c.b / 255, c.opacity];
                     ColorStore.store1[str] = data;
@@ -9795,7 +9805,7 @@
                 arr[3] = color[3];
                 return arr;
             }
-            const c = Color.parseColorString(str);
+            const c = vutils.Color.parseColorString(str);
             if (c) {
                 ColorStore.store1[str] = [c.r / 255, c.g / 255, c.b / 255, c.opacity];
                 ColorStore.store255[str] = [c.r, c.g, c.b, c.opacity];
@@ -13540,7 +13550,7 @@
             var _a;
             const attribute = this.attribute;
             const textTheme = getTheme(this).text;
-            if (Array.isArray(attribute.text)) {
+            if (this.isMultiLine) {
                 return undefined;
             }
             const { maxLineWidth = textTheme.maxLineWidth } = attribute;
@@ -13551,7 +13561,7 @@
             return this.cache.clipedText;
         }
         get clipedWidth() {
-            if (Array.isArray(this.attribute.text)) {
+            if (this.isMultiLine) {
                 return undefined;
             }
             this.tryUpdateAABBBounds();
@@ -13560,7 +13570,7 @@
         get cliped() {
             const textTheme = getTheme(this).text;
             const attribute = this.attribute;
-            if (Array.isArray(attribute.text)) {
+            if (this.isMultiLine) {
                 return undefined;
             }
             const { maxLineWidth = textTheme.maxLineWidth } = attribute;
@@ -13571,12 +13581,15 @@
             return this.clipedText !== attribute.text.toString();
         }
         get multilineLayout() {
-            if (!Array.isArray(this.attribute.text)) {
+            if (!this.isMultiLine) {
                 return undefined;
             }
             this.tryUpdateAABBBounds();
             return this.cache.layoutData;
         }
+        get isMultiLine() {
+            return Array.isArray(this.attribute.text) || this.attribute.whiteSpace === 'normal';
+        }
         constructor(params = { text: '', fontSize: 16 }) {
             super(params);
             this.type = 'text';
@@ -21274,7 +21287,7 @@
         drawShape(text, context, x, y, drawContext, params, fillCb, strokeCb) {
             var _a, _b, _c;
             const textAttribute = getTheme(text, params === null || params === void 0 ? void 0 : params.theme).text;
-            const { text: str, underline = textAttribute.underline, lineThrough = textAttribute.lineThrough, keepDirIn3d = textAttribute.keepDirIn3d, direction = textAttribute.direction, fontSize = textAttribute.fontSize, verticalMode = textAttribute.verticalMode, x: originX = textAttribute.x, y: originY = textAttribute.y } = text.attribute;
+            const { text: str, underline = textAttribute.underline, lineThrough = textAttribute.lineThrough, keepDirIn3d = textAttribute.keepDirIn3d, direction = textAttribute.direction, whiteSpace = textAttribute.whiteSpace, fontSize = textAttribute.fontSize, verticalMode = textAttribute.verticalMode, x: originX = textAttribute.x, y: originY = textAttribute.y } = text.attribute;
             let { textAlign = textAttribute.textAlign, textBaseline = textAttribute.textBaseline } = text.attribute;
             if (!verticalMode && direction === 'vertical') {
                 const t = textAlign;
@@ -21328,7 +21341,7 @@
                     context.setTransformForCurrent();
                 }
             };
-            if (Array.isArray(str)) {
+            if (text.isMultiLine) {
                 context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);
                 if (direction === 'horizontal') {
                     const { multilineLayout } = text;
@@ -22095,6 +22108,15 @@
                 plugin.activate(this);
             }
         }
+        unRegister(plugin) {
+            if (plugin.activeEvent === 'onStartupFinished') {
+                this.onStartupFinishedPlugin.splice(this.onStartupFinishedPlugin.indexOf(plugin), 1);
+            }
+            else if (plugin.activeEvent === 'onRegister') {
+                this.onRegisterPlugin.splice(this.onStartupFinishedPlugin.indexOf(plugin), 1);
+            }
+            plugin.deactivate(this);
+        }
         release(...params) {
             this.onStartupFinishedPlugin.forEach(plugin => {
                 plugin.deactivate(this);
@@ -24957,7 +24979,7 @@
             }
             this.view3dTranform = false;
             this.pluginService.findPluginsByName('ViewTransform3dPlugin').forEach(plugin => {
-                plugin.deactivate(this.pluginService);
+                this.pluginService.unRegister(plugin);
             });
         }
         enableAutoRender() {
@@ -24973,7 +24995,7 @@
             }
             this.autoRender = false;
             this.pluginService.findPluginsByName('AutoRenderPlugin').forEach(plugin => {
-                plugin.deactivate(this.pluginService);
+                this.pluginService.unRegister(plugin);
             });
         }
         enableIncrementalAutoRender() {
@@ -24989,7 +25011,7 @@
             }
             this.increaseAutoRender = false;
             this.pluginService.findPluginsByName('IncrementalAutoRenderPlugin').forEach(plugin => {
-                plugin.deactivate(this.pluginService);
+                this.pluginService.unRegister(plugin);
             });
         }
         enableDirtyBounds() {
@@ -25012,7 +25034,7 @@
             }
             this.dirtyBounds = null;
             this.pluginService.findPluginsByName('DirtyBoundsPlugin').forEach(plugin => {
-                plugin.deactivate(this.pluginService);
+                this.pluginService.unRegister(plugin);
             });
         }
         enableLayout() {
@@ -25028,7 +25050,7 @@
             }
             this._enableLayout = false;
             this.pluginService.findPluginsByName('FlexLayoutPlugin').forEach(plugin => {
-                plugin.deactivate(this.pluginService);
+                this.pluginService.unRegister(plugin);
             });
         }
         enableHtmlAttribute(container) {
@@ -25044,7 +25066,7 @@
             }
             this.htmlAttribute = false;
             this.pluginService.findPluginsByName('HtmlAttributePlugin').forEach(plugin => {
-                plugin.deactivate(this.pluginService);
+                this.pluginService.unRegister(plugin);
             });
         }
         tryUpdateAABBBounds() {
@@ -25310,7 +25332,7 @@
         }
         setCursor(mode) {
             this._cursor = mode;
-            this.eventSystem.setCursor(mode);
+            this.eventSystem.setCursor(mode, 'ignore');
         }
         getCursor() {
             return this._cursor;