@visactor/vrender-components 0.13.2-alpha.1 → 0.13.2

package/dist/index.js

@@ -875,27 +875,70 @@
       return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
     };
 
+    const theme = {
+        poptip: {
+            visible: true,
+            position: 'top',
+            titleStyle: {
+                fontSize: 16,
+                fill: '#08979c'
+            },
+            contentStyle: {
+                fontSize: 12,
+                fill: 'green'
+            },
+            panel: {
+                visible: true,
+                fill: '#e6fffb',
+                stroke: '#87e8de',
+                lineWidth: 1,
+                cornerRadius: 4
+            }
+        }
+    };
+
+    function wrapPoptip(target, source) {
+        vutils.merge(target, theme.poptip, source);
+        return target;
+    }
     let PopTipRenderContribution = class PopTipRenderContribution {
         render(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
-            if (graphic._showPoptip) {
-                const { visible, visibleCb } = graphic.attribute.poptip;
+            if (graphic._showPoptip === 1) {
+                const { visible, visibleCb } = graphic.attribute.poptip || {};
                 if (visible === false || (visibleCb && visibleCb(graphic) === false)) {
                     return;
                 }
                 if (!this.poptipComponent) {
                     this.poptipComponent = new PopTip(graphic.attribute.poptip);
                 }
+                let poptip = graphic.attribute.poptip || {};
+                if (graphic.type === 'text' && poptip.title == null && poptip.content == null) {
+                    const out = {};
+                    wrapPoptip(out, poptip);
+                    poptip = out;
+                    poptip.content = poptip.content ?? graphic.attribute.text;
+                }
+                const matrix = graphic.globalTransMatrix;
                 this.poptipComponent.setAttributes({
-                    ...graphic.attribute.poptip,
-                    x: 0,
-                    y: 0,
-                    postMatrix: graphic.globalTransMatrix
+                    visibleAll: true,
+                    pickable: false,
+                    childrenPickable: false,
+                    ...poptip,
+                    x: matrix.e,
+                    y: matrix.f
                 });
                 const interactiveLayer = drawContext.stage.getLayer('_builtin_interactive');
                 if (interactiveLayer) {
                     interactiveLayer.add(this.poptipComponent);
                 }
             }
+            else if (graphic._showPoptip === 2) {
+                graphic._showPoptip = 0;
+                this.poptipComponent &&
+                    this.poptipComponent.setAttributes({
+                        visibleAll: false
+                    });
+            }
         }
     };
     PopTipRenderContribution = __decorate([
@@ -916,16 +959,21 @@
         }
         poptip = (e) => {
             const graphic = e.target;
-            if (graphic.isContainer || !graphic.attribute || graphic === this.activeGraphic) {
+            if (graphic.isContainer || !graphic.attribute) {
                 this.unpoptip(e);
                 return;
             }
+            if (graphic === this.activeGraphic) {
+                return;
+            }
             const { poptip } = graphic.attribute;
             if (poptip) {
-                graphic._showPoptip = true;
+                graphic.setAttributes({});
+                graphic._showPoptip = 1;
             }
             if (this.activeGraphic) {
-                this.activeGraphic._showPoptip = false;
+                this.activeGraphic.setAttributes({});
+                this.activeGraphic._showPoptip = 2;
             }
             this.setActiveGraphic(graphic, true);
         };
@@ -933,7 +981,8 @@
             if (!this.activeGraphic) {
                 return;
             }
-            this.activeGraphic._showPoptip = false;
+            this.activeGraphic.setAttributes({});
+            this.activeGraphic._showPoptip = 2;
             this.setActiveGraphic(null, true);
         };
         setActiveGraphic(graphic, rerender) {
@@ -948,14 +997,69 @@
     PopTipPlugin = __decorate([
         injectable()
     ], PopTipPlugin);
+    let PopTipForClipedTextPlugin = class PopTipForClipedTextPlugin {
+        name = 'poptipForText';
+        activeEvent = 'onRegister';
+        pluginService;
+        _uid = vrender.Generator.GenAutoIncrementId();
+        key = this.name + this._uid;
+        activeGraphic;
+        activate(context) {
+            this.pluginService = context;
+            const { stage } = this.pluginService;
+            stage.addEventListener('pointerover', this.poptip);
+        }
+        poptip = (e) => {
+            const graphic = e.target;
+            if (graphic.type !== 'text' || !graphic.cliped || graphic.isContainer || !graphic.attribute) {
+                this.unpoptip(e);
+                return;
+            }
+            if (graphic === this.activeGraphic) {
+                return;
+            }
+            const { poptip = {} } = graphic.attribute;
+            if (poptip) {
+                graphic.setAttributes({});
+                graphic._showPoptip = 1;
+            }
+            if (this.activeGraphic) {
+                this.activeGraphic.setAttributes({});
+                this.activeGraphic._showPoptip = 2;
+            }
+            this.setActiveGraphic(graphic, true);
+        };
+        unpoptip = (e) => {
+            if (!this.activeGraphic) {
+                return;
+            }
+            this.activeGraphic.setAttributes({});
+            this.activeGraphic._showPoptip = 2;
+            this.setActiveGraphic(null, true);
+        };
+        setActiveGraphic(graphic, rerender) {
+            this.activeGraphic = graphic;
+            this.pluginService.stage.renderNextFrame();
+        }
+        deactivate(context) {
+            const { stage } = this.pluginService;
+            stage.removeEventListener('pointerover', this.poptip);
+        }
+    };
+    PopTipForClipedTextPlugin = __decorate([
+        injectable()
+    ], PopTipForClipedTextPlugin);
 
     const module = new ContainerModule(bind => {
         bind(PopTipRenderContribution).toSelf().inSingletonScope();
         bind(vrender.InteractiveSubRenderContribution).toService(PopTipRenderContribution);
         bind(PopTipPlugin).toSelf().inSingletonScope();
         bind(vrender.AutoEnablePlugins).toService(PopTipPlugin);
+        bind(PopTipForClipedTextPlugin).toSelf().inSingletonScope();
+        bind(vrender.AutoEnablePlugins).toService(PopTipForClipedTextPlugin);
     });
-    function enablePoptip() {
+    function loadPoptip(defaultPoptipTheme) {
+        vutils.merge(theme.poptip, defaultPoptipTheme);
         vrender.container.load(module);
     }
 
@@ -3209,11 +3313,23 @@
                 labelLength += space;
                 const layerCount = Object.keys(this.axisLabelLayerSize).length;
                 if (axisVector[1] === 0) {
-                    labelLength += this.axisLabelsContainer.AABBBounds.height() + (layerCount - 1) * space;
+                    const labelBoundsHeight = this.axisLabelsContainer.AABBBounds.height();
+                    if (isFinite(labelBoundsHeight)) {
+                        labelLength += labelBoundsHeight + (layerCount - 1) * space;
+                    }
+                    else {
+                        labelLength = 0;
+                    }
                 }
                 else {
                     if (axisVector[0] === 0) {
-                        labelLength += this.axisLabelsContainer.AABBBounds.width() + (layerCount - 1) * space;
+                        const boundsWidth = this.axisLabelsContainer.AABBBounds.width();
+                        if (isFinite(boundsWidth)) {
+                            labelLength += boundsWidth + (layerCount - 1) * space;
+                        }
+                        else {
+                            labelLength = 0;
+                        }
                     }
                     else {
                         Object.keys(this.axisLabelLayerSize).forEach((layer, index) => {
@@ -9311,7 +9427,7 @@
         }
     }
 
-    const version = "0.13.2-alpha.1";
+    const version = "0.13.2";
 
     exports.AbstractComponent = AbstractComponent;
     exports.BasePlayer = BasePlayer;
@@ -9360,10 +9476,10 @@
     exports.Tag = Tag;
     exports.Title = Title;
     exports.Tooltip = Tooltip;
-    exports.enablePoptip = enablePoptip;
     exports.getHorizontalPath = getHorizontalPath;
     exports.getSizeHandlerPath = getSizeHandlerPath;
     exports.getVerticalPath = getVerticalPath;
+    exports.loadPoptip = loadPoptip;
     exports.module = module;
     exports.version = version;