@iasiv5/dsh-skins 1.5.5 → 1.5.7

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) {
@@ -1679,7 +1703,13 @@ ${names}`,
     // 毛玻璃弹层（dsh-quota-watch 同款配方）：86% 不透明底 + blur14 提饱和，
     // 下层文字被底色盖住、只余柔光，弹层文字保持清晰可读；首条 solid 声明
     // 兜底不支持 color-mix 的浏览器。
-    ".dsh-skins-pop{position:fixed;z-index:60;box-sizing:border-box;display:flex;flex-direction:column;gap:8px;width:min(390px,calc(100vw - 24px));max-height:calc(100vh - 24px);padding:14px;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;background:var(--dsw-alias-bg-elevated,var(--dsw-alias-bg-overlay));background:color-mix(in srgb,var(--dsw-alias-bg-base,#1f1f1f) 86%,transparent);backdrop-filter:blur(14px) saturate(1.3);-webkit-backdrop-filter:blur(14px) saturate(1.3);color:var(--dsw-alias-label-primary);box-shadow:var(--dsw-shadow-lv3,0 8px 24px rgba(0,0,0,.14));overflow-y:auto;transition:width .2s ease-out}",
+    // Width term reserves 16px margins per side on sub-414px viewports (the
+    // 390px cap keeps every wider viewport untouched). The old 24px term left
+    // only ~10px of right margin once the trigger-anchored left offset was
+    // paid, and — combined with the fixed 360px list column — clipped the
+    // gear column at the pop's own edge on phones (field report 2026-10-14:
+    // 手机上齿轮被截半 + 横向滚动条).
+    ".dsh-skins-pop{position:fixed;z-index:60;box-sizing:border-box;display:flex;flex-direction:column;gap:8px;width:min(390px,calc(100vw - 32px));max-height:calc(100vh - 24px);padding:14px;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;background:var(--dsw-alias-bg-elevated,var(--dsw-alias-bg-overlay));background:color-mix(in srgb,var(--dsw-alias-bg-base,#1f1f1f) 86%,transparent);backdrop-filter:blur(14px) saturate(1.3);-webkit-backdrop-filter:blur(14px) saturate(1.3);color:var(--dsw-alias-label-primary);box-shadow:var(--dsw-shadow-lv3,0 8px 24px rgba(0,0,0,.14));overflow-y:auto;transition:width .2s ease-out}",
     // Slim themed scrollbars for the shell's own scroll region (list-only
     // popover): thin + token-colored thumb, WebKit and Firefox both covered.
     ".dsh-skins-pop{scrollbar-width:thin;scrollbar-color:var(--dsw-alias-border-l2) transparent}",
@@ -1725,7 +1755,11 @@ ${names}`,
     "body[data-ds-dark-theme]:not([data-dsh-meirenzhi-skin]):not([data-dsh-openbmc-skin]):not([data-dsh-uefi-harness]) .dsh-skins-pop{background:rgba(41,42,44,0.97)}",
     // -- combined shell (Q44/Q46): list column + docked panel column ----------
     ".dsh-skins-pop.dsh-skins-wide{flex-direction:row;align-items:stretch;width:min(1105px,calc(100vw - 24px))}",
-    ".dsh-skins-pop-main{display:flex;flex-direction:column;gap:8px;min-width:0;width:360px;flex:none}",
+    // List column: exactly 360px wherever the 390px narrow shell fits (the
+    // v2.5 宽度恒定 ruling #10/#11), shrinking only BELOW a 414px viewport —
+    // a fixed 360px column inside a narrower pop overflowed horizontally and
+    // pushed the gear column behind the pop's right edge (same field report).
+    ".dsh-skins-pop-main{display:flex;flex-direction:column;gap:8px;min-width:0;width:min(360px,100%);flex:none}",
     ".dsh-skins-pop.dsh-skins-wide .dsh-skins-pop-main{flex:0 0 360px}",
     // box-sizing is NOT inherited: without border-box here, the sweep's
     // measured rect width feeds flex-basis as a CONTENT width (+15px padding/
@@ -1850,7 +1884,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);
@@ -1977,7 +2015,7 @@ ${names}`,
       });
       const showPersonalization = personalizeId !== null && PersonalizationPanel !== null;
       const stackedSheet = showPersonalization && typeof window !== "undefined" && window.innerWidth <= 904;
-      const shellLeft = box === null ? void 0 : showPersonalization && typeof window !== "undefined" ? Math.max(12, Math.min(box.left, window.innerWidth - 1117)) : box.left;
+      const shellLeft = box === null ? void 0 : showPersonalization && typeof window !== "undefined" ? Math.max(12, Math.min(box.left, window.innerWidth - 1117)) : typeof window !== "undefined" ? Math.max(16, Math.min(box.left, window.innerWidth - Math.min(390, window.innerWidth - 32) - 16)) : box.left;
       const shellMaxHeight = box === null || typeof window === "undefined" || typeof window.innerHeight !== "number" ? void 0 : stackedSheet ? window.innerHeight - 24 : Math.max(220, window.innerHeight - box.bottom - 12);
       react.useLayoutEffect(() => {
         if (!open || box === null) return void 0;
@@ -2053,9 +2091,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.5",
+  "version": "1.5.7",
   "homepage": "https://github.com/iasiv5/dsh-skins#readme",
   "repository": {
     "type": "git",