@opendata-ai/openchart-engine 7.0.3 → 7.0.4

package/dist/index.js

@@ -1243,7 +1243,6 @@ function computeEndpointLabels(spec, marks, theme, chartArea, strategy) {
     32
   );
   const columnX = chartArea.x + chartArea.width + ENDPOINT_COLUMN_GAP;
-  const markerX = chartArea.x + chartArea.width;
   const showLeader = config?.showLeader === true;
   const entries = provisional.map((p, i) => {
     const labelY = sweptTops[i];
@@ -1260,7 +1259,7 @@ function computeEndpointLabels(spec, marks, theme, chartArea, strategy) {
     };
     if (showMarker) {
       entry.marker = {
-        x: markerX,
+        x: p.dataX,
         y: p.dataY,
         fill: markerFill,
         stroke: config?.markerStyle?.stroke ?? p.color,
@@ -1493,8 +1492,8 @@ function computeBarMarks(spec, scales, _chartArea, _strategy) {
     const categoryGroups = groupByField(spec.data, yChannel.field);
     const needsStacking = Array.from(categoryGroups.values()).some((rows) => rows.length > 1);
     if (needsStacking) {
-      const stackDisabled = xChannel.stack === null || xChannel.stack === false;
-      if (stackDisabled) {
+      const stackEnabled = xChannel.stack === true || xChannel.stack === "zero" || xChannel.stack === "normalize" || xChannel.stack === "center";
+      if (!stackEnabled) {
         marks = computeGroupedBars(
           spec.data,
           xChannel.field,
@@ -1738,8 +1737,8 @@ function computeSimpleBars(data, valueField, categoryField, xScale, yScale, band
 import {
   buildD3Formatter,
   estimateTextWidth as estimateTextWidth4,
-  findAccessibleColor,
   getRepresentativeColor,
+  pickLabelColor,
   resolveCollisions
 } from "@opendata-ai/openchart-core";
 
@@ -1806,7 +1805,7 @@ function computeBarLabels(marks, _chartArea, density = "auto", labelFormat, labe
     if (labelPrefix) valuePart = labelPrefix + valuePart;
     const textWidth = estimateTextWidth4(valuePart, LABEL_FONT_SIZE, LABEL_FONT_WEIGHT);
     const textHeight = LABEL_FONT_SIZE * 1.2;
-    const isStacked2 = mark.cornerRadius === 0;
+    const isStacked2 = mark.stackGroup !== void 0;
     const isInside = mark.width >= MIN_WIDTH_FOR_INSIDE_LABEL;
     const isNegative = Number.isFinite(rawNum) ? rawNum < 0 : false;
     const bgColor = getRepresentativeColor(mark.fill);
@@ -1815,16 +1814,16 @@ function computeBarLabels(marks, _chartArea, density = "auto", labelFormat, labe
     let textAnchor;
     if (isStacked2 && isInside) {
       anchorX = mark.x + mark.width / 2;
-      fill = findAccessibleColor("#ffffff", bgColor, 4.5);
+      fill = pickLabelColor(bgColor);
       textAnchor = "middle";
     } else if (isInside) {
       if (isNegative) {
         anchorX = mark.x + LABEL_PADDING;
-        fill = findAccessibleColor("#ffffff", bgColor, 4.5);
+        fill = pickLabelColor(bgColor);
         textAnchor = "start";
       } else {
         anchorX = mark.x + mark.width - LABEL_PADDING;
-        fill = findAccessibleColor("#ffffff", bgColor, 4.5);
+        fill = pickLabelColor(bgColor);
         textAnchor = "end";
       }
     } else {
@@ -1944,8 +1943,8 @@ function computeColumnMarks(spec, scales, _chartArea, _strategy) {
     const categoryGroups = groupByField(spec.data, xChannel.field);
     const needsStacking = Array.from(categoryGroups.values()).some((rows) => rows.length > 1);
     if (needsStacking) {
-      const stackDisabled = yChannel.stack === null || yChannel.stack === false;
-      if (stackDisabled) {
+      const stackEnabled = yChannel.stack === true || yChannel.stack === "zero" || yChannel.stack === "normalize" || yChannel.stack === "center";
+      if (!stackEnabled) {
         marks = computeGroupedColumns(
           spec.data,
           xChannel.field,
@@ -11018,8 +11017,8 @@ function computeScales(spec, chartArea, data) {
   if (encoding.x) {
     let xData = data;
     let xChannel = encoding.x;
-    const xStackDisabled = encoding.x.stack === null || encoding.x.stack === false;
-    if (spec.markType === "bar" && encoding.color && encoding.x.type === "quantitative" && !xStackDisabled) {
+    const xStackEnabled = encoding.x.stack === true || encoding.x.stack === "zero" || encoding.x.stack === "normalize" || encoding.x.stack === "center";
+    if (spec.markType === "bar" && encoding.color && encoding.x.type === "quantitative" && xStackEnabled) {
       if (encoding.x.stack === "normalize") {
         xChannel = { ...encoding.x, scale: { ...encoding.x.scale, domain: [0, 1], nice: false } };
       } else if (encoding.x.stack === "center") {
@@ -11074,7 +11073,7 @@ function computeScales(spec, chartArea, data) {
     const stackProp = encoding.y.stack;
     const isExplicitlyStacked = stackProp === true || stackProp === "zero" || stackProp === "normalize" || stackProp === "center";
     const isAreaStacked = spec.markType === "area" && isExplicitlyStacked;
-    const isBarStacked = isVerticalBar && stackProp !== null && stackProp !== false;
+    const isBarStacked = isVerticalBar && isExplicitlyStacked;
     const hasStackingGroup = isBarStacked && encoding.color !== void 0;
     const userRequestedStack = isExplicitlyStacked;
     const isLineOrArea2 = spec.markType === "line" || spec.markType === "area";