release: v0.6.0 — 内置解析器迁移 / Toast 全面接入 / Sqlark 深度集成

- 渲染管线迁移至 MetonaEditor 内置解析器,移除 unified/rehype 全家桶(9 个依赖)
- 修复相对路径图片修复的目录前缀碰撞与路径解析 bug
- ConfirmDialog/useConfirm/LoadingSpinner/useDocStats 移除,改用 MeToast.confirm/loading/promise
- 新增状态栏(字数/行数/阅读时间/光标位置)、Zen 模式、数据备份导出导入
- Sqlark: 版本化迁移(addMigration/migrateTo)、subscribe 表变更、备份 exportAll/importTable
- 数据库损坏自愈:异常退出残留残缺 SSTable 导致打开失败时自动重建
- 大纲导航改用 scrollToLine 官方 API
- 修复 rollup 平台包互删(postinstall 自动补齐)+ 集成测试(fake-indexeddb)
This commit is contained in:
thzxx
2026-08-09 16:50:06 +08:00
parent 20eb39efc5
commit ee5f35177e
71 changed files with 4837 additions and 4345 deletions
+34
View File
@@ -0,0 +1,34 @@
import 'fake-indexeddb/auto'
import { create } from '/mnt/d/CodeWorkspace/MarkLite/node_modules/@metona-team/metona-sqlark/dist/metona-sqlark.esm.js'
const DB = 'aria-corrupt-test'
// 1. 正常建库写数据
const db1 = await create({ name: 'corrupt-test', mode: 'aria', diskEngine: 'indexeddb', version: 0 })
await db1.defineTable('recentFiles', { filePath: { type: 'string', primaryKey: true }, lastOpened: { type: 'number' } })
await db1.table('recentFiles').insert({ filePath: '/a.md', lastOpened: 1 })
await db1.close()
// 2. 模拟异常退出留下的残缺 SSTable 页面:直接往 IDB 写一个 10 字节的 pg_ 文件
await new Promise((resolve, reject) => {
const req = indexedDB.open(DB, 1)
req.onsuccess = () => {
const idb = req.result
const tx = idb.transaction('data', 'readwrite')
tx.objectStore('data').put(new ArrayBuffer(10), 'pg_1') // 残缺页面(正常 4096 字节)
tx.oncomplete = () => { idb.close(); resolve() }
tx.onerror = () => reject(tx.error)
}
req.onerror = () => reject(req.error)
})
// 3. 重新打开 → 应该抛 offset is out of bounds
try {
const db2 = await create({ name: 'corrupt-test', mode: 'aria', diskEngine: 'indexeddb', version: 0 })
const rows = await db2.table('recentFiles').select().execute()
console.log('S2 opened OK, rows:', JSON.stringify(rows))
await db2.close()
console.log('NO ERROR — 未能复现')
} catch (e) {
console.log('REPRODUCED:', e.constructor.name, '|', e.message)
}
+41
View File
@@ -0,0 +1,41 @@
import 'fake-indexeddb/auto'
import { create } from '/mnt/d/CodeWorkspace/MarkLite/node_modules/@metona-team/metona-sqlark/dist/metona-sqlark.esm.js'
const DB = 'aria-heal-test'
// 1. 正常建库写数据
const db1 = await create({ name: 'heal-test', mode: 'aria', diskEngine: 'indexeddb', version: 0 })
await db1.defineTable('recentFiles', { filePath: { type: 'string', primaryKey: true }, lastOpened: { type: 'number' } })
await db1.table('recentFiles').insert({ filePath: '/a.md', lastOpened: 1 })
await db1.close()
// 2. 制造损坏:写一个 footer 声称块偏移在 100000 的残缺 sst 文件(data store 里直接塞坏数据)
await new Promise((resolve, reject) => {
const req = indexedDB.open(DB, 1)
req.onsuccess = () => {
const idb = req.result
const tx = idb.transaction('data', 'readwrite')
const store = tx.objectStore('data')
// 残缺 sst:8 字节(正常是 4096 块),meta 记录会声称偏移 4096+
store.put(new ArrayBuffer(8), 'sst_1')
tx.oncomplete = () => { idb.close(); resolve() }
tx.onerror = () => reject(tx.error)
}
req.onerror = () => reject(req.error)
})
// 3. 删除损坏库(模拟自愈,无活动连接时应该成功)
await new Promise((resolve) => {
const req = indexedDB.deleteDatabase(DB)
req.onsuccess = () => { console.log('deleteDatabase OK'); resolve() }
req.onerror = () => { console.log('deleteDatabase error'); resolve() }
req.onblocked = () => { console.log('deleteDatabase BLOCKED'); resolve() }
})
// 4. 重建库成功
const db2 = await create({ name: 'heal-test', mode: 'aria', diskEngine: 'indexeddb', version: 0 })
await db2.defineTable('recentFiles', { filePath: { type: 'string', primaryKey: true }, lastOpened: { type: 'number' } })
await db2.table('recentFiles').insert({ filePath: '/new.md', lastOpened: 2 })
console.log('rebuilt rows:', JSON.stringify(await db2.table('recentFiles').select().execute()))
await db2.close()
console.log('HEAL OK')
+33 -44
View File
@@ -2,13 +2,13 @@
## 1. 项目概述
MarkLite 是一款轻量级的 Windows 本地 Markdown 编辑器桌面应用程序。基于 Electron + React + TypeScript 构建,采用 MetonaEditor v0.1.14 编辑器(三模式视图 + 插件系统)、Zustand 状态管理、IndexedDB 持久化、unified/rehype Markdown 渲染管线
MarkLite 是一款轻量级的 Windows 本地 Markdown 编辑器桌面应用程序。基于 Electron + React + TypeScript 构建,采用 MetonaEditor v0.4.0 编辑器(三模式视图 + 内置解析器 + 插件系统)、Zustand 状态管理、MetonaSqlarkAriaEngine)持久化
### 1.1 核心原则
1. **类型安全** — 全量 TypeScript,所有 IPC 通信、状态、接口均有类型定义
2. **模块化** — 源文件按职责分层:主进程 / 预加载 / 渲染进程(组件 / stores / hooks / lib / db / types
3. **安全隔离** — contextIsolation + nodeIntegration:false + CSP + rehype-sanitize
3. **安全隔离** — contextIsolation + nodeIntegration:false + CSP + 内置解析器 XSS 防护
4. **可测试性** — 业务逻辑(lib/)与 UIcomponents/)解耦
## 2. 技术架构
@@ -23,8 +23,8 @@ MarkLite 是一款轻量级的 Windows 本地 Markdown 编辑器桌面应用程
| 编辑器 | MetonaEditor | v0.4.0 | 零依赖 Markdown 编辑器,三模式视图 + 插件系统 |
| 状态管理 | Zustand | v5 | 轻量级状态管理 |
| 持久化 | MetonaSqlark (IndexedDB) | v0.4.1 | 标签页状态 / 用户设置 / 最近文件(AriaEngine |
| Markdown 解析 | unified / remark / rehype | v11 | 插件化渲染管线(作为 MetonaEditor render 钩子) |
| 代码高亮 | rehype-highlight | v7 | 基于 highlight.js |
| Markdown 解析 | MetonaEditor 内置解析器 | v0.4.0 | 零依赖,GFM + 脚注 + 数学公式 + mermaid |
| 代码高亮 | MetonaEditor 内置高亮器 | v0.4.0 | 零依赖,16 种语言 |
| Toast | @metona-team/metona-toast | v0.5.0 | 通知提示组件 |
| 构建工具 | electron-vite | v3 | Electron + ViteHMR 热更新 |
| 打包工具 | electron-builder | v25 | Windows NSIS 安装包 |
@@ -86,7 +86,7 @@ MarkLite 是一款轻量级的 Windows 本地 Markdown 编辑器桌面应用程
| Electron | `nodeIntegration: false` | 渲染进程无法访问 Node.js API |
| IPC | `contextBridge.exposeInMainWorld` | 仅暴露 18 个类型安全方法 + 4 个事件订阅 |
| CSP | `default-src 'self'; script-src 'self'` | 阻断内联脚本、外部资源 |
| HTML | `rehype-sanitize` | 渲染 Markdown 时过滤危险标签/属性 |
| HTML | `MetonaEditor 内置解析器` | 渲染 MarkdownescapeHTML + safeUrl XSS 防护) |
| 链接 | 协议白名单 | 仅允许 `http:` / `https:` / `#` 锚点 |
| 路径 | `validatePath()` | 防止路径遍历攻击 |
@@ -265,26 +265,27 @@ MetonaEditor 内置模式切换工具栏,与应用层的 viewMode store 双向
### 6.4 渲染管线集成
通过 MetonaEditor 的 `render` 钩子接入 unified/rehype 管线,实现:
v0.6.0: 移除 unified/remark/rehype 自研管线,改用 MetonaEditor **内置解析器**parseMarkdown),
通过 `render` 钩子接入,实现:
- **相对路径图片解析**将相对路径转换为 `file://` 绝对路径
- **XSS 防护**rehype-sanitize 过滤危险标签
- **代码高亮**rehype-highlight 语法高亮
- **处理器缓存**:LRU 缓存(最多 20 个),按文件路径分桶
- **相对路径图片解析**内置解析器的 safeUrl 会过滤 `file:` 协议,因此渲染后做 HTML 后处理,将相对路径图片 src 转换为 `file://` 绝对路径(越界路径保持原样)
- **XSS 防护**内置 escapeHTML + safeUrl(过滤 javascript:/vbscript:/file:/data:+ 属性转义
- **代码高亮**内置零依赖高亮器(`highlight: MeEditor.highlight`16 种语言)
- **Mermaid 图表**:内置解析器原生输出 `.me-mermaid` 容器,`mermaid.run()` 直接渲染
```
Markdown 源码
unified 管线(renderMarkdownSync
├── remark-parse 解析为 MDAST
├── remark-gfm GFM 扩展
├── remark-rehype 转换为 HAST
├── rehype-raw 解析内联 HTML
── rehype-sanitize 安全过滤
├── rehype-fixImages 相对路径 → file://
├── rehype-highlight 代码高亮
└── rehype-stringify 序列化为 HTML
parseMarkdownMetonaEditor 内置解析器
├── GFM / 任务列表 / 表格 / 删除线
├── 脚注 / 数学公式 / 定义列表 / emoji
├── 引用链接 / 自动链接 / 上下标
├── mermaid → <div class="me-mermaid">…
── XSS 防护(escapeHTML + safeUrl
fixImageSrcsHTML 后处理:相对路径 → file://)
MetonaEditor 预览区渲染
@@ -306,35 +307,24 @@ MetonaEditor 的 CSS 样式通过 wrapper 元素上的 inline `--md-*` CSS 变
## 7. Markdown 渲染管线
v0.6.0: 渲染完全由 MetonaEditor 内置解析器承担(零依赖),应用侧仅保留图片路径修复后处理:
```
Markdown 文本
remark-parse 解析为 MDAST
parseMarkdownMetonaEditor 内置解析器)
├── 块级:标题 / 列表 / 引用 / 代码块 / 表格 / 水平线 / 脚注 / 数学公式 / 定义列表
├── 行内:粗体 / 斜体 / 删除线 / 高亮 / 上下标 / 行内代码 / 链接 / 图片 / emoji
├── mermaid<div class="me-mermaid"><pre class="mermaid">…
└── 安全:escapeHTML 转义 + safeUrl URL 过滤 + 属性级注入防护
remark-gfm 扩展 GFM 语法
fixImageSrcsmarkdown.ts 后处理)
└── 相对路径图片 src → file:// 绝对路径(越界 ../ 不处理)
remark-rehype 转换为 HAST
rehype-raw 解析内联 HTML
rehype-sanitize 安全过滤
rehype-fixImages 相对路径图片转 file:// URL
rehype-highlight 代码语法高亮
rehype-stringify 序列化为 HTML
Renderer (MetonaEditor preview / Preview component)
MetonaEditor 预览区 / getHTML 导出
```
## 8. UI 设计
@@ -415,12 +405,11 @@ npm run build:portable # 便携版(免安装)
|------|------|------|
| react / react-dom | ^18.3 | UI 框架 |
| zustand | ^5.0 | 状态管理 |
| @metona-team/metona-sqlark | 0.4.1 | 前端关系型数据库(IndexedDB |
| @metona-team/metona-sqlark | 0.4.1 | 前端关系型数据库(AriaEngine |
| nanoid | ^5.0 | 唯一 ID 生成 |
| @metona-team/metona-editor | 0.4.0 | Markdown 编辑器(零依赖 |
| @metona-team/metona-editor | 0.4.0 | Markdown 编辑器(内置解析器 + 高亮 |
| @metona-team/metona-toast | 0.5.0 | Toast 通知组件 |
| unified / remark / rehype | ^11.0 | Markdown 渲染管线 |
| rehype-highlight | ^7.0 | 代码语法高亮 |
| mermaid | ^10.9 | Mermaid 图表渲染 |
### 开发依赖
+8 -6
View File
@@ -30,9 +30,9 @@
|------|------|
| 📑 **多标签页** | 同时打开多个文件,Ctrl+T 新建、Ctrl+W 关闭、Ctrl+Tab MRU 切换 |
| 📂 **文件打开** | 按钮打开 / 拖拽打开 / 文件关联(双击 .md) / 命令行参数 |
| ✏️ **编辑器** | 基于 MetonaEditor 的代码+预览编辑器,内置格式化工具栏、浮动格式栏、三模式切换(编辑/分屏/预览)、搜索替换、撤销重做、粘贴图片转 base64 |
| 👁 **实时预览** | 分屏模式下左侧编辑、右侧实时预览,基于 unified/rehype 管线渲染 |
| 🔤 **代码高亮** | 基于 rehype-highlight,支持 180+ 种编程语言语法高亮 |
| ✏️ **编辑器** | 基于 MetonaEditor 的代码+预览编辑器,内置解析器渲染、格式化工具栏、浮动格式栏、三模式切换(编辑/分屏/预览)、搜索替换、撤销重做、Zen 专注模式、粘贴图片转 base64 |
| 👁 **实时预览** | 分屏模式下左侧编辑、右侧实时预览,MetonaEditor 内置解析器渲染 |
| 🔤 **代码高亮** | MetonaEditor 内置零依赖高亮器(js / ts / python / bash / css / html / json 等 16 种语言) |
| 🎨 **三种视图** | 编辑模式 / 分屏模式 / 预览模式,自由切换 |
| 🌙 **暗色主题** | 一键切换亮色/暗色/暖色主题,偏好自动记忆(MetonaSqlark),编辑器主题同步切换 |
| 🔔 **文件监听** | 外部修改文件时自动提示,支持重新加载或忽略 |
@@ -40,7 +40,9 @@
| 🔍 **搜索替换** | Ctrl+F 搜索、Ctrl+H 替换,支持正则表达式、大小写敏感 |
| 📁 **文件树** | 侧边栏浏览项目目录,点击打开文件,目录变化自动刷新 |
| 📊 **Mermaid 图表** | 代码块中渲染 Mermaid 流程图 / 时序图 / 甘特图等 |
| 📋 **状态栏** | 实时显示文档字数 / 行数 / 阅读时间 / 光标位置 / 自动保存状态 |
| 💾 **状态持久化** | 标签页状态、用户设置通过 MetonaSqlarkAriaEngine)持久化,关闭后可恢复 |
| 📦 **数据备份** | 一键导出/导入全部数据为 JSON 文件(MetonaSqlark exportAll/importTable |
| ⌨️ **快捷键** | 完整的键盘快捷键支持,操作高效 |
| 📦 **NSIS 安装包** | 一键打包为 Windows exe 安装程序 / 便携版 |
| 🖼️ **粘贴图片** | Ctrl+V 粘贴剪贴板图片,自动转为 base64 内嵌 |
@@ -146,11 +148,11 @@ npm run test:coverage
| 桌面框架 | [Electron](https://www.electronjs.org/) v28 | 跨平台桌面应用框架 |
| 前端框架 | [React](https://react.dev/) v18 | 函数组件 + Hooks |
| 类型系统 | [TypeScript](https://www.typescriptlang.org/) v5.6 | 全量类型安全 |
| 编辑器 | [MetonaEditor](https://git.metona.cn/MetonaTeam/MetonaEditor) v0.4.0 | 零依赖 Markdown 编辑器,三模式视图 + 浮动格式栏 + 插件系统 |
| 编辑器 | [MetonaEditor](https://git.metona.cn/MetonaTeam/MetonaEditor) v0.4.0 | 内置解析器 + 高亮,三模式视图 + 浮动格式栏 + Zen 模式 + 插件系统 |
| 状态管理 | [Zustand](https://zustand-demo.pmnd.rs/) v5 | 轻量级状态管理 |
| 持久化 | [MetonaSqlark](https://git.metona.cn/MetonaTeam/MetonaSqlark) v0.4.1 (IndexedDB, AriaEngine) | 标签页状态 & 用户设置持久化 |
| Markdown 解析 | [unified](https://unifiedjs.com/) / [remark](https://remark.js.org/) / [rehype](https://rehype.js.org/) | 插件化 Markdown 渲染管线 |
| 代码高亮 | [rehype-highlight](https://github.com/rehypejs/rehype-highlight) | 基于 highlight.js 的语法高亮 |
| Markdown 解析 | MetonaEditor 内置解析器 | 零依赖:GFM / 脚注 / 数学公式 / Mermaid |
| 代码高亮 | MetonaEditor 内置高亮器 | 零依赖,16 种语言 |
| Toast | [@metona-team/metona-toast](https://git.metona.cn/MetonaTeam/-/packages/npm/@metona-team%2Fmetona-toast) v0.5.0 | 通知提示组件 |
| 构建工具 | [electron-vite](https://electron-vite.org/) v3 | Electron + Vite 集成,HMR 热更新 |
| 打包工具 | [electron-builder](https://www.electron.build/) | 生成 exe 安装包 |
+5 -11
View File
@@ -1,6 +1,6 @@
{
"name": "marklite",
"version": "0.5.0",
"version": "0.6.0",
"description": "Lightweight Markdown Editor for Windows",
"main": "./dist/main/index.js",
"scripts": {
@@ -14,7 +14,8 @@
"test": "vitest run",
"test:watch": "vitest",
"test:coverage": "vitest run --coverage",
"prepare": "husky"
"prepare": "husky",
"postinstall": "node scripts/ensure-rollup-platform.mjs"
},
"lint-staged": {
"*.{ts,tsx}": [
@@ -35,18 +36,10 @@
"nanoid": "^5.1.5",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"rehype-highlight": "^7.0.2",
"rehype-raw": "^7.0.0",
"rehype-sanitize": "^6.0.0",
"rehype-stringify": "^10.0.0",
"remark-gfm": "^4.0.1",
"remark-parse": "^11.0.0",
"remark-rehype": "^11.1.2",
"unified": "^11.0.5",
"unist-util-visit": "^5.1.0",
"zustand": "^5.0.6"
},
"devDependencies": {
"@rollup/rollup-linux-x64-gnu": "^4.60.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
"@types/jsdom": "^28.0.3",
@@ -60,6 +53,7 @@
"eslint": "^9.22.0",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.19",
"fake-indexeddb": "^6.2.5",
"husky": "^9.1.7",
"jsdom": "^29.1.1",
"lint-staged": "^17.0.7",
+55
View File
@@ -0,0 +1,55 @@
/**
* 确保 rollup 当前平台的 optional 原生包已安装。
*
* 背景: npm bug #4828 导致跨平台共享 node_modules(如 WSL 与 Windows 挂载同一目录)时,
* 一方 npm install 可能清理掉另一方的 rollup 平台包(@rollup/rollup-<os>-x64-<libc>),
* 导致 build/test 报 "Cannot find module @rollup/rollup-<platform>"。
*
* 方案: 在 postinstall 阶段检测当前平台所需的 rollup 原生包,缺失则自动补装
* --no-save 不污染依赖清单,--ignore-scripts 防止递归触发 postinstall)。
*/
import { execSync } from 'child_process'
import { existsSync } from 'fs'
import { join, dirname } from 'path'
import { fileURLToPath } from 'url'
const ROLLUP_VERSION = '4.60.4'
const __dirname = dirname(fileURLToPath(import.meta.url))
/** 平台 → 架构 → 对应 rollup 原生包 */
const PLATFORM_PACKAGES = {
win32: {
x64: '@rollup/rollup-win32-x64-msvc',
ia32: '@rollup/rollup-win32-ia32-msvc',
arm64: '@rollup/rollup-win32-arm64-msvc',
},
linux: {
x64: '@rollup/rollup-linux-x64-gnu',
arm64: '@rollup/rollup-linux-arm64-gnu',
arm: '@rollup/rollup-linux-arm-gnueabihf',
},
darwin: {
x64: '@rollup/rollup-darwin-x64',
arm64: '@rollup/rollup-darwin-arm64',
},
}
const pkg = PLATFORM_PACKAGES[process.platform]?.[process.arch]
if (!pkg) {
process.exit(0)
}
const pkgDir = join(__dirname, '..', 'node_modules', ...pkg.split('/'))
if (existsSync(pkgDir)) {
process.exit(0)
}
try {
execSync(`npm install --no-save --ignore-scripts ${pkg}@${ROLLUP_VERSION}`, {
stdio: 'inherit',
cwd: join(__dirname, '..'),
})
} catch (err) {
// eslint-disable-next-line no-console -- 安装失败仅告警,不阻断 npm install
console.warn(`[ensure-rollup-platform] 自动安装 ${pkg} 失败:`, err)
}
+15 -8
View File
@@ -10,26 +10,29 @@ export async function readFileContent(filePath: string): Promise<ReadFileResult>
try {
const fileStat = await stat(filePath)
if (fileStat.size > MAX_FILE_SIZE) {
return { success: false, error: `文件过大(${(fileStat.size / 1024 / 1024).toFixed(1)} MB),暂不支持超过 20MB 的文件` }
return {
success: false,
error: `文件过大(${(fileStat.size / 1024 / 1024).toFixed(1)} MB),暂不支持超过 20MB 的文件`,
}
}
// L-01: 检测并剥离 BOMUTF-8 FEFF / UTF-16 LE FFFE / UTF-16 BE FEFF
const buffer = await readFile(filePath)
let content: string
if (buffer.length >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
if (buffer.length >= 2 && buffer[0] === 0xfe && buffer[1] === 0xff) {
// UTF-16 BE: swap bytes to LE 再解码
const swapped = Buffer.allocUnsafe(buffer.length)
buffer.copy(swapped)
swapped.swap16()
content = swapped.toString('utf-16le')
if (content.charCodeAt(0) === 0xFEFF) content = content.slice(1)
} else if (buffer.length >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
if (content.charCodeAt(0) === 0xfeff) content = content.slice(1)
} else if (buffer.length >= 2 && buffer[0] === 0xff && buffer[1] === 0xfe) {
// UTF-16 LE
content = buffer.toString('utf-16le')
if (content.charCodeAt(0) === 0xFEFF) content = content.slice(1)
if (content.charCodeAt(0) === 0xfeff) content = content.slice(1)
} else {
// UTF-8 (含 FEFF BOM 剥离)
content = buffer.toString('utf-8')
if (content.charCodeAt(0) === 0xFEFF) content = content.slice(1)
if (content.charCodeAt(0) === 0xfeff) content = content.slice(1)
}
return { success: true, content }
} catch (err) {
@@ -48,7 +51,11 @@ export async function saveFileContent(filePath: string, content: string): Promis
return { success: true, filePath }
} catch (err) {
// 清理残留临时文件
try { await unlink(tmpFile) } catch { /* ignore */ }
try {
await unlink(tmpFile)
} catch {
/* ignore */
}
return { success: false, error: (err as Error).message }
}
}
@@ -58,7 +65,7 @@ export async function buildDirTree(
dirPath: string,
depth = 0,
maxDepth = 10,
visited?: Set<string>
visited?: Set<string>,
): Promise<FileNode[]> {
if (depth > maxDepth) return []
+1 -1
View File
@@ -15,7 +15,7 @@ export class FileWatcher {
if (!filePath) return
try {
this.currentPath = filePath
this.watcher = fs.watch(filePath, (eventType) => {
this.watcher = fs.watch(filePath, eventType => {
if (eventType === 'change') {
if (this.isSelfWriting) return
const win = this.getMainWindow()
+7 -6
View File
@@ -10,7 +10,7 @@ const state = {
activeFilePath: null as string | null,
pendingFilePath: null as string | null,
isClosing: false,
closeTimeout: null as NodeJS.Timeout | null
closeTimeout: null as NodeJS.Timeout | null,
}
const fileWatcher = new FileWatcher(() => mainWindow)
@@ -18,20 +18,22 @@ const sidebarWatcher = new SidebarWatcher(() => mainWindow)
function openFileInTab(filePath: string): void {
if (!mainWindow || mainWindow.isDestroyed()) return
readFileContent(filePath).then(result => {
readFileContent(filePath)
.then(result => {
if (result.success && mainWindow && !mainWindow.isDestroyed()) {
state.activeFilePath = filePath
fileWatcher.start(filePath)
mainWindow.setTitle(`MarkLite - ${filePath.split(/[/\\]/).pop()}`)
mainWindow.webContents.send('file:openInTab', { filePath, content: result.content })
}
}).catch((err) => {
})
.catch(err => {
// eslint-disable-next-line no-console -- IPC file open error
console.error('openFileInTab failed:', err)
})
}
const lockOk = setupSingleInstanceLock((filePath) => {
const lockOk = setupSingleInstanceLock(filePath => {
if (mainWindow && !mainWindow.isDestroyed()) {
if (mainWindow.isMinimized()) mainWindow.restore()
mainWindow.focus()
@@ -42,10 +44,9 @@ const lockOk = setupSingleInstanceLock((filePath) => {
if (!lockOk) {
app.quit()
} else {
function setupCloseHandler(): void {
if (!mainWindow) return
mainWindow.on('close', (e) => {
mainWindow.on('close', e => {
if (state.isClosing) return
state.isClosing = true
e.preventDefault()
+69 -13
View File
@@ -2,7 +2,7 @@ import { ipcMain, dialog, BrowserWindow, type IpcMainInvokeEvent } from 'electro
import { readFileContent, saveFileContent, buildDirTree } from './file-system'
import { FileWatcher, SidebarWatcher } from './file-watcher'
import { IPC_CHANNELS } from '../shared/ipc-channels'
import { stat } from 'fs/promises'
import { stat, readFile, writeFile } from 'fs/promises'
import { basename, isAbsolute } from 'path'
// 安全校验:拒绝路径遍历攻击
@@ -24,7 +24,12 @@ export function registerIpcHandlers(
getMainWindow: () => BrowserWindow | null,
fileWatcher: FileWatcher,
sidebarWatcher: SidebarWatcher,
state: { activeFilePath: string | null; pendingFilePath: string | null; isClosing: boolean; closeTimeout: NodeJS.Timeout | null }
state: {
activeFilePath: string | null
pendingFilePath: string | null
isClosing: boolean
closeTimeout: NodeJS.Timeout | null
},
): void {
// 打开文件对话框
ipcMain.handle(IPC_CHANNELS.DIALOG_OPEN_FILE, async () => {
@@ -33,7 +38,7 @@ export function registerIpcHandlers(
try {
const result = await dialog.showOpenDialog(win, {
properties: ['openFile'],
filters: [{ name: 'Markdown 文件', extensions: ['md', 'markdown', 'txt'] }]
filters: [{ name: 'Markdown 文件', extensions: ['md', 'markdown', 'txt'] }],
})
if (!result.canceled && result.filePaths.length > 0) {
const filePath = result.filePaths[0]
@@ -61,7 +66,9 @@ export function registerIpcHandlers(
})
// 保存文件
ipcMain.handle(IPC_CHANNELS.FILE_SAVE, async (_event: IpcMainInvokeEvent, data: { filePath: string | null; content: string }) => {
ipcMain.handle(
IPC_CHANNELS.FILE_SAVE,
async (_event: IpcMainInvokeEvent, data: { filePath: string | null; content: string }) => {
if (data.filePath && !validatePath(data.filePath)) {
return { success: false, error: '无效的文件路径' }
}
@@ -85,7 +92,7 @@ export function registerIpcHandlers(
} else {
if (!win) return { success: false, error: '窗口不可用' }
const saveResult = await dialog.showSaveDialog(win, {
filters: [{ name: 'Markdown 文件', extensions: ['md'] }]
filters: [{ name: 'Markdown 文件', extensions: ['md'] }],
})
if (!saveResult.canceled) {
fileWatcher.setSelfWriting(true)
@@ -107,15 +114,18 @@ export function registerIpcHandlers(
}
return { success: false, error: (err as Error).message }
}
})
},
)
// 另存为
ipcMain.handle(IPC_CHANNELS.FILE_SAVE_AS, async (_event: IpcMainInvokeEvent, data: { content: string }) => {
ipcMain.handle(
IPC_CHANNELS.FILE_SAVE_AS,
async (_event: IpcMainInvokeEvent, data: { content: string }) => {
const win = getMainWindow()
if (!win) return { success: false, error: '窗口不可用' }
try {
const result = await dialog.showSaveDialog(win, {
filters: [{ name: 'Markdown 文件', extensions: ['md'] }]
filters: [{ name: 'Markdown 文件', extensions: ['md'] }],
})
if (!result.canceled) {
fileWatcher.setSelfWriting(true)
@@ -133,7 +143,8 @@ export function registerIpcHandlers(
fileWatcher.setSelfWriting(false)
return { success: false, error: (err as Error).message }
}
})
},
)
// 获取当前路径
ipcMain.handle(IPC_CHANNELS.FILE_GET_CURRENT_PATH, () => state.activeFilePath)
@@ -159,7 +170,9 @@ export function registerIpcHandlers(
})
// 目录树
ipcMain.handle(IPC_CHANNELS.DIR_READ_TREE, async (_event: IpcMainInvokeEvent, dirPath: string) => {
ipcMain.handle(
IPC_CHANNELS.DIR_READ_TREE,
async (_event: IpcMainInvokeEvent, dirPath: string) => {
if (!validatePath(dirPath)) {
return { success: false, error: '无效的目录路径' }
}
@@ -169,7 +182,8 @@ export function registerIpcHandlers(
} catch (err) {
return { success: false, error: (err as Error).message }
}
})
},
)
// 打开文件夹对话框
ipcMain.handle(IPC_CHANNELS.DIR_OPEN_DIALOG, async () => {
@@ -193,7 +207,9 @@ export function registerIpcHandlers(
})
// 标签切换
ipcMain.handle(IPC_CHANNELS.TAB_SWITCHED, (_event: IpcMainInvokeEvent, filePath: string | null) => {
ipcMain.handle(
IPC_CHANNELS.TAB_SWITCHED,
(_event: IpcMainInvokeEvent, filePath: string | null) => {
const normalizedPath = filePath || null
if (normalizedPath && !validatePath(normalizedPath)) {
fileWatcher.stop()
@@ -205,7 +221,8 @@ export function registerIpcHandlers(
if (win && !win.isDestroyed()) {
win.setTitle(normalizedPath ? `MarkLite - ${basename(normalizedPath)}` : 'MarkLite')
}
})
},
)
// 窗口控制
ipcMain.handle(IPC_CHANNELS.WINDOW_FORCE_CLOSE, () => {
@@ -225,4 +242,43 @@ export function registerIpcHandlers(
state.closeTimeout = null
}
})
// v0.6.0: 数据备份导出 — 保存对话框 + 写 JSON 文件
ipcMain.handle(IPC_CHANNELS.DATA_EXPORT, async (_event: IpcMainInvokeEvent, content: string) => {
const win = getMainWindow()
if (!win) return { success: false, error: '窗口不可用' }
try {
const dateStr = new Date().toISOString().slice(0, 10)
const result = await dialog.showSaveDialog(win, {
title: '导出数据备份',
defaultPath: `marklite-backup-${dateStr}.json`,
filters: [{ name: 'JSON 备份文件', extensions: ['json'] }],
})
if (result.canceled) return { success: false, canceled: true }
await writeFile(result.filePath, content, 'utf8')
return { success: true, filePath: result.filePath }
} catch (err) {
return { success: false, error: (err as Error).message }
}
})
// v0.6.0: 数据备份导入 — 打开对话框 + 读 JSON 文件
ipcMain.handle(IPC_CHANNELS.DATA_IMPORT, async () => {
const win = getMainWindow()
if (!win) return { success: false, error: '窗口不可用' }
try {
const result = await dialog.showOpenDialog(win, {
title: '导入数据备份',
properties: ['openFile'],
filters: [{ name: 'JSON 备份文件', extensions: ['json'] }],
})
if (result.canceled || result.filePaths.length === 0) {
return { success: false, canceled: true }
}
const content = await readFile(result.filePaths[0], 'utf8')
return { success: true, content }
} catch (err) {
return { success: false, error: (err as Error).message }
}
})
}
+4 -4
View File
@@ -13,16 +13,16 @@ export function createWindow(): BrowserWindow {
preload: join(__dirname, '../preload/index.js'),
contextIsolation: true,
nodeIntegration: false,
sandbox: true
sandbox: true,
},
titleBarStyle: 'default',
show: false
show: false,
})
mainWindow.setMenu(null)
// H-04: 阻止窗口导航和弹出窗口,防止渲染进程绕过 CSP
mainWindow.webContents.on('will-navigate', (event) => {
mainWindow.webContents.on('will-navigate', event => {
event.preventDefault()
})
mainWindow.webContents.setWindowOpenHandler(() => ({ action: 'deny' }))
@@ -35,7 +35,7 @@ export function createWindow(): BrowserWindow {
}
export function setupSingleInstanceLock(
onSecondInstance: (filePath: string | null) => void
onSecondInstance: (filePath: string | null) => void,
): boolean {
const gotTheLock = app.requestSingleInstanceLock()
if (!gotTheLock) {
+26 -11
View File
@@ -7,8 +7,8 @@ const api: ElectronAPI = {
// File operations
openFile: () => ipcRenderer.invoke(IPC_CHANNELS.DIALOG_OPEN_FILE),
readFile: (filePath: string) => ipcRenderer.invoke(IPC_CHANNELS.FILE_READ, filePath),
saveFile: (data) => ipcRenderer.invoke(IPC_CHANNELS.FILE_SAVE, data),
saveFileAs: (data) => ipcRenderer.invoke(IPC_CHANNELS.FILE_SAVE_AS, data),
saveFile: data => ipcRenderer.invoke(IPC_CHANNELS.FILE_SAVE, data),
saveFileAs: data => ipcRenderer.invoke(IPC_CHANNELS.FILE_SAVE_AS, data),
getCurrentPath: () => ipcRenderer.invoke(IPC_CHANNELS.FILE_GET_CURRENT_PATH),
getFileStats: (filePath: string) => ipcRenderer.invoke(IPC_CHANNELS.FILE_STATS, filePath),
reloadFile: () => ipcRenderer.invoke(IPC_CHANNELS.FILE_RELOAD),
@@ -38,27 +38,42 @@ const api: ElectronAPI = {
watchDir: (dirPath: string) => ipcRenderer.invoke(IPC_CHANNELS.DIR_WATCH, dirPath),
unwatchDir: () => ipcRenderer.invoke(IPC_CHANNELS.DIR_UNWATCH),
// v0.6.0: 数据备份导出/导入
exportData: (content: string) => ipcRenderer.invoke(IPC_CHANNELS.DATA_EXPORT, content),
importData: () => ipcRenderer.invoke(IPC_CHANNELS.DATA_IMPORT),
// Events from main process — 返回取消订阅函数
onFileOpenInTab: (callback) => {
const handler = (_event: Electron.IpcRendererEvent, data: { filePath: string; content: string }) => callback(data)
onFileOpenInTab: callback => {
const handler = (
_event: Electron.IpcRendererEvent,
data: { filePath: string; content: string },
) => callback(data)
ipcRenderer.on(IPC_CHANNELS.FILE_OPEN_IN_TAB, handler)
return () => { ipcRenderer.removeListener(IPC_CHANNELS.FILE_OPEN_IN_TAB, handler) }
return () => {
ipcRenderer.removeListener(IPC_CHANNELS.FILE_OPEN_IN_TAB, handler)
}
},
onExternalModification: (callback) => {
onExternalModification: callback => {
const handler = (_event: Electron.IpcRendererEvent, filePath: string) => callback(filePath)
ipcRenderer.on(IPC_CHANNELS.FILE_EXTERNALLY_MODIFIED, handler)
return () => { ipcRenderer.removeListener(IPC_CHANNELS.FILE_EXTERNALLY_MODIFIED, handler) }
return () => {
ipcRenderer.removeListener(IPC_CHANNELS.FILE_EXTERNALLY_MODIFIED, handler)
}
},
onDirChanged: (callback) => {
onDirChanged: callback => {
const handler = () => callback()
ipcRenderer.on(IPC_CHANNELS.SIDEBAR_DIR_CHANGED, handler)
return () => { ipcRenderer.removeListener(IPC_CHANNELS.SIDEBAR_DIR_CHANGED, handler) }
return () => {
ipcRenderer.removeListener(IPC_CHANNELS.SIDEBAR_DIR_CHANGED, handler)
}
},
onConfirmClose: (callback) => {
onConfirmClose: callback => {
const handler = () => callback()
ipcRenderer.on(IPC_CHANNELS.WINDOW_CONFIRM_CLOSE, handler)
return () => { ipcRenderer.removeListener(IPC_CHANNELS.WINDOW_CONFIRM_CLOSE, handler) }
return () => {
ipcRenderer.removeListener(IPC_CHANNELS.WINDOW_CONFIRM_CLOSE, handler)
}
},
}
contextBridge.exposeInMainWorld('electronAPI', api)
+27 -16
View File
@@ -11,8 +11,9 @@ import { useFileOperations } from './hooks/useFileOperations'
import { useDragDrop } from './hooks/useDragDrop'
import { useAutoSave } from './hooks/useAutoSave'
import { useIpcListeners } from './hooks/useIpcListeners'
import { useConfirm } from './hooks/useConfirm'
import { MeToast } from './lib/toast'
import { Toolbar } from './components/Toolbar/Toolbar'
import { StatusBar } from './components/StatusBar'
import { TabBar } from './components/TabBar/TabBar'
import { Editor } from './components/Editor/Editor'
import { Sidebar } from './components/Sidebar/Sidebar'
@@ -21,7 +22,6 @@ import { ModifiedBanner } from './components/ModifiedBanner/ModifiedBanner'
import { DropOverlay } from './components/DropOverlay/DropOverlay'
import { ErrorBoundary } from './components/ErrorBoundary'
import { AboutDialog } from './components/AboutDialog'
import { ConfirmDialog } from './components/ConfirmDialog/ConfirmDialog'
export function App() {
const tabs = useTabStore(s => s.tabs)
@@ -34,12 +34,13 @@ export function App() {
const externallyModified = useEditorStore(s => s.externallyModified)
const setExternallyModified = useEditorStore(s => s.setExternallyModified)
const { themeMode, cycleTheme } = useTheme()
const { confirm, confirmDialogProps } = useConfirm()
const [showAbout, setShowAbout] = useState(false)
const handleCloseAbout = useCallback(() => setShowAbout(false), [])
useSettingsInit()
useEffect(() => { loadFromDB() }, [loadFromDB])
useEffect(() => {
loadFromDB()
}, [loadFromDB])
const { handleOpenFile, handleSave, handleSaveAs, handleOpenRecent } = useFileOperations()
const { isAutoSaving, autoSaveEnabled, toggleAutoSave } = useAutoSave()
@@ -48,15 +49,14 @@ export function App() {
// useAutoSave() already called above to get state for toolbar
// UX-01: 传入 confirm 函数替代原生 confirm()
// v0.6.0: 使用 MeToast.confirm(内置 10 秒安全超时,超时自动 resolve(false)
const handleConfirmClose = useCallback(async (message: string): Promise<boolean> => {
return confirm({
return MeToast.confirm(message, {
title: '未保存的更改',
message,
variant: 'warning',
confirmLabel: '不保存',
cancelLabel: '取消'
confirmText: '不保存',
cancelText: '取消',
})
}, [confirm])
}, [])
useUnsavedWarning(() => tabs.some(t => t.isModified), handleConfirmClose, flushSaveToDB)
useKeyboard(handleOpenFile, handleSave, handleSaveAs)
@@ -85,8 +85,10 @@ export function App() {
<ErrorBoundary>
<div id="app" className={`mode-${viewMode}`}>
<Toolbar
onOpen={handleOpenFile} onSave={handleSave}
themeMode={themeMode} onCycleTheme={cycleTheme}
onOpen={handleOpenFile}
onSave={handleSave}
themeMode={themeMode}
onCycleTheme={cycleTheme}
onShowAbout={() => setShowAbout(true)}
isAutoSaving={isAutoSaving}
autoSaveEnabled={autoSaveEnabled}
@@ -97,20 +99,29 @@ export function App() {
<div id="main-content">
<TabBar />
{externallyModified && (
<ModifiedBanner onReload={handleReloadModified} onDismiss={() => setExternallyModified(null)} />
<ModifiedBanner
onReload={handleReloadModified}
onDismiss={() => setExternallyModified(null)}
/>
)}
{tabs.length > 0 ? (
<div id="content-wrapper">
<div id="editor-panel"><Editor themeMode={themeMode} onAppSave={handleSave} /></div>
<div id="editor-panel">
<Editor themeMode={themeMode} onAppSave={handleSave} />
</div>
</div>
) : (
<WelcomeScreen onOpen={handleOpenFile} onNew={() => createTab(null, '')} onOpenRecent={handleOpenRecent} />
<WelcomeScreen
onOpen={handleOpenFile}
onNew={() => createTab(null, '')}
onOpenRecent={handleOpenRecent}
/>
)}
</div>
</div>
<StatusBar />
<DropOverlay />
{showAbout && <AboutDialog onClose={handleCloseAbout} />}
<ConfirmDialog {...confirmDialogProps} />
</div>
</ErrorBoundary>
)
@@ -17,7 +17,13 @@ export const AboutDialog = React.memo(function AboutDialog({ onClose }: AboutDia
}
return (
<div className="about-overlay" onClick={onClose} role="dialog" aria-modal="true" aria-label="关于 MarkLite">
<div
className="about-overlay"
onClick={onClose}
role="dialog"
aria-modal="true"
aria-label="关于 MarkLite"
>
<div className="about-dialog" onClick={(e: React.MouseEvent) => e.stopPropagation()}>
<div className="about-header">
<AppIcon size={64} />
@@ -36,6 +42,8 @@ export const AboutDialog = React.memo(function AboutDialog({ onClose }: AboutDia
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>
@@ -48,7 +56,9 @@ export const AboutDialog = React.memo(function AboutDialog({ onClose }: AboutDia
<p>MetonaEditor 0.4.0 · MetonaToast 0.5.0 · MetonaSqlark 0.4.1</p>
<p className="about-copyright">© 2026 thzxx</p>
</div>
<button className="about-close-btn" onClick={onClose}></button>
<button className="about-close-btn" onClick={onClose}>
</button>
</div>
</div>
)
@@ -1,111 +0,0 @@
import React, { useEffect, useRef, useCallback } from 'react'
interface ConfirmDialogProps {
open: boolean
title: string
message: string
confirmLabel?: string
cancelLabel?: string
variant?: 'danger' | 'warning' | 'info'
onConfirm: () => void
onCancel: () => void
}
export const ConfirmDialog = React.memo(function ConfirmDialog({
open,
title,
message,
confirmLabel = '确定',
cancelLabel = '取消',
variant = 'warning',
onConfirm,
onCancel
}: ConfirmDialogProps) {
const confirmRef = useRef<HTMLButtonElement>(null)
const previousFocusRef = useRef<HTMLElement | null>(null)
// 打开时保存焦点并聚焦确认按钮;关闭时恢复焦点
useEffect(() => {
if (!open) {
// Only restore focus if the element is still in the DOM
if (previousFocusRef.current && previousFocusRef.current.isConnected) {
previousFocusRef.current.focus()
}
return
}
previousFocusRef.current = document.activeElement as HTMLElement
const timer = setTimeout(() => confirmRef.current?.focus(), 50)
return () => {
clearTimeout(timer)
}
}, [open])
// ESC 键关闭
const handleKeyDown = useCallback((e: KeyboardEvent) => {
if (e.key === 'Escape') {
e.preventDefault()
onCancel()
}
}, [onCancel])
useEffect(() => {
if (!open) return
document.addEventListener('keydown', handleKeyDown)
return () => document.removeEventListener('keydown', handleKeyDown)
}, [open, handleKeyDown])
// 防止背景滚动
useEffect(() => {
if (!open) return
const original = document.body.style.overflow
document.body.style.overflow = 'hidden'
return () => { document.body.style.overflow = original }
}, [open])
if (!open) return null
return (
<div
className="confirm-overlay"
onClick={onCancel}
role="presentation"
>
<div
className="confirm-dialog"
role="alertdialog"
aria-modal="true"
aria-labelledby="confirm-title"
aria-describedby="confirm-message"
onClick={e => e.stopPropagation()}
>
<div className={`confirm-header confirm-${variant}`}>
<h3 id="confirm-title">{title}</h3>
</div>
<div className="confirm-body">
<p id="confirm-message">{message}</p>
</div>
<div className="confirm-actions">
<button
className="confirm-btn confirm-btn-cancel"
onClick={onCancel}
type="button"
>
{cancelLabel}
</button>
<button
ref={confirmRef}
className={`confirm-btn confirm-btn-${variant}`}
onClick={onConfirm}
type="button"
>
{confirmLabel}
</button>
</div>
</div>
</div>
)
})
ConfirmDialog.displayName = 'ConfirmDialog'
@@ -1 +0,0 @@
export { ConfirmDialog } from './ConfirmDialog'
+73 -12
View File
@@ -50,15 +50,15 @@ export const Editor = React.memo(function Editor({ themeMode, onAppSave }: Edito
const activeTabId = useTabStore(s => s.activeTabId)
// B-03: 用 activeTabId + tabs 推导 activeTab 而非 s.getActiveTab()
// 后者每次返回新对象引用导致 Zustand 无条件重渲染
const activeTab = useMemo(
() => tabs.find(t => t.id === activeTabId) ?? null,
[tabs, activeTabId]
)
const activeTab = useMemo(() => tabs.find(t => t.id === activeTabId) ?? null, [tabs, activeTabId])
const updateTabContent = useTabStore(s => s.updateTabContent)
const setModified = useTabStore(s => s.setModified)
const updateTabScroll = useTabStore(s => s.updateTabScroll)
const viewMode = useEditorStore(s => s.viewMode)
const setViewMode = useEditorStore(s => s.setViewMode)
const setStats = useEditorStore(s => s.setStats)
const setCursor = useEditorStore(s => s.setCursor)
const setZenMode = useEditorStore(s => s.setZenMode)
const containerRef = useRef<HTMLDivElement>(null)
const editorRef = useRef<MarkdownEditor | null>(null)
@@ -78,12 +78,34 @@ export const Editor = React.memo(function Editor({ themeMode, onAppSave }: Edito
mode: mapViewMode(viewMode),
height: '100%',
toolbar: [
'bold', 'italic', 'strikethrough', 'underline', 'code', '|',
'h1', 'h2', 'h3', '|',
'quote', 'ul', 'ol', 'indent', 'outdent', '|',
'link', 'image', 'table', 'hr', '|',
'undo', 'redo', '|',
'edit', 'split', 'preview', 'fullscreen'
'bold',
'italic',
'strikethrough',
'underline',
'code',
'|',
'h1',
'h2',
'h3',
'|',
'quote',
'ul',
'ol',
'indent',
'outdent',
'|',
'link',
'image',
'table',
'hr',
'|',
'undo',
'redo',
'|',
'edit',
'split',
'preview',
'fullscreen',
],
locale: 'zh-CN',
theme: themeMode as ThemeName,
@@ -105,7 +127,9 @@ export const Editor = React.memo(function Editor({ themeMode, onAppSave }: Edito
historyLimit: 100,
historyDebounce: 400,
// 使用 unified 管线渲染,保留图片路径修复能力
// 使用内置解析器渲染(unified 管线已移除),保留图片路径修复能力
// v0.6.0: highlight 使用内置零依赖高亮器(16 种语言)
highlight: MeEditor.highlight,
render: (md: string) => {
const tabId = activeTabIdRef.current
const filePath = tabId
@@ -161,12 +185,49 @@ export const Editor = React.memo(function Editor({ themeMode, onAppSave }: Edito
// v0.5.0: 绑定 afterRender → 触发 Mermaid 图表渲染
const renderMermaid = () => {
try { mermaid.run({ querySelector: '.me-mermaid .mermaid' }) } catch { /* 容错 */ }
try {
mermaid.run({ querySelector: '.me-mermaid .mermaid' })
} catch {
/* 容错 */
}
}
editor.on('afterRender', renderMermaid)
// 首次渲染后延迟触发一次
setTimeout(renderMermaid, 300)
// v0.6.0: 实时状态同步 — getStats + 光标/zen 事件 → editorStore(状态栏消费)
const syncStats = () => {
try {
const s = editor.getStats()
setStats({
characters: s.characters,
words: s.words,
chineseChars: s.chineseChars,
englishWords: s.englishWords,
lines: s.lines,
readingTime: s.readingTime,
})
} catch {
/* 容错 */
}
}
const syncCursor = (pos?: { line: number; column: number }) => {
try {
setCursor(pos ?? editor.getCursorPosition())
} catch {
/* 容错 */
}
}
const syncZen = (zen: boolean) => {
setZenMode(Boolean(zen))
}
editor.on('change', syncStats)
editor.on('input', syncStats)
editor.on('cursorMove', syncCursor)
editor.on('zenChange', syncZen)
syncStats()
syncCursor()
return () => {
editor.destroy()
editorRef.current = null
@@ -43,11 +43,7 @@ export class ErrorBoundary extends Component<Props, State> {
return (
<div className="error-boundary-root" role="alert">
<h2 className="error-boundary-title"></h2>
{isDev && (
<pre className="error-boundary-detail">
{this.state.error?.message}
</pre>
)}
{isDev && <pre className="error-boundary-detail">{this.state.error?.message}</pre>}
<button className="error-boundary-reset" onClick={this.handleReset}>
</button>
@@ -18,7 +18,7 @@ export const FileTree = React.memo(function FileTree({
expandedDirs,
toggleDir,
activeFilePath,
onFileClick
onFileClick,
}: FileTreeProps) {
return (
<>
@@ -30,7 +30,7 @@ export const FileTree = React.memo(function FileTree({
<React.Fragment key={node.path}>
<div
className={`tree-item ${isActive ? 'active' : ''}`}
style={{ paddingLeft: (8 + depth * 16) + 'px' }}
style={{ paddingLeft: 8 + depth * 16 + 'px' }}
role="treeitem"
aria-expanded={node.type === 'dir' ? isExpanded : undefined}
aria-selected={isActive}
@@ -43,7 +43,7 @@ export const FileTree = React.memo(function FileTree({
onFileClick(node.path)
}
}}
onKeyDown={(e) => {
onKeyDown={e => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault()
if (node.type === 'dir') {
+225 -64
View File
@@ -12,54 +12,88 @@ const defaultProps: Partial<IconProps> = { size: 18 }
// ===== 应用图标 =====
export function AppIcon({ size = 80 }: IconProps) {
return (
<img src={appIconUrl} alt="MarkLite" width={size} height={size} draggable={false} />
)
return <img src={appIconUrl} alt="MarkLite" width={size} height={size} draggable={false} />
}
// ===== 工具栏图标 =====
export function FolderOpen({ size = defaultProps.size }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M5 19a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h4l2 2h6a2 2 0 0 1 2 2v1"/>
<path d="M20.5 15H5a2 2 0 0 0-2 2l1.5 7h18l2-7a2 2 0 0 0-2-2h-2.5z" fill="none"/>
<path d="M12 11h4" strokeDasharray="2 2"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M5 19a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h4l2 2h6a2 2 0 0 1 2 2v1" />
<path d="M20.5 15H5a2 2 0 0 0-2 2l1.5 7h18l2-7a2 2 0 0 0-2-2h-2.5z" fill="none" />
<path d="M12 11h4" strokeDasharray="2 2" />
</svg>
)
}
export function Save({ size = defaultProps.size }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/>
<polyline points="17 21 17 13 7 13 7 21"/>
<polyline points="7 3 7 8 15 8"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z" />
<polyline points="17 21 17 13 7 13 7 21" />
<polyline points="7 3 7 8 15 8" />
</svg>
)
}
export function Moon({ size = defaultProps.size }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/>
<circle cx="19" cy="5" r="1" fill="currentColor" opacity="0.5"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z" />
<circle cx="19" cy="5" r="1" fill="currentColor" opacity="0.5" />
</svg>
)
}
export function Sun({ size = defaultProps.size }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<circle cx="12" cy="12" r="5"/>
<circle cx="12" cy="12" r="2" fill="currentColor" opacity="0.3"/>
<line x1="12" y1="1" x2="12" y2="3"/>
<line x1="12" y1="21" x2="12" y2="23"/>
<line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/>
<line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/>
<line x1="1" y1="12" x2="3" y2="12"/>
<line x1="21" y1="12" x2="23" y2="12"/>
<line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/>
<line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<circle cx="12" cy="12" r="5" />
<circle cx="12" cy="12" r="2" fill="currentColor" opacity="0.3" />
<line x1="12" y1="1" x2="12" y2="3" />
<line x1="12" y1="21" x2="12" y2="23" />
<line x1="4.22" y1="4.22" x2="5.64" y2="5.64" />
<line x1="18.36" y1="18.36" x2="19.78" y2="19.78" />
<line x1="1" y1="12" x2="3" y2="12" />
<line x1="21" y1="12" x2="23" y2="12" />
<line x1="4.22" y1="19.78" x2="5.64" y2="18.36" />
<line x1="18.36" y1="5.64" x2="19.78" y2="4.22" />
</svg>
)
}
@@ -68,17 +102,26 @@ export function Sun({ size = defaultProps.size }: IconProps) {
export function Gitee({ size = defaultProps.size }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="currentColor">
<path d="M11.984 0C5.372 0 0 5.372 0 11.984c0 6.612 5.372 11.984 11.984 11.984s11.984-5.372 11.984-11.984C23.968 5.372 18.596 0 11.984 0zm6.78 18.272c-.224.448-.832.672-1.344.448l-3.584-1.792c-.448-.224-.672-.448-.672-.896v-4.704c0-.448.448-.896.896-.896h4.704c.448 0 .896.448.896.896v4.704c0 .896-.448 1.568-1.344 1.792l.448.64zm-6.112-2.688c-.896 0-1.568-.672-1.568-1.568s.672-1.568 1.568-1.568 1.568.672 1.568 1.568-.672 1.568-1.568 1.568z"/>
<path d="M11.984 0C5.372 0 0 5.372 0 11.984c0 6.612 5.372 11.984 11.984 11.984s11.984-5.372 11.984-11.984C23.968 5.372 18.596 0 11.984 0zm6.78 18.272c-.224.448-.832.672-1.344.448l-3.584-1.792c-.448-.224-.672-.448-.672-.896v-4.704c0-.448.448-.896.896-.896h4.704c.448 0 .896.448.896.896v4.704c0 .896-.448 1.568-1.344 1.792l.448.64zm-6.112-2.688c-.896 0-1.568-.672-1.568-1.568s.672-1.568 1.568-1.568 1.568.672 1.568 1.568-.672 1.568-1.568 1.568z" />
</svg>
)
}
export function Info({ size = defaultProps.size }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<circle cx="12" cy="12" r="10"/>
<line x1="12" y1="16" x2="12" y2="12"/>
<line x1="12" y1="8" x2="12.01" y2="8"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<circle cx="12" cy="12" r="10" />
<line x1="12" y1="16" x2="12" y2="12" />
<line x1="12" y1="8" x2="12.01" y2="8" />
</svg>
)
}
@@ -86,18 +129,34 @@ export function Info({ size = defaultProps.size }: IconProps) {
// ===== 标签栏图标 =====
export function Close({ size = 10 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round">
<line x1="18" y1="6" x2="6" y2="18"/>
<line x1="6" y1="6" x2="18" y2="18"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="2.5"
strokeLinecap="round"
>
<line x1="18" y1="6" x2="6" y2="18" />
<line x1="6" y1="6" x2="18" y2="18" />
</svg>
)
}
export function Plus({ size = 14 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round">
<line x1="12" y1="5" x2="12" y2="19"/>
<line x1="5" y1="12" x2="19" y2="12"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
>
<line x1="12" y1="5" x2="12" y2="19" />
<line x1="5" y1="12" x2="19" y2="12" />
</svg>
)
}
@@ -105,38 +164,74 @@ export function Plus({ size = 14 }: IconProps) {
// ===== 侧边栏图标 =====
export function Folder({ size = 14 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/>
<line x1="9" y1="13" x2="15" y2="13" opacity="0.4"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z" />
<line x1="9" y1="13" x2="15" y2="13" opacity="0.4" />
</svg>
)
}
export function File({ size = 14 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
<polyline points="14 2 14 8 20 8"/>
<line x1="8" y1="13" x2="16" y2="13" opacity="0.4"/>
<line x1="8" y1="17" x2="13" y2="17" opacity="0.3"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
<polyline points="14 2 14 8 20 8" />
<line x1="8" y1="13" x2="16" y2="13" opacity="0.4" />
<line x1="8" y1="17" x2="13" y2="17" opacity="0.3" />
</svg>
)
}
export function ChevronRight({ size = 10 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
<polyline points="9 18 15 12 9 6"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="2.5"
strokeLinecap="round"
strokeLinejoin="round"
>
<polyline points="9 18 15 12 9 6" />
</svg>
)
}
export function FolderPlus({ size = 14 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/>
<line x1="12" y1="11" x2="12" y2="17"/>
<line x1="9" y1="14" x2="15" y2="14"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z" />
<line x1="12" y1="11" x2="12" y2="17" />
<line x1="9" y1="14" x2="15" y2="14" />
</svg>
)
}
@@ -144,11 +239,59 @@ export function FolderPlus({ size = 14 }: IconProps) {
// ===== 拖拽覆盖层图标 =====
export function UploadCloud({ size = 64 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.25" strokeLinecap="round" strokeLinejoin="round">
<path d="M4 14.899A7 7 0 1 1 15.71 8h1.79a4.5 4.5 0 0 1 2.5 8.242"/>
<polyline points="12 16 12 8"/>
<polyline points="8 12 12 8 16 12"/>
<line x1="12" y1="16" x2="12" y2="22"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.25"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M4 14.899A7 7 0 1 1 15.71 8h1.79a4.5 4.5 0 0 1 2.5 8.242" />
<polyline points="12 16 12 8" />
<polyline points="8 12 12 8 16 12" />
<line x1="12" y1="16" x2="12" y2="22" />
</svg>
)
}
// ===== v0.6.0: 数据备份图标 =====
export function Download({ size = defaultProps.size }: IconProps) {
return (
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
<polyline points="7 10 12 15 17 10" />
<line x1="12" y1="15" x2="12" y2="3" />
</svg>
)
}
export function Upload({ size = defaultProps.size }: IconProps) {
return (
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
<polyline points="17 8 12 3 7 8" />
<line x1="12" y1="3" x2="12" y2="15" />
</svg>
)
}
@@ -156,21 +299,39 @@ export function UploadCloud({ size = 64 }: IconProps) {
// ===== 欢迎屏幕图标 =====
export function WelcomeFile({ size = 20 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/>
<line x1="12" y1="11" x2="12" y2="17"/>
<line x1="9" y1="14" x2="15" y2="14"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z" />
<line x1="12" y1="11" x2="12" y2="17" />
<line x1="9" y1="14" x2="15" y2="14" />
</svg>
)
}
export function WelcomeNew({ size = 20 }: IconProps) {
return (
<svg width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75" strokeLinecap="round" strokeLinejoin="round">
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
<polyline points="14 2 14 8 20 8"/>
<line x1="12" y1="18" x2="12" y2="12"/>
<line x1="9" y1="15" x2="15" y2="15"/>
<svg
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
strokeLinecap="round"
strokeLinejoin="round"
>
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
<polyline points="14 2 14 8 20 8" />
<line x1="12" y1="18" x2="12" y2="12" />
<line x1="9" y1="15" x2="15" y2="15" />
</svg>
)
}
@@ -1,70 +0,0 @@
import React from 'react'
interface LoadingSpinnerProps {
size?: 'small' | 'medium' | 'large'
label?: string
/** 是否全屏覆盖 */
overlay?: boolean
}
const sizeMap = {
small: 16,
medium: 24,
large: 36
}
/**
* UX-02: 通用加载指示器组件
*/
export const LoadingSpinner = React.memo(function LoadingSpinner({
size = 'medium',
label,
overlay = false
}: LoadingSpinnerProps) {
const px = sizeMap[size]
const spinner = (
<div
className={`loading-spinner loading-spinner-${size}`}
role="status"
aria-label={label || '加载中'}
>
<svg
className="loading-spinner-svg"
width={px}
height={px}
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
>
<circle
cx="12"
cy="12"
r="10"
stroke="currentColor"
strokeWidth="3"
strokeLinecap="round"
opacity="0.2"
/>
<path
d="M12 2a10 10 0 0 1 10 10"
stroke="currentColor"
strokeWidth="3"
strokeLinecap="round"
/>
</svg>
{label && <span className="loading-spinner-label">{label}</span>}
</div>
)
if (!overlay) return spinner
return (
<div className="loading-overlay" aria-busy="true">
{spinner}
</div>
)
})
LoadingSpinner.displayName = 'LoadingSpinner'
@@ -1 +0,0 @@
export { LoadingSpinner } from './LoadingSpinner'
@@ -5,12 +5,19 @@ interface ModifiedBannerProps {
onDismiss: () => void
}
export const ModifiedBanner = React.memo(function ModifiedBanner({ onReload, onDismiss }: ModifiedBannerProps) {
export const ModifiedBanner = React.memo(function ModifiedBanner({
onReload,
onDismiss,
}: ModifiedBannerProps) {
return (
<div id="modified-banner" role="alert" aria-live="assertive">
<span></span>
<button className="banner-btn" onClick={onReload} aria-label="重新加载文件"></button>
<button className="banner-btn" onClick={onDismiss} aria-label="忽略外部修改"></button>
<button className="banner-btn" onClick={onReload} aria-label="重新加载文件">
</button>
<button className="banner-btn" onClick={onDismiss} aria-label="忽略外部修改">
</button>
</div>
)
})
@@ -20,7 +20,7 @@ const OutlineItem = memo(function OutlineItem({
heading,
index,
isActive,
onNavigate
onNavigate,
}: OutlineItemProps) {
return (
<button
@@ -39,7 +39,7 @@ const OutlineItem = memo(function OutlineItem({
export const OutlinePanel = memo(function OutlinePanel({
headings,
onNavigate,
activeHeadingIndex
activeHeadingIndex,
}: OutlinePanelProps) {
if (headings.length === 0) {
return (
+53 -34
View File
@@ -58,10 +58,11 @@ export const Sidebar = React.memo(function Sidebar() {
const activeHeadingIndex = useActiveHeading(
viewMode === 'preview' ? previewRef : { current: null },
headings
headings,
)
// Navigate to heading in MetonaEditor
// v0.6.0: 使用官方 APIscrollToLine + setCursorPosition)替代 DOM hack
const handleHeadingNavigate = useCallback((heading: Heading) => {
const editor = getMetonaEditor()
if (!editor) return
@@ -69,38 +70,27 @@ export const Sidebar = React.memo(function Sidebar() {
try {
// 获取当前内容,查找标题文本在源代码中的位置
const content = editor.getValue()
const headingPattern = new RegExp(
`^#{1,6}\\s+${escapeRegex(heading.text)}\\s*$`,
'm'
)
const headingPattern = new RegExp(`^#{1,6}\\s+${escapeRegex(heading.text)}\\s*$`, 'm')
const match = headingPattern.exec(content)
if (!match) return
const pos = match.index
// 通过 DOM 操作滚动 textarea 到对应位置
const container = document.querySelector('.metona-editor-wrapper') as HTMLElement | null
if (!container) return
const textarea = container.querySelector('textarea')
if (!textarea) return
// 估算滚动位置(简单方法:按行数比例)
const linesBefore = content.substring(0, pos).split('\n').length
const lineHeight = 24 // 估算行高
textarea.scrollTop = linesBefore * lineHeight
// 设置光标位置
textarea.focus()
textarea.setSelectionRange(pos, pos)
// 按行号导航 — 官方 API 处理滚动与光标
const line = content.substring(0, match.index).split('\n').length
editor.scrollToLine(line)
editor.setCursorPosition(line, 0)
editor.focus()
} catch {
// 导航失败,静默忽略
}
}, [])
const handleFileClick = useCallback(async (path: string) => {
const handleFileClick = useCallback(
async (path: string) => {
const existing = tabs.find(t => t.filePath === path)
if (existing) { switchToTab(existing.id); return }
if (existing) {
switchToTab(existing.id)
return
}
if (!window.electronAPI) return
setLoading('file-open', true)
try {
@@ -112,7 +102,9 @@ export const Sidebar = React.memo(function Sidebar() {
} finally {
setLoading('file-open', false)
}
}, [tabs, switchToTab, createTab, setLoading])
},
[tabs, switchToTab, createTab, setLoading],
)
const independentFiles = tabs.filter(t => {
if (!t.filePath) return false
@@ -138,9 +130,12 @@ export const Sidebar = React.memo(function Sidebar() {
<nav id="sidebar-tree" role="tree" aria-label="文件树">
{independentFiles.length > 0 && (
<div className="independent-files-section" role="group" aria-label="已打开的文件">
<div className="independent-files-header" id="independent-files-label"></div>
<div className="independent-files-header" id="independent-files-label">
</div>
{independentFiles.map(tab => (
<div key={tab.id}
<div
key={tab.id}
className={`tree-item independent-file-item ${tab.id === activeTabId ? 'active' : ''}`}
style={{ paddingLeft: '8px' }}
role="treeitem"
@@ -148,22 +143,46 @@ export const Sidebar = React.memo(function Sidebar() {
aria-selected={tab.id === activeTabId}
aria-label={getFileName(tab.filePath!)}
onClick={() => switchToTab(tab.id)}
onKeyDown={(e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); switchToTab(tab.id) } }}
onKeyDown={e => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault()
switchToTab(tab.id)
}
}}
>
<span className="tree-icon"><File size={14} /></span>
<span className="tree-icon">
<File size={14} />
</span>
<span className="tree-name">{getFileName(tab.filePath!)}</span>
{tab.isModified && <span className="independent-modified-dot" aria-label="已修改"> </span>}
{tab.isModified && (
<span className="independent-modified-dot" aria-label="已修改">
{' '}
</span>
)}
</div>
))}
</div>
)}
{rootPath && (
<>
<div className="sidebar-section-header" id="folder-tree-label"></div>
<div className="sidebar-section-header" id="folder-tree-label">
</div>
<FileTree
nodes={[{ name: rootPath.split(/[/\\]/).pop() || rootPath, path: rootPath, type: 'dir' as const, children: tree }]}
depth={0} expandedDirs={expandedDirs} toggleDir={toggleDir}
activeFilePath={activeFilePath} onFileClick={handleFileClick}
nodes={[
{
name: rootPath.split(/[/\\]/).pop() || rootPath,
path: rootPath,
type: 'dir' as const,
children: tree,
},
]}
depth={0}
expandedDirs={expandedDirs}
toggleDir={toggleDir}
activeFilePath={activeFilePath}
onFileClick={handleFileClick}
/>
</>
)}
@@ -0,0 +1,38 @@
import React from 'react'
import { useEditorStore } from '../../stores/editorStore'
import { useAutoSaveStore } from '../../stores/autoSaveStore'
/**
* v0.6.0: 状态栏 — 展示文档统计 / 光标位置 / 自动保存状态。
* 数据来自 editorStoreEditor 组件绑定 MetonaEditor 事件实时写入)。
*/
export const StatusBar = React.memo(function StatusBar() {
const stats = useEditorStore(s => s.stats)
const cursor = useEditorStore(s => s.cursor)
const zenMode = useEditorStore(s => s.zenMode)
const isAutoSaving = useAutoSaveStore(s => s.isAutoSaving)
const autoSaveEnabled = useAutoSaveStore(s => s.autoSaveEnabled)
return (
<footer id="statusbar" role="status" aria-label="状态栏">
{zenMode && <span className="statusbar-item statusbar-zen">🧘 Zen</span>}
{stats && (
<span className="statusbar-item" title="字数 / 词数 / 行数 / 阅读时间">
{stats.words} · {stats.lines} · {stats.readingTime}
</span>
)}
<span className="statusbar-spacer" />
{cursor && (
// getCursorPosition: line 为 1-basedcolumn 为 0-based
<span className="statusbar-item">
{cursor.line}, {cursor.column + 1}
</span>
)}
<span className={`statusbar-item statusbar-autosave${isAutoSaving ? ' saving' : ''}`}>
{isAutoSaving ? '保存中...' : autoSaveEnabled ? '自动保存' : '手动保存'}
</span>
</footer>
)
})
StatusBar.displayName = 'StatusBar'
@@ -0,0 +1 @@
export { StatusBar } from './StatusBar'
+47 -45
View File
@@ -1,9 +1,8 @@
import React, { useCallback, useState, useEffect, useRef } from 'react'
import { useTabStore } from '../../stores/tabStore'
import { useConfirm } from '../../hooks/useConfirm'
import { getFileName } from '../../lib/fileUtils'
import { MeToast } from '../../lib/toast'
import { Close, Plus } from '../Icons'
import { ConfirmDialog } from '../ConfirmDialog/ConfirmDialog'
interface ContextMenuState {
visible: boolean
@@ -27,7 +26,6 @@ export const TabBar = React.memo(function TabBar() {
const [menu, setMenu] = useState<ContextMenuState>({ visible: false, x: 0, y: 0, tabId: '' })
const [dragOverIndex, setDragOverIndex] = useState<number | null>(null)
const dragTabIdRef = useRef<string | null>(null)
const { confirm, confirmDialogProps } = useConfirm()
// 滚动到活动标签
const scrollToActiveTab = useCallback(() => {
@@ -41,11 +39,11 @@ export const TabBar = React.memo(function TabBar() {
// 如果标签在可视区域左侧之外
if (tabRect.left < listRect.left) {
tabList.scrollLeft -= (listRect.left - tabRect.left + 20)
tabList.scrollLeft -= listRect.left - tabRect.left + 20
}
// 如果标签在可视区域右侧之外
else if (tabRect.right > listRect.right) {
tabList.scrollLeft += (tabRect.right - listRect.right + 20)
tabList.scrollLeft += tabRect.right - listRect.right + 20
}
}, [])
@@ -76,21 +74,23 @@ export const TabBar = React.memo(function TabBar() {
return () => tabList.removeEventListener('wheel', handleWheel)
}, [])
const handleClose = useCallback(async (e: React.MouseEvent, tabId: string) => {
const handleClose = useCallback(
async (e: React.MouseEvent, tabId: string) => {
e.stopPropagation()
const tab = tabs.find(t => t.id === tabId)
if (tab?.isModified) {
const name = tab.filePath ? getFileName(tab.filePath) : '未命名'
const confirmed = await confirm({
const confirmed = await MeToast.confirm(`"${name}" 尚未保存,确定要关闭吗?`, {
title: '关闭标签',
message: `"${name}" 尚未保存,确定要关闭吗?`,
variant: 'warning',
confirmLabel: '关闭'
confirmText: '关闭',
cancelText: '取消',
})
if (!confirmed) return
}
closeTab(tabId)
}, [tabs, closeTab, confirm])
},
[tabs, closeTab],
)
// C-06: 右键菜单(带边界修正)
const handleContextMenu = useCallback((e: React.MouseEvent, tabId: string) => {
@@ -114,67 +114,65 @@ export const TabBar = React.memo(function TabBar() {
const tab = tabs.find(t => t.id === menu.tabId)
if (tab?.isModified) {
const name = tab.filePath ? getFileName(tab.filePath) : '未命名'
const confirmed = await confirm({
const confirmed = await MeToast.confirm(`"${name}" 尚未保存,确定要关闭吗?`, {
title: '关闭标签',
message: `"${name}" 尚未保存,确定要关闭吗?`,
variant: 'warning',
confirmLabel: '关闭'
confirmText: '关闭',
cancelText: '取消',
})
if (!confirmed) return
}
closeTab(menu.tabId)
setMenu(prev => ({ ...prev, visible: false }))
}, [tabs, menu.tabId, closeTab, confirm])
}, [tabs, menu.tabId, closeTab])
const handleMenuCloseOthers = useCallback(async () => {
const otherModified = tabs.filter(t => t.id !== menu.tabId && t.isModified)
if (otherModified.length > 0) {
const names = otherModified.map(t => t.filePath ? getFileName(t.filePath) : '未命名').join('、')
const confirmed = await confirm({
const names = otherModified
.map(t => (t.filePath ? getFileName(t.filePath) : '未命名'))
.join('、')
const confirmed = await MeToast.confirm(`以下文件尚未保存:${names},确定要关闭吗?`, {
title: '关闭其他标签',
message: `以下文件尚未保存:${names},确定要关闭吗?`,
variant: 'warning',
confirmLabel: '关闭'
confirmText: '关闭',
cancelText: '取消',
})
if (!confirmed) return
}
closeOtherTabs(menu.tabId)
setMenu(prev => ({ ...prev, visible: false }))
}, [tabs, menu.tabId, closeOtherTabs, confirm])
}, [tabs, menu.tabId, closeOtherTabs])
const handleMenuCloseAll = useCallback(async () => {
const modified = tabs.filter(t => t.isModified)
if (modified.length > 0) {
const names = modified.map(t => t.filePath ? getFileName(t.filePath) : '未命名').join('、')
const confirmed = await confirm({
const names = modified.map(t => (t.filePath ? getFileName(t.filePath) : '未命名')).join('、')
const confirmed = await MeToast.confirm(`以下文件尚未保存:${names},确定要关闭吗?`, {
title: '关闭全部标签',
message: `以下文件尚未保存:${names},确定要关闭吗?`,
variant: 'warning',
confirmLabel: '关闭'
confirmText: '关闭',
cancelText: '取消',
})
if (!confirmed) return
}
closeAllTabs()
setMenu(prev => ({ ...prev, visible: false }))
}, [tabs, closeAllTabs, confirm])
}, [tabs, closeAllTabs])
const handleMenuCloseRight = useCallback(async () => {
const index = tabs.findIndex(t => t.id === menu.tabId)
const rightTabs = tabs.slice(index + 1)
const modified = rightTabs.filter(t => t.isModified)
if (modified.length > 0) {
const names = modified.map(t => t.filePath ? getFileName(t.filePath) : '未命名').join('、')
const confirmed = await confirm({
const names = modified.map(t => (t.filePath ? getFileName(t.filePath) : '未命名')).join('、')
const confirmed = await MeToast.confirm(`以下文件尚未保存:${names},确定要关闭吗?`, {
title: '关闭右侧标签',
message: `以下文件尚未保存:${names},确定要关闭吗?`,
variant: 'warning',
confirmLabel: '关闭'
confirmText: '关闭',
cancelText: '取消',
})
if (!confirmed) return
}
closeTabsToRight(menu.tabId)
setMenu(prev => ({ ...prev, visible: false }))
}, [tabs, menu.tabId, closeTabsToRight, confirm])
}, [tabs, menu.tabId, closeTabsToRight])
// D1: 拖拽排序事件处理
const handleDragStart = useCallback((e: React.DragEvent, tabId: string) => {
@@ -198,7 +196,8 @@ export const TabBar = React.memo(function TabBar() {
setDragOverIndex(null)
}, [])
const handleDrop = useCallback((e: React.DragEvent, toIndex: number) => {
const handleDrop = useCallback(
(e: React.DragEvent, toIndex: number) => {
e.preventDefault()
setDragOverIndex(null)
const fromId = dragTabIdRef.current
@@ -208,7 +207,9 @@ export const TabBar = React.memo(function TabBar() {
dragTabIdRef.current = null
// 清理 dragging 类
document.querySelectorAll('.tab-item.dragging').forEach(el => el.classList.remove('dragging'))
}, [moveTab])
},
[moveTab],
)
const handleDragEnd = useCallback(() => {
setDragOverIndex(null)
@@ -216,7 +217,9 @@ export const TabBar = React.memo(function TabBar() {
dragTabIdRef.current = null
}, [])
const hasRightTabs = menu.visible && (() => {
const hasRightTabs =
menu.visible &&
(() => {
const index = tabs.findIndex(t => t.id === menu.tabId)
return index < tabs.length - 1
})()
@@ -237,11 +240,11 @@ export const TabBar = React.memo(function TabBar() {
data-tab-id={tab.id}
draggable
onClick={() => switchToTab(tab.id)}
onContextMenu={(e) => handleContextMenu(e, tab.id)}
onDragStart={(e) => handleDragStart(e, tab.id)}
onDragOver={(e) => handleDragOver(e, index)}
onContextMenu={e => handleContextMenu(e, tab.id)}
onDragStart={e => handleDragStart(e, tab.id)}
onDragOver={e => handleDragOver(e, index)}
onDragLeave={handleDragLeave}
onDrop={(e) => handleDrop(e, index)}
onDrop={e => handleDrop(e, index)}
onDragEnd={handleDragEnd}
>
<span className="tab-name">
@@ -249,7 +252,7 @@ export const TabBar = React.memo(function TabBar() {
</span>
<button
className="tab-close"
onClick={(e) => handleClose(e, tab.id)}
onClick={e => handleClose(e, tab.id)}
aria-label={`关闭 ${tab.filePath ? getFileName(tab.filePath) : '未命名'}`}
>
<Close size={10} />
@@ -273,8 +276,8 @@ export const TabBar = React.memo(function TabBar() {
style={{ left: menu.x, top: menu.y }}
role="menu"
aria-label="标签操作"
onClick={(e) => e.stopPropagation()}
onMouseDown={(e) => e.stopPropagation()}
onClick={e => e.stopPropagation()}
onMouseDown={e => e.stopPropagation()}
>
<div className="tab-context-item" role="menuitem" onClick={handleMenuClose}>
@@ -296,7 +299,6 @@ export const TabBar = React.memo(function TabBar() {
</div>
)}
</div>
<ConfirmDialog {...confirmDialogProps} />
</>
)
})
+113 -11
View File
@@ -1,5 +1,9 @@
import React from 'react'
import { FolderOpen, Save, Moon, Sun, Info } from '../Icons'
import React, { useCallback } from 'react'
import { FolderOpen, Save, Moon, Sun, Info, Download, Upload } from '../Icons'
import { getMetonaEditor, useEditorStore } from '../../stores/editorStore'
import { backupRepository } from '../../db/backupRepository'
import { showToast } from '../../lib/toast'
import { logError } from '../../lib/errorHandler'
import type { ThemeMode } from '../../types/settings'
interface ToolbarProps {
@@ -20,23 +24,83 @@ const THEME_LABELS: Record<ThemeMode, string> = {
}
/**
* 应用顶层工具栏 — 文件操作、自动保存、主题循环、关于。
* 应用顶层工具栏 — 文件操作、自动保存、主题循环、数据备份、关于。
* 编辑器格式化和模式切换由 MetonaEditor 内置工具栏处理。
*/
export const Toolbar = React.memo(function Toolbar({
onOpen, onSave, themeMode, onCycleTheme, onShowAbout,
isAutoSaving, autoSaveEnabled, onToggleAutoSave
onOpen,
onSave,
themeMode,
onCycleTheme,
onShowAbout,
isAutoSaving,
autoSaveEnabled,
onToggleAutoSave,
}: ToolbarProps) {
const nextLabel = THEME_LABELS[themeMode] ?? '主题'
const zenMode = useEditorStore(s => s.zenMode)
// v0.6.0: Zen 专注模式切换(MetonaEditor 内置能力)
const handleToggleZen = useCallback(() => {
const editor = getMetonaEditor()
if (!editor) return
editor.toggleZen()
}, [])
// v0.6.0: 数据备份导出(sqlark exportAll → JSON 文件)
const handleExport = useCallback(async () => {
if (!window.electronAPI) return
const data = await backupRepository.exportAll()
if (!data) return
const result = await window.electronAPI.exportData(JSON.stringify(data, null, 2))
if (result.success) {
showToast('备份已导出', 'success')
} else if (!result.canceled) {
showToast(`导出失败: ${result.error ?? '未知错误'}`, 'error')
}
}, [])
// v0.6.0: 数据备份导入(JSON 文件 → sqlark importTable
const handleImport = useCallback(async () => {
if (!window.electronAPI) return
const result = await window.electronAPI.importData()
if (!result.success) return
if (result.canceled || !result.content) return
try {
const data = JSON.parse(result.content) as Record<string, Record<string, unknown>[]>
const ok = await backupRepository.importAll(data)
if (ok) {
// 恢复后刷新页面 — 所有 store 从新数据库重新加载(loadFromDB 有 _loaded 守卫,
// 且 settings/sidebar 也只在初始化时读取,直接重载页面最可靠)
showToast('备份已恢复', 'success')
setTimeout(() => window.location.reload(), 800)
} else {
showToast('恢复备份失败', 'error')
}
} catch (error) {
logError('解析备份文件失败', error)
showToast('备份文件格式无效', 'error')
}
}, [])
return (
<div id="toolbar" role="toolbar" aria-label="工具栏">
<div className="toolbar-left" role="group" aria-label="文件操作">
<button className="toolbar-btn" onClick={onOpen} title="打开文件 (Ctrl+O)" aria-label="打开文件">
<button
className="toolbar-btn"
onClick={onOpen}
title="打开文件 (Ctrl+O)"
aria-label="打开文件"
>
<FolderOpen size={18} />
<span></span>
</button>
<button className="toolbar-btn" onClick={onSave} title="保存文件 (Ctrl+S)" aria-label="保存文件">
<button
className="toolbar-btn"
onClick={onSave}
title="保存文件 (Ctrl+S)"
aria-label="保存文件"
>
<Save size={18} />
<span></span>
</button>
@@ -44,13 +108,46 @@ export const Toolbar = React.memo(function Toolbar({
<button
className={`toolbar-btn toolbar-autosave${isAutoSaving ? ' saving' : ''}`}
onClick={onToggleAutoSave}
title={isAutoSaving ? '正在自动保存...' : (autoSaveEnabled ? '自动保存已开启 — 点击关闭' : '自动保存已关闭 — 点击开启')}
aria-label={isAutoSaving ? '正在自动保存' : (autoSaveEnabled ? '关闭自动保存' : '开启自动保存')}
title={
isAutoSaving
? '正在自动保存...'
: autoSaveEnabled
? '自动保存已开启 — 点击关闭'
: '自动保存已关闭 — 点击开启'
}
aria-label={
isAutoSaving ? '正在自动保存' : autoSaveEnabled ? '关闭自动保存' : '开启自动保存'
}
>
<span>{isAutoSaving ? '保存中...' : (autoSaveEnabled ? '自动' : '手动')}</span>
<span>{isAutoSaving ? '保存中...' : autoSaveEnabled ? '自动' : '手动'}</span>
</button>
</div>
<div className="toolbar-right" role="group" aria-label="设置">
<button
className={`toolbar-btn${zenMode ? ' active' : ''}`}
onClick={handleToggleZen}
title={zenMode ? '退出专注模式' : '专注模式 — 隐藏编辑器工具栏'}
aria-label={zenMode ? '退出专注模式' : '进入专注模式'}
aria-pressed={zenMode}
>
<span>🧘 {zenMode ? '专注中' : '专注'}</span>
</button>
<button
className="toolbar-btn"
onClick={handleExport}
title="导出数据备份"
aria-label="导出数据备份"
>
<Download size={16} />
</button>
<button
className="toolbar-btn"
onClick={handleImport}
title="导入数据备份"
aria-label="导入数据备份"
>
<Upload size={16} />
</button>
<button
className="toolbar-btn"
onClick={onCycleTheme}
@@ -60,7 +157,12 @@ export const Toolbar = React.memo(function Toolbar({
{themeMode === 'dark' ? <Moon size={18} /> : <Sun size={18} />}
<span style={{ fontSize: 12, marginLeft: 2 }}>{nextLabel}</span>
</button>
<button className="toolbar-btn" onClick={onShowAbout} title="关于" aria-label="关于 MarkLite">
<button
className="toolbar-btn"
onClick={onShowAbout}
title="关于"
aria-label="关于 MarkLite"
>
<Info size={18} />
</button>
</div>
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from 'react'
import { AppIcon, WelcomeFile, WelcomeNew } from '../Icons'
import { recentFilesRepository } from '../../db/recentFilesRepository'
import { getDb } from '../../db/schema'
import { getFileName } from '../../lib/fileUtils'
interface WelcomeScreenProps {
@@ -9,13 +10,47 @@ interface WelcomeScreenProps {
onOpenRecent?: (filePath: string) => void
}
export const WelcomeScreen = React.memo(function WelcomeScreen({ onOpen, onNew, onOpenRecent }: WelcomeScreenProps) {
export const WelcomeScreen = React.memo(function WelcomeScreen({
onOpen,
onNew,
onOpenRecent,
}: WelcomeScreenProps) {
const [recentFiles, setRecentFiles] = useState<string[]>([])
// v0.6.0: 订阅 recentFiles 表变更,文件打开/删除时自动刷新
useEffect(() => {
recentFilesRepository.getAll(10).then((files: string[]) => {
setRecentFiles(files)
let cancelled = false
let unsubscribe: (() => void) | null = null
const refresh = async () => {
const files = await recentFilesRepository.getAll(10)
if (!cancelled) setRecentFiles(files)
}
refresh()
getDb()
.then(db => {
if (cancelled) return
unsubscribe = db.subscribe('recentFiles', event => {
if (
event.type === 'insert' ||
event.type === 'update' ||
event.type === 'delete' ||
event.type === 'external'
) {
refresh()
}
})
})
.catch(() => {
/* 订阅失败不阻塞页面 */
})
return () => {
cancelled = true
unsubscribe?.()
}
}, [])
return (
@@ -51,7 +86,14 @@ export const WelcomeScreen = React.memo(function WelcomeScreen({ onOpen, onNew,
aria-label={`打开 ${getFileName(filePath)}`}
>
<span className="recent-icon" aria-hidden="true">
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.75">
<svg
width="14"
height="14"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="1.75"
>
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
<polyline points="14 2 14 8 20 8" />
</svg>
@@ -0,0 +1,34 @@
import 'fake-indexeddb/auto'
import { describe, it, expect } from 'vitest'
import { recentFilesRepository } from '../recentFilesRepository'
describe('recentFilesRepository (真实 AriaEngine + IndexedDB)', () => {
it('should add and read recent files', async () => {
await recentFilesRepository.add('/test/a.md')
const files = await recentFilesRepository.getAll(10)
expect(files).toContain('/test/a.md')
})
it('should update lastOpened on re-add', async () => {
await recentFilesRepository.add('/test/b.md')
await new Promise(r => setTimeout(r, 5))
await recentFilesRepository.add('/test/b.md')
const files = await recentFilesRepository.getAll(10)
expect(files[0]).toBe('/test/b.md')
})
it('should enforce 50 item limit', async () => {
for (let i = 0; i < 55; i++) {
await recentFilesRepository.add(`/test/f${String(i).padStart(2, '0')}.md`)
}
const files = await recentFilesRepository.getAll(60)
expect(files.length).toBeLessThanOrEqual(50)
})
it('should remove a file', async () => {
await recentFilesRepository.add('/test/remove-me.md')
await recentFilesRepository.remove('/test/remove-me.md')
const files = await recentFilesRepository.getAll(60)
expect(files).not.toContain('/test/remove-me.md')
})
})
+44
View File
@@ -0,0 +1,44 @@
import { getDb } from './schema'
import { logError } from '../lib/errorHandler'
/** v0.6.0: 备份数据格式 — { 表名: 行[] }(与 db.exportAll() 一致) */
export type BackupData = Record<string, Record<string, unknown>[]>
const BACKUP_TABLES = ['tabSnapshots', 'settings', 'recentFiles', 'activeTab']
/**
* v0.6.0: 数据备份/恢复 — 基于 sqlark 的 exportAll / importTable。
*/
export const backupRepository = {
async exportAll(): Promise<BackupData | null> {
try {
const db = await getDb()
return (await db.exportAll()) as BackupData
} catch (error) {
logError('导出备份失败', error)
return null
}
},
async importAll(data: BackupData): Promise<boolean> {
try {
const db = await getDb()
// 先清空现有四表,再按表导入(清空走事务保证原子性)
await db.transaction(async trx => {
for (const tableName of BACKUP_TABLES) {
await trx.table(tableName).clear()
}
})
for (const tableName of BACKUP_TABLES) {
const rows = data[tableName]
if (Array.isArray(rows) && rows.length > 0) {
await db.importTable(tableName, rows)
}
}
return true
} catch (error) {
logError('导入备份失败', error)
return false
}
},
}
+22 -3
View File
@@ -1,7 +1,20 @@
import { type Table } from '@metona-team/metona-sqlark'
import { type MetonaSqlark, type Table } from '@metona-team/metona-sqlark'
import { getDb, type RecentFile } from './schema'
import { logError } from '../lib/errorHandler'
/**
* v0.6.0: 本地写操作完成后 emit 表变更事件 —
* sqlark 的 Table 写操作只通过 BroadcastChannel 通知其他标签页,
* 本地订阅(subscribe)需要手动 emitWelcomeScreen 借此自动刷新最近文件。
*/
async function emitChange(db: MetonaSqlark, type: string): Promise<void> {
try {
db.emit('recentFiles', { type })
} catch {
// 通知失败不影响主流程
}
}
export const recentFilesRepository = {
async add(filePath: string): Promise<void> {
try {
@@ -17,8 +30,12 @@ export const recentFilesRepository = {
const all = (await tbl.select().orderBy('lastOpened', 'desc').execute()) as RecentFile[]
if (all.length > 50) {
const toDelete = all.slice(50).map((f: RecentFile) => f.filePath)
await tbl.delete().where({ filePath: { $in: toDelete } }).execute()
await tbl
.delete()
.where({ filePath: { $in: toDelete } })
.execute()
}
await emitChange(db, 'update')
} catch (error) {
logError('添加最近文件失败', error)
}
@@ -44,6 +61,7 @@ export const recentFilesRepository = {
try {
const db = await getDb()
await db.table('recentFiles').delete().where({ filePath }).execute()
await emitChange(db, 'delete')
} catch (error) {
logError('删除最近文件失败', error)
}
@@ -53,8 +71,9 @@ export const recentFilesRepository = {
try {
const db = await getDb()
await db.table('recentFiles').clear()
await emitChange(db, 'delete')
} catch (error) {
logError('清空最近文件失败', error)
}
}
},
}
+105 -14
View File
@@ -1,5 +1,6 @@
import { create, type ColumnDef, type MetonaSqlark } from '@metona-team/metona-sqlark'
import { logError } from '../lib/errorHandler'
import { MeToast } from '../lib/toast'
// 注意: 使用 type 别名而非 interface —
// sqlark 的 Table<T> 泛型约束 T & Record<string, unknown>
@@ -38,7 +39,15 @@ export type RecentFile = {
// v0.5.0: 库名更换为 MarkLiteV2,与旧 Dexie 库(MarkLite)彻底隔离,旧数据已放弃
// v0.5.0: 存储引擎选用 AriaEngine(自研 LSM-Tree + WAL + MVCC,对标 SQLite
const DB_NAME = 'MarkLiteV2'
const DB_VERSION = 1
/**
* v0.6.0: 版本化 Schema 迁移。
* create 时 version 传 0(表示尚未应用任何 schema),migrateTo(SCHEMA_VERSION)
* 会依次执行所有 version > 0 的迁移。注意 _version 不持久化(每次启动从配置值
* 开始),因此每个迁移内部必须幂等(表存在检查)。
* 未来升级: 新增 addMigration(N) + 提升 SCHEMA_VERSION,迁移内部做增量变更。
*/
const SCHEMA_VERSION = 1
const TAB_SNAPSHOTS_COLUMNS: Record<string, ColumnDef> = {
id: { type: 'string', primaryKey: true },
@@ -70,33 +79,115 @@ const ACTIVE_TAB_COLUMNS: Record<string, ColumnDef> = {
}
/**
* v0.5.0: MetonaSqlark 初始化 — 懒加载单例。
* v0.6.0: MetonaSqlark 初始化 — 懒加载单例。
* create() 为异步,无法像 Dexie 那样模块顶层同步实例化;
* 首次调用时创建,之后复用同一 Promise。
*
* v0.6.0: 数据损坏自愈 —
* AriaEngine 在异常退出(强杀/断电)时可能留下残缺的 SSTable 文件,
* 重新打开解析块偏移会抛 RangeErroroffset is out of bounds)导致初始化失败。
* 检测到打开失败后:标记 localStorage → 重载页面(干净环境无残留 IDB 连接)
* → 删除损坏库 → 重建。create 成功后才清除标记,避免自愈失败死循环。
*/
let dbPromise: Promise<MetonaSqlark> | null = null
let initFailedNotified = false
async function defineTablesIfNeeded(db: MetonaSqlark): Promise<void> {
const tables = await db.getTableNames()
if (!tables.includes('tabSnapshots')) await db.defineTable('tabSnapshots', TAB_SNAPSHOTS_COLUMNS)
if (!tables.includes('settings')) await db.defineTable('settings', SETTINGS_COLUMNS)
if (!tables.includes('recentFiles')) await db.defineTable('recentFiles', RECENT_FILES_COLUMNS)
if (!tables.includes('activeTab')) await db.defineTable('activeTab', ACTIVE_TAB_COLUMNS)
// IndexedDBBackend 的内部库名 = `aria-${name}`sqlark 源码约定)
const DB_STORAGE_NAME = `aria-${DB_NAME}`
const RESET_PENDING_KEY = 'marklite-db-reset-pending'
/** 删除损坏数据库(无活动连接时立即成功) */
function deleteStorageDatabase(): Promise<void> {
return new Promise<void>(resolve => {
const req = indexedDB.deleteDatabase(DB_STORAGE_NAME)
req.onsuccess = () => resolve()
req.onerror = () => resolve()
req.onblocked = () => resolve()
})
}
export function getDb(): Promise<MetonaSqlark> {
if (!dbPromise) {
dbPromise = (async () => {
/** 自愈入口:存在重置标记时删除损坏库(保留标记,create 成功后才清除) */
async function resetCorruptDatabaseIfNeeded(): Promise<void> {
try {
if (localStorage.getItem(RESET_PENDING_KEY) !== '1') return
await deleteStorageDatabase()
try {
MeToast?.info('数据库已重置(原数据损坏,无法恢复)')
} catch {
/* 提示失败不影响主流程 */
}
} catch {
/* 重置失败不阻塞启动 */
}
}
async function createDatabase(): Promise<MetonaSqlark> {
const db = await create({
name: DB_NAME,
mode: 'aria', // AriaEngine: LSM-Tree + WAL + MVCC 快照隔离
diskEngine: 'indexeddb', // 底层存储后端(indexeddb | opfs | memory
version: DB_VERSION,
version: 0, // 0 = 尚未应用任何 schema 迁移
onError: (err: Error) => logError('数据库错误', err),
})
await defineTablesIfNeeded(db)
// v1: 初始四表结构
db.addMigration(1, async d => {
const tables = await d.getTableNames()
if (!tables.includes('tabSnapshots')) await d.defineTable('tabSnapshots', TAB_SNAPSHOTS_COLUMNS)
if (!tables.includes('settings')) await d.defineTable('settings', SETTINGS_COLUMNS)
if (!tables.includes('recentFiles')) await d.defineTable('recentFiles', RECENT_FILES_COLUMNS)
if (!tables.includes('activeTab')) await d.defineTable('activeTab', ACTIVE_TAB_COLUMNS)
})
await db.migrateTo(SCHEMA_VERSION)
return db
})()
}
async function initDb(): Promise<MetonaSqlark> {
await resetCorruptDatabaseIfNeeded()
try {
const db = await createDatabase()
// 创建成功:清除重置标记(自愈完成)
try {
localStorage.removeItem(RESET_PENDING_KEY)
} catch {
/* 忽略 */
}
return db
} catch (err) {
logError('数据库打开失败', err)
// 数据损坏自愈:首次失败 → 标记 + 重载页面(干净环境删除损坏库重建)
try {
if (localStorage.getItem(RESET_PENDING_KEY) !== '1') {
localStorage.setItem(RESET_PENDING_KEY, '1')
window.location.reload()
}
} catch {
/* 忽略 */
}
throw err
}
}
export function getDb(): Promise<MetonaSqlark> {
if (!dbPromise) {
dbPromise = initDb().catch(err => {
// v0.6.0: 初始化失败不再静默 — 记录日志并提示用户(否则所有数据持久化静默失效)
logError('数据库初始化失败', err)
if (!initFailedNotified) {
initFailedNotified = true
try {
const code = (err as { code?: string })?.code ?? 'UNKNOWN'
const msg = err instanceof Error ? err.message : String(err)
setTimeout(() => {
MeToast?.error(`数据库初始化失败(${code}):${msg}`)
}, 0)
} catch {
/* 提示失败不影响主流程 */
}
}
throw err
})
// 初始化失败时允许下次重试
dbPromise.catch(() => {
dbPromise = null
+7 -8
View File
@@ -7,18 +7,14 @@ export const settingsRepository = {
async load(): Promise<Settings> {
try {
const db = await getDb()
const rows = await db
.table('settings')
.select()
.where({ id: 'default' })
.execute()
const rows = await db.table('settings').select().where({ id: 'default' }).execute()
const record = rows[0] as SettingsRecord | undefined
if (record) {
return {
themeMode: record.themeMode ?? DEFAULT_SETTINGS.themeMode,
viewMode: record.viewMode ?? DEFAULT_SETTINGS.viewMode,
sidebarCollapsed: record.sidebarCollapsed ?? DEFAULT_SETTINGS.sidebarCollapsed,
sidebarWidth: record.sidebarWidth ?? DEFAULT_SETTINGS.sidebarWidth
sidebarWidth: record.sidebarWidth ?? DEFAULT_SETTINGS.sidebarWidth,
}
}
} catch (error) {
@@ -37,12 +33,15 @@ export const settingsRepository = {
const tbl = db.table('settings') as Table<SettingsRecord>
const rows = await tbl.select().where({ id: 'default' }).execute()
if (rows.length > 0) {
await tbl.update({ ...merged }).where({ id: 'default' }).execute()
await tbl
.update({ ...merged })
.where({ id: 'default' })
.execute()
} else {
await tbl.insert(merged)
}
} catch (error) {
logError('保存设置失败', error)
}
}
},
}
+3 -11
View File
@@ -7,7 +7,7 @@ export const tabRepository = {
try {
const db = await getDb()
// v0.5.0: sqlark 事务 — 失败自动回滚(AriaEngine MVCC 快照隔离)
await db.transaction(async (trx) => {
await db.transaction(async trx => {
await trx.table('tabSnapshots').clear()
if (tabs.length > 0) {
await trx.table('tabSnapshots').insertMany(tabs)
@@ -21,11 +21,7 @@ export const tabRepository = {
async loadAll(): Promise<TabSnapshot[]> {
try {
const db = await getDb()
const rows = await db
.table('tabSnapshots')
.select()
.orderBy('updatedAt', 'asc')
.execute()
const rows = await db.table('tabSnapshots').select().orderBy('updatedAt', 'asc').execute()
return rows as TabSnapshot[]
} catch (error) {
logError('加载标签快照失败', error)
@@ -60,11 +56,7 @@ export const tabRepository = {
async loadActiveTabId(): Promise<string | null> {
try {
const db = await getDb()
const rows = await db
.table('activeTab')
.select()
.where({ id: 'current' })
.execute()
const rows = await db.table('activeTab').select().where({ id: 'current' }).execute()
return (rows[0] as ActiveTabRecord | undefined)?.activeTabId ?? null
} catch (error) {
logError('加载活动标签ID失败', error)
@@ -1,76 +0,0 @@
import { describe, it, expect } from 'vitest'
import { computeDocStats } from '../useDocStats'
describe('computeDocStats', () => {
it('should return zeros for undefined content', () => {
expect(computeDocStats(undefined)).toEqual({ words: 0, chars: 0, charsNoSpace: 0, lines: 0 })
})
it('should return zeros for null content', () => {
expect(computeDocStats(null)).toEqual({ words: 0, chars: 0, charsNoSpace: 0, lines: 0 })
})
it('should return zeros for empty string', () => {
expect(computeDocStats('')).toEqual({ words: 0, chars: 0, charsNoSpace: 0, lines: 0 })
})
it('should count single word', () => {
const result = computeDocStats('hello')
expect(result.words).toBe(1)
expect(result.chars).toBe(5)
expect(result.charsNoSpace).toBe(5)
expect(result.lines).toBe(1)
})
it('should count multiple words', () => {
const result = computeDocStats('hello world')
expect(result.words).toBe(2)
expect(result.chars).toBe(11) // 'hello world' = 11 chars
expect(result.charsNoSpace).toBe(10) // without the space
})
it('should count characters without spaces', () => {
const result = computeDocStats('a b c')
expect(result.chars).toBe(5)
expect(result.charsNoSpace).toBe(3)
})
it('should count lines', () => {
const result = computeDocStats('line1\nline2\nline3')
expect(result.lines).toBe(3)
expect(result.words).toBe(3)
})
it('should handle Windows line endings', () => {
const result = computeDocStats('line1\r\nline2\r\nline3')
expect(result.lines).toBe(3)
})
it('should handle trailing newline', () => {
const result = computeDocStats('hello\n')
expect(result.lines).toBe(2)
expect(result.words).toBe(1)
})
it('should count markdown content correctly', () => {
const md = '# Title\n\nThis is a **paragraph** with some *text*.\n\n- List item 1\n- List item 2\n'
const result = computeDocStats(md)
expect(result.words).toBe(17)
expect(result.lines).toBe(7)
expect(result.chars).toBe(md.length)
})
it('should handle whitespace-only content', () => {
const result = computeDocStats(' \n \n ')
expect(result.words).toBe(0)
expect(result.chars).toBe(9)
expect(result.charsNoSpace).toBe(0)
expect(result.lines).toBe(3)
})
it('should handle content with non-ASCII characters', () => {
const result = computeDocStats('中文测试 日本語 한국어')
expect(result.words).toBe(3)
expect(result.chars).toBe(12)
})
})
+3 -3
View File
@@ -13,7 +13,7 @@ import { useEffect, useState, useCallback } from 'react'
*/
export function useActiveHeading(
containerRef: React.RefObject<HTMLElement | null>,
headings: { level: number; text: string }[]
headings: { level: number; text: string }[],
): number | null {
const [activeIndex, setActiveIndex] = useState<number | null>(null)
@@ -26,7 +26,7 @@ export function useActiveHeading(
// 收集容器内所有 h1-h6 元素的 offsetTop
const headingElements = Array.from(
container.querySelectorAll('h1, h2, h3, h4, h5, h6')
container.querySelectorAll('h1, h2, h3, h4, h5, h6'),
) as HTMLElement[]
if (headingElements.length === 0) {
@@ -48,7 +48,7 @@ export function useActiveHeading(
// 找到 headings 中匹配的索引
const text = el.textContent?.trim() ?? ''
const matchIdx = headings.findIndex(
h => h.text.trim() === text && el.tagName.slice(-1) === String(h.level)
h => h.text.trim() === text && el.tagName.slice(-1) === String(h.level),
)
if (matchIdx >= 0) bestIndex = matchIdx
}
+7 -3
View File
@@ -23,7 +23,11 @@ export function toggleAutoSaveExternal(): void {
* Captures the tabId at debounce start so the timeout always saves the
* correct tab even if the user switches tabs during the debounce window.
*/
export function useAutoSave(): { isAutoSaving: boolean; autoSaveEnabled: boolean; toggleAutoSave: () => void } {
export function useAutoSave(): {
isAutoSaving: boolean
autoSaveEnabled: boolean
toggleAutoSave: () => void
} {
const [isAutoSaving, setIsAutoSaving] = useState(false)
const [autoSaveEnabled, setAutoSaveEnabled] = useState(true)
const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
@@ -50,7 +54,7 @@ export function useAutoSave(): { isAutoSaving: boolean; autoSaveEnabled: boolean
mountedRef.current = true
// Subscribe to Zustand store — fires on every state change
const unsub = useTabStore.subscribe((state) => {
const unsub = useTabStore.subscribe(state => {
if (!enabledRef.current) return
const tab = state.getActiveTab()
@@ -79,7 +83,7 @@ export function useAutoSave(): { isAutoSaving: boolean; autoSaveEnabled: boolean
if (!window.electronAPI) return
const result = await window.electronAPI.saveFile({
filePath: tabToSave.filePath,
content: tabToSave.content
content: tabToSave.content,
})
if (result.success && mountedRef.current) {
currentState.setModified(tabToSave.id, false)
-71
View File
@@ -1,71 +0,0 @@
import { useState, useCallback, useRef } from 'react'
interface ConfirmOptions {
title: string
message: string
confirmLabel?: string
cancelLabel?: string
variant?: 'danger' | 'warning' | 'info'
}
interface ConfirmState extends ConfirmOptions {
open: boolean
resolve: ((value: boolean) => void) | null
}
/**
* UX-01: Promise-based 确认对话框 hook
* 替代原生 confirm(),返回 Promise<boolean>
*/
export function useConfirm() {
const [state, setState] = useState<ConfirmState>({
open: false,
title: '',
message: '',
resolve: null
})
// 使用 ref 确保回调中能拿到最新的 resolve
const resolveRef = useRef<((value: boolean) => void) | null>(null)
const confirm = useCallback((options: ConfirmOptions): Promise<boolean> => {
return new Promise<boolean>((resolve) => {
resolveRef.current = resolve
setState({
open: true,
title: options.title,
message: options.message,
confirmLabel: options.confirmLabel,
cancelLabel: options.cancelLabel,
variant: options.variant,
resolve
})
})
}, [])
const handleConfirm = useCallback(() => {
resolveRef.current?.(true)
setState(prev => ({ ...prev, open: false, resolve: null }))
resolveRef.current = null
}, [])
const handleCancel = useCallback(() => {
resolveRef.current?.(false)
setState(prev => ({ ...prev, open: false, resolve: null }))
resolveRef.current = null
}, [])
return {
confirm,
confirmDialogProps: {
open: state.open,
title: state.title,
message: state.message,
confirmLabel: state.confirmLabel,
cancelLabel: state.cancelLabel,
variant: state.variant,
onConfirm: handleConfirm,
onCancel: handleCancel
}
}
}
-39
View File
@@ -1,39 +0,0 @@
import { useMemo } from 'react'
export interface DocStats {
/** 单词数(按空白字符分割) */
words: number
/** 总字符数(含空白字符) */
chars: number
/** 字符数(不含空白字符) */
charsNoSpace: number
/** 行数 */
lines: number
}
/**
* 计算文档统计信息:单词数、字符数(含/不含空格)、行数。
* 对空文档或 undefined 返回全零值。
*/
export function computeDocStats(content: string | undefined | null): DocStats {
if (!content) {
return { words: 0, chars: 0, charsNoSpace: 0, lines: 0 }
}
const chars = content.length
const charsNoSpace = content.replace(/\s/g, '').length
const words = content.trim()
? content.trim().split(/\s+/).length
: 0
const lines = content === '' ? 0 : content.split(/\r?\n/).length
return { words, chars, charsNoSpace, lines }
}
/**
* Hook:根据文档内容实时计算统计信息。
* 使用 useMemo 避免不必要的重新计算。
*/
export function useDocStats(content: string | undefined | null): DocStats {
return useMemo(() => computeDocStats(content), [content])
}
+5 -2
View File
@@ -8,7 +8,8 @@ import { showToast } from '../lib/toast'
export function useDragDrop() {
const createTab = useTabStore(s => s.createTab)
const handleDrop = useCallback(async (e: DragEvent) => {
const handleDrop = useCallback(
async (e: DragEvent) => {
e.preventDefault()
e.stopPropagation()
@@ -51,7 +52,9 @@ export function useDragDrop() {
if (rejected > 0) {
showToast(`仅支持 .md / .markdown / .txt 文件,已忽略 ${rejected} 个文件`)
}
}, [createTab])
},
[createTab],
)
useEffect(() => {
const prevent = (e: DragEvent) => {
+40 -14
View File
@@ -3,12 +3,13 @@ import { useTabStore } from '../stores/tabStore'
import { useEditorStore } from '../stores/editorStore'
import { recentFilesRepository } from '../db/recentFilesRepository'
import { logError } from '../lib/errorHandler'
import { showToast } from '../lib/toast'
import { MeToast, showToast } from '../lib/toast'
/**
* AR-01: 从 App.tsx 提取的文件操作逻辑
* UX-02: 添加 loading 状态指示
* v0.1.9: handleSave 添加防重入锁,避免编辑器 onSave + 全局 Ctrl+S 双重触发
* v0.6.0: loading 改用 MeToast.loading 链式转换,保存结果用 MeToast.promise 提示
*/
export function useFileOperations() {
const createTab = useTabStore(s => s.createTab)
@@ -19,18 +20,22 @@ export function useFileOperations() {
const savingGate = useRef(false)
const handleOpenFile = useCallback(async (): Promise<void> => {
try {
if (!window.electronAPI) return
const loading = MeToast.loading('打开文件...')
try {
setLoading('file-open', true)
const result = await window.electronAPI.openFile()
if (result && 'filePath' in result) {
createTab(result.filePath, result.content)
if (result.filePath) recentFilesRepository.add(result.filePath)
setTimeout(() => useTabStore.getState().saveToDB(), 100)
loading.success('文件已打开')
} else {
loading.dismiss()
}
} catch (error) {
logError('打开文件失败', error)
showToast('打开文件失败', 'error')
loading.error('打开文件失败')
} finally {
setLoading('file-open', false)
}
@@ -43,20 +48,31 @@ export function useFileOperations() {
try {
const tab = getActiveTab()
if (!tab || !window.electronAPI) return
const result = await window.electronAPI.saveFile({
// v0.6.0: promise 监听保存生命周期 — 自动 loading → success/error,返回原 Promise
const result = await MeToast.promise(
window.electronAPI.saveFile({
filePath: tab.filePath,
content: tab.content
})
content: tab.content,
}),
{
loading: '保存中...',
success: '已保存',
error: '保存失败',
},
)
if (result.success) {
useTabStore.getState().setModified(tab.id, false)
showToast('已保存', 'success')
} else {
// IPC 返回 success:false 不 rejectpromise 的 error 文案不会触发,需显式提示
showToast('保存失败', 'error')
}
} catch (error) {
logError('保存文件失败', error)
showToast('保存失败', 'error')
} finally {
// 300ms 后释放锁,允许下次保存
setTimeout(() => { savingGate.current = false }, 300)
setTimeout(() => {
savingGate.current = false
}, 300)
}
}, [getActiveTab])
@@ -64,18 +80,26 @@ export function useFileOperations() {
try {
const tab = getActiveTab()
if (!tab || !window.electronAPI) return
const result = await window.electronAPI.saveFileAs({ content: tab.content })
const result = await MeToast.promise(
window.electronAPI.saveFileAs({ content: tab.content }),
{
loading: '另存为...',
success: '已保存',
error: '另存为失败',
},
)
if (result.success) {
useTabStore.getState().setModified(tab.id, false)
showToast('已保存', 'success')
} else if (!result.canceled) {
showToast('另存为失败', 'error')
}
} catch (error) {
logError('另存为失败', error)
showToast('另存为失败', 'error')
}
}, [getActiveTab])
const handleOpenRecent = useCallback(async (filePath: string): Promise<void> => {
const handleOpenRecent = useCallback(
async (filePath: string): Promise<void> => {
if (!window.electronAPI) return
setLoading('file-open', true)
try {
@@ -88,7 +112,9 @@ export function useFileOperations() {
} finally {
setLoading('file-open', false)
}
}, [createTab, setLoading])
},
[createTab, setLoading],
)
return { handleOpenFile, handleSave, handleSaveAs, handleOpenRecent }
}
+31 -10
View File
@@ -7,17 +7,38 @@ import { useTabStore } from '../stores/tabStore'
* v0.1.9 onSave 回调处理编辑器聚焦时的 Ctrl+S,
* 全局 handler 作为焦点外兜底(工具栏/侧边栏聚焦时仍可保存)。
*/
export function useKeyboard(handleOpenFile: () => void, handleSave: () => void, handleSaveAs: () => void) {
const handleKeydown = useCallback((e: KeyboardEvent) => {
export function useKeyboard(
handleOpenFile: () => void,
handleSave: () => void,
handleSaveAs: () => void,
) {
const handleKeydown = useCallback(
(e: KeyboardEvent) => {
const isCtrl = e.ctrlKey || e.metaKey
if (isCtrl && e.key === 'o') { e.preventDefault(); handleOpenFile(); return }
if (isCtrl && e.key === 'o') {
e.preventDefault()
handleOpenFile()
return
}
// 全局兜底:编辑器未聚焦时仍可保存(编辑器聚焦时由 onSave 回调处理)
if (isCtrl && e.key === 's' && !e.shiftKey) { e.preventDefault(); handleSave(); return }
if (isCtrl && e.shiftKey && e.key === 'S') { e.preventDefault(); handleSaveAs(); return }
if (isCtrl && e.key === 's' && !e.shiftKey) {
e.preventDefault()
handleSave()
return
}
if (isCtrl && e.shiftKey && e.key === 'S') {
e.preventDefault()
handleSaveAs()
return
}
const tabState = useTabStore.getState()
if (isCtrl && e.key === 't') { e.preventDefault(); tabState.createTab(null, ''); return }
if (isCtrl && e.key === 't') {
e.preventDefault()
tabState.createTab(null, '')
return
}
if (isCtrl && e.key === 'w') {
e.preventDefault()
if (tabState.activeTabId) tabState.closeTab(tabState.activeTabId)
@@ -37,14 +58,14 @@ export function useKeyboard(handleOpenFile: () => void, handleSave: () => void,
}
}
const idx = tabs.findIndex(t => t.id === activeTabId)
const next = e.shiftKey
? (idx - 1 + tabs.length) % tabs.length
: (idx + 1) % tabs.length
const next = e.shiftKey ? (idx - 1 + tabs.length) % tabs.length : (idx + 1) % tabs.length
tabState.switchToTab(tabs[next].id)
}
return
}
}, [handleOpenFile, handleSave, handleSaveAs])
},
[handleOpenFile, handleSave, handleSaveAs],
)
useEffect(() => {
document.addEventListener('keydown', handleKeydown)
+4 -3
View File
@@ -18,8 +18,9 @@ export function useSettingsInit() {
if (isInitialized.current) return
isInitialized.current = true
settingsRepository.load()
.then((settings) => {
settingsRepository
.load()
.then(settings => {
// 主题:优先使用保存的设置,否则跟随系统偏好
const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches
const themeMode = settings.themeMode ?? (prefersDark ? 'dark' : 'light')
@@ -34,7 +35,7 @@ export function useSettingsInit() {
useSidebarStore.setState({
isVisible: !settings.sidebarCollapsed,
sidebarWidth: settings.sidebarWidth,
_loaded: true
_loaded: true,
})
}
})
+14 -8
View File
@@ -7,7 +7,9 @@ import type { ThemeMode } from '../types/settings'
/** 将 hex 颜色转为带 alpha 的版本,用于背景色 */
function hexWithAlpha(hex: string, alpha: number): string {
if (!hex || !hex.startsWith('#')) return hex
const a = Math.round(alpha * 255).toString(16).padStart(2, '0')
const a = Math.round(alpha * 255)
.toString(16)
.padStart(2, '0')
return hex.length === 7 ? hex + a : hex.slice(0, 7) + a
}
@@ -45,13 +47,17 @@ function syncAppColorsToEditor(): void {
set('--search-border', vars['--md-border'])
// 阴影根据主题适配
const isDark = vars['--md-bg'] && vars['--md-bg'] !== '#ffffff' && vars['--md-bg'] !== '#fff'
root.style.setProperty('--shadow', isDark
? '0 1px 3px rgba(0,0,0,0.3)'
: '0 1px 3px rgba(0,0,0,0.08)')
root.style.setProperty('--shadow-lg', isDark
? '0 4px 12px rgba(0,0,0,0.4)'
: '0 4px 12px rgba(0,0,0,0.1)')
} catch { /* 容错 */ }
root.style.setProperty(
'--shadow',
isDark ? '0 1px 3px rgba(0,0,0,0.3)' : '0 1px 3px rgba(0,0,0,0.08)',
)
root.style.setProperty(
'--shadow-lg',
isDark ? '0 4px 12px rgba(0,0,0,0.4)' : '0 4px 12px rgba(0,0,0,0.1)',
)
} catch {
/* 容错 */
}
}
const THEME_TO_TOAST: Record<ThemeMode, string> = {
+1 -1
View File
@@ -8,7 +8,7 @@ export function useUnsavedWarning(
hasUnsaved: () => boolean,
confirmFn?: (message: string) => Promise<boolean>,
// D5: 关闭前回调(flush 待保存数据)
onBeforeForceClose?: () => Promise<void>
onBeforeForceClose?: () => Promise<void>,
) {
const confirmFnRef = useRef(confirmFn)
confirmFnRef.current = confirmFn
+93 -19
View File
@@ -1,7 +1,7 @@
import { describe, it, expect } from 'vitest'
import { renderMarkdown } from '../markdown'
import { renderMarkdown, renderMarkdownSync } from '../markdown'
describe('renderMarkdown', () => {
describe('renderMarkdown (MetonaEditor 内置解析器)', () => {
it('should render a simple heading', async () => {
const result = await renderMarkdown('# Hello World')
expect(result).toContain('<h1')
@@ -26,7 +26,7 @@ describe('renderMarkdown', () => {
expect(result).toContain('code')
})
it('should render code blocks with syntax highlighting', async () => {
it('should render code blocks', async () => {
const md = '```javascript\nconst x = 1;\n```'
const result = await renderMarkdown(md)
expect(result).toContain('<pre')
@@ -75,32 +75,106 @@ describe('renderMarkdown', () => {
expect(result).toContain('deleted')
})
it('should render task list', async () => {
const result = await renderMarkdown('- [x] done\n- [ ] todo')
expect(result).toContain('me-task-item')
expect(result).toContain('checked')
})
it('should render mermaid as .me-mermaid container', async () => {
const md = '```mermaid\ngraph TD\nA-->B\n```'
const result = await renderMarkdown(md)
expect(result).toContain('me-mermaid')
expect(result).toContain('class="mermaid"')
expect(result).toContain('graph TD')
})
it('should handle empty content', async () => {
const result = await renderMarkdown('')
expect(result).toBe('')
})
it('should return error HTML on rendering failure with invalid input', async () => {
// unified should still handle gracefully, but verify error path works
const result = await renderMarkdown('normal text')
expect(result).not.toContain('渲染错误')
it('should handle null and undefined filePath', async () => {
expect(await renderMarkdown('# No File', null)).toContain('No File')
expect(await renderMarkdown('# No File')).toContain('No File')
})
it('should cache processors for same filePath', async () => {
// Call twice with same filePath to test caching
const result1 = await renderMarkdown('# Test', '/test/file.md')
const result2 = await renderMarkdown('# Test 2', '/test/file.md')
expect(result1).toContain('<h1')
expect(result2).toContain('Test 2')
it('should be sync-callable via renderMarkdownSync', () => {
const result = renderMarkdownSync('# Sync')
expect(result).toContain('<h1')
})
})
it('should handle null filePath', async () => {
const result = await renderMarkdown('# No File', null)
expect(result).toContain('No File')
describe('fixImageSrcs — 相对路径图片修复', () => {
const FILE = '/home/user/docs/note.md'
it('should fix relative image paths to file://', async () => {
const result = await renderMarkdown('![img](./pic.png)', FILE)
expect(result).toContain('src="file:///home/user/docs/pic.png"')
})
it('should fix nested relative paths', async () => {
const result = await renderMarkdown('![img](assets/a.png)', FILE)
expect(result).toContain('src="file:///home/user/docs/assets/a.png"')
})
it('should fix unix absolute paths', async () => {
const result = await renderMarkdown('![img](/abs/pic.png)', FILE)
expect(result).toContain('src="file:///abs/pic.png"')
})
it('should not touch http/https/data:/file: URLs', async () => {
const md = '![a](https://x.com/a.png) ![b](data:image/png;base64,xx) ![c](file:///c.png)'
const result = await renderMarkdown(md, FILE)
expect(result).toContain('https://x.com/a.png')
expect(result).toContain('data:image/png;base64,xx')
expect(result).toContain('file:///c.png')
})
it('should skip out-of-directory traversal (../ and ../../)', async () => {
const md = '![a](../outside.png) ![b](../../outside.png)'
const result = await renderMarkdown(md, FILE)
// 越界路径保持原样(不注入 file://)
expect(result).not.toContain('file:')
expect(result).toContain('../outside.png')
expect(result).toContain('../../outside.png')
})
it('should not treat sibling directory with same prefix as inside', async () => {
// /home/user/docs-other/ 与 /home/user/docs/ 前缀相似但目录不同
const result = await renderMarkdown('![img](../docs-other/pic.png)', FILE)
expect(result).not.toContain('file:')
expect(result).toContain('../docs-other/pic.png')
})
it('should not touch images when filePath is null', async () => {
const result = await renderMarkdown('![img](./pic.png)')
expect(result).toContain('./pic.png')
expect(result).not.toContain('file:')
})
it('should fix relative image paths from root-level file', async () => {
const result = await renderMarkdown('![img](./pic.png)', '/note.md')
expect(result).toContain('src="file:///pic.png"')
})
it('should escape special chars in fixed path', async () => {
const result = await renderMarkdown('![img](./a&b.png)', FILE)
expect(result).toContain('src="file:///home/user/docs/a&amp;b.png"')
})
})
describe('XSS 防护(内置 safeUrl', () => {
it('should not emit anchor for javascript: URLs', async () => {
const result = await renderMarkdown('[x](javascript:alert(1))')
// 内置解析器将危险 URL 转义原样输出(不生成 <a>),文本不构成可执行链接
expect(result).not.toContain('<a')
expect(result).not.toContain('href=')
})
it('should handle undefined filePath', async () => {
const result = await renderMarkdown('# No File')
expect(result).toContain('No File')
it('should not emit img for javascript: image src', async () => {
const result = await renderMarkdown('![x](javascript:alert(1))')
expect(result).not.toContain('<img')
expect(result).not.toContain('src=')
})
})
+58 -157
View File
@@ -1,13 +1,9 @@
import { unified, type Plugin } from 'unified'
import remarkParse from 'remark-parse'
import remarkGfm from 'remark-gfm'
import remarkRehype from 'remark-rehype'
import rehypeRaw from 'rehype-raw'
import rehypeSanitize, { defaultSchema } from 'rehype-sanitize'
import rehypeStringify from 'rehype-stringify'
import rehypeHighlight from 'rehype-highlight'
import { visit } from 'unist-util-visit'
import type { Element, Root } from 'hast'
import { parseMarkdown } from '@metona-team/metona-editor'
// v0.6.0: 渲染管线迁移至 MetonaEditor 内置解析器(parseMarkdown),
// 移除 unified/remark/rehype 自研管线。
// 内置解析器原生支持:GFM / 任务列表 / 脚注 / 数学公式 / 定义列表 / emoji /
// mermaid(输出 .me-mermaid 容器)/ XSS 防护(escapeHTML + safeUrl)。
// 简单的路径解析(Electron renderer 中没有 path 模块)
// E1: 统一规范化 — 解析前先全部转为 /,避免混合分隔符导致的误判
@@ -30,152 +26,65 @@ function resolveRelativePath(base: string, rel: string): string {
return parts.join('/')
}
// 自定义 rehype 插件:将相对路径图片转为 file:// 绝对路径
function rehypeFixImages(filePath: string | null): Plugin<[], Root> {
return () => (tree: Root) => {
if (!filePath) return
/** 属性值转义(与内置解析器 escapeAttr 行为一致) */
function escapeAttr(s: string): string {
return s.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
}
/**
* 图片路径修复 — HTML 后处理。
*
* v0.6.0: 内置解析器的 safeUrl 会过滤 file: 协议,且 sanitize 钩子不参与预览渲染,
* 因此相对路径图片的修复必须在 parseMarkdown 之后、输出到 DOM 之前完成。
* 内置解析器输出的 img 标签格式固定(src 属性在最前、属性值经 escapeAttr 转义),
* 用正则精确匹配 src 属性即可安全替换。
*
* CQ-09: 保持与原 rehypeFixImages 一致的安全策略 —
* 解析完整路径并检查是否越界到 markdown 文件所在目录之外。
*/
function fixImageSrcs(html: string, filePath: string | null): string {
if (!filePath) return html
const dir: string = filePath.replace(/[/\\][^/\\]+$/, '')
function visit(node: Element | Root): void {
if (!node.children) return
for (const child of node.children) {
if (child.type === 'element' && child.tagName === 'img') {
const src = child.properties?.src as string | undefined
if (src && !src.startsWith('http://') && !src.startsWith('https://') && !src.startsWith('data:') && !src.startsWith('file://')) {
// 处理Unix风格绝对路径(以/开头)
if (src.startsWith('/')) {
child.properties = {
...child.properties,
src: 'file://' + src
return html.replace(/<img\b[^>]*\bsrc="([^"]*)"/g, (full, src) => {
const raw = String(src).replace(/&amp;/g, '&') // 先还原转义,避免二次转义
if (!raw) return full
if (
raw.startsWith('http://') ||
raw.startsWith('https://') ||
raw.startsWith('data:') ||
raw.startsWith('file:')
) {
return full
}
continue
// 处理 Unix 风格绝对路径(以 / 开头)
if (raw.startsWith('/')) {
return full.replace(`src="${src}"`, `src="${escapeAttr('file://' + raw)}"`)
}
// 解析完整路径并检查是否越界到 markdown 文件所在目录之外
const resolvedPath = resolveRelativePath(dir, src)
// E1: 统一规范化后比较,防止 ../ 路径越界
// 解析完整路径并检查是否越界
// 注意: resolveRelativePath 的 base 语义是"文件路径"(内部 pop 掉文件名),
// 因此传入完整 filePath 而非 dir,否则会多弹掉一级目录
const resolvedPath = resolveRelativePath(filePath, raw)
const normalizedBase = normPath(dir)
if (!normPath(resolvedPath).startsWith(normalizedBase)) return
child.properties = {
...child.properties,
src: 'file://' + (normPath(dir) + '/' + src).replace(/\/+/g, '/')
}
}
}
if (child.type === 'element') {
visit(child as Element)
}
}
}
visit(tree)
}
}
// 自定义 rehype 插件:将 mermaid 代码块转为 .me-mermaid 容器
// 在 rehypeHighlight 之后运行,此时 code 元素已有 language-mermaid 类名。
// 输出结构需与 MetonaEditor 内置解析器一致,以便 mermaid.run() 统一查询。
function rehypeMermaid(): Plugin<[], Root> {
return () => (tree: Root) => {
visit(tree, 'element', (node: Element, index, parent) => {
if (node.tagName !== 'pre') return
if (parent === null || parent === undefined || index === undefined) return
const code = node.children.find(
(child): child is Element => child.type === 'element' && child.tagName === 'code'
)
if (!code) return
const className: string[] = (code.properties?.className as string[] | undefined) ?? []
if (!className.some(c => c === 'language-mermaid' || c === 'mermaid')) return
// 提取代码文本内容
const text = (code.children ?? [])
.filter(c => c.type === 'text')
.map(c => (c as { type: 'text'; value: string }).value)
.join('')
// 替换为 mermaid 渲染容器(与 MetonaEditor 内置输出一致)
const mermaidContainer: Element = {
type: 'element',
tagName: 'div',
properties: { className: ['me-mermaid'] },
children: [{
type: 'element',
tagName: 'div',
properties: { className: ['mermaid'] },
children: [{ type: 'text', value: text }]
}]
}
parent.children[index] = mermaidContainer
// 用 base + '/' 前缀判断,避免 /home/docs-other/ 误判为在 /home/docs/ 内
const boundary = normalizedBase === '' ? '/' : normalizedBase + '/'
if (!normPath(resolvedPath).startsWith(boundary)) return full
const fixed = 'file://' + resolvedPath
return full.replace(`src="${src}"`, `src="${escapeAttr(fixed)}"`)
})
}
}
// PF-01: Markdown处理器LRU缓存
const MAX_CACHE_SIZE = 20
const processorCache = new Map<string, ReturnType<typeof buildProcessor>>()
function buildProcessor(filePath: string | null) {
return unified()
.use(remarkParse)
.use(remarkGfm)
.use(remarkRehype, { allowDangerousHtml: true })
.use(rehypeRaw)
// CQ-09: rehypeFixImages 必须在 rehypeSanitize 之前运行,
// 以保证 file:// URL 接受 sanitize 协议检查而非绕过。
.use(rehypeFixImages(filePath ?? null))
.use(rehypeSanitize, {
...defaultSchema,
attributes: {
...defaultSchema.attributes,
// 允许 img 的 src 属性(fixImages 注入 file:// 后 sanitize 需要放行)
img: [...(defaultSchema.attributes?.img ?? []), ['src']],
},
protocols: {
...(defaultSchema.protocols ?? {}),
src: [
...((defaultSchema.protocols as Record<string, string[]> | undefined)?.src ?? []),
'file:',
],
},
// H-05: 显式 strip 事件处理器属性,纵深防御
strip: ['script', 'on*', 'javascript:'],
})
.use(rehypeHighlight)
.use(rehypeMermaid())
.use(rehypeStringify)
}
function getCachedProcessor(filePath: string | null): ReturnType<typeof buildProcessor> {
const key: string = filePath ?? '__null__'
if (processorCache.has(key)) {
const cached = processorCache.get(key)!
processorCache.delete(key)
processorCache.set(key, cached)
return cached
}
const processor = buildProcessor(filePath)
if (processorCache.size >= MAX_CACHE_SIZE) {
const oldestKey = processorCache.keys().next().value
if (oldestKey !== undefined) {
processorCache.delete(oldestKey)
}
}
processorCache.set(key, processor)
return processor
}
export async function renderMarkdown(content: string, filePath?: string | null): Promise<string> {
/**
* 渲染 Markdown — 使用 MetonaEditor 内置解析器。
*
* @param content Markdown 源码
* @param filePath 文件路径(用于修复相对路径图片;null 时不做图片修复)
*/
export function renderMarkdownSync(content: string, filePath?: string | null): string {
try {
const processor = getCachedProcessor(filePath ?? null)
const result = await processor.process(content)
return String(result)
const html = parseMarkdown(content)
return fixImageSrcs(html, filePath ?? null)
} catch (e) {
const errorMsg: string = e instanceof Error ? e.message : String(e)
return `<p style="color:red">渲染错误: ${errorMsg}</p>`
@@ -183,16 +92,8 @@ export async function renderMarkdown(content: string, filePath?: string | null):
}
/**
* 步版本 — 供 MetonaEditor 的 render 钩子使用
* 所有 unified 插件均为同步转换器,可以在 render 钩子中同步调用。
* 步版本 — 内置解析器为同步实现,此函数仅保持兼容签名
*/
export function renderMarkdownSync(content: string, filePath?: string | null): string {
try {
const processor = getCachedProcessor(filePath ?? null)
const result = processor.processSync(content)
return String(result)
} catch (e) {
const errorMsg: string = e instanceof Error ? e.message : String(e)
return `<p style="color:red">渲染错误: ${errorMsg}</p>`
}
export async function renderMarkdown(content: string, filePath?: string | null): Promise<string> {
return renderMarkdownSync(content, filePath)
}
+6
View File
@@ -1,4 +1,5 @@
import MeToast from '@metona-team/metona-toast'
import { logError } from './errorHandler'
/**
* MeToast 全局配置
@@ -7,6 +8,7 @@ import MeToast from '@metona-team/metona-toast'
* MeToast 自管理 DOM 与样式,无需在 React 树中挂载容器组件。
*
* v0.5.0: 升级 MeToast 0.5.0,安装 keyboard / accessibility 插件。
* v0.6.0: 接入 dedupe 去重插件与 onError 全局错误回调。
*/
MeToast.configure({
position: 'top-right',
@@ -20,6 +22,8 @@ MeToast.configure({
draggable: true,
locale: 'zh-CN',
width: 360,
// v0.6.0: 钩子/定时器异常统一走应用错误日志
onError: ({ hook, error }) => logError(`Toast ${hook} 异常`, error),
})
// 安装内置插件
@@ -27,6 +31,8 @@ MeToast.configure({
MeToast.use('keyboard') // ESC 关闭所有 Toast
// eslint-disable-next-line react-hooks/rules-of-hooks
MeToast.use('accessibility') // 屏幕阅读器实时朗读 Toast 内容
// eslint-disable-next-line react-hooks/rules-of-hooks
MeToast.use('dedupe') // 相同 type+message 自动去重(避免重复弹窗)
/** 与原 showToast 保持兼容的类型子集 */
export type ToastType = 'success' | 'error' | 'warning' | 'info'
+1 -1
View File
@@ -8,5 +8,5 @@ import './styles/markdown-body.css'
ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<App />
</React.StrictMode>
</React.StrictMode>,
)
@@ -100,4 +100,40 @@ describe('editorStore', () => {
expect(useEditorStore.getState().isLoading('markdown-render')).toBe(true)
})
})
describe('editor live state (v0.6.0)', () => {
beforeEach(() => {
useEditorStore.setState({ stats: null, cursor: null, zenMode: false })
})
it('should set stats', () => {
useEditorStore.getState().setStats({
characters: 10,
words: 2,
chineseChars: 5,
englishWords: 1,
lines: 3,
readingTime: 1,
})
expect(useEditorStore.getState().stats?.words).toBe(2)
expect(useEditorStore.getState().stats?.lines).toBe(3)
})
it('should clear stats', () => {
useEditorStore.getState().setStats(null)
expect(useEditorStore.getState().stats).toBeNull()
})
it('should set cursor position', () => {
useEditorStore.getState().setCursor({ line: 5, column: 12 })
expect(useEditorStore.getState().cursor).toEqual({ line: 5, column: 12 })
})
it('should set zen mode', () => {
useEditorStore.getState().setZenMode(true)
expect(useEditorStore.getState().zenMode).toBe(true)
useEditorStore.getState().setZenMode(false)
expect(useEditorStore.getState().zenMode).toBe(false)
})
})
})
+2 -2
View File
@@ -17,8 +17,8 @@ interface AutoSaveStore extends AutoSaveState {
setState: (partial: Partial<AutoSaveState>) => void
}
export const useAutoSaveStore = create<AutoSaveStore>((set) => ({
export const useAutoSaveStore = create<AutoSaveStore>(set => ({
isAutoSaving: false,
autoSaveEnabled: true,
setState: (partial) => set(partial)
setState: partial => set(partial),
}))
+33 -3
View File
@@ -16,6 +16,21 @@ export function getMetonaEditor(): MarkdownEditor | null {
const THEME_CYCLE: ThemeMode[] = ['light', 'dark', 'warm']
/** v0.6.0: 编辑器实时状态(由 Editor 组件绑定事件写入,状态栏消费) */
export interface EditorLiveStats {
characters: number
words: number
chineseChars: number
englishWords: number
lines: number
readingTime: number
}
export interface EditorCursor {
line: number
column: number
}
interface EditorState {
viewMode: ViewMode
themeMode: ThemeMode
@@ -23,6 +38,10 @@ interface EditorState {
externallyModified: { filePath: string } | null
// UX-02: 全局加载状态
loadingStates: Record<string, boolean>
// v0.6.0: 编辑器实时状态
stats: EditorLiveStats | null
cursor: EditorCursor | null
zenMode: boolean
setViewMode: (mode: ViewMode) => void
setThemeMode: (mode: ThemeMode) => void
@@ -31,6 +50,10 @@ interface EditorState {
// UX-02: 加载状态管理
setLoading: (key: string, loading: boolean) => void
isLoading: (key: string) => boolean
// v0.6.0: 编辑器状态同步
setStats: (stats: EditorLiveStats | null) => void
setCursor: (cursor: EditorCursor | null) => void
setZenMode: (zen: boolean) => void
}
export const useEditorStore = create<EditorState>((set, get) => ({
@@ -38,6 +61,9 @@ export const useEditorStore = create<EditorState>((set, get) => ({
themeMode: 'light',
externallyModified: null,
loadingStates: {},
stats: null,
cursor: null,
zenMode: false,
setViewMode: (mode: ViewMode) => set({ viewMode: mode }),
setThemeMode: (mode: ThemeMode) => set({ themeMode: mode }),
@@ -49,8 +75,12 @@ export const useEditorStore = create<EditorState>((set, get) => ({
return next
},
setExternallyModified: (info: { filePath: string } | null) => set({ externallyModified: info }),
setLoading: (key: string, loading: boolean) => set(state => ({
loadingStates: { ...state.loadingStates, [key]: loading }
setLoading: (key: string, loading: boolean) =>
set(state => ({
loadingStates: { ...state.loadingStates, [key]: loading },
})),
isLoading: (key: string) => get().loadingStates[key] ?? false
isLoading: (key: string) => get().loadingStates[key] ?? false,
setStats: (stats: EditorLiveStats | null) => set({ stats }),
setCursor: (cursor: EditorCursor | null) => set({ cursor }),
setZenMode: (zenMode: boolean) => set({ zenMode }),
}))
+4 -6
View File
@@ -18,7 +18,7 @@ interface SidebarState {
setSidebarWidth: (width: number) => void
}
export const useSidebarStore = create<SidebarState>((set) => ({
export const useSidebarStore = create<SidebarState>(set => ({
isVisible: true,
rootPath: null,
tree: [],
@@ -36,17 +36,15 @@ export const useSidebarStore = create<SidebarState>((set) => ({
set(state => ({
expandedDirs: state.expandedDirs.includes(path)
? state.expandedDirs.filter(p => p !== path)
: [...state.expandedDirs, path]
: [...state.expandedDirs, path],
})),
expandDirs: (paths: string[]) =>
set(state => {
const newDirs = paths.filter(p => !state.expandedDirs.includes(p))
return newDirs.length > 0
? { expandedDirs: [...state.expandedDirs, ...newDirs] }
: state
return newDirs.length > 0 ? { expandedDirs: [...state.expandedDirs, ...newDirs] } : state
}),
setSidebarWidth: (width: number) => {
set({ sidebarWidth: width })
settingsRepository.save({ sidebarWidth: width })
}
},
}))
+27 -20
View File
@@ -4,7 +4,10 @@ import type { Tab } from '../types/tab'
import { tabRepository } from '../db/tabRepository'
// PF-08: 防抖工具函数
function debounce<F extends (...args: unknown[]) => void>(fn: F, delay: number): F & { cancel: () => void } {
function debounce<F extends (...args: unknown[]) => void>(
fn: F,
delay: number,
): F & { cancel: () => void } {
let timer: ReturnType<typeof setTimeout> | null = null
const debounced = ((...args: unknown[]) => {
if (timer) clearTimeout(timer)
@@ -38,13 +41,16 @@ interface TabState {
updateTabContent: (tabId: string, content: string) => void
setModified: (tabId: string, modified: boolean) => void
getActiveTab: () => Tab | null
updateTabScroll: (tabId: string, scroll: Partial<Pick<Tab, 'scrollTop' | 'selectionStart' | 'selectionEnd'>>) => void
updateTabScroll: (
tabId: string,
scroll: Partial<Pick<Tab, 'scrollTop' | 'selectionStart' | 'selectionEnd'>>,
) => void
loadFromDB: () => Promise<void>
saveToDB: () => Promise<void>
}
// PF-08: 模块级防抖保存函数(500ms延迟)
let _debouncedSaveToDB: (() => void) & { cancel: () => void } | null = null
let _debouncedSaveToDB: ((() => void) & { cancel: () => void }) | null = null
function getActualSaveToDB(get: () => TabState) {
return async () => {
@@ -61,7 +67,7 @@ function getActualSaveToDB(get: () => TabState) {
scrollTop: t.scrollTop,
selectionStart: t.selectionStart,
selectionEnd: t.selectionEnd,
updatedAt: Date.now()
updatedAt: Date.now(),
}))
await tabRepository.saveAll(snapshots)
await tabRepository.saveActiveTabId(get().activeTabId)
@@ -83,7 +89,7 @@ export const useTabStore = create<TabState>((set, get) => {
try {
const [snapshots, savedActiveTabId] = await Promise.all([
tabRepository.loadAll(),
tabRepository.loadActiveTabId()
tabRepository.loadActiveTabId(),
])
if (snapshots.length > 0) {
const tabs: Tab[] = snapshots.map(s => ({
@@ -93,9 +99,10 @@ export const useTabStore = create<TabState>((set, get) => {
isModified: s.isModified,
scrollTop: s.scrollTop,
selectionStart: s.selectionStart,
selectionEnd: s.selectionEnd
selectionEnd: s.selectionEnd,
}))
const activeTabId = (savedActiveTabId && tabs.find(t => t.id === savedActiveTabId))
const activeTabId =
savedActiveTabId && tabs.find(t => t.id === savedActiveTabId)
? savedActiveTabId
: tabs[tabs.length - 1].id
set({ tabs, activeTabId, _loaded: true })
@@ -131,12 +138,12 @@ export const useTabStore = create<TabState>((set, get) => {
isModified: false,
scrollTop: 0,
selectionStart: 0,
selectionEnd: 0
selectionEnd: 0,
}
set(state => ({
tabs: [...state.tabs, tab],
activeTabId: tab.id
activeTabId: tab.id,
}))
_debouncedSaveToDB?.()
@@ -192,13 +199,14 @@ export const useTabStore = create<TabState>((set, get) => {
const index = state.tabs.findIndex(t => t.id === tabId)
if (index === -1) return state
const newTabs = state.tabs.slice(0, index + 1)
const newActiveId = state.activeTabId && newTabs.find(t => t.id === state.activeTabId)
const newActiveId =
state.activeTabId && newTabs.find(t => t.id === state.activeTabId)
? state.activeTabId
: tabId
return {
tabs: newTabs,
activeTabId: newActiveId,
mruStack: state.mruStack.filter(id => newTabs.some(t => t.id === id))
mruStack: state.mruStack.filter(id => newTabs.some(t => t.id === id)),
}
})
_debouncedSaveToDB?.()
@@ -237,15 +245,13 @@ export const useTabStore = create<TabState>((set, get) => {
// A3: 内容未变时不变更对象引用(避免误标记 isModified
if (t.content === content) return t
return { ...t, content, isModified: true }
})
}),
}))
},
setModified: (tabId: string, modified: boolean) => {
set(state => ({
tabs: state.tabs.map(t =>
t.id === tabId ? { ...t, isModified: modified } : t
)
tabs: state.tabs.map(t => (t.id === tabId ? { ...t, isModified: modified } : t)),
}))
},
@@ -254,13 +260,14 @@ export const useTabStore = create<TabState>((set, get) => {
return tabs.find(t => t.id === activeTabId) ?? null
},
updateTabScroll: (tabId: string, scroll: Partial<Pick<Tab, 'scrollTop' | 'selectionStart' | 'selectionEnd'>>) => {
updateTabScroll: (
tabId: string,
scroll: Partial<Pick<Tab, 'scrollTop' | 'selectionStart' | 'selectionEnd'>>,
) => {
set(state => ({
tabs: state.tabs.map(t =>
t.id === tabId ? { ...t, ...scroll } : t
)
tabs: state.tabs.map(t => (t.id === tabId ? { ...t, ...scroll } : t)),
}))
}
},
}
})
+37 -168
View File
@@ -87,6 +87,38 @@ body {
min-height: 0;
}
/* v0.6.0: StatusBar */
#statusbar {
height: var(--statusbar-height);
background: var(--bg);
border-top: 1px solid var(--border);
display: flex;
align-items: center;
gap: 16px;
padding: 0 12px;
font-size: 12px;
color: var(--text-tertiary);
flex-shrink: 0;
user-select: none;
}
.statusbar-item {
white-space: nowrap;
}
.statusbar-spacer {
flex: 1;
}
.statusbar-zen {
color: var(--primary);
font-weight: 500;
}
.statusbar-autosave.saving {
color: var(--primary);
}
#main-content {
flex: 1;
display: flex;
@@ -128,6 +160,11 @@ body {
height: 100%;
}
/* v0.6.0: Zen 专注模式加宽 — 覆盖内置 820px(同优先级下运行时注入的样式会赢,用更高 specificity */
.metona-editor-wrapper .me-wrapper.me-zen .me-body {
max-width: 1200px;
}
/* FIX: Allow text selection in the preview pane.
global.css sets user-select:none on html/body to prevent
selection in UI chrome (toolbar, tabs, sidebar), but this
@@ -906,174 +943,6 @@ body {
background: var(--primary-dark);
}
/* ===== UX-01: ConfirmDialog ===== */
.confirm-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
z-index: 10001;
animation: fadeIn 0.15s ease;
}
.confirm-dialog {
background: var(--bg);
border-radius: 12px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.25);
width: 380px;
max-width: 90vw;
overflow: hidden;
animation: fadeIn 0.15s ease;
}
.confirm-header {
padding: 20px 24px 0;
}
.confirm-header h3 {
font-size: 16px;
font-weight: 600;
color: var(--text);
margin: 0;
}
.confirm-header.confirm-danger h3 {
color: #d93025;
}
.confirm-header.confirm-warning h3 {
color: #e37400;
}
:root.dark .confirm-header.confirm-warning h3 {
color: #fdd663;
}
.confirm-body {
padding: 12px 24px 20px;
}
.confirm-body p {
font-size: 14px;
color: var(--text-secondary);
margin: 0;
line-height: 1.5;
}
.confirm-actions {
display: flex;
justify-content: flex-end;
gap: 8px;
padding: 12px 24px 20px;
}
.confirm-btn {
padding: 8px 20px;
border: 1px solid var(--border);
border-radius: 6px;
font-size: 13px;
font-family: var(--font-ui);
font-weight: 500;
cursor: pointer;
transition: all 0.15s ease;
background: var(--bg);
color: var(--text);
}
.confirm-btn-cancel:hover {
background: var(--bg-tertiary);
}
.confirm-btn-danger {
background: #d93025;
border-color: #d93025;
color: white;
}
.confirm-btn-danger:hover {
background: #b5271d;
}
.confirm-btn-warning {
background: var(--primary);
border-color: var(--primary);
color: white;
}
.confirm-btn-warning:hover {
background: var(--primary-dark);
}
.confirm-btn-info {
background: var(--primary);
border-color: var(--primary);
color: white;
}
.confirm-btn-info:hover {
background: var(--primary-dark);
}
.confirm-btn:focus-visible {
outline: 2px solid var(--primary);
outline-offset: 2px;
}
/* ===== UX-02: LoadingSpinner ===== */
.loading-spinner {
display: inline-flex;
align-items: center;
gap: 8px;
color: var(--text-secondary);
}
.loading-spinner-svg {
animation: spin 0.8s linear infinite;
}
.loading-spinner-label {
font-size: 13px;
font-family: var(--font-ui);
color: var(--text-secondary);
}
.loading-overlay {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(255, 255, 255, 0.8);
display: flex;
align-items: center;
justify-content: center;
z-index: 10;
}
:root.dark .loading-overlay {
background: rgba(30, 30, 30, 0.8);
}
.preview-loading {
display: flex;
align-items: center;
justify-content: center;
padding: 40px 0;
color: var(--text-tertiary);
}
@keyframes spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
/* ===== UX-07: 通用可访问性增强 ===== */
/* Focus visible 为所有交互元素提供清晰的焦点指示 */
+45 -16
View File
@@ -7,8 +7,12 @@
word-wrap: break-word;
}
.markdown-body h1, .markdown-body h2, .markdown-body h3,
.markdown-body h4, .markdown-body h5, .markdown-body h6 {
.markdown-body h1,
.markdown-body h2,
.markdown-body h3,
.markdown-body h4,
.markdown-body h5,
.markdown-body h6 {
margin-top: 24px;
margin-bottom: 16px;
font-weight: 600;
@@ -28,10 +32,19 @@
border-bottom: 1px solid var(--border-light);
}
.markdown-body h3 { font-size: 1.25em; }
.markdown-body h4 { font-size: 1em; }
.markdown-body h5 { font-size: 0.875em; }
.markdown-body h6 { font-size: 0.85em; color: var(--text-secondary); }
.markdown-body h3 {
font-size: 1.25em;
}
.markdown-body h4 {
font-size: 1em;
}
.markdown-body h5 {
font-size: 0.875em;
}
.markdown-body h6 {
font-size: 0.85em;
color: var(--text-secondary);
}
.markdown-body p {
margin-top: 0;
@@ -44,8 +57,12 @@
cursor: pointer;
}
.markdown-body a:hover { text-decoration: underline; }
.markdown-body strong { font-weight: 600; }
.markdown-body a:hover {
text-decoration: underline;
}
.markdown-body strong {
font-weight: 600;
}
.markdown-body img {
max-width: 100%;
@@ -71,16 +88,23 @@
border-radius: 0 var(--radius) var(--radius) 0;
}
.markdown-body blockquote p:last-child { margin-bottom: 0; }
.markdown-body blockquote p:last-child {
margin-bottom: 0;
}
.markdown-body ul, .markdown-body ol {
.markdown-body ul,
.markdown-body ol {
margin-top: 0;
margin-bottom: 16px;
padding-left: 2em;
}
.markdown-body li { margin-top: 4px; }
.markdown-body li + li { margin-top: 4px; }
.markdown-body li {
margin-top: 4px;
}
.markdown-body li + li {
margin-top: 4px;
}
.markdown-body code {
font-family: var(--font-mono);
@@ -91,7 +115,9 @@
color: #e83e8c;
}
:root.dark .markdown-body code { color: #f48fb1; }
:root.dark .markdown-body code {
color: #f48fb1;
}
.markdown-body pre {
margin-top: 0;
@@ -119,7 +145,8 @@
display: block;
}
.markdown-body table th, .markdown-body table td {
.markdown-body table th,
.markdown-body table td {
padding: 8px 16px;
border: 1px solid var(--border);
text-align: left;
@@ -130,9 +157,11 @@
background: var(--bg-secondary);
}
.markdown-body table tr:nth-child(even) { background: var(--bg-secondary); }
.markdown-body table tr:nth-child(even) {
background: var(--bg-secondary);
}
.markdown-body input[type="checkbox"] {
.markdown-body input[type='checkbox'] {
margin-right: 6px;
accent-color: var(--primary);
}
+15 -1
View File
@@ -6,7 +6,7 @@ import type {
SaveAsPayload,
ReloadFileResult,
FileStatsResult,
ReadDirTreeResult
ReadDirTreeResult,
} from '../../shared/types'
export interface IpcInvokeMap {
@@ -24,6 +24,11 @@ export interface IpcInvokeMap {
'dir:openDialog': [void, string | null]
'dir:watch': [string, void]
'dir:unwatch': [void, void]
'data:export': [
string,
{ success: boolean; canceled?: boolean; filePath?: string; error?: string },
]
'data:import': [void, { success: boolean; canceled?: boolean; content?: string; error?: string }]
}
export type Unsubscribe = () => void
@@ -44,6 +49,15 @@ export interface ElectronAPI {
openFolderDialog: () => Promise<string | null>
watchDir: (dirPath: string) => Promise<void>
unwatchDir: () => Promise<void>
exportData: (
content: string,
) => Promise<{ success: boolean; canceled?: boolean; filePath?: string; error?: string }>
importData: () => Promise<{
success: boolean
canceled?: boolean
content?: string
error?: string
}>
onFileOpenInTab: (callback: (data: { filePath: string; content: string }) => void) => Unsubscribe
onExternalModification: (callback: (filePath: string) => void) => Unsubscribe
onDirChanged: (callback: () => void) => Unsubscribe
+1 -1
View File
@@ -12,5 +12,5 @@ export const DEFAULT_SETTINGS: Settings = {
themeMode: 'light',
viewMode: 'editor',
sidebarCollapsed: false,
sidebarWidth: 240
sidebarWidth: 240,
}
+1
View File
@@ -0,0 +1 @@
/// <reference types="vite/client" />
+11 -3
View File
@@ -1,8 +1,16 @@
// 共享常量 — 主进程和渲染进程共用
export const APP_VERSION = 'v0.5.0'
export const APP_VERSION = 'v0.6.0'
export const MAX_FILE_SIZE = 20 * 1024 * 1024 // 20MB
export const ALLOWED_EXTENSIONS = ['.md', '.markdown', '.txt'] as const
export const SKIP_DIRS = new Set([
'node_modules', '.git', '.svn', '.hg', 'dist', 'out',
'.next', '.nuxt', '__pycache__', '.DS_Store'
'node_modules',
'.git',
'.svn',
'.hg',
'dist',
'out',
'.next',
'.nuxt',
'__pycache__',
'.DS_Store',
])
+5 -1
View File
@@ -16,11 +16,15 @@ export const IPC_CHANNELS = {
DIR_WATCH: 'dir:watch',
DIR_UNWATCH: 'dir:unwatch',
// v0.6.0: 数据备份导出/导入(JSON
DATA_EXPORT: 'data:export',
DATA_IMPORT: 'data:import',
// 主进程 → 渲染进程 (send)
FILE_OPEN_IN_TAB: 'file:openInTab',
FILE_EXTERNALLY_MODIFIED: 'file:externallyModified',
WINDOW_CONFIRM_CLOSE: 'window:confirmClose',
SIDEBAR_DIR_CHANGED: 'sidebar:dirChanged'
SIDEBAR_DIR_CHANGED: 'sidebar:dirChanged',
} as const
export type IpcChannel = (typeof IPC_CHANNELS)[keyof typeof IPC_CHANNELS]