@iasiv5/dsh-skins 1.5.4 → 1.5.6

package/lib/client.js

@@ -587,6 +587,30 @@
       return `${selector}{${light.join(";")}}
 ${darkSelector}{${dark.join(";")}}`;
     }
+    const BRAND_PRIORITY_BASE = -20;
+    function occupantPriorities(name) {
+      try {
+        return (ctx.slots.entries?.(name) ?? []).map((entry) => entry.options.priority ?? 0);
+      } catch {
+        return [];
+      }
+    }
+    function registerBrandSeat(name, component) {
+      for (let attempt = 0; attempt < 4; attempt += 1) {
+        const taken = occupantPriorities(name);
+        const floor = taken.length > 0 ? Math.min(...taken) - 1 : BRAND_PRIORITY_BASE;
+        const priority = Math.min(BRAND_PRIORITY_BASE, floor);
+        try {
+          return ctx.slots.register({ name, priority }, component);
+        } catch (error) {
+          if (!/already has a registration/.test(String(error?.message ?? error))) throw error;
+          console.warn(`[dsh-skins] brand seat "${name}" priority ${priority} taken; retrying deeper`);
+        }
+      }
+      console.warn(`[dsh-skins] brand seat "${name}" stays with its occupant; skin mounts without it`);
+      return () => {
+      };
+    }
     function buildEffects(skin, effects) {
       if (!ctx) throw new Error("[dsh-skins] mount before apply");
       const body = document.body;
@@ -606,9 +630,9 @@ ${darkSelector}{${dark.join(";")}}`;
             "sidebar.brand.name",
             () => ctx.slots.inject("conversation.hero.brand.mark", () => {
               const registrations = [
-                ctx.slots.register({ name: "sidebar.brand.mark", priority: -10 }, skin.Mark),
-                ctx.slots.register({ name: "sidebar.brand.name", priority: -10 }, skin.Name),
-                ctx.slots.register({ name: "conversation.hero.brand.mark", priority: -10 }, skin.Mark)
+                registerBrandSeat("sidebar.brand.mark", skin.Mark),
+                registerBrandSeat("sidebar.brand.name", skin.Name),
+                registerBrandSeat("conversation.hero.brand.mark", skin.Mark)
               ];
               return () => {
                 for (let index = registrations.length - 1; index >= 0; index -= 1) {
@@ -871,8 +895,10 @@ ${darkSelector}{${dark.join(";")}}`;
       "personalization.confirmTitle": "确认操作",
       "personalization.confirm": "确认",
       "personalization.cancel": "取消",
-      "personalization.resetJoin": "、",
-      "personalization.resetConfirm": "以下设置将恢复为出厂默认：\n{fields}\n此操作立即生效，确认继续吗？",
+      "personalization.resetJoin": "\n• ",
+      "personalization.resetConfirm": "以下设置将恢复为出厂默认：\n\n{fields}\n\n此操作立即生效，确认继续吗？",
+      "personalization.resetConfirmIntro": "以下设置将恢复为出厂默认：",
+      "personalization.resetConfirmOutro": "此操作立即生效，确认继续吗？",
       "personalization.light": "浅色",
       "personalization.dark": "深色",
       "personalization.builtin": "内置画作",
@@ -942,8 +968,10 @@ ${darkSelector}{${dark.join(";")}}`;
       "personalization.confirmTitle": "Confirm action",
       "personalization.confirm": "Confirm",
       "personalization.cancel": "Cancel",
-      "personalization.resetJoin": ", ",
-      "personalization.resetConfirm": "These settings will be reset to factory defaults:\n{fields}\nThis takes effect immediately. Continue?",
+      "personalization.resetJoin": "\n• ",
+      "personalization.resetConfirm": "These settings will be reset to factory defaults:\n\n{fields}\n\nThis takes effect immediately. Continue?",
+      "personalization.resetConfirmIntro": "These settings will be reset to factory defaults:",
+      "personalization.resetConfirmOutro": "This takes effect immediately. Continue?",
       "personalization.light": "Light",
       "personalization.dark": "Dark",
       "personalization.builtin": "Built-in artwork",
@@ -1112,6 +1140,10 @@ ${darkSelector}{${dark.join(";")}}`;
     ".dsh-skins-pz-dialog{box-sizing:border-box;width:min(480px,calc(100vw - 32px));max-height:calc(100vh - 32px);padding:20px;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;background:var(--dsw-alias-bg-elevated,var(--dsw-alias-bg-overlay));color:var(--dsw-alias-label-primary);box-shadow:var(--dsw-shadow-lv3,0 8px 24px rgba(0,0,0,.25));font:inherit}",
     ".dsh-skins-pz-dialog::backdrop{background:rgba(0,0,0,.45)}",
     ".dsh-skins-pz-dialog-message{margin:0 0 20px;white-space:pre-line;line-height:1.6;font-size:14px}",
+    ".dsh-skins-pz-dialog-intro{margin:0;font-size:14px;line-height:1.6}.dsh-skins-pz-dialog-outro{margin:0 0 20px;font-size:14px;line-height:1.6}",
+    ".dsh-skins-pz-dialog-tags{display:flex;flex-wrap:wrap;gap:8px;margin:12px 0 16px;padding:0;list-style:none}",
+    ".dsh-skins-pz-dialog-tag{box-sizing:border-box;display:inline-flex;align-items:center;gap:7px;max-width:100%;padding:6px 10px;border:1px solid var(--dsw-alias-border-l2);border-color:color-mix(in srgb,var(--dsw-alias-brand-primary) 42%,transparent);border-radius:999px;background:var(--dsw-alias-bg-layer-1);background:color-mix(in srgb,var(--dsw-alias-brand-primary) 10%,var(--dsw-alias-bg-overlay));color:var(--dsw-alias-label-primary);font-size:13px;line-height:18px;font-weight:600;white-space:normal}",
+    '.dsh-skins-pz-dialog-tag::before{content:"";flex:none;width:6px;height:6px;border-radius:50%;background:var(--dsw-alias-brand-primary)}',
     ".dsh-skins-pz-dialog-actions{display:flex;justify-content:flex-end;gap:8px}",
     // Stacked (<904px) resets MUST come after the rules they override — the
     // array order is the cascade order among equal-specificity selectors.
@@ -1405,13 +1437,13 @@ ${names}`,
       const dialogRef = useRef(null);
       const confirmationRef = useRef(null);
       const [confirmation, setConfirmation] = useState(null);
-      const requestConfirm = (message, accept) => {
+      const requestConfirm = (message, accept, { detailItems = null } = {}) => {
         if (!desktopProfile) {
           if (window.confirm(message)) void accept();
           return;
         }
         if (confirmationRef.current !== null) return;
-        const next = { message, accept };
+        const next = { message, accept, detailItems };
         confirmationRef.current = next;
         setConfirmation(next);
       };
@@ -1530,11 +1562,11 @@ ${names}`,
             onClick: () => {
               const affected = schema.fields.filter((field) => overrides[field.key] !== void 0).map((field) => tr(field.labelKey));
               requestConfirm(tr("personalization.resetConfirm", {
-                fields: affected.length > 0 ? affected.join(tr("personalization.resetJoin")) : "—"
+                fields: affected.length > 0 ? `• ${affected.join(tr("personalization.resetJoin"))}` : "—"
               }), () => {
                 for (const field of schema.fields) configClient.previewReset(skinId, field.key);
                 void configClient.flushNow();
-              });
+              }, { detailItems: affected });
             },
             children: tr("personalization.reset")
           }) : null,
