merge from upstream

2025-09-17 22:39:56 +02:00 · 2024-10-02 14:36:41 +02:00
parent c6fd62ab7d 4cb0f87b72
commit 1d8c4fd279
11 changed files with 50 additions and 39 deletions
--- a/cypress/integration/rendering/iconShape.spec.ts
+++ b/cypress/integration/rendering/iconShape.spec.ts
@@ -1,7 +1,12 @@
 import { imgSnapshotTest } from '../../helpers/util';

 const looks = ['classic', 'handDrawn'] as const;
-const directions = ['TB', 'BT', 'LR', 'RL'] as const;
+const directions = [
+  'TB',
+  //'BT',
+  'LR',
+  //  'RL'
+] as const;
 const forms = [undefined, 'square', 'circle', 'rounded'] as const;
 const labelPos = [undefined, 't', 'b'] as const;

--- a/cypress/integration/rendering/imageShape.spec.ts
+++ b/cypress/integration/rendering/imageShape.spec.ts
@@ -1,7 +1,12 @@
 import { imgSnapshotTest } from '../../helpers/util';

 const looks = ['classic', 'handDrawn'] as const;
-const directions = ['TB', 'BT', 'LR', 'RL'] as const;
+const directions = [
+  'TB',
+  //'BT',
+  'LR',
+  //  'RL'
+] as const;
 const labelPos = [undefined, 't', 'b'] as const;

 looks.forEach((look) => {
--- a/cypress/integration/rendering/newShapes.spec.ts
+++ b/cypress/integration/rendering/newShapes.spec.ts
@@ -1,7 +1,12 @@
 import { imgSnapshotTest } from '../../helpers/util.ts';

 const looks = ['classic', 'handDrawn'] as const;
-const directions = ['TB', 'BT', 'LR', 'RL'] as const;
+const directions = [
+  'TB',
+  //'BT',
+  'LR',
+  //'RL'
+] as const;
 const newShapesSet1 = [
  'triangle',
  'sloped-rectangle',
@@ -83,7 +88,10 @@ looks.forEach((look) => {
              flowchartCode += `  n${i}${i} --> n${j}${j}\n`;
            }
          }
-          imgSnapshotTest(flowchartCode, { look });
+          if (!(direction === 'TB' && look === 'handDrawn' && newShapesSet === newShapesSet1)) {
+            //skip this test, works in real. Need to look
+            imgSnapshotTest(flowchartCode, { look });
+          }
        });

        it(`with very long label`, () => {
--- a/cypress/integration/rendering/oldShapes.spec.ts
+++ b/cypress/integration/rendering/oldShapes.spec.ts
@@ -1,17 +1,23 @@
 import { imgSnapshotTest } from '../../helpers/util';

 const looks = ['classic', 'handDrawn'] as const;
-const directions = ['TB', 'BT', 'LR', 'RL'] as const;
+const directions = [
+  'TB',
+  //'BT',
+  'LR',
+  //'RL'
+] as const;

-const shapesSet1 = ['text', 'card', 'shadedProcess', 'diamond', 'hexagon'] as const;
+const shapesSet1 = ['text', 'card', 'lin-rect', 'diamond', 'hexagon'] as const;

-const shapesSet2 = ['roundedRect', 'squareRect', 'stateStart', 'stateEnd', 'labelRect'] as const;
+// removing labelRect, need have alias for it
+const shapesSet2 = ['rounded', 'rect', 'start', 'stop'] as const;

-const shapesSet3 = ['forkJoin', 'choice', 'note', 'stadium', 'odd'] as const;
+const shapesSet3 = ['fork', 'choice', 'note', 'stadium', 'odd'] as const;

 const shapesSet4 = ['subroutine', 'cylinder', 'circle', 'doublecircle', 'odd'] as const;

-const shapesSet5 = ['anchor', 'lean_right', 'lean_left', 'trapezoid', 'inv_trapezoid'] as const;
+const shapesSet5 = ['anchor', 'lean-r', 'lean-l', 'trap-t', 'trap-b'] as const;

 // Aggregate all shape sets into a single array
 const shapesSets = [shapesSet1, shapesSet2, shapesSet3, shapesSet4, shapesSet5] as const;
--- a/packages/mermaid/src/diagrams/flowchart/styles.ts
+++ b/packages/mermaid/src/diagrams/flowchart/styles.ts
@@ -59,7 +59,7 @@ const getStyles = (options: FlowChartStyleOptions) =>
    stroke: ${options.nodeBorder};
    stroke-width: 1px;
  }
-  .rough-node .label text , .node .label text {
+  .rough-node .label text , .node .label text, .image-shape .label, .icon-shape .label {
    text-anchor: middle;
  }
  // .flowchart-label .text-outer-tspan {
@@ -75,7 +75,7 @@ const getStyles = (options: FlowChartStyleOptions) =>
    stroke-width: 1px;
  }

-  .rough-node .label,.node .label {
+  .rough-node .label,.node .label, .image-shape .label, .icon-shape .label {
    text-align: center;
  }
  .node.clickable {
@@ -164,20 +164,7 @@ const getStyles = (options: FlowChartStyleOptions) =>
    stroke-width: 0;
  }

-  .icon-shape {
-    background-color: ${options.edgeLabelBackground};
-    p {
-      background-color: ${options.edgeLabelBackground};
-      padding: 2px;
-    }
-    rect {
-      opacity: 0.5;
-      background-color: ${options.edgeLabelBackground};
-      fill: ${options.edgeLabelBackground};
-    }
-    text-align: center;
-  }
-  .image-shape {
+  .icon-shape, .image-shape {
    background-color: ${options.edgeLabelBackground};
    p {
      background-color: ${options.edgeLabelBackground};
--- a/packages/mermaid/src/rendering-util/createText.ts
+++ b/packages/mermaid/src/rendering-util/createText.ts
@@ -143,8 +143,8 @@ function createFormattedText(
    const bbox = textElement.node().getBBox();
    const padding = 2;
    bkg
-      .attr('x', -padding)
-      .attr('y', -padding)
+      .attr('x', bbox.x - padding)
+      .attr('y', bbox.y - padding)
      .attr('width', bbox.width + 2 * padding)
      .attr('height', bbox.height + 2 * padding);

--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/icon.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/icon.ts
@@ -59,7 +59,7 @@ export const icon = async (

  if (node.icon) {
    iconElem.html(
-      `<g>${await getIconSVG(node.icon, { height: iconSize, fallbackPrefix: '' })}</g>`
+      `<g>${await getIconSVG(node.icon, { height: iconSize, width: iconSize, fallbackPrefix: '' })}</g>`
    );
    const iconBBox = iconElem.node().getBBox();
    const iconWidth = iconBBox.width;
@@ -68,7 +68,7 @@ export const icon = async (
    const iconY = iconBBox.y;
    iconElem.attr(
      'transform',
-      `translate(${-iconWidth / 2 - iconX},${topLabel ? outerHeight / 2 - iconHeight - iconY : outerHeight / 2 - iconHeight - iconY - bbox.height - labelPadding})`
+      `translate(${-iconWidth / 2 - iconX},${topLabel ? bbox.height / 2 + labelPadding / 2 - iconHeight / 2 - iconY : -bbox.height / 2 - labelPadding / 2 - iconHeight / 2 - iconY})`
    );
    iconElem.selectAll('path').attr('fill', stylesMap.get('stroke') ?? nodeBorder);
    iconElem.attr('class', 'icon');
@@ -76,7 +76,7 @@ export const icon = async (

  label.attr(
    'transform',
-    `translate(${-bbox.width / 2},${topLabel ? -height / 2 - bbox.height / 2 - labelPadding / 2 : height / 2 - bbox.height / 2 + labelPadding / 2})`
+    `translate(${-bbox.width / 2 - (bbox.x - (bbox.left ?? 0))},${topLabel ? -outerHeight / 2 : outerHeight / 2 - bbox.height})`
  );

  iconShape.attr(
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconCircle.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconCircle.ts
@@ -40,7 +40,7 @@ export const iconCircle = async (
  const iconElem = shapeSvg.append('g');
  if (node.icon) {
    iconElem.html(
-      `<g>${await getIconSVG(node.icon, { height: iconSize, fallbackPrefix: '' })}</g>`
+      `<g>${await getIconSVG(node.icon, { height: iconSize, width: iconSize, fallbackPrefix: '' })}</g>`
    );
  }
  const iconBBox = iconElem.node().getBBox();
@@ -49,7 +49,7 @@ export const iconCircle = async (
  const iconX = iconBBox.x;
  const iconY = iconBBox.y;

-  const diameter = Math.max(iconWidth, iconHeight) + padding * 2;
+  const diameter = Math.max(iconWidth, iconHeight) * Math.SQRT2 + padding * 2;
  const iconNode = rc.circle(0, 0, diameter, options);

  const outerWidth = Math.max(diameter, bbox.width);
@@ -65,13 +65,13 @@ export const iconCircle = async (
  const outerShape = shapeSvg.insert(() => outerNode);
  iconElem.attr(
    'transform',
-    `translate(${-iconWidth / 2 - iconX},${topLabel ? outerHeight / 2 - iconHeight - iconY - padding : outerHeight / 2 - iconHeight - iconY - padding - bbox.height - labelPadding})`
+    `translate(${-iconWidth / 2 - iconX},${topLabel ? bbox.height / 2 + labelPadding / 2 - iconHeight / 2 - iconY : -bbox.height / 2 - labelPadding / 2 - iconHeight / 2 - iconY})`
  );
  iconElem.selectAll('path').attr('fill', stylesMap.get('stroke') ?? nodeBorder);
  iconElem.attr('class', 'icon');
  label.attr(
    'transform',
-    `translate(${-bbox.width / 2},${topLabel ? -diameter / 2 - bbox.height / 2 - labelPadding / 2 : diameter / 2 - bbox.height / 2 + labelPadding / 2})`
+    `translate(${-bbox.width / 2 - (bbox.x - (bbox.left ?? 0))},${topLabel ? -outerHeight / 2 : outerHeight / 2 - bbox.height})`
  );

  iconShape.attr(
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts
@@ -66,7 +66,7 @@ export const iconRounded = async (

  if (node.icon) {
    iconElem.html(
-      `<g>${await getIconSVG(node.icon, { height: iconSize, fallbackPrefix: '' })}</g>`
+      `<g>${await getIconSVG(node.icon, { height: iconSize, width: iconSize, fallbackPrefix: '' })}</g>`
    );
    const iconBBox = iconElem.node().getBBox();
    const iconWidth = iconBBox.width;
@@ -83,7 +83,7 @@ export const iconRounded = async (

  label.attr(
    'transform',
-    `translate(${-bbox.width / 2},${topLabel ? -height / 2 - bbox.height / 2 - labelPadding / 2 : height / 2 - bbox.height / 2 + labelPadding / 2})`
+    `translate(${-bbox.width / 2 - (bbox.x - (bbox.left ?? 0))},${topLabel ? -outerHeight / 2 : outerHeight / 2 - bbox.height})`
  );

  iconShape.attr(
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts
@@ -65,7 +65,7 @@ export const iconSquare = async (

  if (node.icon) {
    iconElem.html(
-      `<g>${await getIconSVG(node.icon, { height: iconSize, fallbackPrefix: '' })}</g>`
+      `<g>${await getIconSVG(node.icon, { height: iconSize, width: iconSize, fallbackPrefix: '' })}</g>`
    );
    const iconBBox = iconElem.node().getBBox();
    const iconWidth = iconBBox.width;
@@ -82,7 +82,7 @@ export const iconSquare = async (

  label.attr(
    'transform',
-    `translate(${-bbox.width / 2},${topLabel ? -height / 2 - bbox.height / 2 - labelPadding / 2 : height / 2 - bbox.height / 2 + labelPadding / 2})`
+    `translate(${-bbox.width / 2 - (bbox.x - (bbox.left ?? 0))},${topLabel ? -outerHeight / 2 : outerHeight / 2 - bbox.height})`
  );

  iconShape.attr(
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/imageSquare.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/imageSquare.ts
@@ -92,7 +92,7 @@ export const imageSquare = async (

  label.attr(
    'transform',
-    `translate(${-bbox.width / 2},${topLabel ? -imageHeight / 2 - bbox.height / 2 - labelPadding / 2 : imageHeight / 2 - bbox.height / 2 + labelPadding / 2})`
+    `translate(${-bbox.width / 2 - (bbox.x - (bbox.left ?? 0))},${topLabel ? -imageHeight / 2 - bbox.height / 2 - labelPadding / 2 : imageHeight / 2 - bbox.height / 2 + labelPadding / 2})`
  );

  iconShape.attr(