Merge remote-tracking branch 'os_repo/5237-unified-layout-common-renderer' into alanaV11

packages/mermaid/package.json

@@ -135,6 +135,5 @@
   "files": [
     "dist/",
     "README.md"
-  ],
-  "sideEffects": false
+  ]
 }

packages/mermaid/src/rendering-util/rendering-elements/clusters.js

@@ -326,16 +326,13 @@ const divider = (parent, node) => {
   let rect;
   if (node.look === 'handdrawn') {
     const rc = rough.svg(shapeSvg);
-    const roughOuterNode =
-      node.rx || node.ry
-        ? rc.path(createRoundedRectPathD(x, y, width, height, 10), {
-            roughness: 0.7,
-            fill: compositeTitleBackground,
-            fillStyle: 'solid',
-            stroke: nodeBorder,
-            seed: handdrawnSeed,
-          })
-        : rc.rectangle(x, y, width, height, { seed: handdrawnSeed });
+    const roughOuterNode = rc.rectangle(x, y, width, height, {
+      fill: 'lightgrey',
+      roughness: 0.5,
+      strokeLineDash: [5],
+      stroke: nodeBorder,
+      seed: handdrawnSeed,
+    });
 
     rect = shapeSvg.insert(() => roughOuterNode, ':first-child');
   } else {

packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts

@@ -6,7 +6,6 @@ import {
   userNodeOverrides,
   styles2String,
 } from '$root/rendering-util/rendering-elements/shapes/handdrawnStyles.js';
-// @ts-expect-error TODO: Fix rough typings
 import rough from 'roughjs';
 import { getConfig } from '$root/diagram-api/diagramAPI.js';
 

packages/mermaid/src/rendering-util/rendering-elements/shapes/handdrawnStyles.ts

@@ -82,7 +82,7 @@ export const userNodeOverrides = (node: Node, options: any) => {
       roughness: 0.7,
       fill: stylesMap.get('fill') || mainBkg,
       fillStyle: 'hachure', // solid fill
-      fillWeight: 3.5,
+      fillWeight: 4,
       stroke: stylesMap.get('stroke') || nodeBorder,
       seed: handdrawnSeed,
       strokeWidth: 1.3,