@@ -1562,7 +1594,11 @@ ${names}`,
           },
           children: [
             jsx("div", { id: "dsh-skins-confirm-title", className: "dsh-skins-pop-title", children: tr("personalization.confirmTitle") }),
-            jsx("p", { className: "dsh-skins-pz-dialog-message", children: confirmation.message }),
+            confirmation.detailItems === null ? jsx("p", { className: "dsh-skins-pz-dialog-message", children: confirmation.message }) : jsx("div", { children: [
+              jsx("p", { className: "dsh-skins-pz-dialog-intro", children: tr("personalization.resetConfirmIntro") }),
+              confirmation.detailItems.length > 0 ? jsx("ul", { className: "dsh-skins-pz-dialog-tags", children: confirmation.detailItems.map((label) => jsx("li", { className: "dsh-skins-pz-dialog-tag", children: label }, label)) }) : jsx("p", { className: "dsh-skins-pz-dialog-message", children: "—" }),
+              jsx("p", { className: "dsh-skins-pz-dialog-outro", children: tr("personalization.resetConfirmOutro") })
+            ] }),
             jsx("div", { className: "dsh-skins-pz-dialog-actions", children: [
               jsx("button", {
                 type: "button",
@@ -1838,7 +1874,11 @@ ${names}`,
         jsx("path", { d: "M8 21h8M12 17v4", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round" })
       ] });
     }
-    function SidebarAction({ wide, t }) {
+    function SidebarAction(props) {
+      if (shellTakeover()) return null;
+      return jsx(SidebarActionBody, props);
+    }
+    function SidebarActionBody({ wide, t }) {
       const tr = typeof t === "function" ? (key, params) => t(key, params) : fallbackTranslate;
       const [open, setOpen] = react.useState(false);
       const [activeId, setActiveId] = react.useState(runtime.active);
@@ -2041,9 +2081,22 @@ ${names}`,
         };
       }
     }, "dsh-skins: sidebar switcher dictionary");
+    const shellTakeover = () => {
+      try {
+        return (ctx.slots.entries?.("sidebar.workspaces") ?? []).some((entry) => (entry.options.priority ?? 0) < 0);
+      } catch {
+        return false;
+      }
+    };
     ctx.slots.inject("sidebar.footer.action", () => ctx.slots.register({
       name: "sidebar.footer.action",
       id: "skins-switcher",
+      // Footer order stays at the positive utility seat (4): the bot view is
+      // handled by the shell-takeover sentinel below (we render nothing there),
+      // so order only sorts the PLAIN harness foot — where the DS Bot entry
+      // (-200) belongs ABOVE these utility rows (ruling 2026-10-13: a deep
+      // negative order was tried and reverted because it sank the DS Bot entry
+      // to the bottom of the harness foot).
       order: 4,
       locale: NS,
       label: () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iasiv5/dsh-skins",
   "description": "DSH Web 皮肤插件：多套品牌皮肤侧栏热切换。",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "homepage": "https://github.com/iasiv5/dsh-skins#readme",
   "repository": {
     "type": "git",