dsh-mermaid-plus 0.1.2 → 0.1.4

package/client.js

@@ -1,6 +1,17 @@
 window.__ModuleLoader__.load({
 	id: 'dsh-mermaid-plus',
 	factory(require) {
+		/** Package name; also the boot-graph entry id and the source of every runtime name. */
+		const PKG = 'dsh-mermaid-plus';
+		/**
+		 * Host route serving the vendored runtime, derived from the package name so two
+		 * diagram plugins can be installed side by side. The Host half derives the same
+		 * value from its own manifest; the two formulas must stay identical.
+		 */
+		const RUNTIME_PATH = `/x-${PKG.replace(/^@/, '').replace(/[^a-z0-9]+/gi, '-').toLowerCase()}`;
+		/** Bundled Mermaid release; part of the URL so a page reload refetches a new build. */
+		const RUNTIME_VERSION = '11.17.0';
+
 		/** Report one browser-half event to the Host's sink; a failure here is never fatal. */
 		function report(event, detail) {
 			try {
@@ -8,7 +19,8 @@ window.__ModuleLoader__.load({
 					method: 'POST',
 					headers: { 'content-type': 'application/json' },
 					body: JSON.stringify({ event, detail, href: String(window.location.href), at: Date.now() }),
-					keepalive: true,
+					// No `keepalive`: on the desktop app's custom scheme the browser
+					// drops keepalive requests, and this report is best-effort anyway.
 				}).catch(() => undefined);
 			} catch {
 				/* the report is best effort only */
@@ -27,16 +39,6 @@ window.__ModuleLoader__.load({
 		const h = React.createElement;
 
 		//#region configuration
-		/** Package name; also the boot-graph entry id and the source of every runtime name. */
-		const PKG = 'dsh-mermaid-plus';
-		/**
-		 * Host route serving the vendored runtime, derived from the package name so two
-		 * diagram plugins can be installed side by side. The Host half derives the same
-		 * value from its own manifest; the two formulas must stay identical.
-		 */
-		const RUNTIME_PATH = `/x-${PKG.replace(/^@/, '').replace(/[^a-z0-9]+/gi, '-').toLowerCase()}`;
-		/** Bundled Mermaid release; part of the URL so a page reload refetches a new build. */
-		const RUNTIME_VERSION = '11.17.0';
 		/**
 		 * Preference key for the render mode. Namespaced by package name so a second
 		 * diagram plugin cannot read or overwrite this one's choice.
@@ -468,7 +470,7 @@ window.__ModuleLoader__.load({
 .dsh-mdm-lb-btn:focus-visible{outline:2px solid #8ab4f8;outline-offset:2px}
 .dsh-mdm-lb-stage{flex:1;min-height:0;display:flex;align-items:center;justify-content:center;overflow:hidden;touch-action:none;cursor:grab}
 .dsh-mdm-lb-stage[data-dragging="true"]{cursor:grabbing}
-.dsh-mdm-lb-canvas{transform-origin:center center;will-change:transform;flex:none}
+.dsh-mdm-lb-canvas{transform-origin:center center;will-change:transform;flex:none;padding:24px;border-radius:14px;box-sizing:content-box;box-shadow:0 18px 60px rgba(0,0,0,.5)}
 .dsh-mdm-lb-canvas svg{display:block;width:100%;height:100%;max-width:none}
 .dsh-mdm-lb-hint{padding:0 14px 12px;font-size:11px;line-height:1.4;color:rgba(242,245,250,.6);text-align:center;flex:none}
 @media (prefers-reduced-motion: no-preference){.dsh-mdm-lb{animation:dsh-mdm-in .15s ease-out}}
@@ -738,6 +740,8 @@ window.__ModuleLoader__.load({
 			const scheme = currentScheme();
 			const palette = readPalette(scheme);
 			paletteSignature = palette.signature;
+			entry.surface = palette.palette.background;
+			entry.surfaceDark = palette.dark;
 			const key = `${paletteSignature}\u0000${source}`;
 			if (key === entry.hash && entry.state === 'ok') return;
 			entry.hash = key;
@@ -787,6 +791,8 @@ window.__ModuleLoader__.load({
 						throw new Error('mermaid produced an empty diagram');
 					}
 					remember(key, result.svg);
+					entry.surface = palette.palette.background;
+					entry.surfaceDark = palette.dark;
 					entry.canvas.replaceChildren(svgFragment(result.svg));
 					entry.state = 'ok';
 					paint(entry);
@@ -825,6 +831,40 @@ window.__ModuleLoader__.load({
 		/** The one open fullscreen viewer, or null. */
 		let lightbox = null;
 
+		/**
+		 * Force a colour to be opaque.
+		 *
+		 * A translucent surface would let the dark backdrop through and defeat the
+		 * point, so an `rgba()` value below full alpha falls back to the theme's solid
+		 * base. Hex and named colours are opaque by definition.
+		 * @param color - any CSS colour string from the design tokens.
+		 * @param dark - whether the dark fallback applies.
+		 * @returns an opaque colour string.
+		 */
+		function opaqueSurface(color, dark) {
+			const match = /^rgba?\(\s*([\d.]+)[,\s]+([\d.]+)[,\s]+([\d.]+)(?:[,\s/]+([\d.]+%?))?\s*\)$/i.exec(color);
+			if (match === null) return color;
+			const raw = match[4];
+			const alpha = raw === undefined ? 1 : raw.endsWith('%') ? Number.parseFloat(raw) / 100 : Number.parseFloat(raw);
+			if (alpha >= 1) return color;
+			return dark ? '#1b1c1f' : '#ffffff';
+		}
+
+		/** The surface a diagram should sit on, from its own record or the live tokens. */
+		function knownSurface(entry) {
+			const dark = typeof entry?.surfaceDark === 'boolean' ? entry.surfaceDark : currentScheme() === 'dark';
+			if (typeof entry?.surface === 'string' && entry.surface !== '') {
+				return { color: opaqueSurface(entry.surface, dark), dark };
+			}
+			let color = '';
+			try {
+				color = window.getComputedStyle(document.documentElement).getPropertyValue('--dsw-alias-bg-base').trim();
+			} catch {
+				color = '';
+			}
+			return { color: opaqueSurface(color === '' ? '#ffffff' : color, dark), dark };
+		}
+
 		/** A diagram's natural size, read from its viewBox with sane fallbacks. */
 		function naturalSize(svg) {
 			const box = (svg.getAttribute('viewBox') ?? '').trim().split(/[\s,]+/).map(Number);
@@ -912,6 +952,12 @@ window.__ModuleLoader__.load({
 			canvas.className = 'dsh-mdm-lb-canvas';
 			canvas.style.width = `${size.width}px`;
 			canvas.style.height = `${size.height}px`;
+			// Paint the palette this diagram was rendered for. Without it the
+			// transparent SVG sits on the dark backdrop and dark labels vanish.
+			const surface = knownSurface(entry);
+			canvas.style.background = surface.color;
+			canvas.style.border = `1px solid ${surface.dark ? 'rgba(255,255,255,.16)' : 'rgba(0,0,0,.08)'}`;
+			canvas.setAttribute('data-dsh-mermaid-surface', surface.dark ? 'dark' : 'light');
 			const clone = source.cloneNode(true);
 			clone.style.width = '100%';
 			clone.style.height = '100%';
@@ -939,7 +985,9 @@ window.__ModuleLoader__.load({
 			const fit = () => {
 				const availableWidth = Math.max(80, stage.clientWidth - 48);
 				const availableHeight = Math.max(80, stage.clientHeight - 48);
-				view.fit = Math.min(availableWidth / size.width, availableHeight / size.height);
+				// The sheet's padding scales with the diagram, so fit against the
+				// padded box rather than the bare viewBox.
+				view.fit = Math.min(availableWidth / (size.width + 48), availableHeight / (size.height + 48));
 				// Never blow a small diagram up past 1.5x: filling the window with two
 				// giant boxes looks broken, and dense diagrams are already large.
 				view.scale = Math.max(view.min, Math.min(view.fit, 1.5));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mermaid-plus",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Mermaid diagrams for DeepSeek Harness: on-demand rendering, theme-aware, with a fullscreen zoom viewer.",
   "license": "MIT",
   "author": "pidongqianqian",