clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-27 15:45:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pencil not working if drawing quickly (replace tldraw's undo/redo history with logseq's) (#7786)

Browse Source 
* fix: pencil not working if drawing quickly

* feat: mod+c mod+g to toggle grid

Co-authored-by: Konstantinos Kaloutas <konstantinos@logseq.com>
This commit is contained in:
Tienson Qin
2023-02-22 23:16:52 +08:00
committed by GitHub
parent 46d3cb516a
commit 6a5b0c8199
20 changed files with 373 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/frontend/modules/editor/undo_redo.cljs
View File

@@ -2,11 +2,13 @@
(:require [datascript.core :as d]
[frontend.db.conn :as conn]
[frontend.modules.datascript-report.core :as db-report]
[frontend.state :as state]))
[frontend.state :as state]
[clojure.set :as set]))
;;;; APIs
(def ^:private undo-redo-states (atom {}))
(def *pause-listener (atom false))
(defn- get-state
[]
@@ -99,7 +101,7 @@
[]
(let [[e prev-e] (pop-undo)]
(when e
(let [{:keys [txs]} e
(let [{:keys [txs tx-meta]} e
new-txs (get-txs false txs)
editor-cursor (if (= (get-in e [:editor-cursor :last-edit-block :block/uuid])
(get-in prev-e [:editor-cursor :last-edit-block :block/uuid])) ; same block
@@ -107,23 +109,43 @@
(:editor-cursor e))]
(push-redo e)
(transact! new-txs (merge {:undo? true}
tx-meta
(select-keys e [:pagination-blocks-range])))
(when (:whiteboard/transact? tx-meta)
(state/pub-event! [:whiteboard/undo e]))
(assoc e
:txs-op new-txs
:editor-cursor editor-cursor)))))
(defn redo
[]
(when-let [{:keys [txs]:as e} (pop-redo)]
(when-let [{:keys [txs tx-meta] :as e} (pop-redo)]
(let [new-txs (get-txs true txs)]
(push-undo e)
(transact! new-txs (merge {:redo? true}
tx-meta
(select-keys e [:pagination-blocks-range])))
(when (:whiteboard/transact? tx-meta)
(state/pub-event! [:whiteboard/redo e]))
(assoc e :txs-op new-txs))))
(defn listen-outliner-operation
(defn pause-listener!
[]
(reset! *pause-listener true))
(defn resume-listener!
[]
(reset! *pause-listener false))
(defn listen-db-changes!
[{:keys [tx-data tx-meta] :as tx-report}]
(when-not (empty? tx-data)
(when (and (seq tx-data)
(not (or (:undo? tx-meta)
(:redo? tx-meta)))
(not @*pause-listener)
(not (set/subset?
(set (map :a tx-data))
#{:block/created-at :block/updated-at})))
(reset-redo)
(if (:compute-new-refs? tx-meta)
(let [[removed-e _prev-e] (pop-undo)
@@ -132,6 +154,7 @@
(let [updated-blocks (db-report/get-blocks tx-report)
entity {:blocks updated-blocks
:txs tx-data
:tx-meta tx-meta
:editor-cursor (:editor-cursor tx-meta)
:pagination-blocks-range (get-in [:ui/pagination-blocks-range (get-in tx-report [:db-after :max-tx])] @state/state)}]
(push-undo entity)))))
(push-undo entity)))))