github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-07 12:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fixed problem with recursive color changes for frames

Browse Source
This commit is contained in:
alonso.torres 2020-10-16 07:32:22 +02:00
parent f8abcc1b9c
commit f992c740d5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/app/main/data/colors.cljs
View File

@ -111,7 +111,8 @@
(watch [_ state s] (watch [_ state s]
(let [pid (:current-page-id state) (let [pid (:current-page-id state)
objects (get-in state [:workspace-data :pages-index pid :objects]) objects (get-in state [:workspace-data :pages-index pid :objects])
children (mapcat #(cph/get-children % objects) ids) not-frame (fn [shape-id] (not= (get-in objects [shape-id :type]) :frame))
children (->> ids (filter not-frame) (mapcat #(cph/get-children % objects)))
ids (into ids children) ids (into ids children)
is-text? #(= :text (:type (get objects %))) is-text? #(= :text (:type (get objects %)))
@ -138,7 +139,8 @@
ptk/WatchEvent ptk/WatchEvent
(watch [_ state s] (watch [_ state s]
(let [objects (get-in state [:workspace-data :pages-index (:current-page-id state) :objects]) (let [objects (get-in state [:workspace-data :pages-index (:current-page-id state) :objects])
children (mapcat #(cph/get-children % objects) ids) not-frame (fn [shape-id] (not= (get-in objects [shape-id :type]) :frame))
children (->> ids (filter not-frame) (mapcat #(cph/get-children % objects)))
ids (into ids children) ids (into ids children)
update-fn (fn [s] update-fn (fn [s]