greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(shortcut): render crash when edit disabled binding item

pull/10356/head
charlie 2023-10-12 12:52:09 +08:00 committed by Tienson Qin
parent dd246229b7
commit 9ca6e7896d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/frontend/components/shortcut2.cljs
View File

@ -284,7 +284,8 @@
[:div.shortcuts-keys-wrap
[:span.keyboard-shortcut.flex.flex-wrap.mr-2.space-x-2
(for [x current-binding]
(for [x current-binding
:when (string? x)]
[:code.tracking-wider
(-> x (string/trim) (string/lower-case) (shortcut-utils/decorate-binding))
[:a.x {:on-click (fn [] (set-current-binding!
@ -455,7 +456,7 @@
[:a.action-wrap
{:class (util/classnames [{:disabled disabled?}])
:on-click (when id
:on-click (when (and id (not disabled?))
#(open-customize-shortcut-dialog! id))}
(cond

8
src/main/frontend/modules/shortcut/config.cljs
View File

@ -529,19 +529,19 @@
:inactive (not (util/electron?))
:fn commit/show-commit-modal!}
:dev/show-block-data {:binding false
:dev/show-block-data {:binding []
:inactive (not (state/developer-mode?))
:fn :frontend.handler.common.developer/show-block-data}
:dev/show-block-ast {:binding false
:dev/show-block-ast {:binding []
:inactive (not (state/developer-mode?))
:fn :frontend.handler.common.developer/show-block-ast}
:dev/show-page-data {:binding false
:dev/show-page-data {:binding []
:inactive (not (state/developer-mode?))
:fn :frontend.handler.common.developer/show-page-data}
:dev/show-page-ast {:binding false
:dev/show-page-ast {:binding []
:inactive (not (state/developer-mode?))
:fn :frontend.handler.common.developer/show-page-ast}})