@opendata-ai/openchart-engine 6.13.0 → 6.15.1

package/src/tooltips/compute.ts

@@ -84,12 +84,25 @@ function buildFields(row: DataRow, encoding: Encoding, color?: string): TooltipF
 
   const fields: TooltipField[] = [];
 
+  // Color/series field (e.g. "Source: Coal") so the user knows which series
+  if (encoding.color && 'field' in encoding.color) {
+    fields.push({
+      label: resolveLabel(encoding.color),
+      value: formatValue(
+        row[encoding.color.field],
+        encoding.color.type,
+        resolveFormat(encoding.color),
+      ),
+      color,
+    });
+  }
+
   // Y-axis value (the "main" value in most charts)
   if (encoding.y) {
     fields.push({
       label: resolveLabel(encoding.y),
       value: formatValue(row[encoding.y.field], encoding.y.type, resolveFormat(encoding.y)),
-      color,
+      color: encoding.color ? undefined : color,
     });
   }
 
@@ -138,6 +151,21 @@ function getTooltipTitle(row: DataRow, encoding: Encoding): string | undefined {
     return String(row[encoding.y.field] ?? '');
   }
 
+  // For scatter/bubble (both axes quantitative), find a name-like string field
+  // in the data row that isn't already used by an encoding channel
+  if (encoding.x?.type === 'quantitative' && encoding.y?.type === 'quantitative') {
+    const encodedFields = new Set(
+      [encoding.x, encoding.y, encoding.color, encoding.size, encoding.detail]
+        .filter((ch): ch is EncodingChannel => !!ch && 'field' in ch)
+        .map((ch) => ch.field),
+    );
+    for (const [key, value] of Object.entries(row)) {
+      if (!encodedFields.has(key) && typeof value === 'string') {
+        return value;
+      }
+    }
+  }
+
   // For color-encoded series, use the series name (skip conditional defs)
   if (encoding.color && 'field' in encoding.color) {
     return String(row[encoding.color.field] ?? '');