dsh-workspace-session-filter 1.0.5 → 1.0.7

package/README.md

@@ -6,7 +6,8 @@
 
 1. **侧边栏底部的筛选条** —— 设置按钮上方单独一行，`运行中` / `待确认` / `未读` 三个
    chip（各自带命中数）。点一下向上弹出按工作区分组的会话列表，点行直接进会话，是日常主入口；
-2. 侧边栏面板列表里的「会话筛选」图标 —— 打开中间栏的完整视图，顶部是
+2. 侧边栏面板列表里的「会话筛选」图标（**默认不显示**）—— 在
+   `设置 → 插件 → 会话筛选` 里打开开关后出现，指向中间栏的完整视图，顶部是
    `全部 / 运行中 / 等待确认 / 未读 / 更多` 筛选器，`更多` 里是 `最近一天 / 最近三天 /
    最近一周 / 最近一个月`（外加 `不限时间`）。
 
@@ -80,11 +81,12 @@ dsh plugin --profile desktop remove dsh-workspace-session-filter
 装好后：
 
 - 侧边栏**底部**（设置按钮上方、单独一行）出现 `运行中 N` / `待确认 N` / `未读 N` 筛选条；
-- 侧边栏面板列表里出现「会话筛选」图标，指向中间栏的完整视图。
+- 面板列表里**不会**自动多出图标；需要完整视图时，到
+  `设置 → 插件 → 会话筛选` 打开「在左侧导航显示」，图标才出现（开关状态存本地，刷新后保留）。
 
 卸载：`plugin_manager({ action: "remove_bundle", target: "dsh-workspace-session-filter" })`。
 
-> 包名 `dsh-workspace-session-filter` 与仓库同名。截至 1.0.3，npm registry、
+> 包名 `dsh-workspace-session-filter` 与仓库同名。截至 1.0.7，npm registry、
 > GitHub、release tarball、本地目录四种来源都能装；registry 上是 `npm publish` 发出的
 > 正式版本，`repository` 字段指回本仓库。
 
@@ -92,7 +94,7 @@ dsh plugin --profile desktop remove dsh-workspace-session-filter
 
 | 文件 | 作用 |
 | --- | --- |
-| `client.js` | 全部界面逻辑：字典、图标、底部筛选条 + 面板 + 侧边栏图标三个 slot 注册、内联样式 |
+| `client.js` | 全部界面逻辑：字典、图标、底部筛选条 / 面板 / 设置页三处注册 + 按开关动态注册的侧边栏图标、内联样式 |
 | `index.js` | Host 半边（本插件不需要 Host 能力，留空） |
 | `cordis.patch.yml` | 把 `session-filter` 条目插入 profile 组合 |
 | `package.json` | 包元信息 + `dsh.client` / `dsh.bundle` 声明 |
@@ -104,6 +106,10 @@ dsh plugin --profile desktop remove dsh-workspace-session-filter
 - **面板落位**：`sidebar.panellist` 的 `id` 与 `main` 的 `key` 复用同一个字符串
   `session-filter`，侧边栏图标因此直接指向本面板；`order: 30` 排在插件、定时任务、
   上下文之后。
+- **导航图标可关**：开关出现在两处 —— `设置 → 内置插件 → 会话筛选` 标签页，以及底部筛选条
+  弹出的列表页脚（不打开设置也能拨）；
+  偏好存 `localStorage`（键 `dsh-workspace-session-filter:nav.v1`，默认关），
+  开关变化时**注销/重建** `sidebar.panellist` 注册，因此关掉时不会留下一个空图标位。
 - **筛选条落位**：注册在 `sidebar.footer.action`（设置按钮上方的一行槽位），整条占满宽度；
   弹层用 `position: fixed` 贴在 chip 上方（`bottom: innerHeight - rect.top + 8`），因为侧边栏
   容器 `overflow` 会裁掉绝对定位的浮层。宽版渲染三个 chip，窄条（`wide: false`）渲染一个

package/client.js

