fix lineHeight

mbostock · mbostock · commit 2261a39954d4 · 2023-05-05T16:39:51.000-07:00
diff --git a/src/marks/tooltip.js b/src/marks/tooltip.js
@@ -192,7 +192,7 @@ export class Tooltip extends Mark {
           const cy = (/^top-/.test(c) ? fitTop || !fitBottom : fitTop && !fitBottom) ? "top" : "bottom";
           c = `${cy}-${cx}`;
         }
-        const oy = getLineOffset(c, text) * lineHeight;
+        const oy = getLineOffset(c, text, lineHeight);
         tspan.attr("y", (d, i) => `${i * lineHeight + oy}em`);
         path.attr("d", getPath(c, m, r, w, h));
         content.attr("transform", getTextTransform(c, m, r, w, h));
@@ -280,8 +280,8 @@ function getSource2(channels, key) {
   return key === "x1" ? getSource(channels, "x2") : key === "y1" ? getSource(channels, "y2") : null;
 }
 
-function getLineOffset(anchor, text) {
-  return /^top-/.test(anchor) ? 0.94 : 0.71 - text.length;
+function getLineOffset(anchor, text, lineHeight) {
+  return /^top-/.test(anchor) ? 0.94 : -0.29 - (text.length - 1) * lineHeight;
 }
 
 function getTextTransform(anchor, m, r, width) {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ export class Tooltip extends Mark {`
`192`	`192`	`const cy = (/^top-/.test(c) ? fitTop \|\| !fitBottom : fitTop && !fitBottom) ? "top" : "bottom";`
`193`	`193`	c = `${cy}-${cx}`;
`194`	`194`	`}`
`195`		`- const oy = getLineOffset(c, text) * lineHeight;`
	`195`	`+ const oy = getLineOffset(c, text, lineHeight);`
`196`	`196`	tspan.attr("y", (d, i) => `${i * lineHeight + oy}em`);
`197`	`197`	`path.attr("d", getPath(c, m, r, w, h));`
`198`	`198`	`content.attr("transform", getTextTransform(c, m, r, w, h));`
`@@ -280,8 +280,8 @@ function getSource2(channels, key) {`
`280`	`280`	`return key === "x1" ? getSource(channels, "x2") : key === "y1" ? getSource(channels, "y2") : null;`
`281`	`281`	`}`
`282`	`282`
`283`		`-function getLineOffset(anchor, text) {`
`284`		`- return /^top-/.test(anchor) ? 0.94 : 0.71 - text.length;`
	`283`	`+function getLineOffset(anchor, text, lineHeight) {`
	`284`	`+ return /^top-/.test(anchor) ? 0.94 : -0.29 - (text.length - 1) * lineHeight;`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`function getTextTransform(anchor, m, r, width) {`