@iasiv5/dsh-skins 1.5.0 → 1.5.2

package/lib/client.js

@@ -306,6 +306,14 @@
       }
       const blur = backdrop.blur ?? 0;
       if (typeof blur !== "number" || !(blur >= 0 && blur <= 24)) return null;
+      const desktopBlur = backdrop.desktopBlur ?? null;
+      if (desktopBlur !== null) {
+        if (!isPlainObject(desktopBlur)) return null;
+        for (const key of ["light", "dark"]) {
+          const value = desktopBlur[key];
+          if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 24) return null;
+        }
+      }
     }
     const tokenOverrides = source.tokenOverrides ?? null;
     if (tokenOverrides !== null) {
@@ -340,7 +348,8 @@
         imageDark: backdrop.imageDark ?? null,
         overlayLight: backdrop.overlayLight ?? null,
         overlayDark: backdrop.overlayDark ?? null,
-        blur: backdrop.blur ?? 0
+        blur: backdrop.blur ?? 0,
+        desktopBlur: backdrop.desktopBlur ?? null
       },
       tokenOverrides,
       cssVariables,
@@ -503,6 +512,23 @@
           rules.push(`${darkSelector}::after{background-image:${backdrop.overlayDark}}`);
         }
       }
+      const desktopBlur = backdrop.desktopBlur ?? null;
+      if (desktopBlur !== null && (backdrop.imageLight !== null || backdrop.imageDark !== null)) {
+        const desktopSelector = `html[data-windows-titlebar] ${selector}`;
+        const blurDeclarations = (blur) => `filter:blur(${blur}px);transform:scale(1.02);`;
+        if (desktopBlur.light === desktopBlur.dark) {
+          if (desktopBlur.light > 0) {
+            rules.push(`${desktopSelector}::before{${blurDeclarations(desktopBlur.light)}}`);
+          }
+        } else {
+          if (desktopBlur.light > 0) {
+            rules.push(`${desktopSelector}:not([data-ds-dark-theme])::before{${blurDeclarations(desktopBlur.light)}}`);
+          }
+          if (desktopBlur.dark > 0) {
+            rules.push(`${desktopSelector}[data-ds-dark-theme]::before{${blurDeclarations(desktopBlur.dark)}}`);
+          }
+        }
+      }
       return rules.length === 0 ? null : rules.join("\n");
     }
     function variablesCss(effects) {
@@ -2377,13 +2403,17 @@ ${names}`);
     `${SCOPE}{--dsw-menu-surface-fill:rgba(250, 249, 246, 0.94);--dsw-alias-menu-group-header-fill:rgba(250, 249, 246, 0.94);--dsw-specific-menu:rgba(250, 249, 246, 0.94)}`,
     `${SCOPE}[data-ds-dark-theme]{--dsw-menu-surface-fill:rgba(18, 18, 26, 0.94);--dsw-alias-menu-group-header-fill:rgba(18, 18, 26, 0.94);--dsw-specific-menu:rgba(18, 18, 26, 0.94)}`,
     // 弹窗毛玻璃（dsh-quota-watch 同款配方）：宿主 Modal（设置页各弹窗、风险
-    // 确认、灯箱）与 dsh-m / dsh-skins 弹层面板底色偏透，下层文字干扰阅读；
+    // 确认）与 dsh-m / dsh-skins 弹层面板底色偏透，下层文字干扰阅读；
     // 统一 86% 不透明皮肤底（暖雾白/玄夜）+ blur14 提饱和，下层内容只余柔光。
     // 宿主弹窗经 CSS modules 哈希 → role/aria 定位；.dshm-*/.dsh-skins-pop 为
     // 各插件自有稳定类名。--dsw-mask-blur 点亮官方默认 none 的遮罩模糊。
+    // 1.5.1 豁免（ADR-0007 amendment）：dsh-m 截图灯箱 .dsvm-lightbox 根同带
+    // role/aria 语义，浅色 tint 会把影院式黑遮罩染成浅毛玻璃、白色控件整体隐形
+    // （用户双模式实拍）；影院遮罩归 dsh-m 自有不变量（0.9.62 起 background
+    // !important 自持），此处 :not 双保险、语义归位。
     `${SCOPE}{--dsw-mask-blur:blur(10px)}`,
-    `${SCOPE} [role="dialog"][aria-modal="true"],${SCOPE} .dshm-panel,${SCOPE} .dshm-compat-dialog,${SCOPE} .dshm-dshchip-tip,${SCOPE} .dsh-skins-pop{background:color-mix(in srgb,rgb(250, 249, 246) 86%,transparent);backdrop-filter:blur(14px) saturate(1.3);-webkit-backdrop-filter:blur(14px) saturate(1.3)}`,
-    `${SCOPE}[data-ds-dark-theme] [role="dialog"][aria-modal="true"],${SCOPE}[data-ds-dark-theme] .dshm-panel,${SCOPE}[data-ds-dark-theme] .dshm-compat-dialog,${SCOPE}[data-ds-dark-theme] .dshm-dshchip-tip,${SCOPE}[data-ds-dark-theme] .dsh-skins-pop{background:color-mix(in srgb,rgb(18, 18, 26) 86%,transparent)}`,
+    `${SCOPE} [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),${SCOPE} .dshm-panel,${SCOPE} .dshm-compat-dialog,${SCOPE} .dshm-dshchip-tip,${SCOPE} .dsh-skins-pop{background:color-mix(in srgb,rgb(250, 249, 246) 86%,transparent);backdrop-filter:blur(14px) saturate(1.3);-webkit-backdrop-filter:blur(14px) saturate(1.3)}`,
+    `${SCOPE}[data-ds-dark-theme] [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),${SCOPE}[data-ds-dark-theme] .dshm-panel,${SCOPE}[data-ds-dark-theme] .dshm-compat-dialog,${SCOPE}[data-ds-dark-theme] .dshm-dshchip-tip,${SCOPE}[data-ds-dark-theme] .dsh-skins-pop{background:color-mix(in srgb,rgb(18, 18, 26) 86%,transparent)}`,
     // 浮层毛玻璃 v2（补漏，ADR-0007）：v1 只盖宿主 Modal 与 .dshm-*/.dsh-skins-pop；
     // 逐面排查后的剩余缺口——dockkit 悬浮窗壳 _float_（bg-layer-2 皮肤下 α≈0.6
     // 且无 blur）、宿主对话框非 modal 变体（无 aria-modal，用 _dialog_ 结构兜底）、
@@ -2468,6 +2498,7 @@ ${names}`);
     const scrimLight = `linear-gradient(rgba(252, 250, 246, ${s}) 0%, rgba(252, 250, 246, ${s}) 100%)`;
     const scrimDark = `linear-gradient(rgba(16, 16, 26, ${s}) 0%, rgba(16, 16, 26, ${s}) 100%)`;
     const blurPx = Math.round(12 * t * t);
