trackplot 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1640bf80db9c399eac8aeb2df85355ad008dec2b91c3b7e3a8c87fa1dfaaddc
-  data.tar.gz: 88a4e3de4b79d903085690c6dd7bcd9795f9f574fc083d1b68b03e0eba7a19bc
+  metadata.gz: dd81256294542897c6d23b5f3f1e6a44ec163ddcfb2e342299b8ece69267b0f7
+  data.tar.gz: 8ffb1cb2f0d060a460a4f2e16b547ba6a495d6f1d756f043e28b2e01e5a178ca
 SHA512:
-  metadata.gz: 90143b3d120b726acf7fe579314636d8e7526de86d34d384f053663ddee6eb41497176aa6d670c28c8b2d1c52a7a6e6b516d3fd5d9d433287597b7c1360746a1
-  data.tar.gz: 58cb42158c1d86bf600e93a1c7ae0792e4cbb270e1d9177d6d96da84d90ae41070c686a72a0fbcad98ff026fb3d4673d61d0977095807bb6b3ee59e6f9ec433a
+  metadata.gz: a200da76cac37a0676045c46335fb3639f9f132d8bda06c0fa93f2d4cc3aa6eb29ea29b63e9581a6bb9831e4b935b58c8f1714bca49fbbcae076b9380bc31f1e
+  data.tar.gz: 7515dbf870e6174984ea2a5f8ca4fa348a2727ed0694817e9e05e98a34ac773131face3e50141e1c95dd3edf6904423f93967fb76b506e248dce22629507bf06

data/app/assets/javascripts/trackplot/index.d.ts

