@visactor/vrender-components 0.22.6-alpha.1 → 0.22.7-alpha.0

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { tau, halfPi as halfPi$1, AABBBounds, degreeToRadian, Point, PointService, abs, max, min, atan2, epsilon, Matrix, pi2, Logger, pi, isArray, isNumberClose, TextMeasure, EventEmitter, isBoolean, isObject, isFunction, cos, sin, isString, pointAt, isNumber, getDecimalPlaces, isNil, Color, sqrt, OBBBounds, has, normalTransform, isValidUrl, isBase64, acos, transformBoundsWithMatrix, getContextFont, rotatePoint, clampAngleByRadian, asin, arrayEqual, Bounds, getRectIntersect, isRectIntersect, isPlainObject, merge, clamp, clampRange, normalizePadding, debounce, throttle, hexToRgb, crossProduct, isValid, isEmpty, rectInsideAnotherRect, radianToDegree, getAngleByPoint, polarToCartesian, normalizeAngle, isValidNumber, flattenArray, array, isRotateAABBIntersect, isLess, isGreater, cloneDeep, get, last, mixin, isEqual, interpolateString, minInArray, maxInArray, binaryFuzzySearchInNumberRange, calculateAnchorOfBounds, computeQuadrant, polygonContainPoint } from '@visactor/vutils';
+import { tau, halfPi as halfPi$1, AABBBounds, degreeToRadian, Point, PointService, abs, max, min, atan2, epsilon, Matrix, pi2, Logger, pi, isArray, isNumberClose, TextMeasure, EventEmitter, isBoolean, isObject, isFunction, cos, sin, isString, pointAt, isNumber, getDecimalPlaces, isNil, Color, sqrt, OBBBounds, has, normalTransform, isValidUrl, isBase64, acos, transformBoundsWithMatrix, getContextFont, rotatePoint, clampAngleByRadian, asin, arrayEqual, Bounds, getRectIntersect, isRectIntersect, isPlainObject, merge, clamp, clampRange, normalizePadding, debounce, throttle, hexToRgb, crossProduct, isValid, isEmpty, array, rectInsideAnotherRect, radianToDegree, getAngleByPoint, polarToCartesian, normalizeAngle, isValidNumber, flattenArray, isRotateAABBIntersect, isLess, isGreater, cloneDeep, get, last, mixin, isEqual, interpolateString, minInArray, maxInArray, binaryFuzzySearchInNumberRange, pointInRect, calculateAnchorOfBounds, computeQuadrant, polygonContainPoint } from '@visactor/vutils';
 import { isContinuous, isDiscrete, LinearScale } from '@visactor/vscale';
 
 class Generator {
@@ -4162,7 +4162,7 @@ class FederatedEvent {
   }
   _composedDetailPath(params) {
     if (params && params.graphic) {
-      const g = this.pickParams.graphic;
+      const g = params.graphic;
       if (g.stage) {
         const path = g.stage.eventSystem.manager.propagationPath(g);
         this.detailPath.push(path), this._composedDetailPath(params.params);
@@ -15941,14 +15941,17 @@ class Tag extends AbstractComponent {
         tagWidth += symbolPlaceWidth;
         textX += symbolPlaceWidth;
         let textShape;
+        let textWidth;
+        let textHeight;
         const isRich = isRichText({ text }) || type === 'rich';
         if (isRich) {
             const richTextAttrs = Object.assign(Object.assign(Object.assign({}, richTextAttributeTransform(Object.assign({ type, text }, textStyle))), textStyle), { visible: isValid(text) && visible !== false, x: textX, y: 0 });
+            if (isNil(richTextAttrs.lineHeight)) {
+                richTextAttrs.lineHeight = textStyle.fontSize;
+            }
             textShape = group.createOrUpdateChild('tag-text', richTextAttrs, 'richtext');
-            tagWidth += textShape.AABBBounds.width();
-            tagHeight += textShape.AABBBounds.height();
-            tagX += textShape.AABBBounds.x1;
-            tagY += textShape.AABBBounds.y1;
+            textWidth = textShape.AABBBounds.width();
+            textHeight = textShape.AABBBounds.height();
         }
         else {
             const textAttrs = Object.assign(Object.assign({ text: isObject(text) && 'type' in text && text.type === 'text' ? text.text : text, visible: isValid(text) && visible !== false, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize }, textStyle), { x: textX, y: 0 });
@@ -15956,126 +15959,134 @@ class Tag extends AbstractComponent {
                 textAttrs.lineHeight = textStyle.fontSize;
             }
             textShape = group.createOrUpdateChild('tag-text', textAttrs, 'text');
-            if (!isEmpty(state === null || state === void 0 ? void 0 : state.text)) {
-                textShape.states = state.text;
-            }
             const textBounds = measureTextSize(textAttrs.text, textStyle, (_b = (_a = this.stage) === null || _a === void 0 ? void 0 : _a.getTheme()) === null || _b === void 0 ? void 0 : _b.text);
-            const textWidth = textBounds.width;
-            const textHeight = textBounds.height;
-            tagWidth += textWidth;
-            const size = (_c = shape.size) !== null && _c !== void 0 ? _c : 10;
-            const maxSize = (isNumber(size) ? size : Math.max(size[0], size[1]));
-            tagHeight += Math.max(textHeight, shape.visible ? maxSize : 0);
-            const { textAlign, textBaseline } = textStyle;
-            if (isValid(minWidth) || isValid(maxWidth)) {
-                if (isValid(minWidth) && tagWidth < minWidth) {
-                    tagWidth = minWidth;
-                }
-                if (isValid(maxWidth) && tagWidth > maxWidth) {
-                    tagWidth = maxWidth;
-                    textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);
-                }
-            }
-            tagX = 0;
-            tagY = 0;
-            let flag = 0;
-            if (textAlign === 'left' || textAlign === 'start') {
-                flag = 1;
+            textWidth = textBounds.width;
+            textHeight = textBounds.height;
+        }
+        tagWidth += textWidth;
+        const size = (_c = shape.size) !== null && _c !== void 0 ? _c : 10;
+        const maxSize = (isNumber(size) ? size : Math.max(size[0], size[1]));
+        tagHeight += Math.max(textHeight, shape.visible ? maxSize : 0);
+        const { textAlign, textBaseline } = textStyle;
+        if (isValid(minWidth) || isValid(maxWidth)) {
+            if (isValid(minWidth) && tagWidth < minWidth) {
+                tagWidth = minWidth;
             }
-            else if (textAlign === 'right' || textAlign === 'end') {
-                flag = -1;
+            if (isValid(maxWidth) && tagWidth > maxWidth) {
+                tagWidth = maxWidth;
+                textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);
             }
-            else if (textAlign === 'center') {
-                flag = 0;
+        }
+        tagX = 0;
+        tagY = 0;
+        let flag = 0;
+        if (textAlign === 'left' || textAlign === 'start') {
+            flag = 1;
+        }
+        else if (textAlign === 'right' || textAlign === 'end') {
+            flag = -1;
+        }
+        else if (textAlign === 'center') {
+            flag = 0;
+        }
+        if (!flag) {
+            tagX -= tagWidth / 2;
+            if (symbol) {
+                symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);
             }
-            if (!flag) {
-                tagX -= tagWidth / 2;
-                if (symbol) {
-                    symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);
-                }
-                group.setAttribute('x', -symbolPlaceWidth / 2);
+            group.setAttribute('x', -symbolPlaceWidth / 2);
+        }
+        else if (flag < 0) {
+            tagX -= tagWidth;
+            if (symbol) {
+                symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);
             }
-            else if (flag < 0) {
-                tagX -= tagWidth;
-                if (symbol) {
-                    symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);
-                }
-                group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);
-            }
-            else if (flag > 0) {
-                group.setAttribute('x', parsedPadding[3]);
-            }
-            const shouldCenter = containerTextAlign ? containerTextAlign === 'center' : textAlwaysCenter;
-            const shouldRight = containerTextAlign === 'right' || containerTextAlign === 'end';
-            const shouldLeft = containerTextAlign === 'left' || containerTextAlign === 'start';
-            if (shouldCenter && flag) {
-                const containerWidth = tagWidth - parsedPadding[1] - parsedPadding[3];
-                const tsWidth = textWidth + symbolPlaceWidth;
-                const textX = flag === 1
-                    ? (containerWidth - tsWidth) / 2 + symbolPlaceWidth + textWidth / 2
-                    : parsedPadding[0] + symbolPlaceWidth - (tagWidth / 2 + tsWidth / 2 - symbolPlaceWidth) + textWidth / 2;
+            group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);
+        }
+        else if (flag > 0) {
+            group.setAttribute('x', parsedPadding[3]);
+        }
+        const shouldCenter = containerTextAlign ? containerTextAlign === 'center' : textAlwaysCenter;
+        const shouldRight = containerTextAlign === 'right' || containerTextAlign === 'end';
+        const shouldLeft = containerTextAlign === 'left' || containerTextAlign === 'start';
+        const updateTextAttrs = (textX, textAlign) => {
+            if (textShape.type === 'richtext') {
                 textShape.setAttributes({
                     x: textX,
-                    textAlign: 'center'
+                    textAlign,
+                    textConfig: array(textShape.attribute.textConfig).map(t => {
+                        return Object.assign(Object.assign({}, t), { textAlign });
+                    })
                 });
-                if (symbol) {
-                    const symbolX = textX - textWidth / 2 - symbolPlaceWidth + maxSize / 2;
-                    symbol.setAttributes({
-                        x: symbolX
-                    });
-                }
             }
-            if (shouldLeft && flag !== 1) {
-                const containerWidth = tagWidth - parsedPadding[1] - parsedPadding[3];
-                const offset = flag === 0
-                    ? -containerWidth / 2 + symbolPlaceWidth / 2
-                    : -tagWidth + parsedPadding[3] + parsedPadding[1] + symbolPlaceWidth;
-                const textX = offset + symbolPlaceWidth;
+            else {
                 textShape.setAttributes({
                     x: textX,
-                    textAlign: 'left'
+                    textAlign
                 });
-                if (symbol) {
-                    const symbolX = offset + maxSize / 2;
-                    symbol.setAttributes({
-                        x: symbolX
-                    });
-                }
             }
-            if (shouldRight && flag !== -1) {
-                const containerWidth = tagWidth - parsedPadding[1] - parsedPadding[3];
-                const textX = flag === 0 ? containerWidth / 2 + symbolPlaceWidth / 2 : containerWidth;
-                textShape.setAttributes({
-                    x: textX,
-                    textAlign: 'right'
+        };
+        if (shouldCenter && flag) {
+            const containerWidth = tagWidth - parsedPadding[1] - parsedPadding[3];
+            const tsWidth = textWidth + symbolPlaceWidth;
+            const textX = flag === 1
+                ? (containerWidth - tsWidth) / 2 + symbolPlaceWidth + textWidth / 2
+                : parsedPadding[0] + symbolPlaceWidth - (tagWidth / 2 + tsWidth / 2 - symbolPlaceWidth) + textWidth / 2;
+            updateTextAttrs(textX, 'center');
+            if (symbol) {
+                const symbolX = textX - textWidth / 2 - symbolPlaceWidth + maxSize / 2;
+                symbol.setAttributes({
+                    x: symbolX
                 });
-                if (symbol) {
-                    const symbolX = textX - textWidth - symbolPlaceWidth + maxSize / 2;
-                    symbol.setAttributes({
-                        x: symbolX
-                    });
-                }
             }
-            if (textBaseline === 'middle') {
-                tagY -= tagHeight / 2;
-                if (symbol) {
-                    symbol.setAttribute('y', 0);
-                }
+        }
+        if (shouldLeft && flag !== 1) {
+            const containerWidth = tagWidth - parsedPadding[1] - parsedPadding[3];
+            const offset = flag === 0
+                ? -containerWidth / 2 + symbolPlaceWidth / 2
+                : -tagWidth + parsedPadding[3] + parsedPadding[1] + symbolPlaceWidth;
+            const textX = offset + symbolPlaceWidth;
+            updateTextAttrs(textX, 'left');
+            if (symbol) {
+                const symbolX = offset + maxSize / 2;
+                symbol.setAttributes({
+                    x: symbolX
+                });
             }
-            else if (textBaseline === 'bottom') {
-                tagY -= tagHeight;
-                if (symbol) {
-                    symbol.setAttribute('y', -textHeight / 2);
-                }
-                group.setAttribute('y', -parsedPadding[2]);
+        }
+        if (shouldRight && flag !== -1) {
+            const containerWidth = tagWidth - parsedPadding[1] - parsedPadding[3];
+            const textX = flag === 0 ? containerWidth / 2 + symbolPlaceWidth / 2 : containerWidth;
+            updateTextAttrs(textX, 'right');
+            if (symbol) {
+                const symbolX = textX - textWidth - symbolPlaceWidth + maxSize / 2;
+                symbol.setAttributes({
+                    x: symbolX
+                });
             }
-            else if (textBaseline === 'top') {
-                group.setAttribute('y', parsedPadding[0]);
-                if (symbol) {
-                    symbol.setAttribute('y', textHeight / 2);
-                }
+        }
+        if (textBaseline === 'middle') {
+            tagY -= tagHeight / 2;
+            if (symbol) {
+                symbol.setAttribute('y', 0);
+            }
+        }
+        else if (textBaseline === 'bottom') {
+            tagY -= tagHeight;
+            if (symbol) {
+                symbol.setAttribute('y', -textHeight / 2);
+            }
+            group.setAttribute('y', -parsedPadding[2]);
+        }
+        else if (textBaseline === 'top') {
+            group.setAttribute('y', parsedPadding[0]);
+            if (symbol) {
+                symbol.setAttribute('y', textHeight / 2);
             }
         }
+        if (!isEmpty(state === null || state === void 0 ? void 0 : state.text)) {
+            textShape.states = state.text;
+        }
         const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
         if (visible && isBoolean(bgVisible)) {
             const bgRect = this.createOrUpdateChild('tag-panel', Object.assign(Object.assign({}, backgroundStyle), { visible: bgVisible && !!text, width: tagWidth, height: tagHeight, x: tagX, y: tagY }), 'rect');
@@ -20012,10 +20023,11 @@ function bitmapTool(width, height, padding = { top: 0, left: 0, right: 0, bottom
 }
 function clampRangeByBitmap($, range) {
     const { x1, x2, y1, y2 } = range;
-    const _x1 = clamp(x1, 0, $.width);
-    const _x2 = clamp(x2, 0, $.width);
-    const _y1 = clamp(y1, 0, $.height);
-    const _y2 = clamp(y2, 0, $.height);
+    const { top = 0, left = 0, right = 0, bottom = 0 } = $.padding;
+    const _x1 = clamp(x1, -left, $.width + right);
+    const _x2 = clamp(x2, -left, $.width + right);
+    const _y1 = clamp(y1, -top, $.height + bottom);
+    const _y2 = clamp(y2, -top, $.height + bottom);
     return {
         x1: $.x(_x1),
         x2: $.x(_x2),
@@ -20186,9 +20198,18 @@ function getAnimationAttributes(textAttribute, type) {
     return (_b = (_a = animationEffects[type]) === null || _a === void 0 ? void 0 : _a.call(animationEffects, textAttribute)) !== null && _b !== void 0 ? _b : { from: {}, to: {} };
 }
 function updateAnimation(prev, next, animationConfig) {
+    const changeAttributes = (prev, next) => {
+        const changed = {};
+        for (const key in next.attribute) {
+            if (prev.attribute[key] !== next.attribute[key]) {
+                changed[key] = next.attribute[key];
+            }
+        }
+        return changed;
+    };
     if (!isArray(animationConfig)) {
         const { duration, easing, increaseEffect = true } = animationConfig;
-        prev.animate().to(next.attribute, duration, easing);
+        prev.animate().to(changeAttributes(prev, next), duration, easing);
         if (increaseEffect && prev.type === 'text' && next.type === 'text') {
             playIncreaseCount(prev, next, duration, easing);
         }
@@ -20198,7 +20219,7 @@ function updateAnimation(prev, next, animationConfig) {
         const { duration, easing, increaseEffect = true, channel } = cfg;
         const { to } = update(prev, next, channel, cfg.options);
         if (!isEmpty(to)) {
-            prev.animate().to(to, duration, easing);
+            prev.animate().to(changeAttributes(prev, next), duration, easing);
         }
         if (increaseEffect && prev.type === 'text' && next.type === 'text') {
             playIncreaseCount(prev, next, duration, easing);
@@ -20957,7 +20978,9 @@ class LabelBase extends AbstractComponent {
         return this._overlapByStrategy(labels, option, bmpTool, bitmap);
     }
     _overlapGlobal(labels, option, bmpTool, bitmap) {
-        let result = labels.filter(label => label.attribute.visible && label.attribute.opacity !== 0);
+        let result = labels.filter(label => label.attribute.visible &&
+            label.attribute.opacity !== 0 &&
+            this.isMarkInsideRect(this.getRelatedGraphic(label.attribute), bmpTool));
         const { clampForce = true, hideOnHit = true, overlapPadding, strategy } = option;
         if (clampForce) {
             for (let i = 0; i < result.length; i++) {
@@ -21049,7 +21072,7 @@ class LabelBase extends AbstractComponent {
             const text = labels[i];
             const baseMark = this.getRelatedGraphic(text.attribute);
             text.update();
-            if (!isRectIntersect(baseMark.AABBBounds, { x1: 0, x2: bmpTool.width, y1: 0, y2: bmpTool.height }, true)) {
+            if (!this.isMarkInsideRect(baseMark, bmpTool)) {
                 continue;
             }
             if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce, overlapPadding)) {
@@ -21089,6 +21112,23 @@ class LabelBase extends AbstractComponent {
         }
         return result;
     }
+    isMarkInsideRect(baseMark, bmpTool) {
+        const { left, right, top, bottom } = bmpTool.padding;
+        const rect = { x1: -left, x2: bmpTool.width + right, y1: -top, y2: bmpTool.height + bottom };
+        const bounds = baseMark.AABBBounds;
+        if (bounds.width() !== 0 && bounds.height() !== 0) {
+            return isRectIntersect(baseMark.AABBBounds, rect, true);
+        }
+        const { attribute } = baseMark;
+        if (baseMark.type === 'rect') {
+            const { x, x1, y, y1 } = attribute;
+            return pointInRect({ x: x !== null && x !== void 0 ? x : x1, y: y !== null && y !== void 0 ? y : y1 }, rect, true);
+        }
+        else if ('x' in attribute && 'y' in attribute) {
+            return pointInRect({ x: attribute.x, y: attribute.y }, rect, true);
+        }
+        return false;
+    }
     getBaseMarkGroup() {
         const { baseMarkGroupName } = this.attribute;
         if (!baseMarkGroupName) {
@@ -31460,6 +31500,6 @@ StoryLabelItem.defaultAttributes = {
     theme: 'default'
 };
 
-const version = "0.22.6-alpha.1";
+const version = "0.22.7-alpha.0";
 
 export { AXIS_ELEMENT_NAME, AbstractComponent, ArcInfo, ArcLabel, ArcSegment, AxisStateValue, BasePlayer, Brush, CheckBox, CircleAxis, CircleAxisGrid, CircleCrosshair, ColorContinuousLegend, ContinuousPlayer, DEFAULT_ITEM_SPACE_COL, DEFAULT_ITEM_SPACE_ROW, DEFAULT_LABEL_SPACE, DEFAULT_PAGER_SPACE, DEFAULT_SHAPE_SIZE, DEFAULT_SHAPE_SPACE, DEFAULT_STATES$1 as DEFAULT_STATES, DEFAULT_TITLE_SPACE, DEFAULT_VALUE_SPACE, DataLabel, DataZoom, DataZoomActiveTag, DirectionEnum, DiscreteLegend, DiscretePlayer, EmptyTip, GroupTransition, IMarkAreaLabelPosition, IMarkCommonArcLabelPosition, IMarkLineLabelPosition, IMarkPointItemPosition, IOperateType, Indicator, LEGEND_ELEMENT_NAME, LabelBase, LegendEvent, LegendStateValue, LineAxis, LineAxisGrid, LineCrosshair, LineLabel, LinkPath, MarkArcArea, MarkArcLine, MarkArea, MarkLine, MarkPoint, Pager, PlayerEventEnum, PolygonCrosshair, PolygonSectorCrosshair, PopTip, Radio, RectCrosshair, RectLabel, SLIDER_ELEMENT_NAME, ScrollBar, SectorCrosshair, Segment, SizeContinuousLegend, Slider, StoryLabelItem, Switch, SymbolLabel, Tag, Timeline, Title, Tooltip, TopZIndex, VTag, WeatherBox, alignTextInLine, angle, angleLabelOrientAttribute, angleTo, cartesianTicks, clampRadian, computeOffsetForlimit, continuousTicks, contrastAccessibilityChecker, convertDomainToTickData, createTextGraphicByType, deltaXYToAngle, fuzzyEqualNumber, getAxisBreakSymbolAttrs, getCircleLabelPosition, getCirclePoints, getCircleVerticalVector, getElMap, getHorizontalPath, getMarksByName, getNoneGroupMarksByName, getPolarAngleLabelPosition, getPolygonPath, getSizeHandlerPath, getTextAlignAttrOfVerticalDir, getTextType, getVerticalCoord, getVerticalPath, hasOverlap, htmlAttributeTransform, initTextMeasure, isInRange, isPostiveXAxis, isRichText, isVisible, labelSmartInvert, length, limitShapeInBounds, linearDiscreteTicks, loadPoptip, loadScrollbar, measureTextSize, normalize, polarAngleAxisDiscreteTicks, polarTicks, reactAttributeTransform, registerArcDataLabel, registerLineDataLabel, registerMarkArcAreaAnimate, registerMarkArcLineAnimate, registerMarkAreaAnimate, registerMarkLineAnimate, registerMarkPointAnimate, registerRectDataLabel, registerSymbolDataLabel, removeRepeatPoint, richTextAttributeTransform, scale, scrollbarModule, setPoptipTheme, smartInvertStrategy, tan2AngleToAngle, textIntersect, ticks, traverseGroup, version };

package/es/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.22.6-alpha.1";
+export declare const version = "0.22.7-alpha.0";
 export * from './core/base';
 export * from './core/type';
 export * from './scrollbar';

package/es/index.js

@@ -1,4 +1,4 @@
-export const version = "0.22.6-alpha.1";
+export const version = "0.22.7-alpha.0";
 
 export * from "./core/base";
 

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAExC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.22.6-alpha.1\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './weather';\nexport * from './util';\nexport * from './switch';\nexport * from './label-item';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAExC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.22.7-alpha.0\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './weather';\nexport * from './util';\nexport * from './switch';\nexport * from './label-item';\n"]}

package/es/label/animate/animate.js

@@ -44,13 +44,19 @@ export function getAnimationAttributes(textAttribute, type) {
 }
 
 export function updateAnimation(prev, next, animationConfig) {
+    const changeAttributes = (prev, next) => {
+        const changed = {};
+        for (const key in next.attribute) prev.attribute[key] !== next.attribute[key] && (changed[key] = next.attribute[key]);
+        return changed;
+    };
     if (!isArray(animationConfig)) {
         const {duration: duration, easing: easing, increaseEffect: increaseEffect = !0} = animationConfig;
-        return prev.animate().to(next.attribute, duration, easing), void (increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing));
+        return prev.animate().to(changeAttributes(prev, next), duration, easing), void (increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing));
     }
     animationConfig.forEach((cfg => {
         const {duration: duration, easing: easing, increaseEffect: increaseEffect = !0, channel: channel} = cfg, {to: to} = update(prev, next, channel, cfg.options);
-        isEmpty(to) || prev.animate().to(to, duration, easing), increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing);
+        isEmpty(to) || prev.animate().to(changeAttributes(prev, next), duration, easing), 
+        increaseEffect && "text" === prev.type && "text" === next.type && playIncreaseCount(prev, next, duration, easing);
     }));
 }
 

package/es/label/animate/animate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/label/animate/animate.ts"],"names":[],"mappings":"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","file":"animate.js","sourcesContent":["import type { IText, ITextGraphicAttribute, EasingType } from '@visactor/vrender-core';\nimport { IncreaseCount } from '@visactor/vrender-core';\nimport type { ILabelAnimation, ILabelUpdateAnimation, ILabelUpdateChannelAnimation, LabelContent } from '../type';\nimport { array, isArray, isEmpty, isValidNumber } from '@visactor/vutils';\n\nconst fadeIn = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    },\n    to: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    }\n  };\n};\n\nconst fadeOut = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    },\n    to: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    }\n  };\n};\n\nconst animationEffects = { fadeIn, fadeOut };\n\nexport function getAnimationAttributes(\n  textAttribute: ITextGraphicAttribute,\n  type: 'fadeIn' | 'fadeOut'\n): {\n  from: any;\n  to: any;\n} {\n  return animationEffects[type]?.(textAttribute) ?? { from: {}, to: {} };\n}\n\nexport function updateAnimation(\n  prev: LabelContent['text'],\n  next: LabelContent['text'],\n  animationConfig: ILabelUpdateAnimation | ILabelUpdateChannelAnimation[]\n) {\n  if (!isArray(animationConfig)) {\n    const { duration, easing, increaseEffect = true } = animationConfig;\n    prev.animate().to(next.attribute, duration, easing);\n    if (increaseEffect && prev.type === 'text' && next.type === 'text') {\n      playIncreaseCount(prev as IText, next as IText, duration, easing);\n    }\n    return;\n  }\n\n  animationConfig.forEach(cfg => {\n    const { duration, easing, increaseEffect = true, channel } = cfg;\n    const { to } = update(prev, next, channel, cfg.options);\n    if (!isEmpty(to)) {\n      prev.animate().to(to, duration, easing);\n    }\n\n    if (increaseEffect && prev.type === 'text' && next.type === 'text') {\n      playIncreaseCount(prev as IText, next as IText, duration, easing);\n    }\n  });\n}\n\nexport const update = (\n  prev: LabelContent['text'],\n  next: LabelContent['text'],\n  channel?: string[],\n  options?: ILabelUpdateChannelAnimation['options']\n) => {\n  const from = Object.assign({}, prev.attribute);\n  const to = Object.assign({}, next.attribute);\n  array(options?.excludeChannels).forEach(key => {\n    delete to[key];\n  });\n  Object.keys(to).forEach(key => {\n    if (channel && !channel.includes(key)) {\n      delete to[key];\n    }\n  });\n  return { from, to };\n};\n\nexport function playIncreaseCount(prev: IText, next: IText, duration: number, easing: EasingType) {\n  if (\n    prev.attribute.text !== next.attribute.text &&\n    isValidNumber(Number(prev.attribute.text) * Number(next.attribute.text))\n  ) {\n    prev\n      .animate()\n      .play(\n        new IncreaseCount(\n          { text: prev.attribute.text as string },\n          { text: next.attribute.text as string },\n          duration,\n          easing\n        )\n      );\n  }\n}\n\nexport const DefaultLabelAnimation: ILabelAnimation = {\n  mode: 'same-time',\n  duration: 300,\n  easing: 'linear' as EasingType\n};\n"]}
+{"version":3,"sources":["../src/label/animate/animate.ts"],"names":[],"mappings":"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","file":"animate.js","sourcesContent":["import type { IText, ITextGraphicAttribute, EasingType } from '@visactor/vrender-core';\nimport { IncreaseCount } from '@visactor/vrender-core';\nimport type { ILabelAnimation, ILabelUpdateAnimation, ILabelUpdateChannelAnimation, LabelContent } from '../type';\nimport { array, isArray, isEmpty, isValidNumber } from '@visactor/vutils';\n\nconst fadeIn = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    },\n    to: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    }\n  };\n};\n\nconst fadeOut = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    },\n    to: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    }\n  };\n};\n\nconst animationEffects = { fadeIn, fadeOut };\n\nexport function getAnimationAttributes(\n  textAttribute: ITextGraphicAttribute,\n  type: 'fadeIn' | 'fadeOut'\n): {\n  from: any;\n  to: any;\n} {\n  return animationEffects[type]?.(textAttribute) ?? { from: {}, to: {} };\n}\n\nexport function updateAnimation(\n  prev: LabelContent['text'],\n  next: LabelContent['text'],\n  animationConfig: ILabelUpdateAnimation | ILabelUpdateChannelAnimation[]\n) {\n  const changeAttributes = (prev: LabelContent['text'], next: LabelContent['text']) => {\n    const changed = {};\n    for (const key in next.attribute) {\n      if (prev.attribute[key] !== next.attribute[key]) {\n        changed[key] = next.attribute[key];\n      }\n    }\n    return changed;\n  };\n\n  if (!isArray(animationConfig)) {\n    const { duration, easing, increaseEffect = true } = animationConfig;\n\n    prev.animate().to(changeAttributes(prev, next), duration, easing);\n    if (increaseEffect && prev.type === 'text' && next.type === 'text') {\n      playIncreaseCount(prev as IText, next as IText, duration, easing);\n    }\n    return;\n  }\n\n  animationConfig.forEach(cfg => {\n    const { duration, easing, increaseEffect = true, channel } = cfg;\n    const { to } = update(prev, next, channel, cfg.options);\n    if (!isEmpty(to)) {\n      prev.animate().to(changeAttributes(prev, next), duration, easing);\n    }\n\n    if (increaseEffect && prev.type === 'text' && next.type === 'text') {\n      playIncreaseCount(prev as IText, next as IText, duration, easing);\n    }\n  });\n}\n\nexport const update = (\n  prev: LabelContent['text'],\n  next: LabelContent['text'],\n  channel?: string[],\n  options?: ILabelUpdateChannelAnimation['options']\n) => {\n  const from = Object.assign({}, prev.attribute);\n  const to = Object.assign({}, next.attribute);\n  array(options?.excludeChannels).forEach(key => {\n    delete to[key];\n  });\n  Object.keys(to).forEach(key => {\n    if (channel && !channel.includes(key)) {\n      delete to[key];\n    }\n  });\n  return { from, to };\n};\n\nexport function playIncreaseCount(prev: IText, next: IText, duration: number, easing: EasingType) {\n  if (\n    prev.attribute.text !== next.attribute.text &&\n    isValidNumber(Number(prev.attribute.text) * Number(next.attribute.text))\n  ) {\n    prev\n      .animate()\n      .play(\n        new IncreaseCount(\n          { text: prev.attribute.text as string },\n          { text: next.attribute.text as string },\n          duration,\n          easing\n        )\n      );\n  }\n}\n\nexport const DefaultLabelAnimation: ILabelAnimation = {\n  mode: 'same-time',\n  duration: 300,\n  easing: 'linear' as EasingType\n};\n"]}

package/es/label/base.d.ts

@@ -52,6 +52,7 @@ export declare class LabelBase<T extends BaseLabelAttrs> extends AbstractCompone
     protected _overlapGlobal(labels: (IText | IRichText)[], option: OverlapAttrs, bmpTool: BitmapTool, bitmap: Bitmap): (IRichText | IText)[];
     protected _processClampForce(text: IText, bmpTool: BitmapTool, bitmap: Bitmap, overlapPadding?: number): boolean;
     protected _overlapByStrategy(labels: (IText | IRichText)[], option: OverlapAttrs, bmpTool: BitmapTool, bitmap: Bitmap): (IRichText | IText)[];
+    protected isMarkInsideRect(baseMark: IGraphic, bmpTool: BitmapTool): boolean;
     protected getBaseMarkGroup(): IGroup;
     protected getGraphicBounds(graphic?: IGraphic, point?: Partial<PointLocationCfg>, position?: string): IBoundsLike;
     protected _renderLabels(labels: (IText | IRichText)[]): void;

package/es/label/base.js

@@ -10,7 +10,7 @@ var __rest = this && this.__rest || function(s, e) {
 
 import { graphicCreator, AttributeUpdateType, IContainPointMode, CustomPath2D } from "@visactor/vrender-core";
 
-import { isFunction, isEmpty, isValid, isString, merge, isRectIntersect, isNil, isArray, isObject } from "@visactor/vutils";
+import { isFunction, isEmpty, isValid, isString, merge, isRectIntersect, isNil, isArray, isObject, pointInRect } from "@visactor/vutils";
 
 import { AbstractComponent } from "../core/base";
 
@@ -220,7 +220,7 @@ export class LabelBase extends AbstractComponent {
         "shiftY" === (null == strategy ? void 0 : strategy.type) ? this._overlapGlobal(labels, option, bmpTool, bitmap) : this._overlapByStrategy(labels, option, bmpTool, bitmap);
     }
     _overlapGlobal(labels, option, bmpTool, bitmap) {
-        let result = labels.filter((label => label.attribute.visible && 0 !== label.attribute.opacity));
+        let result = labels.filter((label => label.attribute.visible && 0 !== label.attribute.opacity && this.isMarkInsideRect(this.getRelatedGraphic(label.attribute), bmpTool)));
         const {clampForce: clampForce = !0, hideOnHit: hideOnHit = !0, overlapPadding: overlapPadding, strategy: strategy} = option;
         if (clampForce) for (let i = 0; i < result.length; i++) {
             const text = labels[i], {dx: dx = 0, dy: dy = 0} = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
@@ -279,12 +279,7 @@ export class LabelBase extends AbstractComponent {
         for (let i = 0; i < labels.length; i++) {
             if (!1 === labels[i].attribute.visible) continue;
             const text = labels[i], baseMark = this.getRelatedGraphic(text.attribute);
-            if (text.update(), !isRectIntersect(baseMark.AABBBounds, {
-                x1: 0,
-                x2: bmpTool.width,
-                y1: 0,
-                y2: bmpTool.height
-            }, !0)) continue;
+            if (text.update(), !this.isMarkInsideRect(baseMark, bmpTool)) continue;
             if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce, overlapPadding)) {
                 if (!checkBounds) {
                     bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
@@ -314,6 +309,27 @@ export class LabelBase extends AbstractComponent {
         }
         return result;
     }
+    isMarkInsideRect(baseMark, bmpTool) {
+        const {left: left, right: right, top: top, bottom: bottom} = bmpTool.padding, rect = {
+            x1: -left,
+            x2: bmpTool.width + right,
+            y1: -top,
+            y2: bmpTool.height + bottom
+        }, bounds = baseMark.AABBBounds;
+        if (0 !== bounds.width() && 0 !== bounds.height()) return isRectIntersect(baseMark.AABBBounds, rect, !0);
+        const {attribute: attribute} = baseMark;
+        if ("rect" === baseMark.type) {
+            const {x: x, x1: x1, y: y, y1: y1} = attribute;
+            return pointInRect({
+                x: null != x ? x : x1,
+                y: null != y ? y : y1
+            }, rect, !0);
+        }
+        return "x" in attribute && "y" in attribute && pointInRect({
+            x: attribute.x,
+            y: attribute.y
+        }, rect, !0);
+    }
     getBaseMarkGroup() {
         const {baseMarkGroupName: baseMarkGroupName} = this.attribute;
         if (baseMarkGroupName) return this.getRootNode().find((node => node.name === baseMarkGroupName), !0);