+    const desktopBlurPx = Math.min(24, blurPx + values.panelOpacity / 55);
     const wallpaperUrl = assets?.wallpaper?.url ?? null;
     const imageLight = wallpaperUrl === null ? null : `url("${wallpaperUrl}")`;
     const imageDark = wallpaperUrl === null ? null : `url("${wallpaperUrl}")`;
@@ -2476,7 +2507,14 @@ ${names}`);
       slogans: values.slogan ?? SLOGANS,
       titleBrand: "美人志",
       favicon: { href: MARK_URL, mime: "image/webp" },
-      backdrop: { imageLight, imageDark, overlayLight: scrimLight, overlayDark: scrimDark, blur: blurPx },
+      backdrop: {
+        imageLight,
+        imageDark,
+        overlayLight: scrimLight,
+        overlayDark: scrimDark,
+        blur: blurPx,
+        desktopBlur: { light: desktopBlurPx, dark: desktopBlurPx }
+      },
       tokenOverrides,
       cssVariables: blurPx > 0 ? { "--dsh-mrz-glass-blur": { light: `${blurPx}px`, dark: `${blurPx}px` } } : null,
       staticCss: blurPx > 0 ? CSS2 + "\n" + GLASS_RULE : CSS2,
@@ -2833,13 +2871,17 @@ ${names}`);
    * 类名不可预测；一律通过 token 或 data-* 属性作用。 */
 
   /* ---------- ⑧ 弹窗毛玻璃（dsh-quota-watch 同款配方） ----------
-   * 宿主 Modal（设置页各弹窗、风险确认、灯箱）与 dsh-m / dsh-skins 的弹层面板
+   * 宿主 Modal（设置页各弹窗、风险确认）与 dsh-m / dsh-skins 的弹层面板
    * 底色偏透，下层文字会干扰阅读：统一改为 86% 不透明皮肤底色 + blur14 提饱和，
    * 下层内容被盖住只余柔光。遮罩/对话框由宿主 CSS modules 渲染，类名不可测 →
    * role/aria 属性定位；.dshm-* / .dsh-skins-pop 是各插件自有稳定类名词汇。
-   * --dsw-mask-blur 点亮官方默认 none 的遮罩模糊，弹窗四周页面一并磨砂。 */
+   * --dsw-mask-blur 点亮官方默认 none 的遮罩模糊，弹窗四周页面一并磨砂。
+   * 1.5.1 豁免（ADR-0007 amendment）：dsh-m 截图灯箱 .dsvm-lightbox 根同带
+   * role/aria 语义，浅色 tint 会把影院式黑遮罩染成浅毛玻璃、白色控件整体隐形
+   * （用户双模式实拍）；影院遮罩归 dsh-m 自有不变量（0.9.62 起 background
+   * !important 自持），此处 :not 双保险、语义归位。 */
   body[data-dsh-openbmc-skin] { --dsw-mask-blur: blur(10px); }
