Procházet zdrojové kódy

fix: don't preventDefault for delete

Tienson Qin před 4 roky
rodič
revize
4385c98cc8

+ 1 - 1
resources/electron.html

@@ -52,7 +52,7 @@ const portal = new MagicPortal(worker);
 <script defer src="./js/interact.min.js"></script>
 <script defer src="./js/main.js"></script>
 <script defer src="./js/code-editor.js"></script>
-<script defer src="./js/age-encryption.js"></script>
+<!-- <script defer src="./js/age-encryption.js"></script> -->
 <script defer src="./js/excalidraw.js"></script>
 </body>
 </html>

+ 4 - 0
src/main/frontend/components/editor.cljs

@@ -373,6 +373,10 @@
    #(shortcut/install-shortcut! % {:prevent-default? true})
    :shortcut-listener/editor-prevent-default
    shortcut-handler/editing-only-prevent-default)
+  (mixins/shortcuts
+   #(shortcut/install-shortcut! % {:prevent-default? false})
+   :shortcut-listener/editor
+   shortcut-handler/editing)
   lifecycle/lifecycle
   [state {:keys [on-hide dummy? node format block block-parent-id]
           :or   {dummy? false}

+ 1 - 1
src/main/frontend/handler/editor.cljs

@@ -2129,7 +2129,7 @@
 
       ;; just delete
       :else
-      (delete-and-update input (dec current-pos) current-pos))))
+      (state/set-edit-content! (state/get-edit-input-id) (.-value input)))))
 
 ;; TODO: merge indent-on-tab, outdent-on-shift-tab, on-tab
 (defn indent-on-tab

+ 7 - 3
src/main/frontend/modules/shortcut/handler.cljs

@@ -12,12 +12,16 @@
             [frontend.state :as state]
             [frontend.handler.history :as history]))
 
+(def editing
+  {:editor/delete editor-handler/editor-delete})
+
 (def editing-only-prevent-default
-  {:editor/new-block editor-handler/keydown-new-block-handler
-   :editor/new-line editor-handler/keydown-new-line-handler
-   :editor/delete editor-handler/editor-delete
+  {
+   ;; FIXME: tab not working anymore in the scheduled dialog
    :editor/indent (editor-handler/keydown-tab-handler :right)
    :editor/outindent (editor-handler/keydown-tab-handler :left)
+   :editor/new-block editor-handler/keydown-new-block-handler
+   :editor/new-line editor-handler/keydown-new-line-handler
    :editor/zoom-in  editor-handler/zoom-in!
    :editor/zoom-out  editor-handler/zoom-out!
    :editor/cycle-todo editor-handler/cycle-todo!