@visactor/vchart 1.12.14 → 1.12.15

package/build/index.js

@@ -31743,10 +31743,11 @@
       let candidates = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
       let clampForce = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : !0;
       let pad = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+      let changePosition = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : !1;
       const validCandidates = candidates.filter(candidate => isValid$1(candidate));
       for (let i = 0; i < validCandidates.length; i++) {
-        const tempText = text.clone();
-        if (tempText.setAttributes(validCandidates[i]), tempText.update(), canPlace($, bitmap, tempText.AABBBounds, clampForce, pad)) return bitmap.setRange(boundToRange($, tempText.AABBBounds, !0)), validCandidates[i];
+        let measureText;
+        if (measureText = changePosition ? text : text.clone(), measureText.setAttributes(validCandidates[i]), canPlace($, bitmap, measureText.AABBBounds, clampForce, pad)) return bitmap.setRange(boundToRange($, measureText.AABBBounds, !0)), validCandidates[i];
       }
       return !1;
     }
@@ -31756,8 +31757,9 @@
         overlapPadding = null === (_b = attrs.overlap) || void 0 === _b ? void 0 : _b.overlapPadding;
       if ("bound" === s.type || "position" === s.type) {
         if (isFunction$1(labeling)) {
-          const candidates = ((isFunction$1(s.position) ? s.position(text.attribute) : s.position) || defaultLabelPosition(attrs.type)).map(p => labeling(text.AABBBounds, bounds, p, attrs.offset));
-          return placeToCandidates($, bitmap, text, candidates, clampForce, overlapPadding);
+          const candidates = ((isFunction$1(s.position) ? s.position(text.attribute) : s.position) || defaultLabelPosition(attrs.type)).map(p => labeling(text.AABBBounds, bounds, p, attrs.offset)),
+            shouldClone = !1 === s.restorePosition;
+          return placeToCandidates($, bitmap, text, candidates, clampForce, overlapPadding, shouldClone);
         }
         return !1;
       }
@@ -32141,18 +32143,18 @@
           textInformation.get(text).attempts = attempts;
         };
       function adjustPositionInOneGroup(texts) {
-        var text;
-        if (1 !== texts.length) for (let i = texts.length - 1; i > 0; i--) {
+        for (let i = texts.length - 1; i >= 0; i--) {
           const curText = texts[i],
             upperText = texts[i - 1],
             lowerText = texts[i + 1];
-          if (isIntersect(getY1(upperText) + getHeight(upperText), getY1(curText))) {
+          if (upperText && isIntersect(getY1(upperText) + getHeight(upperText), getY1(curText)) || 0 === getY1(curText) && curText._isClamped) {
             const {
               y: y
             } = labelling(curText);
             lowerText && isIntersect(y + getHeight(curText) / 2, getY1(lowerText)) || y + getHeight(curText) / 2 <= maxY && setY1(curText, getY1(curText) + y - (text = curText, textInformation.get(text).y));
           }
         }
+        var text;
       }
       texts.sort((a, b) => a.attribute.x - b.attribute.x);
       for (const text of texts) {
@@ -32516,12 +32518,35 @@
           const text = result[i],
             bounds = text.AABBBounds,
             range = boundToRange(bmpTool, bounds, !0);
-          canPlace(bmpTool, bitmap, bounds, clampForce, text._isClamped ? 0 : overlapPadding) ? bitmap.setRange(range) : hideOnHit ? text.setAttributes({
-            visible: !1
-          }) : bitmap.setRange(range);
+          if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) bitmap.setRange(range);else {
+            if (clampForce) {
+              if (this._processClampForce(text, bmpTool, bitmap)) continue;
+            }
+            hideOnHit ? text.setAttributes({
+              visible: !1
+            }) : bitmap.setRange(range);
+          }
         }
         return result;
       }
+      _processClampForce(text, bmpTool, bitmap) {
+        const {
+          dy = 0,
+          dx = 0
+        } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
+        if (0 === dx && 0 === dy) {
+          if (canPlace(bmpTool, bitmap, text.AABBBounds)) return bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), !0;
+        } else if (canPlace(bmpTool, bitmap, {
+          x1: text.AABBBounds.x1 + dx,
+          x2: text.AABBBounds.x2 + dx,
+          y1: text.AABBBounds.y1 + dy,
+          y2: text.AABBBounds.y2 + dy
+        })) return text.setAttributes({
+          x: text.attribute.x + dx,
+          y: text.attribute.y + dy
+        }), bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), !0;
+        return !1;
+      }
       _overlapByStrategy(labels, option, bmpTool, bitmap) {
         var _a;
         const {
@@ -32570,25 +32595,8 @@
             break;
           }
           if (!hasPlace && clampForce) {
-            const {
-              dx = 0,
-              dy = 0
-            } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
-            if (0 === dx && 0 === dy) {
-              if (canPlace(bmpTool, bitmap, text.AABBBounds)) {
-                bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
-                continue;
-              }
-            } else if (canPlace(bmpTool, bitmap, {
-              x1: text.AABBBounds.x1 + dx,
-              x2: text.AABBBounds.x2 + dx,
-              y1: text.AABBBounds.y1 + dy,
-              y2: text.AABBBounds.y2 + dy
-            })) {
-              text.setAttributes({
-                x: text.attribute.x + dx,
-                y: text.attribute.y + dy
-              }), bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
+            if (this._processClampForce(text, bmpTool, bitmap)) {
+              result.push(text);
               continue;
             }
           }
@@ -61926,7 +61934,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.12.14";
+    const version = "1.12.15";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();