dsh-notify-me 1.10.1 → 1.10.2

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to **dsh-notify-me** are documented here.
 
+## [1.10.2] — 2026-10-21
+
+### 变更
+
+- 设置页「提醒方式」重做成一行分段选择器：左边「系统通知」、右边「浮层提醒」，选中的那半填色。原来的两个单选圆点会出现「一个在左一个在右、像在打勾」的错位感，也读不出互斥关系。
+- 「浮层位置」只在选了浮层提醒时出现，作为可点开的子项（默认显示当前值，点标题展开）；「音量」同样改为可点开。
+- 设置行说明的悬浮提示改为只在标题文字上触发（之前的触发区是整行，空白处划过也会弹）。
+
+### 测试
+
+- 冒烟测试改断言「两个 role=radio 的分段按钮、选中半区带 on」；`npm test` 两套件通过。
 ## [1.10.1] — 2026-10-21
 
 ### 变更

package/README.en.md

@@ -13,7 +13,7 @@
 [![npm total downloads](https://img.shields.io/npm/dt/dsh-notify-me?style=flat-square&label=total%20downloads&color=1F883D)](https://www.npmjs.com/package/dsh-notify-me)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)
 [![DSH Web and Desktop](https://img.shields.io/badge/DSH-Web%20%7C%20Desktop-blue?style=flat-square)](#installation)
-[![Client bundle size](https://img.shields.io/badge/client-%7E172%20KiB-green?style=flat-square)](lib/client.js)
+[![Client bundle size](https://img.shields.io/badge/client-%7E173%20KiB-green?style=flat-square)](lib/client.js)
 [![DSH Compatibility](https://img.shields.io/badge/DSH-tested%200.2.1--rc.2-6366f1.svg?style=flat-square)](#compatibility)
 [![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
 
@@ -47,7 +47,7 @@ A notification plugin for DSH Web / Desktop, so you can keep full access off wit
 
 ![The Notify me settings page: header, how you get told, when to alert, try it, and the collapsed Advanced block](https://raw.githubusercontent.com/chromoany/dsh-notify-me/main/docs/screenshots/settings-en.png)
 
-The real settings component (v1.10.1 defaults) rendered in a standalone demo shell. The alert channel is a single choice, and row explanations live in a hover tooltip that appears when the pointer rests on a title, which is why only the titles show here.
+The real settings component (v1.10.2 defaults) rendered in a standalone demo shell. Alert type is a segmented control, and row explanations live in a hover tooltip that appears when the pointer rests on a title, which is why only the titles show here.
 </details>
 
 ## Installation
@@ -121,7 +121,7 @@ Open **Settings → Notify me**. The page runs as how you get told, when to aler
 ### How you get told
 
 - **Enable reminders**: master switch — off means no toasts, no sounds, and the tab title is left alone;
-- **How you get told (pick one)**: system notifications or the in-page overlay — a single choice, so turning one on turns the other off;
+- **Alert type (pick one)**: one segmented control — system notifications on the left, in-page overlay on the right; whichever you pick is the only channel used;
   - **System notifications** (default): native toasts landing in the Windows / macOS notification center; needs notification permission;
   - **In-page overlay**: cards drawn in the page corner, on whichever display the window sits on — system notifications only land on the primary display. No permission needed, and the Desktop shell can Approve / Reject right on the card. Click the row open to pick one of four corners when it is the chosen channel. See [Secondary displays and the overlay](#secondary-displays-and-the-overlay);
 - **Sound / Volume**: the switch is direct; the slider folds into that row — click the title (▸ turns into ▾) to reveal it. What it plays comes from Advanced → Alert sound;
@@ -137,7 +137,7 @@ The **in-page overlay** skips the notification center and draws the card inside
 - **No notification permission needed** — it works when permission was never granted, and on the Desktop shell where buttonless toasts are all the OS channel can do;
 - **Approval cards carry Approve / Reject** — the same decision as Allow once / Reject on the approval card, and they work on the Desktop too (no Service Worker involved). Clicking the card body opens its conversation;
 - **Lifetime** — "needs you" cards retire after 12s, "reply finished" after 6s, and an approval card with buttons after 18s; a card or its close button retires one earlier. At most 4 cards stack at once;
-- **Relation to system notifications** — it is one or the other. Both used to be switchable at once, which meant every alert arrived twice and the pair covered each other; 1.10.0 makes it a single choice, and an old config with the overlay on migrates to it.
+- **Relation to system notifications** — it is one or the other. Both used to be switchable at once, which meant every alert arrived twice and the pair covered each other; 1.10.0 made it a single choice, and 1.10.2 turns that into one segmented row. An old config with the overlay on migrates to it.
 
 The overlay only knows which screen the window is on, not which screen you are looking at. If the window stays on the primary display while you watch another one, it stays invisible — same as a toast.
 

package/README.md

@@ -13,7 +13,7 @@
 [![npm total downloads](https://img.shields.io/npm/dt/dsh-notify-me?style=flat-square&label=total%20downloads&color=1F883D)](https://www.npmjs.com/package/dsh-notify-me)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)
 [![DSH Web and Desktop](https://img.shields.io/badge/DSH-Web%20%7C%20Desktop-blue?style=flat-square)](#安装)
-[![Client bundle size](https://img.shields.io/badge/client-%7E172%20KiB-green?style=flat-square)](lib/client.js)
+[![Client bundle size](https://img.shields.io/badge/client-%7E173%20KiB-green?style=flat-square)](lib/client.js)
 [![DSH Compatibility](https://img.shields.io/badge/DSH-%E5%B7%B2%E9%80%82%E9%85%8D%200.2.1--rc.2-6366f1.svg?style=flat-square)](#兼容性)
 [![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
 
@@ -47,7 +47,7 @@ DSH Web / Desktop 的通知插件，让你敢不开完整访问，也不必一
 
 ![通知提醒设置页：页眉、提醒方式、什么时候提醒、试一试与折叠的高级设置](https://raw.githubusercontent.com/chromoany/dsh-notify-me/main/docs/screenshots/settings-zh.png)
 
-真实插件设置组件（v1.10.1 默认配置）在独立演示环境里渲染；提醒方式是一组单选，每行的说明在鼠标停在标题文字上时才出现，所以这里只看到标题。
+真实插件设置组件（v1.10.2 默认配置）在独立演示环境里渲染；「通知类型」是分段选择器，每行的说明在鼠标停在标题文字上时才出现，所以这里只看到标题。
 </details>
 
 ## 安装
@@ -117,7 +117,7 @@ dsh-notify-me 把「监督」和「守在屏幕前」解耦：只在真的出现
 ### 提醒方式
 
 - **启用提醒** 总开关：关闭后不弹通知、不响提示音，也不改标签页标题；
-- **提醒方式（二选一）**：系统通知 / 页面浮层，单选，开了这个就不再弹那个；
+- **通知类型（二选一）**：一行分段选择器，左边「系统通知」、右边「浮层提醒」，点哪个就只走哪个；
   - **系统通知**（默认）：进 Windows / macOS 通知中心，需要通知权限；
   - **页面浮层**：在 DSH 页面角落画提醒卡片，窗口在哪块屏它就在哪块屏——系统通知只会画在主屏，主屏不看时用它；不需要通知权限，桌面端也能在卡片上直接「同意 / 拒绝」。选中后可在该行点开选四个角落的位置，见[副屏与浮层提醒](#副屏与浮层提醒)；
 - **提示音 / 音量**：开关直接切；音量滑块收在该行里，点一下标题（▸ 变成 ▾）展开。具体播什么由「高级设置 → 音效来源」决定；
@@ -133,7 +133,7 @@ Windows 的系统通知横幅固定画在主屏上，系统没有设置项、浏
 - **不需要通知权限**：通知权限没给、或桌面端弹不出带按钮的通知时，浮层照常工作；
 - **审批卡片带「同意 / 拒绝」**：与审批卡片的「允许一次 / 拒绝」等价，桌面端也能用（不依赖 Service Worker）；点卡片正文则切回对应对话；
 - **停留时间**：普通提醒 5 秒自动收起，带「同意 / 拒绝」的审批卡片 12 秒，系统通知同档（普通 5 秒、带按钮 12 秒）；也可以点卡片或右上角叉提前关掉。最多同时叠 4 张；
-- **与系统通知的关系**：二选一。以前两个开关可以同开，结果同一条提醒弹两遍、还互相挡住，1.10.0 起改成单选。老配置里开着浮层的，升级后自动落到浮层。
+- **与系统通知的关系**：二选一。以前两个开关可以同开，结果同一条提醒弹两遍、还互相挡住；1.10.0 起改成单选，1.10.2 起做成一行分段选择器。老配置里开着浮层的，升级后自动落到浮层。
 
 浮层只知道窗口在哪块屏，不知道你人在看哪块屏。窗口留在主屏、人却盯着副屏时，它同样看不见。
 

package/lib/client.js

@@ -1964,7 +1964,7 @@
       });
     } catch (e) {}
     // keep in sync with package.json "version" on every release
-    api.version = "1.10.1";
+    api.version = "1.10.2";
     api.setConfig = function (patch) { return setConfigLocal(patch); };
     api.resetConfig = function () {
       try {
@@ -2183,7 +2183,10 @@
       bridgeOffTail: "）：审批通知会退回不带按钮的普通样式。",
       bridgeOffDesktop: "系统通知没有「同意 / 拒绝」按钮：桌面端页面（dsh-app://）注册不了 Service Worker（宿主少给 allowServiceWorkers 特权），按钮发不出来。想一键裁决就把「提醒方式」切到「页面浮层」。",
       overlay: "页面浮层提醒",
-      overlayHint: "在窗口角落画提醒卡片：窗口在哪块屏，它就在哪块屏；系统通知只会出现在主屏，主屏不看时用它。不需要通知权限，卡片上能直接「同意 / 拒绝」。与上面二选一，选它就不再弹系统通知。",
+      overlayHint: "在窗口角落画提醒卡片：窗口在哪块屏，它就在哪块屏；系统通知只会出现在主屏，主屏不看时用它。不需要通知权限，卡片上能直接「同意 / 拒绝」。与系统通知二选一。",
+    channelLabel: "通知类型",
+    overlaySeg: "浮层提醒",
+    channelHint: "系统通知只会出现在主屏，进通知中心要权限，桌面端也没有「同意 / 拒绝」按钮；页面浮层画在 DSH 窗口所在的那块屏，不需要权限，卡片上能直接裁决。两个只能选一个。",
       overlayCorner: "浮层位置",
       overlayCornerHint: "贴在 DSH 窗口的哪个角；窗口在哪块屏，浮层就出现在哪块屏。",
       overlayPosTR: "右上",
@@ -2310,7 +2313,10 @@
       bridgeOffTail: "); approval toasts fall back to their plain form.",
       bridgeOffDesktop: "System notifications carry no Approve / Reject buttons: dsh-app:// pages cannot register a Service Worker (the shell does not grant the allowServiceWorkers privilege), so the buttons cannot be attached. Switch the alert channel to the in-page overlay to settle approvals in one click.",
       overlay: "In-page overlay",
-      overlayHint: "Draw a card in the window corner, on whatever display the window sits on. System notifications only land on the primary display. No permission needed, and the card carries Approve / Reject directly. Pick this or the system notification above: choosing it stops system notifications.",
+      overlayHint: "Draw a card in the window corner, on whatever display the window sits on. System notifications only ever show on the primary display. No permission needed, and the card carries Approve / Reject directly. It replaces system notifications rather than adding to them.",
+    channelLabel: "Alert type",
+    overlaySeg: "Overlay",
+    channelHint: "System notifications land in the Windows notification center: permission needed, primary display only, and no Approve / Reject buttons on the Desktop shell. The in-page overlay draws on whichever display the DSH window sits on, needs no permission, and lets the Desktop shell decide right on the card. Pick one.",
       overlayCorner: "Overlay position",
       overlayCornerHint: "Which corner of the DSH window the cards stack in; they follow the window to whatever display it is on.",
       overlayPosTR: "Top right",
@@ -2448,8 +2454,11 @@
       ".dnm-knob{position:absolute;top:2px;left:2px;width:14px;height:14px;border-radius:50%;background:#fff;transition:left .15s ease}" +
       ".dnm-switch.on .dnm-knob{left:16px}" +
       ".dnm-radio{flex:none;width:16px;height:16px;margin:0;accent-color:var(--dsw-alias-state-business-primary,#3b82f6);cursor:pointer}" +
-      ".dnm-rowRadio{justify-content:flex-start;gap:10px}" +
-      ".dnm-rowRadio .dnm-rowText{flex:1}" +
+      ".dnm-seg{display:inline-flex;flex:none;border:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.35));border-radius:8px;overflow:hidden}" +
+      ".dnm-segBtn{height:28px;padding:0 12px;border:0;background:transparent;color:var(--dsw-alias-label-secondary,rgba(90,90,90,.95));font:inherit;font-size:12px;line-height:28px;cursor:pointer;white-space:nowrap}" +
+      ".dnm-segBtn+.dnm-segBtn{border-left:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.35))}" +
+      ".dnm-segBtn:hover{color:var(--dsw-alias-label-primary,rgba(20,20,20,.9))}" +
+      ".dnm-segBtn.on{background:var(--dsw-alias-state-business-primary,#3b82f6);color:#fff}" +
       ".dnm-range{width:150px;accent-color:var(--dsw-alias-state-business-primary,#3b82f6)}" +
       ".dnm-select{border:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.4));background:var(--dsw-alias-bg-layer-1,rgba(255,255,255,.03));color:var(--dsw-alias-label-primary,rgba(20,20,20,.9));border-radius:8px;padding:5px 8px;font-size:13px;font-family:inherit}" +
       ".dnm-btn{border:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.4));background:transparent;color:var(--dsw-alias-label-primary,rgba(20,20,20,.9));border-radius:8px;padding:5px 12px;font-size:13px;cursor:pointer;font-family:inherit}" +
@@ -2912,24 +2921,27 @@
       function secTitle(labelText) {
         return h("div", { className: "dnm-secTitle" }, labelText);
       }
-      // One channel at a time, so the pair renders as radios, not switches. The
-      // radio sits ahead of the label: two rows sharing one choice read as a
-      // list of options, which a lone dot on the far right does not.
-      function rowRadio(labelText, hintText, checked, onChange) {
-        var pick = function () { if (!checked) onChange(); };
-        return tipRow("dnm-row dnm-rowRadio", hintText, [
-          h("input", {
-            type: "radio",
-            className: "dnm-radio",
-            name: "dnm-alert-channel",
-            checked: !!checked,
-            "aria-label": labelText,
-            onChange: pick,
-            onClick: pick
-          }),
+      // One channel at a time. A pair of radios read as two unrelated dots, so
+      // the choice is a segmented control: the filled half is the active option.
+      function segButton(labelText, checked, onPick) {
+        return h("button", {
+          type: "button",
+          role: "radio",
+          "aria-checked": checked ? "true" : "false",
+          "aria-label": labelText,
+          className: "dnm-segBtn" + (checked ? " on" : ""),
+          onClick: function () { if (!checked) onPick(); }
+        }, labelText);
+      }
+      function rowChannel(labelText, hintText, current, onPick) {
+        return tipRow("dnm-row", hintText, [
           h("div", { className: "dnm-rowText" }, [
             h("div", { className: "dnm-rowLabel" }, labelText),
             srOnly(hintText)
+          ]),
+          h("div", { className: "dnm-seg", role: "radiogroup", "aria-label": labelText }, [
+            segButton(t("toast"), current !== "overlay", function () { onPick("toast"); }),
+            segButton(t("overlaySeg"), current === "overlay", function () { onPick("overlay"); })
           ])
         ]);
       }
@@ -2971,10 +2983,9 @@
           opts.valueText ? h("span", { className: "dnm-rowValue" }, opts.valueText) : null,
           h("span", { className: "dnm-chev" }, open ? "▾" : "▸")
         ]);
-        var row = tipRow(opts.rowClass || "dnm-row", opts.hintText, [
-          h("div", { className: "dnm-rowText" }, [label, srOnly(opts.hintText)]),
-          opts.control
-        ]);
+        var kids = [h("div", { className: "dnm-rowText" }, [label, srOnly(opts.hintText)])];
+        if (opts.control) kids.push(opts.control);
+        var row = tipRow(opts.rowClass || "dnm-row", opts.hintText, kids);
         return open ? [row, opts.sub] : [row];
       }
       var testRow = tipRow("dnm-row dnm-rowStack", t("testHint"), [
@@ -3004,22 +3015,13 @@
             patch({ enabled: v });
             if (!v && attentionActive > 0) { attentionActive = 0; applyTitle(); }
           }),
-          rowRadio(t("toast"), toastHintText(), cfg.channel !== "overlay", function () { patch({ channel: "toast" }); }),
+          rowChannel(t("channelLabel"), t("channelHint"), cfg.channel, function (next) { patch({ channel: next }); }),
           cfg.channel === "overlay" ? discloseRow({
             key: "overlayCorner",
-            rowClass: "dnm-row dnm-rowRadio",
-            labelText: t("overlay"),
-            hintText: t("overlayHint"),
+            rowClass: "dnm-row dnm-rowSub",
+            labelText: t("overlayCorner"),
+            hintText: t("overlayCornerHint"),
             valueText: t("overlayPos" + ({ "top-right": "TR", "bottom-right": "BR", "top-left": "TL", "bottom-left": "BL" })[overlayCorner()] || "BR"),
-            control: h("input", {
-              type: "radio",
-              className: "dnm-radio",
-              name: "dnm-alert-channel",
-              checked: true,
-              "aria-label": t("overlay") + " " + t("overlayCorner"),
-              onChange: function () {},
-              onClick: function () {}
-            }),
             sub: tipRow("dnm-row dnm-rowSub", t("overlayCornerHint"), [
               h("div", { className: "dnm-rowText" }, [
                 h("div", { className: "dnm-rowLabel" }, t("overlayCorner")),
@@ -3037,7 +3039,7 @@
                 h("option", { value: "bottom-left" }, t("overlayPosBL"))
               ])
             ])
-          }) : rowRadio(t("overlay"), t("overlayHint"), false, function () { patch({ channel: "overlay" }); }),
+          }) : null,
           cfg.sound ? discloseRow({
             key: "volume",
             labelText: t("sound"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-notify-me",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "离开 DSH 页面也能收到提醒：需要你操作 / 后台回复完成时发系统通知、标题标记与可选页面浮层（副屏也能看见），支持审批快捷裁决与外部推送。Brand icon and a reworked settings page in 1.9.0.",
   "license": "MIT",
   "type": "module",