@diagrammo/dgmo 0.8.0 → 0.8.2

package/dist/index.js

@@ -5655,10 +5655,10 @@ function buildScatterOption(parsed, palette, textColor, axisLineColor, gridOpaci
   };
   let series;
   if (hasCategories) {
-    const categories = [
+    const categories2 = [
       ...new Set(points.map((p) => p.category).filter(Boolean))
     ];
-    series = categories.map((category, catIndex) => {
+    series = categories2.map((category, catIndex) => {
       const categoryPoints = points.filter((p) => p.category === category);
       const catColor = parsed.categoryColors?.[category] ?? colors[catIndex % colors.length];
       const data = categoryPoints.map((p) => ({
@@ -5725,18 +5725,18 @@ function buildScatterOption(parsed, palette, textColor, axisLineColor, gridOpaci
   const axisYMax = Math.ceil(yMax + yPad);
   const gridLeft = parsed.ylabel ? 12 : 3;
   const gridRight = 4;
-  const gridBottom = parsed.xlabel ? 10 : 3;
+  const gridBottom = hasCategories ? 15 : parsed.xlabel ? 10 : 3;
   const gridTop = parsed.title ? 15 : 5;
   let graphic;
   if (showLabels && points.length > 0) {
     const labelPoints = [];
     if (hasCategories) {
-      const categories = [
+      const categories2 = [
         ...new Set(points.map((p) => p.category).filter(Boolean))
       ];
       for (let idx = 0; idx < points.length; idx++) {
         const pt = points[idx];
-        const catIndex = pt.category ? categories.indexOf(pt.category) : -1;
+        const catIndex = pt.category ? categories2.indexOf(pt.category) : -1;
         const catColor = pt.category ? parsed.categoryColors?.[pt.category] ?? colors[catIndex % colors.length] : colors[idx % colors.length];
         const color = pt.color ?? catColor;
         const { px, py } = dataToPixel(
@@ -5785,9 +5785,12 @@ function buildScatterOption(parsed, palette, textColor, axisLineColor, gridOpaci
       bg
     );
   }
+  const categories = hasCategories ? [...new Set(points.map((p) => p.category).filter(Boolean))] : [];
+  const legendConfig = categories.length > 0 ? { data: categories, bottom: 10, textStyle: { color: textColor } } : void 0;
   return {
     ...CHART_BASE,
     title: titleConfig,
+    ...legendConfig && { legend: legendConfig },
     tooltip,
     grid: {
       left: `${gridLeft}%`,
@@ -6165,11 +6168,6 @@ function buildBarOption(parsed, textColor, axisLineColor, splitLineColor, gridOp
   return {
     ...CHART_BASE,
     title: titleConfig,
-    tooltip: {
-      trigger: "axis",
-      ...tooltipTheme,
-      axisPointer: { type: "shadow" }
-    },
     grid: makeChartGrid({ xLabel, yLabel, hasTitle: !!parsed.title }),
     xAxis: isHorizontal ? valueAxis : categoryAxis,
     yAxis: isHorizontal ? categoryAxis : valueAxis,
@@ -6504,11 +6502,6 @@ function buildBarStackedOption(parsed, textColor, axisLineColor, splitLineColor,
   return {
     ...CHART_BASE,
     title: titleConfig,
-    tooltip: {
-      trigger: "axis",
-      ...tooltipTheme,
-      axisPointer: { type: "shadow" }
-    },
     legend: {
       data: seriesNames,
       bottom: 10,
@@ -24754,6 +24747,14 @@ function parseVisualization(content, palette) {
     if (result.type === "wordcloud") {
       if (colonIndex === -1 && !line10.includes(" ")) {
         result.words.push({ text: line10, weight: 10, lineNumber });
+      } else if (colonIndex === -1) {
+        const lastSpace = line10.lastIndexOf(" ");
+        const maybeWeight = lastSpace >= 0 ? parseFloat(line10.substring(lastSpace + 1)) : NaN;
+        if (lastSpace >= 0 && !isNaN(maybeWeight) && maybeWeight > 0) {
+          result.words.push({ text: line10.substring(0, lastSpace).trim(), weight: maybeWeight, lineNumber });
+        } else {
+          freeformLines.push(line10);
+        }
       } else {
         freeformLines.push(line10);
       }
@@ -26613,7 +26614,7 @@ function renderWordCloud(container, parsed, palette, _isDark, onClickItem, expor
   const range = maxWeight - minWeight || 1;
   const fontSize = (weight) => {
     const t = (weight - minWeight) / range;
-    return minSize + t * (maxSize - minSize);
+    return minSize + Math.sqrt(t) * (maxSize - minSize);
   };
   const rotateFn = getRotateFn(cloudOptions.rotate);
   renderChartTitle(svg, title, parsed.titleLineNumber, width, textColor, onClickItem);
@@ -26621,7 +26622,7 @@ function renderWordCloud(container, parsed, palette, _isDark, onClickItem, expor
     "transform",
     `translate(${width / 2},${titleHeight + cloudHeight / 2})`
   );
-  cloud().size([width, cloudHeight]).words(words.map((w) => ({ ...w, size: fontSize(w.weight) }))).padding(4).rotate(rotateFn).fontSize((d) => d.size).font(FONT_FAMILY).on("end", (layoutWords) => {
+  cloud().size([width, cloudHeight]).words(words.map((w) => ({ ...w, size: fontSize(w.weight) }))).padding(2).rotate(rotateFn).fontSize((d) => d.size).font(FONT_FAMILY).on("end", (layoutWords) => {
     g.selectAll("text").data(layoutWords).join("text").style("font-size", (d) => `${d.size}px`).style("font-family", FONT_FAMILY).style("font-weight", "600").style("fill", (_d, i) => colors[i % colors.length]).style(
       "cursor",
       (d) => onClickItem && d.lineNumber ? "pointer" : "default"
@@ -26663,7 +26664,7 @@ function renderWordCloudAsync(container, parsed, palette, _isDark, exportDims) {
     const range = maxWeight - minWeight || 1;
     const fontSize = (weight) => {
       const t = (weight - minWeight) / range;
-      return minSize + t * (maxSize - minSize);
+      return minSize + Math.sqrt(t) * (maxSize - minSize);
     };
     const rotateFn = getRotateFn(cloudOptions.rotate);
     const svg = d3Selection13.select(container).append("svg").attr("width", width).attr("height", height).style("background", bgColor);
@@ -26672,7 +26673,7 @@ function renderWordCloudAsync(container, parsed, palette, _isDark, exportDims) {
       "transform",
       `translate(${width / 2},${titleHeight + cloudHeight / 2})`
     );
-    cloud().size([width, cloudHeight]).words(words.map((w) => ({ ...w, size: fontSize(w.weight) }))).padding(4).rotate(rotateFn).fontSize((d) => d.size).font(FONT_FAMILY).on("end", (layoutWords) => {
+    cloud().size([width, cloudHeight]).words(words.map((w) => ({ ...w, size: fontSize(w.weight) }))).padding(2).rotate(rotateFn).fontSize((d) => d.size).font(FONT_FAMILY).on("end", (layoutWords) => {
       g.selectAll("text").data(layoutWords).join("text").style("font-size", (d) => `${d.size}px`).style("font-family", FONT_FAMILY).style("font-weight", "600").style("fill", (_d, i) => colors[i % colors.length]).attr("text-anchor", "middle").attr(
         "transform",
         (d) => `translate(${d.x},${d.y}) rotate(${d.rotate})`