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

enhance: backspace to delete a block value

pull/10016/head
Tienson Qin 2023-08-14 16:43:55 +08:00
parent a37acf5a75
commit ea56b0a9c0
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/frontend/components/property/value.cljs
View File

@ -2,6 +2,7 @@
(:require [cljs-time.coerce :as tc]
[clojure.string :as string]
[frontend.components.select :as select]
[frontend.date :as date]
[frontend.db :as db]
[frontend.db-mixins :as db-mixins]
[frontend.db.model :as model]
@ -14,8 +15,7 @@
[frontend.util :as util]
[goog.dom :as gdom]
[medley.core :as medley]
[rum.core :as rum]
[frontend.date :as date]))
[rum.core :as rum]))
(defn exit-edit-property
[]
@ -237,7 +237,7 @@
(when *add-new-item? (reset! *add-new-item? false))
(editor-handler/edit-block! (db/entity [:block/uuid id]) 0 id)))
(defn- new-block-editor-opts
(defn- block-editor-opts
[repo block property value *add-new-item? opts]
{:on-key-down
(fn [e]
@ -259,7 +259,7 @@
;; no children block
(empty? (:block/_parent current-block)))
(do
(exit-edit-property)
(editor-handler/keydown-up-down-handler :up {:pos :max})
(property-handler/delete-property-value! repo block (:block/uuid property) value)))))})
(rum/defc property-scalar-value < rum/reactive db-mixins/query
@ -342,7 +342,7 @@
:block
(if-let [item-block (db/entity [:block/uuid value])]
(let [editor-opts (new-block-editor-opts repo block property value *add-new-item? opts)]
(let [editor-opts (block-editor-opts repo block property value *add-new-item? opts)]
[:div.property-block-container.w-full
(block-cp [item-block] {:id (str value)
:blocks-container-id (:blocks-container-id opts)
@ -364,10 +364,11 @@
[block property opts]
(let [editing? (state/sub :editor/editing?)]
(when-not editing?
[:div.absolute {:style {:left "-1.75rem"
:bottom " -0.125rem"}
:on-click (fn []
(create-new-block! block property opts))}
[:div.absolute.fade-in
{:style {:left "-1.75rem"
:bottom " -0.125rem"}
:on-click (fn []
(create-new-block! block property opts))}
(ui/tippy {:html [:span.text-sm
[:span.mr-1 "Add another block (click or "]
(ui/render-keyboard-shortcut "mod+enter")

3
src/main/frontend/handler/block.cljs
View File

@ -342,8 +342,7 @@
(when-not (> retry-times 2)
(when-not config/publishing?
(when-let [block-id (:block/uuid block)]
(let [repo (state/get-current-repo)
block (or (db/pull [:block/uuid block-id]) block)
(let [block (or (db/pull [:block/uuid block-id]) block)
edit-input-id (if (uuid? id)
(get-edit-input-id-with-block-id id)
(-> (str (subs id 0 (- (count id) 36)) block-id)

11
src/main/frontend/handler/editor.cljs
View File

@ -2460,7 +2460,7 @@
(state/exit-editing-and-set-selected-blocks! [sibling-block]))))
(defn- move-cross-boundary-up-down
[direction]
[direction move-opts]
(let [input (state/get-input)
line-pos (util/get-first-or-last-line-pos input)
repo (state/get-current-repo)
@ -2480,11 +2480,12 @@
new-uuid (cljs.core/uuid sibling-block-id)
block (db/pull repo '[*] [:block/uuid new-uuid])]
(edit-block! block
[direction line-pos]
(or (:pos move-opts)
[direction line-pos])
new-id))))))
(defn keydown-up-down-handler
[direction]
[direction {:keys [_pos] :as move-opts}]
(let [input (state/get-input)
selected-start (util/get-selection-start input)
selected-end (util/get-selection-end input)
@ -2498,7 +2499,7 @@
(or (and up? (cursor/textarea-cursor-first-row? input))
(and down? (cursor/textarea-cursor-last-row? input)))
(move-cross-boundary-up-down direction)
(move-cross-boundary-up-down direction move-opts)
:else
(if up?
@ -3146,7 +3147,7 @@
(util/stop e)
(cond
(state/editing?)
(keydown-up-down-handler direction)
(keydown-up-down-handler direction {})
(state/selection?)
(select-up-down direction)