@opendata-ai/openchart-engine 6.16.0 → 6.18.0

package/dist/index.d.ts

@@ -305,6 +305,7 @@ interface NormalizedSankeySpec {
     iterations: number;
     linkStyle: SankeyLinkColor;
     nodeLabelAlign: 'auto' | 'left' | 'right';
+    nodeSort?: string[];
     chrome: NormalizedChrome;
     legend?: LegendConfig;
     theme: ThemeConfig;

package/dist/index.js

@@ -6530,6 +6530,7 @@ function normalizeSankeySpec(spec, _warnings) {
     iterations: spec.iterations ?? 6,
     linkStyle: spec.linkStyle ?? "gradient",
     nodeLabelAlign: spec.nodeLabelAlign ?? "auto",
+    nodeSort: spec.nodeSort,
     chrome: normalizeChrome(spec.chrome),
     legend: spec.legend,
     theme: spec.theme ?? {},
@@ -7776,9 +7777,9 @@ import {
   formatNumber as formatNumber6
 } from "@opendata-ai/openchart-core";
 var TICK_COUNTS = {
-  full: 10,
-  reduced: 7,
-  minimal: 3
+  full: 12,
+  reduced: 8,
+  minimal: 4
 };
 var HEIGHT_MINIMAL_THRESHOLD = 120;
 var HEIGHT_REDUCED_THRESHOLD = 200;
@@ -8804,6 +8805,20 @@ function computeLegend(spec, strategy, theme, chartArea, watermark = true) {
     };
   }
   let entries = extractColorEntries(spec, theme);
+  const isLineOrArea = spec.markType === "line" || spec.markType === "area";
+  const hasLabels = spec.labels.density !== "none";
+  const labelsWillRender = strategy.labelMode !== "none";
+  const hasColorEncoding = spec.encoding.color != null;
+  const legendNotForced = spec.legend?.show !== true;
+  if (isLineOrArea && hasLabels && labelsWillRender && hasColorEncoding && legendNotForced) {
+    const isArea = spec.markType === "area";
+    const quantChannel = spec.encoding.y?.type === "quantitative" ? spec.encoding.y : spec.encoding.x;
+    const stackValue2 = quantChannel?.stack;
+    const isStacked = stackValue2 !== null && stackValue2 !== false;
+    if (!isArea || !isStacked) {
+      entries = [];
+    }
+  }
   const labelStyle = {
     fontFamily: theme.fonts.family,
     fontSize: theme.fonts.sizes.small,
@@ -9331,7 +9346,7 @@ var ALIGN_MAP = {
   right,
   center
 };
-function computeSankeyLayout(data, sourceField, targetField, valueField, area, nodeWidth, nodePadding, nodeAlign, iterations) {
+function computeSankeyLayout(data, sourceField, targetField, valueField, area, nodeWidth, nodePadding, nodeAlign, iterations, nodeSort) {
   const nodeSet = /* @__PURE__ */ new Set();
   for (const row of data) {
     nodeSet.add(String(row[sourceField]));
@@ -9352,6 +9367,13 @@ function computeSankeyLayout(data, sourceField, targetField, valueField, area, n
     [area.x, area.y],
     [area.x + area.width, area.y + area.height]
   ]).iterations(iterations);
+  if (nodeSort && nodeSort.length > 0) {
+    const orderMap = new Map(nodeSort.map((id, i) => [id, i]));
+    const fallback = nodeSort.length;
+    generator.nodeSort(
+      (a, b) => (orderMap.get(a.id) ?? fallback) - (orderMap.get(b.id) ?? fallback)
+    );
+  }
   const graph = generator({
     nodes,
     links
@@ -9567,7 +9589,8 @@ function compileSankey(spec, options) {
     sankeySpec.nodeWidth,
     sankeySpec.nodePadding,
     sankeySpec.nodeAlign,
-    sankeySpec.iterations
+    sankeySpec.iterations,
+    sankeySpec.nodeSort
   );
   const nodeLabelAlign = sankeySpec.nodeLabelAlign ?? "auto";
   const maxDepthFirst = nodes.reduce((max4, n) => Math.max(max4, n.depth ?? 0), 0);
@@ -9600,7 +9623,8 @@ function compileSankey(spec, options) {
       sankeySpec.nodeWidth,
       sankeySpec.nodePadding,
       sankeySpec.nodeAlign,
-      sankeySpec.iterations
+      sankeySpec.iterations,
+      sankeySpec.nodeSort
     ));
   }
   const nodeColorMap = buildNodeColorMap(
@@ -9935,12 +9959,16 @@ function computeCategoryColors(data, column, theme, darkMode) {
       }
       bg = explicitMap[key];
       isExplicit = true;
-    } else if (autoAssigned.has(key)) {
-      bg = autoAssigned.get(key);
+    } else if (column.autoAssign) {
+      if (autoAssigned.has(key)) {
+        bg = autoAssigned.get(key);
+      } else {
+        bg = categoricalPalette[nextPaletteIndex % categoricalPalette.length];
+        nextPaletteIndex++;
+        autoAssigned.set(key, bg);
+      }
     } else {
-      bg = categoricalPalette[nextPaletteIndex % categoricalPalette.length];
-      nextPaletteIndex++;
-      autoAssigned.set(key, bg);
+      continue;
     }
     if (darkMode && !isExplicit) {
       bg = adaptColorForDarkMode(bg, lightBg, darkBg);