Merge pull request #3550 from VisActor/fix/dom-tooltip-content-update

Fix/dom tooltip content update
VisActor · Dec 11, 2024 · 46f0b6c · 46f0b6c
2 parents a1a41e2 + 03c8b7d
commit 46f0b6c
Show file tree

Hide file tree

Showing 5 changed files with 251 additions and 168 deletions.
diff --git a/common/changes/@visactor/vchart/fix-dom-tooltip-content-update_2024-12-11-07-29.json b/common/changes/@visactor/vchart/fix-dom-tooltip-content-update_2024-12-11-07-29.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: html tooltip can reuse the dom content and fix the unneed animation\n\n",
+      "type": "none",
+      "packageName": "@visactor/vchart"
+    }
+  ],
+  "packageName": "@visactor/vchart",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@visactor/vchart/fix-tooltip-formatter_2024-12-11-02-38.json b/common/changes/@visactor/vchart/fix-tooltip-formatter_2024-12-11-02-38.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix tooltip content when only has `valueFormatter` or `keyFormatter`\n\n",
+      "type": "none",
+      "packageName": "@visactor/vchart"
+    }
+  ],
+  "packageName": "@visactor/vchart",
+  "email": "[email protected]"
+}
diff --git a/packages/vchart/src/component/tooltip/utils/common.ts b/packages/vchart/src/component/tooltip/utils/common.ts
@@ -78,23 +78,30 @@ function addContentLine(
               ...spec
             }
           : { ...shapeAttrs, ...spec };
-
-      Object.keys(finalSpec).forEach(k => {
-        if (k === 'key') {
-          res.key = getTimeString(
-            getTooltipContentValue(finalSpec.key, datum, params, finalSpec.keyFormatter),
-            finalSpec.keyTimeFormat,
-            finalSpec.keyTimeFormatMode
-          );
-        } else if (k === 'value') {
-          res.value = getTimeString(
-            getTooltipContentValue(finalSpec.value, datum, params, finalSpec.valueFormatter),
-            finalSpec.valueTimeFormat,
-            finalSpec.valueTimeFormatMode
-          );
-        } else {
-          (res as any)[k] = getTooltipContentValue((finalSpec as any)[k], datum, params);
-        }
+      const {
+        key,
+        keyFormatter,
+        keyTimeFormat,
+        keyTimeFormatMode,
+        value,
+        valueFormatter,
+        valueTimeFormat,
+        valueTimeFormatMode,
+        ...others
+      } = finalSpec;
+
+      res.key = getTimeString(
+        getTooltipContentValue(key, datum, params, keyFormatter),
+        keyTimeFormat,
+        keyTimeFormatMode
+      );
+      res.value = getTimeString(
+        getTooltipContentValue(value, datum, params, valueFormatter),
+        valueTimeFormat,
+        valueTimeFormatMode
+      );
+      Object.keys(others).forEach(k => {
+        (res as any)[k] = getTooltipContentValue((finalSpec as any)[k], datum, params);
       });
       if (res.visible !== false && (isValid(res.key) || isValid(res.value))) {
         result.push(res);