From 4c0a5a62c7b51b38237a61b1c64dfd3b7ef5c294 Mon Sep 17 00:00:00 2001
From: peterkogo <peter@xyflow.com>
Date: Tue, 6 Feb 2024 13:19:54 +0100
Subject: [PATCH] fixed minimap styling by props & mask-stroke-width

---
 .../src/additional-components/MiniMap/MiniMap.tsx    |  7 +++++--
 .../react/src/additional-components/MiniMap/types.ts |  2 ++
 .../svelte/src/lib/plugins/Minimap/Minimap.svelte    | 12 ++++++------
 packages/system/src/styles/init.css                  |  9 ++++++++-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/react/src/additional-components/MiniMap/MiniMap.tsx b/packages/react/src/additional-components/MiniMap/MiniMap.tsx
index cd3f64ae..80410922 100644
--- a/packages/react/src/additional-components/MiniMap/MiniMap.tsx
+++ b/packages/react/src/additional-components/MiniMap/MiniMap.tsx
@@ -49,6 +49,7 @@ function MiniMapComponent({
   // We need to rename the prop to be `CapitalCase` so that JSX will render it as
   // a component properly.
   nodeComponent,
+  bgColor,
   maskColor,
   maskStrokeColor = 'none',
   maskStrokeWidth = 1,
@@ -130,7 +131,8 @@ function MiniMapComponent({
       style={
         {
           ...style,
-          '--xy-minimap-mask-color-props': typeof maskColor === 'string' ? maskColor : undefined,
+          '--xy-minimap-background-color-props': typeof bgColor === 'string' ? bgColor : undefined,
+          '--xy-minimap-mask-background-color-props': typeof maskColor === 'string' ? maskColor : undefined,
           '--xy-minimap-node-background-color-props': typeof nodeColor === 'string' ? nodeColor : undefined,
           '--xy-minimap-node-stroke-color-props': typeof nodeStrokeColor === 'string' ? nodeStrokeColor : undefined,
           '--xy-minimap-node-stroke-width-props': typeof nodeStrokeWidth === 'string' ? nodeStrokeWidth : undefined,
@@ -143,6 +145,7 @@ function MiniMapComponent({
         width={elementWidth}
         height={elementHeight}
         viewBox={`${x} ${y} ${width} ${height}`}
+        className="react-flow__minimap-svg"
         role="img"
         aria-labelledby={labelledBy}
         ref={svg}
@@ -164,7 +167,7 @@ function MiniMapComponent({
         M${viewBB.x},${viewBB.y}h${viewBB.width}v${viewBB.height}h${-viewBB.width}z`}
           fillRule="evenodd"
           stroke={maskStrokeColor}
-          strokeWidth={maskStrokeWidth}
+          strokeWidth={maskStrokeWidth * viewScale}
           pointerEvents="none"
         />
       </svg>
diff --git a/packages/react/src/additional-components/MiniMap/types.ts b/packages/react/src/additional-components/MiniMap/types.ts
index 31e67428..4bfd1a51 100644
--- a/packages/react/src/additional-components/MiniMap/types.ts
+++ b/packages/react/src/additional-components/MiniMap/types.ts
@@ -19,6 +19,8 @@ export type MiniMapProps<NodeType extends Node = Node> = Omit<HTMLAttributes<SVG
   nodeStrokeWidth?: number;
   /** Component used to render nodes on minimap */
   nodeComponent?: ComponentType<MiniMapNodeProps>;
+  /** Background color of minimap */
+  bgColor?: string;
   /** Color of mask representing viewport */
   maskColor?: string;
   /** Stroke color of mask representing viewport */
diff --git a/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte b/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte
index 7b2896d8..dfe3d086 100644
--- a/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte
+++ b/packages/svelte/src/lib/plugins/Minimap/Minimap.svelte
@@ -27,7 +27,7 @@
   export let bgColor: $$Props['bgColor'] = undefined;
   export let maskColor: $$Props['maskColor'] = undefined;
   export let maskStrokeColor: $$Props['maskStrokeColor'] = undefined;
-  export let maskStrokeWidth: $$Props['maskStrokeWidth'] = undefined;
+  export let maskStrokeWidth: $$Props['maskStrokeWidth'] = 1;
   export let width: $$Props['width'] = undefined;
   export let height: $$Props['height'] = undefined;
   export let pannable: $$Props['pannable'] = true;
@@ -83,7 +83,7 @@
 
 <Panel
   {position}
-  {style}
+  style={style + `;--xy-minimap-background-color-props:${bgColor}`}
   class={cc(['svelte-flow__minimap', className])}
   data-testid="svelte-flow__minimap"
 >
@@ -92,12 +92,10 @@
       width={elementWidth}
       height={elementHeight}
       viewBox="{x} {y} {viewboxWidth} {viewboxHeight}"
+      class="svelte-flow__minimap-svg"
       role="img"
       aria-labelledby={labelledBy}
-      style:--xy-minimap-background-color-props={bgColor}
-      style:--xy-minimap-mask-color-props={maskColor}
-      style:--xy-minimap-mask-stroke-color-props={maskStrokeColor}
-      style:--xy-minimap-mask-stroke-width-props={maskStrokeWidth}
+      style:--xy-minimap-mask-background-color-props={maskColor}
       use:interactive={{
         panZoom: $panZoom,
         viewport,
@@ -137,6 +135,8 @@
           offset * 2}h{-viewboxWidth - offset * 2}z
       M{viewBB.x},{viewBB.y}h{viewBB.width}v{viewBB.height}h{-viewBB.width}z"
         fill-rule="evenodd"
+        stroke={maskStrokeColor}
+        stroke-width={maskStrokeWidth ?? 1 * viewScale}
         pointer-events="none"
       />
     </svg>
diff --git a/packages/system/src/styles/init.css b/packages/system/src/styles/init.css
index 14519c74..77352a74 100644
--- a/packages/system/src/styles/init.css
+++ b/packages/system/src/styles/init.css
@@ -310,7 +310,14 @@ svg.xy-flow__connectionline {
 }
 
 .xy-flow__minimap {
-  background: var(--xy-minimap-background-color, var(--xy-minimap-background-color-default));
+  background: var(
+    --xy-minimap-background-color,
+    var(--xy-minimap-background-color-props, var(--xy-minimap-background-color-default))
+  );
+
+  &-svg {
+    display: block;
+  }
 
   &-mask {
     fill: var(