mirror of
https://github.com/penpot/penpot.git
synced 2025-03-15 17:21:17 -05:00
🐛 Fix concurrent thumbnail modification
This commit is contained in:
parent
541168aee4
commit
14b1970a8a
4 changed files with 83 additions and 57 deletions
|
@ -189,10 +189,14 @@
|
||||||
(s/def ::file-change-event
|
(s/def ::file-change-event
|
||||||
(s/keys :req-un [::type ::profile-id ::file-id ::session-id ::revn ::changes]))
|
(s/keys :req-un [::type ::profile-id ::file-id ::session-id ::revn ::changes]))
|
||||||
|
|
||||||
|
|
||||||
(defn handle-file-change
|
(defn handle-file-change
|
||||||
[{:keys [file-id changes] :as msg}]
|
[{:keys [file-id changes] :as msg}]
|
||||||
(us/assert ::file-change-event msg)
|
(us/assert ::file-change-event msg)
|
||||||
(ptk/reify ::handle-file-change
|
(ptk/reify ::handle-file-change
|
||||||
|
IDeref
|
||||||
|
(-deref [_] {:changes changes})
|
||||||
|
|
||||||
ptk/WatchEvent
|
ptk/WatchEvent
|
||||||
(watch [_ _ _]
|
(watch [_ _ _]
|
||||||
(let [position-data-operation?
|
(let [position-data-operation?
|
||||||
|
|
|
@ -18,6 +18,10 @@
|
||||||
([state page-id]
|
([state page-id]
|
||||||
(get-in state [:workspace-data :pages-index page-id])))
|
(get-in state [:workspace-data :pages-index page-id])))
|
||||||
|
|
||||||
|
(defn lookup-data-objects
|
||||||
|
[data page-id]
|
||||||
|
(dm/get-in data [:pages-index page-id :objects]))
|
||||||
|
|
||||||
(defn lookup-page-objects
|
(defn lookup-page-objects
|
||||||
([state]
|
([state]
|
||||||
(lookup-page-objects state (:current-page-id state)))
|
(lookup-page-objects state (:current-page-id state)))
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
[app.common.pages.helpers :as cph]
|
[app.common.pages.helpers :as cph]
|
||||||
[app.common.uuid :as uuid]
|
[app.common.uuid :as uuid]
|
||||||
[app.main.data.workspace.changes :as dch]
|
[app.main.data.workspace.changes :as dch]
|
||||||
|
[app.main.data.workspace.state-helpers :as wsh]
|
||||||
[app.main.refs :as refs]
|
[app.main.refs :as refs]
|
||||||
[app.main.repo :as rp]
|
[app.main.repo :as rp]
|
||||||
[app.main.store :as st]
|
[app.main.store :as st]
|
||||||
|
@ -31,7 +32,9 @@
|
||||||
[object-id]
|
[object-id]
|
||||||
(rx/create
|
(rx/create
|
||||||
(fn [subs]
|
(fn [subs]
|
||||||
(let [node (dom/query (dm/fmt "canvas.thumbnail-canvas[data-object-id='%'" object-id))]
|
;; We look in the DOM a canvas that 1) matches the id and 2) that it's not empty
|
||||||
|
;; will be empty on first rendering before drawing the thumbnail and we don't want to store that
|
||||||
|
(let [node (dom/query (dm/fmt "canvas.thumbnail-canvas[data-object-id='%']:not([data-empty])" object-id))]
|
||||||
(if (some? node)
|
(if (some? node)
|
||||||
(-> node
|
(-> node
|
||||||
(.toBlob (fn [blob]
|
(.toBlob (fn [blob]
|
||||||
|
@ -43,6 +46,14 @@
|
||||||
(do (rx/push! subs nil)
|
(do (rx/push! subs nil)
|
||||||
(rx/end! subs)))))))
|
(rx/end! subs)))))))
|
||||||
|
|
||||||
|
(defn clear-thumbnail
|
||||||
|
[page-id frame-id]
|
||||||
|
(ptk/reify ::clear-thumbnail
|
||||||
|
ptk/UpdateEvent
|
||||||
|
(update [_ state]
|
||||||
|
(let [object-id (dm/str page-id frame-id)]
|
||||||
|
(assoc-in state [:workspace-file :thumbnails object-id] nil)))))
|
||||||
|
|
||||||
(defn update-thumbnail
|
(defn update-thumbnail
|
||||||
"Updates the thumbnail information for the given frame `id`"
|
"Updates the thumbnail information for the given frame `id`"
|
||||||
[page-id frame-id]
|
[page-id frame-id]
|
||||||
|
@ -71,50 +82,39 @@
|
||||||
|
|
||||||
(defn- extract-frame-changes
|
(defn- extract-frame-changes
|
||||||
"Process a changes set in a commit to extract the frames that are changing"
|
"Process a changes set in a commit to extract the frames that are changing"
|
||||||
[[event [old-objects new-objects]]]
|
[[event [old-data new-data]]]
|
||||||
(let [changes (-> event deref :changes)
|
(let [changes (-> event deref :changes)
|
||||||
|
|
||||||
extract-ids
|
extract-ids
|
||||||
(fn [{type :type :as change}]
|
(fn [{:keys [page-id type] :as change}]
|
||||||
(case type
|
(case type
|
||||||
:add-obj [(:id change)]
|
:add-obj [[page-id (:id change)]]
|
||||||
:mod-obj [(:id change)]
|
:mod-obj [[page-id (:id change)]]
|
||||||
:del-obj [(:id change)]
|
:del-obj [[page-id (:id change)]]
|
||||||
:reg-objects (:shapes change)
|
:mov-objects (->> (:shapes change) (map #(vector page-id %)))
|
||||||
:mov-objects (:shapes change)
|
|
||||||
[]))
|
[]))
|
||||||
|
|
||||||
get-frame-id
|
get-frame-id
|
||||||
(fn [id]
|
(fn [[page-id id]]
|
||||||
(let [shape (or (get new-objects id)
|
(let [old-objects (wsh/lookup-data-objects old-data page-id)
|
||||||
(get old-objects id))]
|
new-objects (wsh/lookup-data-objects new-data page-id)
|
||||||
(or (and (cph/frame-shape? shape) id) (:frame-id shape))))
|
|
||||||
|
|
||||||
;; Extracts the frames and then removes nils and the root frame
|
new-shape (get new-objects id)
|
||||||
xform (comp (mapcat extract-ids)
|
old-shape (get old-objects id)
|
||||||
(map get-frame-id)
|
|
||||||
(remove nil?)
|
|
||||||
(filter #(not= uuid/zero %))
|
|
||||||
(filter #(contains? new-objects %)))]
|
|
||||||
|
|
||||||
(into #{} xform changes)))
|
old-frame-id (if (cph/frame-shape? old-shape) id (:frame-id old-shape))
|
||||||
|
new-frame-id (if (cph/frame-shape? new-shape) id (:frame-id new-shape))]
|
||||||
|
|
||||||
(defn thumbnail-change?
|
(cond-> #{}
|
||||||
"Checks if a event is only updating thumbnails to ignore in the thumbnail generation process"
|
(and old-frame-id (not= uuid/zero old-frame-id))
|
||||||
[event]
|
(conj [page-id old-frame-id])
|
||||||
(let [changes (-> event deref :changes)
|
|
||||||
|
|
||||||
is-thumbnail-op?
|
(and new-frame-id (not= uuid/zero new-frame-id))
|
||||||
(fn [{type :type attr :attr}]
|
(conj [page-id new-frame-id]))))]
|
||||||
(and (= type :set)
|
(into #{}
|
||||||
(= attr :thumbnail)))
|
(comp (mapcat extract-ids)
|
||||||
|
(mapcat get-frame-id))
|
||||||
is-thumbnail-change?
|
changes)))
|
||||||
(fn [change]
|
|
||||||
(and (= (:type change) :mod-obj)
|
|
||||||
(->> change :operations (every? is-thumbnail-op?))))]
|
|
||||||
|
|
||||||
(->> changes (every? is-thumbnail-change?))))
|
|
||||||
|
|
||||||
(defn watch-state-changes
|
(defn watch-state-changes
|
||||||
"Watch the state for changes inside frames. If a change is detected will force a rendering
|
"Watch the state for changes inside frames. If a change is detected will force a rendering
|
||||||
|
@ -123,32 +123,39 @@
|
||||||
(ptk/reify ::watch-state-changes
|
(ptk/reify ::watch-state-changes
|
||||||
ptk/WatchEvent
|
ptk/WatchEvent
|
||||||
(watch [_ _ stream]
|
(watch [_ _ stream]
|
||||||
(let [stopper (->> stream
|
(let [stopper
|
||||||
|
(->> stream
|
||||||
(rx/filter #(or (= :app.main.data.workspace/finalize-page (ptk/type %))
|
(rx/filter #(or (= :app.main.data.workspace/finalize-page (ptk/type %))
|
||||||
(= ::watch-state-changes (ptk/type %)))))
|
(= ::watch-state-changes (ptk/type %)))))
|
||||||
|
|
||||||
objects-stream (->> (rx/concat
|
workspace-data-str
|
||||||
|
(->> (rx/concat
|
||||||
(rx/of nil)
|
(rx/of nil)
|
||||||
(rx/from-atom refs/workspace-page-objects {:emit-current-value? true}))
|
(rx/from-atom refs/workspace-data {:emit-current-value? true}))
|
||||||
;; We need to keep the old-objects so we can check the frame for the
|
;; We need to keep the old-objects so we can check the frame for the
|
||||||
;; deleted objects
|
;; deleted objects
|
||||||
(rx/buffer 2 1))
|
(rx/buffer 2 1))
|
||||||
|
|
||||||
frame-changes (->> stream
|
change-str
|
||||||
(rx/filter dch/commit-changes?)
|
(->> stream
|
||||||
|
(rx/filter #(or (dch/commit-changes? %)
|
||||||
|
(= (ptk/type %) :app.main.data.workspace.notifications/handle-file-change)))
|
||||||
|
(rx/observe-on :async))
|
||||||
|
|
||||||
;; Async so we wait for additional side-effects of commit-changes
|
frame-changes-str
|
||||||
(rx/observe-on :async)
|
(->> change-str
|
||||||
(rx/filter (complement thumbnail-change?))
|
(rx/with-latest-from workspace-data-str)
|
||||||
(rx/with-latest-from objects-stream)
|
(rx/flat-map extract-frame-changes)
|
||||||
(rx/map extract-frame-changes)
|
|
||||||
(rx/share))]
|
(rx/share))]
|
||||||
|
|
||||||
(->> frame-changes
|
(->> (rx/merge
|
||||||
(rx/flat-map
|
(->> frame-changes-str
|
||||||
(fn [ids]
|
(rx/filter (fn [[page-id _]] (not= page-id (:current-page-id @st/state))))
|
||||||
(->> (rx/from ids)
|
(rx/map (fn [[page-id frame-id]] (clear-thumbnail page-id frame-id))))
|
||||||
(rx/map #(ptk/data-event ::force-render %)))))
|
|
||||||
|
(->> frame-changes-str
|
||||||
|
(rx/filter (fn [[page-id _]] (= page-id (:current-page-id @st/state))))
|
||||||
|
(rx/map (fn [[_ frame-id]] (ptk/data-event ::force-render frame-id)))))
|
||||||
(rx/take-until stopper))))))
|
(rx/take-until stopper))))))
|
||||||
|
|
||||||
(defn duplicate-thumbnail
|
(defn duplicate-thumbnail
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
(.clearRect canvas-context 0 0 canvas-width canvas-height)
|
(.clearRect canvas-context 0 0 canvas-width canvas-height)
|
||||||
(.drawImage canvas-context img-node 0 0 canvas-width canvas-height)
|
(.drawImage canvas-context img-node 0 0 canvas-width canvas-height)
|
||||||
|
(.removeAttribute canvas-node "data-empty")
|
||||||
true))
|
true))
|
||||||
(catch :default err
|
(catch :default err
|
||||||
(.error js/console err)
|
(.error js/console err)
|
||||||
|
@ -75,6 +76,8 @@
|
||||||
thumbnail-data-ref (mf/use-memo (mf/deps page-id id) #(refs/thumbnail-frame-data page-id id))
|
thumbnail-data-ref (mf/use-memo (mf/deps page-id id) #(refs/thumbnail-frame-data page-id id))
|
||||||
thumbnail-data (mf/deref thumbnail-data-ref)
|
thumbnail-data (mf/deref thumbnail-data-ref)
|
||||||
|
|
||||||
|
prev-thumbnail-data (hooks/use-previous thumbnail-data)
|
||||||
|
|
||||||
render-frame? (mf/use-state (not thumbnail-data))
|
render-frame? (mf/use-state (not thumbnail-data))
|
||||||
|
|
||||||
on-image-load
|
on-image-load
|
||||||
|
@ -141,6 +144,12 @@
|
||||||
(.observe observer node #js {:childList true :attributes true :attributeOldValue true :characterData true :subtree true})
|
(.observe observer node #js {:childList true :attributes true :attributeOldValue true :characterData true :subtree true})
|
||||||
(reset! observer-ref observer)))))]
|
(reset! observer-ref observer)))))]
|
||||||
|
|
||||||
|
(mf/use-effect
|
||||||
|
(mf/deps thumbnail-data)
|
||||||
|
(fn []
|
||||||
|
(when (and (some? prev-thumbnail-data) (nil? thumbnail-data))
|
||||||
|
(rx/push! updates-str :update))))
|
||||||
|
|
||||||
(mf/use-effect
|
(mf/use-effect
|
||||||
(mf/deps @render-frame? thumbnail-data)
|
(mf/deps @render-frame? thumbnail-data)
|
||||||
(fn []
|
(fn []
|
||||||
|
@ -198,8 +207,10 @@
|
||||||
|
|
||||||
[:foreignObject {:x x :y y :width width :height height}
|
[:foreignObject {:x x :y y :width width :height height}
|
||||||
[:canvas.thumbnail-canvas
|
[:canvas.thumbnail-canvas
|
||||||
{:ref frame-canvas-ref
|
{:key (dm/str "thumbnail-canvas-" (:id shape))
|
||||||
|
:ref frame-canvas-ref
|
||||||
:data-object-id (dm/str page-id (:id shape))
|
:data-object-id (dm/str page-id (:id shape))
|
||||||
|
:data-empty true
|
||||||
:width fixed-width
|
:width fixed-width
|
||||||
:height fixed-height
|
:height fixed-height
|
||||||
;; DEBUG
|
;; DEBUG
|
||||||
|
|
Loading…
Add table
Reference in a new issue