Minor fixes on group-selected event.

This commit is contained in:
Andrey Antukh 2016-01-28 20:32:56 +02:00
parent f207136937
commit e595d6b85e

View file

@ -305,14 +305,13 @@
(into [group] $) (into [group] $)
(assoc-in state [:pages-by-id pid :shapes] $))) (assoc-in state [:pages-by-id pid :shapes] $)))
(update-shapes-on-index [state shapes dimensions group] (update-shapes-on-index [state shapes group]
(let [{:keys [x y]} dimensions] (reduce (fn [state {:keys [id] :as shape}]
(reduce (fn [state {:keys [id] :as shape}] (as-> shape $
(as-> shape $ (assoc $ :group group)
(assoc $ :group group) (assoc-in state [:shapes-by-id id] $)))
(assoc-in state [:shapes-by-id id] $))) state
state shapes))]
shapes)))]
(reify rs/UpdateEvent (reify rs/UpdateEvent
(-apply-update [_ state] (-apply-update [_ state]
(let [shapes-by-id (get state :shapes-by-id) (let [shapes-by-id (get state :shapes-by-id)
@ -326,7 +325,7 @@
:id sid :id sid
:page pid}] :page pid}]
(as-> state $ (as-> state $
(update-shapes-on-index $ selected' dimensions sid) (update-shapes-on-index $ selected' sid)
(update-shapes-on-page $ pid selected sid) (update-shapes-on-page $ pid selected sid)
(update $ :shapes-by-id assoc sid group) (update $ :shapes-by-id assoc sid group)
(update $ :workspace assoc :selected #{}))))))) (update $ :workspace assoc :selected #{})))))))