@@ -31,6 +31,8 @@ window.__ModuleLoader__.load({
       'filter.awaiting': '等待确认',
       'filter.awaitingShort': '待确认',
       'filter.unread': '未读',
+      'settings.nav': '在左侧导航显示',
+      'settings.navHint': '打开后左侧导航多一个「会话筛选」入口，可打开完整筛选面板；关闭时侧边栏底部的筛选条照常可用。',
       'filter.more': '更多',
       'filter.reset': '清除筛选',
       'filter.aria': '会话筛选条件',
@@ -70,6 +72,8 @@ window.__ModuleLoader__.load({
       'filter.awaiting': 'Awaiting confirmation',
       'filter.awaitingShort': 'Awaiting',
       'filter.unread': 'Unread',
+      'settings.nav': 'Show in the left navigation',
+      'settings.navHint': 'Adds a Session filter entry to the left navigation that opens the full panel. The filter bar at the foot of the sidebar keeps working either way.',
       'filter.more': 'More',
       'filter.reset': 'Clear filters',
       'filter.aria': 'Session filters',
@@ -232,6 +236,55 @@ window.__ModuleLoader__.load({
       }
     }
 
+    /* ---------------------------- navigation toggle --------------------------- *
+     * The left-nav icon is opt-in: the sidebar already carries four panel cells and
+     * most visits start at the sidebar-foot bar. The preference shares the same
+     * localStorage store as the seen stamps, and the registration follows it, so a
+     * hidden entry leaves no empty cell behind the panel list.
+     * ------------------------------------------------------------------ */
+    const NAV_KEY = 'dsh-workspace-session-filter:nav.v1'
+    const navState = { value: null, listeners: new Set() }
+
+    function navStorage() {
+      try {
+        return typeof localStorage === 'undefined' ? null : localStorage
+      } catch (error) {
+        return null
+      }
+    }
+
+    function navVisible() {
+      if (navState.value !== null) return navState.value
+      const store = navStorage()
+      let value = false
+      if (store) {
+        try { value = store.getItem(NAV_KEY) === '1' } catch (error) { value = false }
+      }
+      navState.value = value
+      return value
+    }
+
+    function setNavVisible(next) {
+      const value = next === true
+      if (navVisible() === value) return
+      navState.value = value
+      const store = navStorage()
+      if (store) {
+        try {
+          if (value) store.setItem(NAV_KEY, '1')
+          else store.removeItem(NAV_KEY)
+        } catch (error) { /* storage may be full or blocked */ }
+      }
+      for (const listener of Array.from(navState.listeners)) {
+        try { listener(value) } catch (error) { console.error('[workspace-session-filter] nav listener failed', error) }
+      }
+    }
+
+    function subscribeNav(listener) {
+      navState.listeners.add(listener)
+      return () => { navState.listeners.delete(listener) }
+    }
+
     function loadSeen() {
       if (seenCache.loaded) return seenCache.map
       seenCache.loaded = true
@@ -785,6 +838,10 @@ window.__ModuleLoader__.load({
               view.loading
                 ? h('div', { className: 'dwsf-empty' }, h('div', null, t('empty.loading')))
                 : h(Groups, { view, t, now, onOpen })
+            ),
+            h('div', { className: 'dwsf-popFoot' },
+              h('span', { className: 'dwsf-popFootLabel' }, t('settings.nav')),
+              h(NavSwitch, { t })
             )
           )
         : null
@@ -811,6 +868,44 @@ window.__ModuleLoader__.load({
       return h('div', { ref: rootRef, className: 'dwsf-foot' }, popover, filters)
     }
 
+    /**
+     * The plugin's own page inside Settings → Plugins. One switch owns the
+     * optional left-nav entry; the sidebar-foot filter bar is unaffected.
+     */
+    function NavSwitch(props) {
+      const [on, setOn] = useState(navVisible)
+
+      useEffect(() => subscribeNav((value) => setOn(value)), [])
+
+      return h('button', {
+        type: 'button',
+        role: 'switch',
+        className: 'dwsf-switch',
+        'aria-checked': on ? 'true' : 'false',
+        'aria-label': props.t('settings.nav'),
+        'data-on': on ? 'true' : 'false',
+        onClick: () => setNavVisible(!on),
+      },
+        h('span', { className: 'dwsf-switchTrack', 'data-on': on ? 'true' : 'false', 'aria-hidden': 'true' },
+          h('span', { className: 'dwsf-switchThumb' })
+        )
+      )
+    }
+
+    function SettingsPage(props) {
+      const t = props.t
+
+      return h('div', { className: 'dwsf-settings' },
+        h('div', { className: 'dwsf-settingRow' },
+          h('div', { className: 'dwsf-settingCopy' },
+            h('span', { className: 'dwsf-settingLabel' }, t('settings.nav')),
+            h('span', { className: 'dwsf-settingHint' }, t('settings.navHint'))
+          ),
+          h(NavSwitch, { t })
+        )
+      )
+    }
+
     /** Sidebar entry: guards the standard hooks and keeps a crash out of the sidebar. */
     function FooterEntry(props) {
       const ready = typeof props.useSessions === 'function'
@@ -919,7 +1014,20 @@ window.__ModuleLoader__.load({
 .dwsf-footRailButton:hover,.dwsf-footRailButton[data-active="true"]{background:var(--dsw-alias-interactive-bg-hover)}
 .dwsf-footRailButton:focus-visible{outline:var(--dsw-focus-ring-width,2px) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:-2px}
 .dwsf-footBadge{position:absolute;top:4px;right:2px;min-width:15px;height:15px;padding:0 3px;border-radius:999px;background:var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-label-primary-inverted);font-size:9px;line-height:15px;text-align:center;font-variant-numeric:tabular-nums}
+.dwsf-settings{display:flex;flex-direction:column;gap:8px;color:var(--dsw-alias-label-primary)}
+.dwsf-settingRow{display:flex;align-items:flex-start;justify-content:space-between;gap:16px;padding:12px 14px;border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-1)}
+.dwsf-settingCopy{display:flex;flex-direction:column;gap:2px;min-width:0}
+.dwsf-settingLabel{font-size:13px;line-height:20px}
+.dwsf-settingHint{font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary)}
+.dwsf-switch{flex:none;margin-top:1px;padding:0;border:0;background:0 0;cursor:pointer;border-radius:999px;line-height:0}
+.dwsf-switch:focus-visible{outline:var(--dsw-focus-ring-width,2px) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:2px}
+.dwsf-switchTrack{display:inline-flex;align-items:center;width:34px;height:20px;padding:2px;border-radius:999px;background:var(--dsw-alias-bg-layer-2);box-shadow:inset 0 0 0 .5px var(--dsw-alias-border-l2);transition:background .16s ease,box-shadow .16s ease}
+.dwsf-switchTrack[data-on="true"]{background:var(--dsw-alias-brand-primary);box-shadow:none}
+.dwsf-switchThumb{width:16px;height:16px;border-radius:999px;background:var(--dsw-alias-bg-base);transition:transform .16s ease}
+.dwsf-switchTrack[data-on="true"] .dwsf-switchThumb{transform:translateX(14px)}
 .dwsf-pop{position:fixed;z-index:60;display:flex;flex-direction:column;width:min(340px,calc(100vw - 24px));max-height:60vh;border-radius:12px;background:var(--dsw-specific-menu);backdrop-filter:var(--dsw-menu-backdrop-filter);--dsw-elevation-stroke-color:var(--dsw-alias-border-l1);box-shadow:var(--dsw-elevation-prominent);overflow:hidden}
+.dwsf-popFoot{flex:none;display:flex;align-items:center;justify-content:space-between;gap:12px;padding:8px 12px;border-top:.5px solid var(--dsw-alias-border-l2);font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary)}
+.dwsf-popFootLabel{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dwsf-popHead{flex:none;display:flex;align-items:center;justify-content:space-between;gap:8px;min-height:44px;padding:10px 12px 4px}
 .dwsf-popTitle{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:500;line-height:20px}
 .dwsf-popCount{flex:none;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:16px;font-variant-numeric:tabular-nums}
@@ -986,12 +1094,43 @@ window.__ModuleLoader__.load({
           inject: () => ({ t, onOpen: openSession }),
         }, FooterEntry)), 'workspace-session-filter: sidebar footer')
 
-        ctx.effect(() => ctx.slots.inject('sidebar.panellist', () => ctx.slots.register({
-          name: 'sidebar.panellist',
+        ctx.effect(() => ctx.slots.inject('settings.plugins.tab', () => ctx.slots.register({
+          name: 'settings.plugins.tab',
           id: PANEL_ID,
           order: 30,
           label: () => t('panel.label'),
-        }, PanelGlyph)), 'workspace-session-filter: icon')
+          inject: () => ({ t }),
+        }, SettingsPage)), 'workspace-session-filter: settings page')
+
+        /* The nav entry is opt-in, so its registration is created and dropped while
+         * the page runs instead of being decided once at apply time. */
+        ctx.effect(() => {
+          let dispose = null
+          const sync = () => {
+            if (navVisible() && !dispose) {
+              dispose = ctx.slots.inject('sidebar.panellist', () => ctx.slots.register({
+                name: 'sidebar.panellist',
+                id: PANEL_ID,
+                order: 30,
+                label: () => t('panel.label'),
+              }, PanelGlyph))
+              return
+            }
+            if (!navVisible() && dispose) {
+              dispose()
+              dispose = null
+            }
+          }
+          const off = subscribeNav(sync)
+          sync()
+          return () => {
+            off()
+            if (dispose) {
+              dispose()
+              dispose = null
+            }
+          }
+        }, 'workspace-session-filter: nav icon')
       },
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-workspace-session-filter",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Workspace session filter panel with status and recency filters.",
   "type": "module",
   "exports": {