dsh-tiddlywiki 0.1.1 → 0.1.2

package/lib/client.js

@@ -80,6 +80,13 @@ html[data-dsh-tw-active] .dshDesktopConversationSurface > :not([data-dsh-tw-view
 }
 .dsh-tw-panel-bar button:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,.12)); }
 .dsh-tw-panel-title { font-weight: 600; margin-right: auto; }
+/* dsh-better-sidebar coexistence: the floating toggle cluster (two 28px
+   buttons at the viewport's top-right) lives above the panel (z-index is
+   handled in JS — the panel stays below the host layer), so reserve the
+   cluster's width at the panel bar's right end — mirroring how
+   dsh-better-sidebar pads the DSH session header — and the panel's own
+   状态/重载 buttons never sit underneath it. */
+.dsh-tw-view[data-sidebar-host] .dsh-tw-panel-bar { padding-right: 80px; }
 .dsh-tw-status-chip { font-variant-numeric: tabular-nums; }
 .dsh-tw-status-chip[data-state="running"] { color: var(--dsw-alias-state-success-primary, #3eaa5f); }
 .dsh-tw-status-chip[data-state="starting"] { color: var(--dsw-alias-state-warning-primary, #d9822b); }
@@ -435,10 +442,35 @@ const ACTIVATE_EVENT = "dsh-panel-activate";
 const PANEL_NAME = "dsh-tiddlywiki";
 /** Overlay z-index: above the shell content, below the note widget (950). */
 const PANEL_Z_INDEX = 40;
+/**
+* dsh-better-sidebar's unified fixed host layer (its persistent
+* expand/collapse toggle cluster lives inside it, at a global z-index of 25
+* — its internal 45 is trapped by the host's stacking context). When this
+* host is present the panel must stay BELOW it, so the sidebar toggle
+* buttons stay visible and clickable above the full-screen TW panel.
+*/
+const PANEL_HOST_SELECTOR = "[data-dsh-panel-host]";
+/** The app's own shell overlay layer (dsh-client-ui-layout pins it at 20). */
+const APP_OVERLAY_Z_INDEX = 20;
 /** Safety re-measure cadence for shell layout changes CSS can't see. */
 const SYNC_INTERVAL_MS = 2e3;
 const STATUS_ENDPOINT$1 = "/dsh-tiddlywiki/status";
 const RESTART_ENDPOINT$1 = "/dsh-tiddlywiki/restart";
+/**
+* The panel's z-index: below any dsh-better-sidebar host layer so its
+* persistent toggle cluster (top-right corner) stays visible and clickable
+* above the full-screen TW panel, otherwise the default 40. The host's live
+* computed z-index is read instead of hardcoding 25, so the rule tracks
+* plugin updates; the panel is still clamped above the app's own shell
+* overlay layer (dsh-client-ui-layout pins it at 20).
+*/
+function resolvePanelZIndex() {
+	const host = document.querySelector(PANEL_HOST_SELECTOR);
+	if (host === null) return PANEL_Z_INDEX;
+	const parsed = parseInt(getComputedStyle(host).zIndex, 10);
+	if (!Number.isFinite(parsed)) return PANEL_Z_INDEX;
+	return Math.max(APP_OVERLAY_Z_INDEX, Math.min(PANEL_Z_INDEX, parsed - 1));
+}
 function conversationColumn() {
 	for (const selector of COLUMN_SELECTORS) {
 		const el = document.querySelector(selector);
@@ -532,13 +564,25 @@ function mountPanel(state) {
 		if (container.style.width !== width) container.style.width = width;
 		if (container.style.height !== height) container.style.height = height;
 	};
+	/**
+	* Coexist with dsh-better-sidebar: keep the panel's z-index below the
+	* host layer (so its toggle cluster stays clickable above the panel) and
+	* flag the host's presence so CSS can reserve the cluster's width at the
+	* panel bar's right end. Re-run whenever the host mounts/unmounts.
+	*/
+	const applyChrome = () => {
+		if (container === void 0) return;
+		container.style.zIndex = String(resolvePanelZIndex());
+		if (document.querySelector(PANEL_HOST_SELECTOR) !== null) container.dataset.sidebarHost = "1";
+		else delete container.dataset.sidebarHost;
+	};
 	const ensure = () => {
 		if (container !== void 0) return;
 		columnEl = conversationColumn();
 		if (columnEl === void 0) return;
 		container = build();
 		container.style.position = "fixed";
-		container.style.zIndex = String(PANEL_Z_INDEX);
+		applyChrome();
 		document.body.append(container);
 		syncRect();
 	};
@@ -640,6 +684,7 @@ function mountPanel(state) {
 	};
 	const waitObserver = new MutationObserver(() => {
 		ensure();
+		applyChrome();
 	});
 	waitObserver.observe(document.body, {
 		childList: true,