From f72d4c24a6a561ed0fd8f4a06f6fbb051631c681 Mon Sep 17 00:00:00 2001
From: xuwb <wza2006abc@163.com>
Date: Thu, 18 Jul 2024 11:40:53 +0800
Subject: [PATCH] fix: label background word wrap width (#6055)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: label background 折行宽度修改

* feat: 更新label-oversized 测试demo和截图

---------

Co-authored-by: xwb163631 <xwb163631@gongdao.com>
---
 .../__tests__/demos/element-label-oversized.ts |  5 +++--
 .../elements/label-oversized/default.svg       | 18 ++++++++++++------
 packages/g6/src/elements/shapes/label.ts       |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/g6/__tests__/demos/element-label-oversized.ts b/packages/g6/__tests__/demos/element-label-oversized.ts
index 23d429d70e..45aa401f2a 100644
--- a/packages/g6/__tests__/demos/element-label-oversized.ts
+++ b/packages/g6/__tests__/demos/element-label-oversized.ts
@@ -8,7 +8,7 @@ export const elementLabelOversized: TestCase = async (context) => {
         data: {
           x: 100,
           y: 150,
-          label: `This label is too  long to be displayed`,
+          label: `This label with padding is too  long to be displayed`,
           size: 100,
         },
       },
@@ -17,7 +17,7 @@ export const elementLabelOversized: TestCase = async (context) => {
         data: {
           x: 400,
           y: 150,
-          label: 'This label is too long to be displayed',
+          label: 'This label with padding is too long to be displayed',
           size: 150,
         },
       },
@@ -50,6 +50,7 @@ export const elementLabelOversized: TestCase = async (context) => {
         labelBackgroundFill: '#eee',
         labelBackgroundFillOpacity: 0.5,
         labelBackgroundRadius: 4,
+        labelPadding: [0, 10, 0, 10],
         labelWordWrap: true,
         labelMaxLines: 4,
       },
diff --git a/packages/g6/__tests__/snapshots/elements/label-oversized/default.svg b/packages/g6/__tests__/snapshots/elements/label-oversized/default.svg
index 1aab3c448b..bccd69c339 100644
--- a/packages/g6/__tests__/snapshots/elements/label-oversized/default.svg
+++ b/packages/g6/__tests__/snapshots/elements/label-oversized/default.svg
@@ -31,15 +31,18 @@
           </g>
           <g fill="none" class="label" transform="matrix(1,0,0,1,0,52)">
             <g>
-              <path fill="rgba(238,238,238,1)" d="M -40.06,0 l 81.12,0 a 4,4,0,0,1,4,4 l 0,47 a 4,4,0,0,1,-4,4 l -81.12,0 a 4,4,0,0,1,-4,-4 l 0,-47 a 4,4,0,0,1,4,-4 z" class="background" opacity="0.75" stroke-width="0" fill-opacity="0.5" x="-44.06" y="0" width="89.12" height="55"/>
+              <path fill="rgba(238,238,238,1)" d="M -49.019999999999996,0 l 99.03999999999999,0 a 4,4,0,0,1,4,4 l 0,63 a 4,4,0,0,1,-4,4 l -99.03999999999999,0 a 4,4,0,0,1,-4,-4 l 0,-63 a 4,4,0,0,1,4,-4 z" class="background" opacity="0.75" stroke-width="0" fill-opacity="0.5" x="-53.019999999999996" y="0" width="107.03999999999999" height="71"/>
             </g>
             <g>
               <text fill="rgba(0,0,0,1)" dominant-baseline="hanging" paint-order="stroke" class="text" font-size="12" font-family="system-ui, sans-serif" text-anchor="middle" fill-opacity="0.85" font-weight="400">
                 <tspan x="0" dx="0.5" dy="0">
-                  This label is
+                  This label with
                 </tspan>
                 <tspan x="0" dx="0.5" dy="16">
-                  too  long to be
+                  padding is too
+                </tspan>
+                <tspan x="0" dx="0.5" dy="16">
+                  long to be
                 </tspan>
                 <tspan x="0" dx="0.5" dy="16">
                   displayed
@@ -54,15 +57,18 @@
           </g>
           <g fill="none" class="label" transform="matrix(1,0,0,1,0,77)">
             <g>
-              <path fill="rgba(238,238,238,1)" d="M -65.38000000000001,0 l 127,0 a 4,4,0,0,1,4,4 l 0,31 a 4,4,0,0,1,-4,4 l -127,0 a 4,4,0,0,1,-4,-4 l 0,-31 a 4,4,0,0,1,4,-4 z" class="background" opacity="0.75" stroke-width="0" fill-opacity="0.5" x="-69.38000000000001" y="0" width="135" height="39"/>
+              <path fill="rgba(238,238,238,1)" d="M -72.96000000000001,0 l 146.92000000000002,0 a 4,4,0,0,1,4,4 l 0,47 a 4,4,0,0,1,-4,4 l -146.92000000000002,0 a 4,4,0,0,1,-4,-4 l 0,-47 a 4,4,0,0,1,4,-4 z" class="background" opacity="0.75" stroke-width="0" fill-opacity="0.5" x="-76.96000000000001" y="0" width="154.92000000000002" height="55"/>
             </g>
             <g>
               <text fill="rgba(0,0,0,1)" dominant-baseline="hanging" paint-order="stroke" class="text" font-size="12" font-family="system-ui, sans-serif" text-anchor="middle" fill-opacity="0.85" font-weight="400">
                 <tspan x="0" dx="0.5" dy="0">
-                  This label is too long to
+                  This label with padding
                 </tspan>
                 <tspan x="0" dx="0.5" dy="16">
-                  be displayed
+                  is too long to be
+                </tspan>
+                <tspan x="0" dx="0.5" dy="16">
+                  displayed
                 </tspan>
               </text>
             </g>
diff --git a/packages/g6/src/elements/shapes/label.ts b/packages/g6/src/elements/shapes/label.ts
index cbd39d0947..cb4a58f846 100644
--- a/packages/g6/src/elements/shapes/label.ts
+++ b/packages/g6/src/elements/shapes/label.ts
@@ -91,7 +91,7 @@ export class Label extends BaseShape<LabelStyleProps> {
       Object.assign(backgroundStyle, {
         x: minX - left,
         y: minY - top,
-        width: wordWrap ? Math.min(totalWidth, wordWrapWidth) : totalWidth,
+        width: wordWrap ? Math.min(totalWidth, wordWrapWidth + left + right) : totalWidth,
         height: halfHeight * 2 + top + bottom,
       });
     }