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

Fix (Whiteboards): Shape index and arrow binding issue (#8885)

Browse Source 
* fix: shape index and bindings

* fix: indexv updating
This commit is contained in:
Konstantinos
2023-03-24 08:39:58 +02:00
committed by GitHub
parent 6ae5e4e42e
commit 5913d81e6f
5 changed files with 72 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/frontend/handler/whiteboard.cljs
View File

@@ -92,7 +92,8 @@
upsert-shapes (->> (set/difference new-id-nonces db-id-nonces)
(map (fn [{:keys [id]}]
(-> (.-serialized ^js (.getShapeById tl-page id))
js->clj-keywordize)))
js->clj-keywordize
(assoc :index (.indexOf shapes-index id)))))
(set))
old-ids (set (map :id db-id-nonces))
new-ids (set (map :id new-id-nonces))
@@ -133,9 +134,13 @@
(defn transact-tldr-delta! [page-name ^js app replace?]
(let [tl-page ^js (second (first (.-pages app)))
shapes (.-shapes ^js tl-page)
shapes-index (map #(gobj/get % "id") shapes)
new-id-nonces (set (map (fn [shape]
{:id (.-id shape)
:nonce (.-nonce shape)}) shapes))
(let [id (.-id shape)]
{:id id
:nonce (if (= shape.id (.indexOf shapes-index id))
(.-nonce shape)
(.getTime (js/Date.)))})) shapes))
repo (state/get-current-repo)
db-id-nonces (or
(get-in @*last-shapes-nonce [repo page-name])
@@ -156,7 +161,7 @@
;; arrow
(some #(and (= "line" (:type %))
(= "arrow "(:end (:decorations %)))) new-shapes)
(= "arrow " (:end (:decorations %)))) new-shapes)
(assoc metadata :whiteboard/op :new-arrow)
:else
@@ -358,15 +363,25 @@
(when (seq bindings)
(.updateBindings tl-page (bean/->js bindings))))))
(defn update-shapes-index!
[^js tl-page page-name]
(when-let [page (db/entity [:block/name page-name])]
(let [shapes-index (get-in page [:block/properties :logseq.tldraw.page :shapes-index])]
(when (seq shapes-index)
(.updateShapesIndex tl-page (bean/->js shapes-index))))))
(defn undo!
[{:keys [tx-meta]}]
(history/pause-listener!)
(try
(when-let [app (state/active-tldraw-app)]
(let [{:keys [deleted-shapes new-shapes changed-shapes prev-changed-blocks]} (:data tx-meta)
(let [{:keys [page-name deleted-shapes new-shapes changed-shapes prev-changed-blocks]} (:data tx-meta)
whiteboard-op (:whiteboard/op tx-meta)
^js api (.-api app)]
^js api (.-api app)
tl-page ^js (second (first (.-pages app)))]
(when api
(update-bindings! tl-page page-name)
(update-shapes-index! tl-page page-name)
(case whiteboard-op
:group
(do
@@ -383,7 +398,7 @@
(delete-shapes! api new-shapes))
(when (seq changed-shapes)
(let [prev-shapes (map (fn [b] (get-in b [:block/properties :logseq.tldraw.shape]))
prev-changed-blocks)]
prev-changed-blocks)]
(update-shapes! api prev-shapes))))))))
(catch :default e
(js/console.error e)))
@@ -400,6 +415,7 @@
tl-page ^js (second (first (.-pages app)))]
(when api
(update-bindings! tl-page page-name)
(update-shapes-index! tl-page page-name)
(case whiteboard-op
:group
(do