@objectivex666/dsh-settings-search 1.9.0 → 1.10.0

package/README.en.md

@@ -6,6 +6,7 @@
 [![license](https://img.shields.io/npm/l/@objectivex666/dsh-settings-search)](./LICENSE)
 [![node](https://img.shields.io/node/v/@objectivex666/dsh-settings-search)](https://nodejs.org)
 [![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
+[![Listed on dsh-plugin.org](https://dsh-plugin.org/badges/listed.svg)](https://dsh-plugin.org/plugins/objectivex666/dsh-settings-search)
 
 **English** · [中文](./README.md)
 
@@ -14,7 +15,8 @@
 ## Features
 
 - 🔍 **Live search** — a search box in the settings panel filters every registered settings page (`settings.section`) and general item (`settings.general.item`) as you type.
-- 🧩 **Four search styles (v1.9.0)** — choose the classic sidebar, window top bar, popup search page, or a mixed window top bar plus popup page layout. The choice is saved in the current browser.
+- 🧩 **Three search styles** — choose the classic sidebar, window top bar, or popup search page. The choice is saved in the current browser.
+- ⌨️ **Search shortcut (v1.10.0)** — focus the search box with `Ctrl+F` or `⌘F` inside the settings panel. You can enable or disable it from the "Settings Search" page; disabling keeps the browser's default find behavior.
 - 🤝 **Import DSH model config (v1.9.0)** — import the Base URL and model name from DSH's current default model in the AI config section. For credential safety, the API key is never imported.
 - 🎯 **First-run onboarding (v1.9.0)** — a welcome modal appears only the first time the settings panel opens after installation. It introduces the four search styles, pinyin/intent/AI hints, click-to-jump, and auto-indexing; there are no "Don't show again" or manual reopen buttons.
 - 📂 **In-page option search (v1.2.0)** — search beyond pages and reach the specific options inside them: Plugins-page tabs (`settings.plugins.tab`), Web UI plugin cards (`web-ui.plugin.item`), general rows, and more, each shown with a "page › option" breadcrumb.

package/README.md

@@ -6,6 +6,7 @@
 [![license](https://img.shields.io/npm/l/@objectivex666/dsh-settings-search)](./LICENSE)
 [![node](https://img.shields.io/node/v/@objectivex666/dsh-settings-search)](https://nodejs.org)
 [![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)
+[![Listed on dsh-plugin.org](https://dsh-plugin.org/badges/listed.svg)](https://dsh-plugin.org/plugins/objectivex666/dsh-settings-search)
 
 **中文** · [English](./README.en.md)
 
@@ -14,7 +15,8 @@
 ## 功能特性
 
 - 🔍 **实时搜索**：在设置面板中嵌入搜索框，输入关键词立即过滤所有已注册的设置页（`settings.section`）与通用设置项（`settings.general.item`）。
-- 🧩 **四种搜索样式（v1.9.0）**：可选择经典侧栏、窗口顶栏、弹出搜索页，或“窗口顶栏 + 弹出搜索页”混合模式；选择会保存在当前浏览器。
+- 🧩 **三种搜索样式**：可选择经典侧栏、窗口顶栏或弹出搜索页；选择会保存在当前浏览器。
+- ⌨️ **搜索快捷键（v1.10.0）**：在设置面板内按 `Ctrl+F` 或 `⌘F` 聚焦搜索框；可在「设置搜索」页启用或关闭，关闭后保留浏览器默认查找。
 - 🤝 **导入 DSH 模型配置（v1.9.0）**：在 AI 配置区一键读取 DSH 当前默认模型的 Base URL 与模型名；为避免凭据扩散，导入始终不包含 API Key。
 - 🎯 **新用户引导（v1.9.0）**：仅在安装后首次打开设置面板时弹出引导弹窗，介绍四种搜索样式、拼音/意图/AI 联想、点击即达与自动导入索引等核心功能；不再提供“不再显示”和手动重开按钮。
 - 📂 **页内选项搜索（v1.2.0）**：不只搜页面，还能直达每个设置页内部的具体选项——插件页的标签页（`settings.plugins.tab`）、Web UI 插件的卡片（`web-ui.plugin.item`）、通用设置行等，结果以「页面 › 选项」面包屑展示。

package/lib/client.js

@@ -30,7 +30,7 @@ window.__ModuleLoader__.load({
 
     const NS = 'settings-search-v5'
     /** Single source of truth is package.json — scripts/check.mjs asserts this matches. */
-    const PKG_VERSION = '1.9.0'
+    const PKG_VERSION = '1.10.0'
     const NPM_NAME = '@objectivex666/dsh-settings-search'
     const zh = {
       title: '设置',
@@ -41,8 +41,9 @@ window.__ModuleLoader__.load({
       styleClassic: '经典侧栏',
       styleTop: '窗口顶栏',
       stylePage: '弹出搜索页',
-      styleMixed: '顶栏 + 搜索页',
       openSearch: '打开搜索',
+      shortcutTitle: 'Ctrl+F / ⌘F 快捷键',
+      shortcutHint: '在设置面板内按 Ctrl+F 或 ⌘F 聚焦搜索框；关闭后保留浏览器默认查找。',
       warming: '正在导入各分区选项…',
       empty: '没有匹配的设置',
       pages: '设置页',
@@ -128,7 +129,7 @@ window.__ModuleLoader__.load({
       wlTitle: '欢迎使用设置搜索',
       wlSubtitle: '为 DSH 设置面板提供即时搜索与导航，几秒钟就能找到任何设置。',
       wlFeature1Title: '实时搜索',
-      wlFeature1Desc: '支持经典侧栏、窗口顶栏、弹出搜索页与顶栏加搜索页混合模式；输入关键词即可过滤设置。',
+      wlFeature1Desc: '支持经典侧栏、窗口顶栏与弹出搜索页；输入关键词即可过滤设置。',
       wlFeature2Title: '拼音与意图联想',
       wlFeature2Desc: '输入拼音首字母（如 sz）或直接描述需求（如「太亮」），也能联想设置项。',
       wlFeature3Title: 'AI 联想（可选）',
@@ -151,8 +152,9 @@ window.__ModuleLoader__.load({
       styleClassic: 'Classic sidebar',
       styleTop: 'Top bar',
       stylePage: 'Popup page',
-      styleMixed: 'Top bar + popup',
       openSearch: 'Open search',
+      shortcutTitle: 'Ctrl+F / ⌘F shortcut',
+      shortcutHint: 'Focus the search box with Ctrl+F or ⌘F inside the settings panel; turn it off to keep the browser default.',
       warming: 'Importing section options…',
       empty: 'No matching settings',
       pages: 'Settings pages',
@@ -238,7 +240,7 @@ window.__ModuleLoader__.load({
       wlTitle: 'Welcome to Settings Search',
       wlSubtitle: 'Instant search and navigation for the DSH settings panel — find any setting in seconds.',
       wlFeature1Title: 'Instant search',
-      wlFeature1Desc: 'Choose classic sidebar, top bar, popup page, or mixed top bar plus popup search; typing filters settings.',
+      wlFeature1Desc: 'Choose classic sidebar, top bar, or popup search page; typing filters settings.',
       wlFeature2Title: 'Pinyin & intent hints',
       wlFeature2Desc: 'Type pinyin initials (e.g. sz) or describe what you want to do to find settings.',
       wlFeature3Title: 'AI hints (optional)',
@@ -514,7 +516,9 @@ window.__ModuleLoader__.load({
     const WELCOME_EVENT = 'dsh-settings-search:welcome'
     const SEARCH_STYLE_KEY = 'dsh-settings-search:style'
     const SEARCH_STYLE_EVENT = 'dsh-settings-search:style-change'
-    const SEARCH_STYLES = ['sidebar', 'top', 'page', 'mixed']
+    const SEARCH_SHORTCUT_KEY = 'dsh-settings-search:shortcut-enabled'
+    const SEARCH_SHORTCUT_EVENT = 'dsh-settings-search:shortcut-change'
+    const SEARCH_STYLES = ['sidebar', 'top', 'page']
     const readSearchStyle = () => {
       if (typeof localStorage === 'undefined') return 'sidebar'
       const style = localStorage.getItem(SEARCH_STYLE_KEY)
@@ -525,6 +529,15 @@ window.__ModuleLoader__.load({
       localStorage.setItem(SEARCH_STYLE_KEY, style)
       window.dispatchEvent(new CustomEvent(SEARCH_STYLE_EVENT, { detail: style }))
     }
+    const searchShortcutEnabled = () => {
+      if (typeof localStorage === 'undefined') return true
+      return localStorage.getItem(SEARCH_SHORTCUT_KEY) !== '0'
+    }
+    const setSearchShortcutEnabled = (enabled) => {
+      if (typeof localStorage === 'undefined') return
+      localStorage.setItem(SEARCH_SHORTCUT_KEY, enabled ? '1' : '0')
+      window.dispatchEvent(new CustomEvent(SEARCH_SHORTCUT_EVENT, { detail: enabled }))
+    }
     const welcomed = () => {
       if (typeof localStorage === 'undefined') return true
       return localStorage.getItem(ONBOARD_KEY) === '1'
@@ -630,6 +643,7 @@ window.__ModuleLoader__.load({
           method: 'POST',
           headers,
           signal,
+          redirect: 'error',
           body: JSON.stringify(body),
         })
         if (!response.ok) throw new Error(`HTTP ${response.status}`)
@@ -716,6 +730,7 @@ window.__ModuleLoader__.load({
         const response = await fetch(requestUrl, {
           method: 'POST',
           headers,
+          redirect: 'error',
           body: JSON.stringify(body),
         })
         if (!response.ok) return { ok: false, code: testHttpCode(response.status), detail: `HTTP ${response.status}` }
@@ -795,7 +810,6 @@ window.__ModuleLoader__.load({
       .sss-page-results { flex: 1; min-height: 0; overflow: auto; padding: 8px; }
       .sss-page-results .sss-group { padding: 2px; }
       .sss-page-results .sss-item { padding: 10px 8px; border-radius: 8px; }
-      .sss-mixed-title { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--dsw-alias-label-primary); font-size: 16px; line-height: 24px; }
       @keyframes sssFlashBg { 0% { background-color: var(--dsw-alias-interactive-bg-hover); } 100% { background-color: transparent; } }
       .sss-flash { animation: sssFlashBg 1.8s ease-out; border-radius: 8px; }
       .sss-vr { list-style: none; border: 1px solid var(--dsw-alias-border-l2); background: var(--dsw-alias-bg-layer-3); border-radius: 12px; max-width: 780px; width: 100%; box-sizing: border-box; transition: border-color .16s, background .16s; }
@@ -1225,9 +1239,16 @@ window.__ModuleLoader__.load({
 
     /* ---------- DOM-level navigation into the settings shell ---------- */
 
-    /** Root element that hosts the settings panel's nav buttons. */
+    /**
+     * Root element that hosts the settings panel's nav buttons. Derived from
+     * the plugin's own mounted UI so an unrelated or plugin-owned dialog can
+     * never become the click root; the first-dialog fallback only applies
+     * when the plugin's anchors are not mounted.
+     */
     const panelRoot = () => {
       if (typeof document === 'undefined') return null
+      const anchor = document.querySelector('.sss-wrap, .sss-vr')
+      if (anchor) return anchor.closest('[role="dialog"]') ?? document.body
       return document.querySelector('[role="dialog"]') ?? document.body
     }
     const panelButtons = () => {
@@ -1237,7 +1258,7 @@ window.__ModuleLoader__.load({
     const clickNavButton = (wantText) => {
       const want = String(wantText ?? '').trim()
       if (want === '') return false
-      const buttons = panelButtons()
+      const buttons = panelButtons().filter((b) => /_navCell/.test(String(b.className || '')))
       const textOf = (b) => (b.textContent ?? '').trim()
       const hit = buttons.find((b) => textOf(b) === want)
       if (!hit) return false
@@ -1477,6 +1498,7 @@ window.__ModuleLoader__.load({
         const [open, setOpen] = React.useState(false)
         const [searchStyle, setSearchStyleState] = React.useState(readSearchStyle)
         const [pageOpen, setPageOpen] = React.useState(false)
+        const [shortcutEnabled, setShortcutEnabled] = React.useState(searchShortcutEnabled)
         const [showWelcome, setShowWelcome] = React.useState(() => !welcomed())
         const [tick, setTick] = React.useState(0)
         const [warming, setWarming] = React.useState(false)
@@ -1555,6 +1577,21 @@ window.__ModuleLoader__.load({
           return () => window.removeEventListener(SEARCH_STYLE_EVENT, sync)
         }, [])
 
+        // A style switch must not carry an open popup from the previous layout
+        // into the new one. The host can keep this component mounted while the
+        // settings choice changes, so reset transient view state explicitly.
+        React.useEffect(() => {
+          setOpen(false)
+          setPageOpen(false)
+          setHint(null)
+        }, [searchStyle])
+
+        React.useEffect(() => {
+          const sync = () => setShortcutEnabled(searchShortcutEnabled())
+          window.addEventListener(SEARCH_SHORTCUT_EVENT, sync)
+          return () => window.removeEventListener(SEARCH_SHORTCUT_EVENT, sync)
+        }, [])
+
         React.useEffect(() => {
           const sync = () => setAiEnabled(aiSearchEnabled())
           const onConfig = () => forceTick()
@@ -1670,8 +1707,7 @@ window.__ModuleLoader__.load({
         const popRef = React.useRef(null)
         const inputRef = React.useRef(null)
         const pageMode = searchStyle === 'page'
-        const mixedMode = searchStyle === 'mixed'
-        const topMode = searchStyle === 'top' || mixedMode
+        const topMode = searchStyle === 'top'
         const activeIndex = Math.min(active, Math.max(results.length - 1, 0))
 
         React.useEffect(() => { setActive(0) }, [query])
@@ -1680,6 +1716,23 @@ window.__ModuleLoader__.load({
           const timer = setTimeout(() => inputRef.current?.focus(), 0)
           return () => clearTimeout(timer)
         }, [pageMode, pageOpen])
+        React.useEffect(() => {
+          if (!shortcutEnabled) return
+          const onKeyDown = (event) => {
+            if (!event.ctrlKey && !event.metaKey) return
+            if (event.altKey || event.shiftKey || event.key !== 'f' && event.key !== 'F') return
+            event.preventDefault()
+            if (pageMode) {
+              setPageOpen(true)
+              return
+            }
+            setHint(null)
+            setOpen(true)
+            inputRef.current?.focus()
+          }
+          window.addEventListener('keydown', onKeyDown)
+          return () => window.removeEventListener('keydown', onKeyDown)
+        }, [pageMode, shortcutEnabled])
         React.useEffect(() => {
           const el = popRef.current?.querySelector('.sss-item.is-active')
           el?.scrollIntoView?.({ block: 'nearest' })
@@ -1812,12 +1865,12 @@ window.__ModuleLoader__.load({
               const item = results[activeIndex]
               if (item) { e.preventDefault(); pick(item) }
             } else if (e.key === 'Escape') {
-              if (pageMode || mixedMode) setPageOpen(false)
+              if (pageMode) setPageOpen(false)
               else setOpen(false)
             }
           },
-          onChange: (e) => { setQuery(e.target.value); setHint(null); setOpen(true); if (mixedMode) setPageOpen(true) },
-          onFocus: () => { setOpen(true); if (mixedMode) setPageOpen(true) },
+          onChange: (e) => { setQuery(e.target.value); setHint(null); setOpen(true) },
+          onFocus: () => setOpen(true),
           onBlur: () => setOpen(false),
         })
         const clearButton = query !== '' ? React.createElement('button', {
@@ -1912,44 +1965,11 @@ window.__ModuleLoader__.load({
                 clearButton,
               ]),
               warming ? React.createElement('p', { className: 'sss-warm-note' }, t('warming')) : null,
-              !mixedMode && open && q !== '' ? React.createElement('div', { className: 'sss-pop', ref: popRef }, [resultsNode]) : null,
-              !mixedMode && hint !== null
+              open && q !== '' ? React.createElement('div', { className: 'sss-pop', ref: popRef }, [resultsNode]) : null,
+              hint !== null
                 ? React.createElement('div', { className: 'sss-guide' }, t('jumpFail').replace('{path}', hint))
                 : null,
             ]),
-            mixedMode && pageOpen
-              ? React.createElement('div', {
-                  className: 'sss-page-overlay',
-                  onMouseDown: (event) => { if (event.target === event.currentTarget) setPageOpen(false) },
-                }, [
-                  React.createElement('div', { className: 'sss-page' }, [
-                    React.createElement('div', { className: 'sss-page-head' }, [
-                      React.createElement('button', {
-                        className: 'sss-icon-btn',
-                        type: 'button',
-                        'aria-label': t('searchBtn'),
-                        title: t('searchBtn'),
-                        onClick: () => inputRef.current?.focus(),
-                      }, [SearchIcon]),
-                      React.createElement('span', { className: 'sss-page-input sss-mixed-title' }, t('pageSearchTitle')),
-                      clearButton,
-                      React.createElement('button', {
-                        className: 'sss-page-close',
-                        type: 'button',
-                        'aria-label': 'Close',
-                        onClick: () => setPageOpen(false),
-                      }, '✕'),
-                    ]),
-                    React.createElement('div', { className: 'sss-page-results' }, [
-                      warming ? React.createElement('p', { className: 'sss-warm-note' }, t('warming')) : null,
-                      q !== '' ? resultsNode : null,
-                      hint !== null
-                        ? React.createElement('div', { className: 'sss-guide' }, t('jumpFail').replace('{path}', hint))
-                        : null,
-                    ]),
-                  ]),
-                ])
-              : null,
           ])
         }
 
@@ -1998,6 +2018,7 @@ window.__ModuleLoader__.load({
       function UpdatePanel() {
         const [open, setOpen] = React.useState(true)
         const [searchStyle, setSearchStyleState] = React.useState(readSearchStyle)
+        const [shortcutOn, setShortcutOn] = React.useState(searchShortcutEnabled)
         const [state, setState] = React.useState('idle') // idle | loading | newest | outdated | error
         const [latest, setLatest] = React.useState('')
         const [copied, setCopied] = React.useState(false)
@@ -2035,6 +2056,12 @@ window.__ModuleLoader__.load({
           return () => window.removeEventListener(SEARCH_STYLE_EVENT, sync)
         }, [])
 
+        React.useEffect(() => {
+          const sync = () => setShortcutOn(searchShortcutEnabled())
+          window.addEventListener(SEARCH_SHORTCUT_EVENT, sync)
+          return () => window.removeEventListener(SEARCH_SHORTCUT_EVENT, sync)
+        }, [])
+
         useAutoReset(copied, () => { setCopied(false); setCopyFailed(false) })
         useAutoReset(aiSaved, () => setAiSaved(false))
 
@@ -2086,6 +2113,12 @@ window.__ModuleLoader__.load({
           setSearchStyleState(style)
         }
 
+        const updateShortcutEnabled = (enabled) => {
+          setSearchShortcutEnabled(enabled)
+          setShortcutOn(enabled)
+          log('info', enabled ? '启用搜索快捷键' : '禁用搜索快捷键', {})
+        }
+
         const requestClearAi = () => setConfirmClearAi(true)
         const cancelClearAi = () => setConfirmClearAi(false)
         const clearAiConfig = () => {
@@ -2268,11 +2301,6 @@ window.__ModuleLoader__.load({
                   type: 'button',
                   onClick: () => updateSearchStyle('page'),
                 }, t('stylePage')),
-                React.createElement('button', {
-                  className: 'sss-vr-seg' + (searchStyle === 'mixed' ? ' is-active' : ''),
-                  type: 'button',
-                  onClick: () => updateSearchStyle('mixed'),
-                }, t('styleMixed')),
               ]),
             ]),
             React.createElement('div', { className: 'sss-vr-field' }, [
@@ -2292,6 +2320,18 @@ window.__ModuleLoader__.load({
               React.createElement('p', { className: 'sss-vr-hint' }, t('aiDesc')),
               React.createElement('p', { className: 'sss-vr-hint' }, t('aiPrivacy')),
             ]),
+            React.createElement('div', { className: 'sss-vr-field' }, [
+              React.createElement('div', { className: 'sss-vr-field-head' }, [
+                React.createElement('span', { className: 'sss-vr-label' }, t('shortcutTitle')),
+                React.createElement('input', {
+                  className: 'sss-vr-check',
+                  type: 'checkbox',
+                  checked: shortcutOn,
+                  onChange: (event) => updateShortcutEnabled(event.target.checked),
+                }),
+              ]),
+              React.createElement('p', { className: 'sss-vr-hint' }, t('shortcutHint')),
+            ]),
             React.createElement('div', { className: 'sss-vr-field sss-vr-form' }, [
               React.createElement('div', { className: 'sss-vr-field-head' }, [
                 React.createElement('label', { className: 'sss-vr-label' }, t('aiProvider')),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectivex666/dsh-settings-search",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "DSH settings panel search plugin – instantly filter setting sections and general items with navigation guidance. Installable via `dsh plugin add`.",
   "keywords": [
     "dsh",