@@ -17,6 +17,7 @@ export interface ThemeConfig {
 export interface LineConfig {
   type: "line";
   data_key: string;
+  name?: string;
   color?: string;
   stroke_width?: number;
   curve?: boolean;
@@ -29,6 +30,7 @@ export interface LineConfig {
 export interface BarConfig {
   type: "bar";
   data_key: string;
+  name?: string;
   color?: string;
   opacity?: number;
   radius?: number;
@@ -39,6 +41,7 @@ export interface BarConfig {
 export interface AreaConfig {
   type: "area";
   data_key: string;
+  name?: string;
   color?: string;
   opacity?: number;
   stroke_width?: number;
@@ -50,6 +53,7 @@ export interface AreaConfig {
 export interface ScatterConfig {
   type: "scatter";
   data_key: string;
+  name?: string;
   x_key?: string;
   color?: string;
   opacity?: number;
@@ -68,6 +72,7 @@ export interface PieConfig {
 export interface RadarConfig {
   type: "radar";
   data_key: string;
+  name?: string;
   color?: string;
   opacity?: number;
   stroke_width?: number;
@@ -78,6 +83,7 @@ export interface RadarConfig {
 export interface HorizontalBarConfig {
   type: "horizontal_bar";
   data_key: string;
+  name?: string;
   color?: string;
   opacity?: number;
   radius?: number;

data/app/assets/javascripts/trackplot/index.js

@@ -60,6 +60,10 @@ function sanitizeClass(str) {
   return String(str).replace(/[^a-zA-Z0-9_-]/g, "_")
 }
 
+function seriesLabel(s) {
+  return s.name || s.data_key
+}
+
 function getXKey(components) {
   const xAxis = components.find(c => c.type === "axis" && c.direction === "x")
   return xAxis ? xAxis.data_key : null
@@ -510,7 +514,7 @@ function renderLine(g, data, xScale, yScale, xKey, series, animate, chartElement
       .attr("stroke", series.color)
       .attr("stroke-width", 2)
       .style("cursor", "pointer")
-      .attr("aria-label", d => `${series.data_key}: ${d[series.data_key]}`)
+      .attr("aria-label", d => `${seriesLabel(series)}: ${d[series.data_key]}`)
 
     if (animate) {
       dots.attr("r", 0).transition().delay(DURATION).duration(300).attr("r", dotR)
@@ -582,7 +586,7 @@ function renderBars(g, data, xScale, yScale, xKey, barSeries, animate, chartElem
         .attr("opacity", series.opacity ?? 1)
         .attr("y", animate ? yScale(0) : d => yScale(+d[series.data_key] || 0))
         .attr("height", animate ? 0 : d => Math.max(0, yScale(0) - yScale(+d[series.data_key] || 0)))
-        .attr("aria-label", d => `${series.data_key}: ${d[series.data_key]}`)
+        .attr("aria-label", d => `${seriesLabel(series)}: ${d[series.data_key]}`)
         .style("cursor", "pointer")
         .transition().duration(animate ? DURATION : 0).ease(EASE)
         .delay((_, i) => animate ? i * 40 : 0)
@@ -637,7 +641,7 @@ function renderStackedBars(g, data, xScale, yScale, xKey, stackedSeries, animate
       .attr("opacity", series.opacity ?? 1)
       .attr("y", animate ? yScale(0) : d => yScale(d[1]))
       .attr("height", animate ? 0 : d => Math.max(0, yScale(d[0]) - yScale(d[1])))
-      .attr("aria-label", (d, i) => `${series.data_key}: ${data[i][series.data_key]}`)
+      .attr("aria-label", (d, i) => `${seriesLabel(series)}: ${data[i][series.data_key]}`)
       .style("cursor", "pointer")
       .transition().duration(animate ? DURATION : 0).ease(EASE)
       .delay((_, i) => animate ? i * 40 : 0)
@@ -771,7 +775,7 @@ function renderScatter(g, data, xScale, yScale, xKey, series, animate, chartElem
     .attr("fill-opacity", series.opacity || 0.7)
     .attr("stroke", "white")
     .attr("stroke-width", 1.5)
-    .attr("aria-label", d => `${series.data_key}: ${d[series.data_key]}`)
+    .attr("aria-label", d => `${seriesLabel(series)}: ${d[series.data_key]}`)
     .style("cursor", "pointer")
 
   if (animate) {
@@ -829,7 +833,7 @@ function renderHorizontalBars(g, data, xScale, yScale, yKey, barSeries, animate,
       .attr("ry", radius)
       .attr("fill", series.color)
       .attr("opacity", series.opacity ?? 1)
-      .attr("aria-label", d => `${series.data_key}: ${d[series.data_key]}`)
+      .attr("aria-label", d => `${seriesLabel(series)}: ${d[series.data_key]}`)
       .style("cursor", "pointer")
       .attr("width", animate ? 0 : d => Math.max(0, xScale(+d[series.data_key] || 0)))
       .transition().duration(animate ? DURATION : 0).ease(EASE)
@@ -1468,7 +1472,7 @@ function setupCartesianTooltip(element, g, data, xScale, yScale, xKey, series, c
             const formatted = isNaN(+val) ? val : fmtValue(+val)
             html += `<div style="display:flex;align-items:center;gap:8px">`
             html += `<span style="width:8px;height:8px;border-radius:50%;background:${s.color};flex-shrink:0"></span>`
-            html += `<span style="color:${t.text_color}">${s.data_key}</span>`
+            html += `<span style="color:${t.text_color}">${seriesLabel(s)}</span>`
             html += `<span style="font-weight:500;color:${t.tooltip_text};margin-left:auto;padding-left:12px">${formatted}</span>`
             html += `</div>`
           }
@@ -1554,7 +1558,7 @@ function setupRadarTooltip(element, g, data, radarSeries, labelKey, config, them
       let html = `<div style="font-weight:600;color:${t.tooltip_text};margin-bottom:2px">${cat}</div>`
       html += `<div style="display:flex;align-items:center;gap:8px">`
       html += `<span style="width:8px;height:8px;border-radius:50%;background:${series.color};flex-shrink:0"></span>`
-      html += `<span style="color:${t.text_color}">${series.data_key}</span>`
+      html += `<span style="color:${t.text_color}">${seriesLabel(series)}</span>`
       html += `<span style="font-weight:500;color:${t.tooltip_text};margin-left:auto;padding-left:12px">${d[series.data_key]}</span>`
       html += `</div>`
       tooltip.innerHTML = html
@@ -1685,7 +1689,7 @@ function renderLegend(element, items, config, theme) {
       background: item.color, flexShrink: "0"
     })
     const label = document.createElement("span")
-    label.textContent = item.data_key
+    label.textContent = seriesLabel(item)
     label.style.color = t.text_color
 
     el.appendChild(dot)
@@ -2000,7 +2004,7 @@ class Chart {
               const formatted = isNaN(+val) ? val : fmtValue(+val)
               html += `<div style="display:flex;align-items:center;gap:8px">`
               html += `<span style="width:8px;height:8px;border-radius:50%;background:${s.color};flex-shrink:0"></span>`
-              html += `<span style="color:${t.text_color}">${s.data_key}</span>`
+              html += `<span style="color:${t.text_color}">${seriesLabel(s)}</span>`
               html += `<span style="font-weight:500;color:${t.tooltip_text};margin-left:auto;padding-left:12px">${formatted}</span>`
               html += `</div>`
             }

data/lib/trackplot/components/area.rb

@@ -17,7 +17,8 @@ module Trackplot
           opacity: options[:opacity] || 0.3,
           stroke_width: options[:stroke_width] || 2,
           stack: options[:stack],
-          y_axis: options[:y_axis]&.to_s
+          y_axis: options[:y_axis]&.to_s,
+          name: options[:name] || data_key
         }.compact
       end
     end

data/lib/trackplot/components/bar.rb

@@ -16,7 +16,8 @@ module Trackplot
           opacity: options[:opacity],
           radius: options[:radius] || 4,
           stack: options[:stack],
-          y_axis: options[:y_axis]&.to_s
+          y_axis: options[:y_axis]&.to_s,
+          name: options[:name] || data_key
         }.compact
       end
     end

data/lib/trackplot/components/horizontal_bar.rb

@@ -14,7 +14,8 @@ module Trackplot
           data_key: data_key,
           color: options[:color],
           opacity: options[:opacity],
-          radius: options[:radius] || 4
+          radius: options[:radius] || 4,
+          name: options[:name] || data_key
         }.compact
       end
     end

data/lib/trackplot/components/line.rb

@@ -18,7 +18,8 @@ module Trackplot
           stroke_width: options[:stroke_width] || 2,
           dot: options.fetch(:dot, true),
           dot_size: options[:dot_size] || 4,
-          y_axis: options[:y_axis]&.to_s
+          y_axis: options[:y_axis]&.to_s,
+          name: options[:name] || data_key
         }.compact
       end
     end

data/lib/trackplot/components/radar.rb

@@ -16,7 +16,8 @@ module Trackplot
           opacity: options[:opacity] || 0.15,
           stroke_width: options[:stroke_width] || 2,
           dot: options.fetch(:dot, true),
-          dot_size: options[:dot_size] || 4
+          dot_size: options[:dot_size] || 4,
+          name: options[:name] || data_key
         }.compact
       end
     end

data/lib/trackplot/components/scatter.rb

@@ -17,7 +17,8 @@ module Trackplot
           dot_size: options[:dot_size] || 5,
           opacity: options[:opacity] || 0.7,
           shape: options[:shape] || "circle",
-          y_axis: options[:y_axis]&.to_s
+          y_axis: options[:y_axis]&.to_s,
+          name: options[:name] || data_key
         }.compact
       end
     end

data/lib/trackplot/version.rb

@@ -1,3 +1,3 @@
 module Trackplot
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackplot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Eagerworks