@opendata-ai/openchart-core 8.0.0-rc.9 → 8.1.0

package/dist/index.js

@@ -284,7 +284,7 @@ function isTileMapSpec(spec) {
 function isBarListSpec(spec) {
   return "type" in spec && spec.type === "barlist";
 }
-function isMapSpec(spec) {
+function isGeoMapSpec(spec) {
   return "type" in spec && spec.type === "map";
 }
 function isTextAnnotation(annotation) {
@@ -1277,7 +1277,7 @@ function getWidthStrategy(breakpoint) {
     case "full":
       return {
         labelMode: "all",
-        legendPosition: "right",
+        legendPosition: "top",
         annotationPosition: "inline",
         axisLabelDensity: "full",
         chromeMode: "full",
@@ -1371,17 +1371,16 @@ function maxRotatedLabelWidth(tickAngle, tickFontSize) {
   const usable = X_AXIS_ROTATED_EXTENT_CAP - lineHeight * Math.cos(angleRad) - AXIS_TO_LABEL_GAP;
   return Math.max(0, usable / sin);
 }
-function truncateRotatedLabel(label, tickAngle, tickFontSize, tickFontWeight, measure = estimateTextWidth) {
-  const budget = maxRotatedLabelWidth(tickAngle, tickFontSize);
+function truncateToWidth(label, budget, fontSize, fontWeight, measure = estimateTextWidth) {
   if (!Number.isFinite(budget)) return label;
-  if (measure(label, tickFontSize, tickFontWeight) <= budget) return label;
+  if (measure(label, fontSize, fontWeight) <= budget) return label;
   const ELLIPSIS = "\u2026";
   let lo = 0;
   let hi = label.length;
   while (lo < hi) {
     const mid = Math.ceil((lo + hi) / 2);
     const candidate = label.slice(0, mid) + ELLIPSIS;
-    if (measure(candidate, tickFontSize, tickFontWeight) <= budget) {
+    if (measure(candidate, fontSize, fontWeight) <= budget) {
       lo = mid;
     } else {
       hi = mid - 1;
@@ -1389,6 +1388,10 @@ function truncateRotatedLabel(label, tickAngle, tickFontSize, tickFontWeight, me
   }
   return lo > 0 ? label.slice(0, lo).trimEnd() + ELLIPSIS : ELLIPSIS;
 }
+function truncateRotatedLabel(label, tickAngle, tickFontSize, tickFontWeight, measure = estimateTextWidth) {
+  const budget = maxRotatedLabelWidth(tickAngle, tickFontSize);
+  return truncateToWidth(label, budget, tickFontSize, tickFontWeight, measure);
+}
 
 // src/theme/defaults.ts
 var DEFAULT_THEME = {
@@ -1538,7 +1541,7 @@ function _luminanceFromHex(color2) {
 function adaptTheme(theme) {
   const pairs = theme._tokenPairs;
   const inputBg = theme.colors.background;
-  const isTransparent = inputBg === "transparent";
+  const isTransparent = !isOpaqueColor(inputBg);
   const alreadyDark = isTransparent || _luminanceFromHex(inputBg) < 0.2;
   const darkBg = pairs?.["colors.background"] ? pairs["colors.background"].dark : alreadyDark ? inputBg : DARK_BG;
   const darkMuted = ACHROMATIC_RAMP.fgMuted;
@@ -1783,7 +1786,7 @@ function relativeLuminance2(hex2) {
   return 0.2126 * toLinear(r) + 0.7152 * toLinear(g) + 0.0722 * toLinear(b);
 }
 function isDarkBackground(hex2) {
-  if (hex2 === "transparent") return false;
+  if (!isOpaqueColor(hex2)) return false;
   return relativeLuminance2(hex2) < 0.2;
 }
 function adaptChromeForDarkBg(theme, textColor) {
@@ -1884,13 +1887,14 @@ function buildTextStyle(defaults, fontFamily, textColor, width, overrides) {
     textAnchor: "start"
   };
 }
-function estimateLineCount(text, style, maxWidth, measureText) {
+function estimateLineCount(text, style, maxWidth, measureText, maxLines) {
   if (maxWidth <= 0) return 1;
   const segments = text.split("\n");
   if (segments.length > 1) {
-    return segments.reduce((total, segment) => {
+    const count = segments.reduce((total, segment) => {
       return total + (segment.length === 0 ? 1 : estimateLineCount(segment, style, maxWidth, measureText));
     }, 0);
+    return maxLines != null ? Math.min(count, maxLines) : count;
   }
   if (measureText) {
     const textWidth = measureText(text, style.fontSize, style.fontWeight).width;
@@ -1908,7 +1912,7 @@ function estimateLineCount(text, style, maxWidth, measureText) {
         current2 = candidate;
       }
     }
-    return lines2;
+    return maxLines != null ? Math.min(lines2, maxLines) : lines2;
   }
   const charWidth = estimateCharWidth(style.fontSize, style.fontWeight);
   const maxChars = Math.floor(maxWidth / charWidth);
@@ -1925,7 +1929,7 @@ function estimateLineCount(text, style, maxWidth, measureText) {
       current = candidate;
     }
   }
-  return lines;
+  return maxLines != null ? Math.min(lines, maxLines) : lines;
 }
 var FOOTNOTE_LINE_HEIGHT = 1.3;
 var FOOTNOTE_BAND_GAP = 4;
@@ -1935,6 +1939,17 @@ function footnoteBandHeight(count, theme) {
 }
 function computeChrome(chrome, theme, width, measureText, chromeMode = "full", padding, watermark = true, bottomLegendHeight = 0) {
   if (!chrome || chromeMode === "hidden") {
+    if (watermark && width >= BRAND_MIN_WIDTH) {
+      const hiddenPad = padding ?? theme.spacing.padding;
+      const brandHeight = estimateTextHeight(BRAND_FONT_SIZE, 1);
+      return {
+        topHeight: 0,
+        bottomHeight: theme.spacing.chartToFooter + brandHeight + hiddenPad + bottomLegendHeight
+      };
+    }
+    if (bottomLegendHeight > 0) {
+      return { topHeight: 0, bottomHeight: bottomLegendHeight };
+    }
     return { topHeight: 0, bottomHeight: 0 };
   }
   const pad2 = padding ?? theme.spacing.padding;
@@ -1953,12 +1968,14 @@ function computeChrome(chrome, theme, width, measureText, chromeMode = "full", p
       width,
       eyebrowNorm.style
     );
-    const lineCount = estimateLineCount(eyebrowNorm.text, style, maxWidth, measureText);
+    const maxLines = eyebrowNorm.style?.maxLines;
+    const lineCount = estimateLineCount(eyebrowNorm.text, style, maxWidth, measureText, maxLines);
     const element = {
       text: eyebrowNorm.text,
       x: pad2 + (eyebrowNorm.offset?.dx ?? 0),
       y: topY + (eyebrowNorm.offset?.dy ?? 0),
       maxWidth,
+      ...maxLines != null ? { maxLines } : {},
       style
     };
     topElements.eyebrow = element;
@@ -1973,12 +1990,14 @@ function computeChrome(chrome, theme, width, measureText, chromeMode = "full", p
       width,
       titleNorm.style
     );
-    const lineCount = estimateLineCount(titleNorm.text, style, maxWidth, measureText);
+    const maxLines = titleNorm.style?.maxLines;
+    const lineCount = estimateLineCount(titleNorm.text, style, maxWidth, measureText, maxLines);
     const element = {
       text: titleNorm.text,
       x: pad2 + (titleNorm.offset?.dx ?? 0),
       y: topY + (titleNorm.offset?.dy ?? 0),
       maxWidth,
+      ...maxLines != null ? { maxLines } : {},
       style
     };
     topElements.title = element;
@@ -1993,12 +2012,14 @@ function computeChrome(chrome, theme, width, measureText, chromeMode = "full", p
       width,
       subtitleNorm.style
     );
-    const lineCount = estimateLineCount(subtitleNorm.text, style, maxWidth, measureText);
+    const maxLines = subtitleNorm.style?.maxLines;
+    const lineCount = estimateLineCount(subtitleNorm.text, style, maxWidth, measureText, maxLines);
     const element = {
       text: subtitleNorm.text,
       x: pad2 + (subtitleNorm.offset?.dx ?? 0),
       y: topY + (subtitleNorm.offset?.dy ?? 0),
       maxWidth,
+      ...maxLines != null ? { maxLines } : {},
       style
     };
     topElements.subtitle = element;
@@ -2063,7 +2084,14 @@ function computeChrome(chrome, theme, width, measureText, chromeMode = "full", p
         width,
         item.norm.style
       );
-      const lineCount = estimateLineCount(item.norm.text, style, bottomMaxWidth, measureText);
+      const maxLines = item.norm.style?.maxLines;
+      const lineCount = estimateLineCount(
+        item.norm.text,
+        style,
+        bottomMaxWidth,
+        measureText,
+        maxLines
+      );
       const height = estimateTextHeight(style.fontSize, lineCount, style.lineHeight);
       bottomElements[item.key] = {
         text: item.norm.text,
@@ -2071,6 +2099,7 @@ function computeChrome(chrome, theme, width, measureText, chromeMode = "full", p
         y: bottomHeight + (item.norm.offset?.dy ?? 0),
         // offset from where bottom chrome starts
         maxWidth: bottomMaxWidth,
+        ...maxLines != null ? { maxLines } : {},
         style
       };
       bottomHeight += height + chromeGap;
@@ -3604,6 +3633,7 @@ function generateAltText(spec, data) {
   parts.push(`(${data.length} data points)`);
   return parts.join(" ");
 }
+var MAX_SR_TABLE_ROWS = 1e3;
 function generateDataTable(spec, data) {
   const fields = [];
   const encoding = spec.encoding;
@@ -3614,7 +3644,7 @@ function generateDataTable(spec, data) {
   const uniqueFields = [...new Set(fields)];
   if (uniqueFields.length === 0) return [];
   const headers = uniqueFields;
-  const rows = data.map((row) => uniqueFields.map((field) => row[field] ?? ""));
+  const rows = data.slice(0, MAX_SR_TABLE_ROWS).map((row) => uniqueFields.map((field) => row[field] ?? ""));
   return [headers, ...rows];
 }
 
@@ -4036,6 +4066,7 @@ export {
   MAX_LEFT_LABEL_FRACTION_DEFAULT,
   MAX_LEFT_LABEL_FRACTION_MEDIUM,
   MAX_LEFT_LABEL_FRACTION_MEDIUM_MAX,
+  MAX_SR_TABLE_ROWS,
   NARROW_VIEWPORT_MAX,
   OFFSET_STRATEGIES,
   SEQUENTIAL_PALETTES,
@@ -4098,10 +4129,10 @@ export {
   isChartSpec,
   isConditionalDef,
   isEncodingChannel,
+  isGeoMapSpec,
   isGradientDef,
   isGraphSpec,
   isLayerSpec,
-  isMapSpec,
   isOpaqueColor,
   isRangeAnnotation,
   isRefLineAnnotation,
@@ -4129,6 +4160,7 @@ export {
   textAscent,
   tileMap,
   truncateRotatedLabel,
+  truncateToWidth,
   wire,
   wrapText
 };