-  body[data-dsh-openbmc-skin] [role="dialog"][aria-modal="true"],
+  body[data-dsh-openbmc-skin] [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),
   body[data-dsh-openbmc-skin] .dshm-panel,
   body[data-dsh-openbmc-skin] .dshm-compat-dialog,
   body[data-dsh-openbmc-skin] .dshm-dshchip-tip,
@@ -2848,7 +2890,7 @@ ${names}`);
     backdrop-filter: blur(14px) saturate(1.3);
     -webkit-backdrop-filter: blur(14px) saturate(1.3);
   }
-  body[data-dsh-openbmc-skin][data-ds-dark-theme] [role="dialog"][aria-modal="true"],
+  body[data-dsh-openbmc-skin][data-ds-dark-theme] [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),
   body[data-dsh-openbmc-skin][data-ds-dark-theme] .dshm-panel,
   body[data-dsh-openbmc-skin][data-ds-dark-theme] .dshm-compat-dialog,
   body[data-dsh-openbmc-skin][data-ds-dark-theme] .dshm-dshchip-tip,
@@ -2987,12 +3029,18 @@ ${names}`);
       const imageLight = custom ? `url("${url}")` : BACKGROUND_ART === "" ? PLACEHOLDER_LIGHT : scrimLight;
       const imageDark = custom ? `url("${url}")` : BACKGROUND_ART === "" ? PLACEHOLDER_DARK : scrimDark;
       const blurPx = Math.round(24 * Math.pow(Math.max(0, (P - 55) / 45), 2));
