feat(shortcuts): adopt Typora defaults for supported actions

web/src/app/EditorChrome.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { runCommand } from './commands'
 import Icon from './Icon.vue'
 import { toggleSourceMode, ws } from './workspace'
 </script>
@@ -8,6 +9,6 @@ import { toggleSourceMode, ws } from './workspace'
     <button class="rm-icon-btn" title="即时预览" aria-label="即时预览" :aria-pressed="!ws.sourceMode" @mousedown.prevent @click="ws.sourceMode && toggleSourceMode()"><Icon name="eye" /></button>
     <button class="rm-icon-btn" title="源码模式" aria-label="源码模式" :aria-pressed="ws.sourceMode" @mousedown.prevent @click="!ws.sourceMode && toggleSourceMode()"><Icon name="source" /></button>
     <button class="rm-icon-btn" title="显示 / 隐藏大纲" aria-label="显示 / 隐藏大纲" :aria-pressed="ws.outlineOpen" @click="ws.outlineOpen = !ws.outlineOpen"><Icon name="outline" /></button>
-    <button class="rm-icon-btn" title="专注写作" aria-label="专注写作" :aria-pressed="ws.focusMode" @click="ws.focusMode = !ws.focusMode"><Icon name="expand" /></button>
+    <button class="rm-icon-btn" title="专注写作" aria-label="专注写作" :aria-pressed="ws.focusMode" @click="runCommand('view.focus')"><Icon name="expand" /></button>
   </section>
 </template>

web/src/app/ShortcutSettings.vue

@@ -62,7 +62,8 @@ async function reset(command: Command) {
 <template>
   <div class="rm-shortcut-settings">
     <div class="rm-shortcut-toolbar"><input v-model="query" type="search" aria-label="搜索快捷键" placeholder="搜索命令或快捷键" /><button class="rm-btn" :disabled="busy" @click="recording = null; error = ''; save({})">重置全部快捷键</button></div>
-    <p class="rm-share-note">点击添加后按下组合键，Esc 取消；× 移除绑定，重置恢复默认。设置在所有设备间同步。</p>
+    <p class="rm-share-note">点击添加后按下组合键，Esc 取消；× 移除绑定，重置恢复默认。默认跟随 Typora；无对应项（含插件）留空。自定义设置在所有设备间同步。</p>
+    <p class="rm-share-note">浏览器可能保留 Ctrl/Cmd+N、W、数字键等组合，网页无法保证拦截；可自行重新绑定。</p>
     <p class="rm-settings-result-count" role="status">{{ filteredCommands.length }} / {{ commands.length }} 个命令{{ filteredCommands.length ? '' : '，没有匹配的快捷键。' }}</p>
     <p v-if="error" role="alert" class="rm-auth-error">{{ error }}</p>
     <div v-for="command in filteredCommands" :key="command.id" class="rm-shortcut-row">

web/src/app/workspace.ts

@@ -4,6 +4,7 @@ import { decodeLinkDestination } from '../markdown/links'
 import { Annotation, EditorState, Transaction } from '@codemirror/state'
 import { EditorView } from '@codemirror/view'
 import { nextTick, reactive, watch } from 'vue'
+import { typoraKeys } from '../typoraKeys'
 import { editorCommands } from '../editor/shortcuts'
 import { refreshImages } from '../editor/livepreview'
 import { createEditorState, insertImageFiles, pasteImages, languageCompartment, pluginCompartment, pluginEditorExtensions, pluginLanguage, preferencesCompartment, previewCompartment, previewExtensions } from '../editor'
@@ -1085,28 +1086,27 @@ function registerBuiltinCommands() {
     ws.switcher = ws.switcher === null ? initial : null
   }
   for (const cmd of [
-    // Mod+P 覆盖浏览器的打印；Firefox 不允许网页覆盖 Ctrl+Shift+P（隐私窗口），F1 作为通用的替代
-    { id: 'app.quickOpen', title: '快速打开笔记', keys: ['Mod+P'], run: () => toggleSwitcher('') },
-    { id: 'app.commandPalette', title: '命令面板', keys: ['Mod+Shift+P', 'F1'], run: () => toggleSwitcher('>') },
-    { id: 'app.search', title: '全文搜索', keys: ['Mod+Shift+F'], run: openSearch },
+    { id: 'app.quickOpen', title: '快速打开笔记', run: () => toggleSwitcher('') },
+    { id: 'app.commandPalette', title: '命令面板', run: () => toggleSwitcher('>') },
+    { id: 'app.search', title: '全文搜索', run: openSearch },
     { id: 'note.new', title: '新建笔记', run: () => withSidebar(() => createNote('')) },
     { id: 'folder.new', title: '新建文件夹', run: () => withSidebar(() => createFolder('')) },
-    { id: 'note.save', title: '保存当前笔记', keys: ['Mod+S'], when: hasNote, run: () => void flush(ws.active!) },
+    { id: 'note.save', title: '保存当前笔记', when: hasNote, run: () => void flush(ws.active!) },
     { id: 'note.rename', title: '重命名当前笔记', when: hasNote, run: () => withSidebar(() => (ws.renaming = ws.active)) },
     { id: 'note.move', title: '移动当前笔记到…', when: hasNote, run: () => (ws.moving = ws.active) },
     { id: 'note.delete', title: '删除当前笔记', when: hasNote, run: () => void remove(ws.active!) },
     { id: 'note.insertImage', title: '插入图片…', when: hasNote, run: insertImagesFromPicker },
-    // 浏览器不允许网页覆盖 Ctrl+W
     { id: 'tab.close', title: '关闭当前标签页', when: hasNote, run: () => void closeTab(ws.active!) },
-    { id: 'app.settings', title: '设置', keys: ['Mod+,'], run: () => (ws.settings = 'index') },
-    { id: 'view.sidebar', title: '显示/隐藏侧栏', keys: ['Mod+\\'], run: toggleSidebar },
-    { id: 'view.outline', title: '显示/隐藏大纲', keys: ['Mod+Shift+O'], when: hasNote, run: () => (ws.outlineOpen = !ws.outlineOpen) },
+    { id: 'app.settings', title: '设置', run: () => (ws.settings = 'index') },
+    { id: 'view.sidebar', title: '显示/隐藏侧栏', run: toggleSidebar },
+    { id: 'view.outline', title: '显示/隐藏大纲', when: hasNote, run: () => (ws.outlineOpen = !ws.outlineOpen) },
     { id: 'view.source', title: '开启/关闭源码编辑', when: hasNote, run: toggleSourceMode },
+    { id: 'view.focus', title: '开启/关闭专注写作', when: hasNote, run: () => (ws.focusMode = !ws.focusMode) },
     { id: 'app.trash', title: '打开回收站', run: () => (ws.settings = 'trash') },
     { id: 'app.images', title: '管理根目录图片', run: () => { ws.imagesAll = false; ws.images = '' } },
     { id: 'app.tokens', title: 'API 令牌', run: () => (ws.settings = 'tokens') },
   ]) {
-    registerCommand(cmd)
+    registerCommand({ ...cmd, keys: typoraKeys(cmd.id) })
   }
 }