Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-18 21:06:11 -05:00
Code Issues Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2022-02-16 16:30:45 +01:00
commit b37d6ec500
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -43,6 +43,7 @@
- Fixed color palette outside viewport [Taiga #2715](https://tree.taiga.io/project/penpot/issue/2715) - Fixed color palette outside viewport [Taiga #2715](https://tree.taiga.io/project/penpot/issue/2715)
- Fixed missing translate string [Taiga #2780](https://tree.taiga.io/project/penpot/issue/2780) - Fixed missing translate string [Taiga #2780](https://tree.taiga.io/project/penpot/issue/2780)
- Fixed handoff shadow type text [Taiga #2717](https://tree.taiga.io/project/penpot/issue/2717) - Fixed handoff shadow type text [Taiga #2717](https://tree.taiga.io/project/penpot/issue/2717)
- Fixed components get "dirty" marker when moved [Taiga #2764](https://tree.taiga.io/project/penpot/issue/2764)
### :arrow_up: Deps updates ### :arrow_up: Deps updates

3
common/src/app/common/pages/helpers.cljc
View file

@ -243,8 +243,7 @@
shape shape
(some? (:shape-ref shape)) (some? (:shape-ref shape))
(recur (get objects (:parent-id shape)) (recur objects (get objects (:parent-id shape)))))
objects)))
(defn make-container (defn make-container
[page-or-component type] [page-or-component type]

2
frontend/src/app/main/data/workspace/selection.cljs
View file

@ -184,7 +184,7 @@
(cph/get-immediate-children objects frame-id)) (cph/get-immediate-children objects frame-id))
selected (into (d/ordered-set) selected (into (d/ordered-set)
(remove :blocked) (comp (remove :blocked) (map :id))
selected)] selected)]
(rx/of (select-shapes selected)))))) (rx/of (select-shapes selected))))))

8
frontend/src/app/main/data/workspace/transforms.cljs
View file

@ -163,7 +163,9 @@
(let [objects (wsh/lookup-page-objects state) (let [objects (wsh/lookup-page-objects state)
ids-with-children (into (vec ids) (mapcat #(cph/get-children-ids objects %)) ids) ids-with-children (into (vec ids) (mapcat #(cph/get-children-ids objects %)) ids)
object-modifiers (get state :workspace-modifiers) object-modifiers (get state :workspace-modifiers)
ignore-tree (get-ignore-tree object-modifiers objects ids)] shapes (map (d/getf objects) ids)
ignore-tree (->> (map #(get-ignore-tree object-modifiers objects %) shapes)
(reduce merge {}))]
(rx/of (dwu/start-undo-transaction) (rx/of (dwu/start-undo-transaction)
(dwg/move-frame-guides ids-with-children) (dwg/move-frame-guides ids-with-children)
@ -245,7 +247,7 @@
(reduce set-child modif-tree children))) (reduce set-child modif-tree children)))
(defn- get-ignore-tree (defn- get-ignore-tree
"Retrieves a map with the flag `ignore-tree` given a tree of modifiers" "Retrieves a map with the flag `ignore-geometry?` given a tree of modifiers"
([modif-tree objects shape] ([modif-tree objects shape]
(get-ignore-tree modif-tree objects shape nil nil {})) (get-ignore-tree modif-tree objects shape nil nil {}))
@ -261,7 +263,7 @@
ignore-tree (assoc ignore-tree shape-id ignore-geometry?) ignore-tree (assoc ignore-tree shape-id ignore-geometry?)
set-child set-child
(fn [modif-tree child] (fn [ignore-tree child]
(get-ignore-tree modif-tree objects child root transformed-root ignore-tree))] (get-ignore-tree modif-tree objects child root transformed-root ignore-tree))]
(reduce set-child ignore-tree children)))) (reduce set-child ignore-tree children))))