+      const desktopExtraBlurPx = P / 55;
+      const desktopBlur = {
+        light: Math.min(24, blurPx + desktopExtraBlurPx),
+        dark: blurPx
+        // OpenBMC dark remains the approved reference baseline.
+      };
       return {
         bodyAttribute: "dshOpenbmcSkin",
         slogans: values.slogan ?? SLOGANS2,
         titleBrand: "OpenBMC Studio",
         favicon: { href: FAVICON_DATA_URL, mime: FAVICON_MIME },
-        backdrop: { imageLight, imageDark, overlayLight: null, overlayDark: null, blur: blurPx },
+        backdrop: { imageLight, imageDark, overlayLight: null, overlayDark: null, blur: blurPx, desktopBlur },
         tokenOverrides,
         cssVariables: blurPx > 0 ? { "--dsh-openbmc-glass-blur": { light: `${blurPx}px`, dark: `${blurPx}px` } } : null,
         staticCss: blurPx > 0 ? CSS3 + "\n" + GLASS_RULE2 : CSS3,
@@ -3146,13 +3194,17 @@ body[data-dsh-uefi-harness][data-ds-dark-theme] :is([class*="oRe1gG_bubble"], [c
 }
 
 /* ---------- 弹窗毛玻璃（dsh-quota-watch 同款配方） ----------
- * 宿主 Modal（设置页各弹窗、风险确认、灯箱）与 dsh-m / dsh-skins 的弹层面板
+ * 宿主 Modal（设置页各弹窗、风险确认）与 dsh-m / dsh-skins 的弹层面板
  * 底色偏透，下层文字会干扰阅读：统一改为 86% 不透明皮肤底色 + blur14 提饱和，
  * 下层内容被盖住只余柔光。遮罩/对话框由宿主 CSS modules 渲染，类名不可测 →
  * role/aria 属性定位；.dshm-* / .dsh-skins-pop 是各插件自有稳定类名词汇。
- * --dsw-mask-blur 点亮官方默认 none 的遮罩模糊，弹窗四周页面一并磨砂。 */
+ * --dsw-mask-blur 点亮官方默认 none 的遮罩模糊，弹窗四周页面一并磨砂。
+ * 1.5.1 豁免（ADR-0007 amendment）：dsh-m 截图灯箱 .dsvm-lightbox 根同带
+ * role/aria 语义，浅色 tint 会把影院式黑遮罩染成浅毛玻璃、白色控件整体隐形
+ * （用户双模式实拍）；影院遮罩归 dsh-m 自有不变量（0.9.62 起 background
+ * !important 自持），此处 :not 双保险、语义归位。 */
 body[data-dsh-uefi-harness] { --dsw-mask-blur: blur(10px); }
-body[data-dsh-uefi-harness] [role="dialog"][aria-modal="true"],
+body[data-dsh-uefi-harness] [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),
 body[data-dsh-uefi-harness] .dshm-panel,
 body[data-dsh-uefi-harness] .dshm-compat-dialog,
 body[data-dsh-uefi-harness] .dshm-dshchip-tip,
@@ -3161,7 +3213,7 @@ body[data-dsh-uefi-harness] .dsh-skins-pop {
   backdrop-filter: blur(14px) saturate(1.3);
   -webkit-backdrop-filter: blur(14px) saturate(1.3);
 }
-body[data-dsh-uefi-harness][data-ds-dark-theme] [role="dialog"][aria-modal="true"],
+body[data-dsh-uefi-harness][data-ds-dark-theme] [role="dialog"][aria-modal="true"]:not(.dsvm-lightbox),
 body[data-dsh-uefi-harness][data-ds-dark-theme] .dshm-panel,
 body[data-dsh-uefi-harness][data-ds-dark-theme] .dshm-compat-dialog,
 body[data-dsh-uefi-harness][data-ds-dark-theme] .dshm-dshchip-tip,
@@ -3296,12 +3348,20 @@ body[data-dsh-uefi-harness][data-ds-dark-theme] .lc-tip {
       const imageLight = custom ? `url("${url}")` : scrimLight;
       const imageDark = custom ? `url("${url}")` : scrimDark;
       const blurPx = Math.round(24 * Math.pow(Math.max(0, (P - 55) / 45), 2));
+      const desktopBlurPx = Math.min(24, blurPx + P / 55);
       return {
         bodyAttribute: "dshUefiHarness",
         slogans: values.slogan ?? SLOGANS2,
         titleBrand: "UEFI Studio",
         favicon: { href: favicon, mime: "image/svg+xml" },
-        backdrop: { imageLight, imageDark, overlayLight: null, overlayDark: null, blur: blurPx },
+        backdrop: {
+          imageLight,
+          imageDark,
+          overlayLight: null,
+          overlayDark: null,
+          blur: blurPx,
+          desktopBlur: { light: desktopBlurPx, dark: desktopBlurPx }
+        },
         tokenOverrides,
         cssVariables: blurPx > 0 ? { "--dsh-uefi-glass-blur": { light: `${blurPx}px`, dark: `${blurPx}px` } } : null,
         staticCss: blurPx > 0 ? css + "\n" + GLASS_RULE2 : css,

package/package.json

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