From 8520b02df579e6208a40f0432a22270fa7d90566 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 24 Dec 2025 21:12:00 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/pull/16676

---
 app/src/config/keymap.ts         |  5 ++++-
 app/src/plugin/index.ts          |  7 ++++++-
 app/src/protyle/toolbar/index.ts | 10 ++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts
index 0f79661b7..79ef5b042 100644
--- a/app/src/config/keymap.ts
+++ b/app/src/config/keymap.ts
@@ -56,9 +56,12 @@ export const keymap = {
 </label>`;
             });
             item.updateProtyleToolbar([]).forEach(toolbarItem => {
-                if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name) || !toolbarItem.hotkey) {
+                if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name)) {
                     return;
                 }
+                if (typeof toolbarItem.hotkey !== "string") {
+                    toolbarItem.hotkey = "";
+                }
                 const dockKeymap = window.siyuan.config.keymap.plugin[item.name][toolbarItem.name];
                 const keyValue = updateHotkeyTip(dockKeymap.custom);
                 commandHTML += `<label class="b3-list-item b3-list-item--narrow b3-list-item--hide-action">
diff --git a/app/src/plugin/index.ts b/app/src/plugin/index.ts
index a6a2d0879..2b7dd8cf2 100644
--- a/app/src/plugin/index.ts
+++ b/app/src/plugin/index.ts
@@ -80,9 +80,12 @@ export class Plugin {
         });
 
         this.updateProtyleToolbar([]).forEach(toolbarItem => {
-            if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name) || !toolbarItem.hotkey) {
+            if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name)) {
                 return;
             }
+            if (typeof toolbarItem.hotkey !== "string") {
+                toolbarItem.hotkey = "";
+            }
             if (!window.siyuan.config.keymap.plugin) {
                 window.siyuan.config.keymap.plugin = {};
             }
@@ -99,6 +102,8 @@ export class Plugin {
                     default: toolbarItem.hotkey,
                     custom: toolbarItem.hotkey,
                 };
+            } else {
+                window.siyuan.config.keymap.plugin[options.name][toolbarItem.name].default = toolbarItem.hotkey;
             }
         });
     }
diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts
index 7998617e6..67a592d72 100644
--- a/app/src/protyle/toolbar/index.ts
+++ b/app/src/protyle/toolbar/index.ts
@@ -69,9 +69,12 @@ export class Toolbar {
         protyle.app.plugins.forEach(item => {
             const pluginToolbar = item.updateProtyleToolbar(options.toolbar);
             pluginToolbar.forEach(toolbarItem => {
-                if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name) || !toolbarItem.hotkey) {
+                if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name)) {
                     return;
                 }
+                if (typeof toolbarItem.hotkey !== "string") {
+                    toolbarItem.hotkey = "";
+                }
                 if (window.siyuan.config.keymap.plugin && window.siyuan.config.keymap.plugin[item.name] && window.siyuan.config.keymap.plugin[item.name][toolbarItem.name]) {
                     toolbarItem.hotkey = window.siyuan.config.keymap.plugin[item.name][toolbarItem.name].custom;
                 }
@@ -90,9 +93,12 @@ export class Toolbar {
         protyle.app.plugins.forEach(item => {
             const pluginToolbar = item.updateProtyleToolbar(protyle.options.toolbar);
             pluginToolbar.forEach(toolbarItem => {
-                if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name) || !toolbarItem.hotkey) {
+                if (typeof toolbarItem === "string" || Constants.INLINE_TYPE.concat("|").includes(toolbarItem.name)) {
                     return;
                 }
+                if (typeof toolbarItem.hotkey !== "string") {
+                    toolbarItem.hotkey = "";
+                }
                 if (window.siyuan.config.keymap.plugin && window.siyuan.config.keymap.plugin[item.name] && window.siyuan.config.keymap.plugin[item.name][toolbarItem.name]) {
                     toolbarItem.hotkey = window.siyuan.config.keymap.plugin[item.name][toolbarItem.name].custom;
                 }