Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-09 06:11:23 -05:00
Code Issues Activity

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

Browse source
This commit is contained in:
Alejandro Alonso 2023-04-13 16:34:22 +02:00
commit ce341a05e1
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -14,6 +14,12 @@
### :heart: Community contributions by (Thank you!) ### :heart: Community contributions by (Thank you!)
## 1.18.3
### :bug: Bugs fixed
- Fix problem with rulers not placing correctly [Taiga #5093](https://tree.taiga.io/project/penpot/issue/5093)
## 1.18.2 ## 1.18.2
### :bug: Bugs fixed ### :bug: Bugs fixed

7
frontend/src/app/main/data/workspace/shapes.cljs
View file

@ -130,6 +130,9 @@
objects (wsh/lookup-page-objects state page-id) objects (wsh/lookup-page-objects state page-id)
ordered-indexes (cph/order-by-indexed-shapes objects shapes) ordered-indexes (cph/order-by-indexed-shapes objects shapes)
parent-id (get-in objects [frame-id :parent-id])
ordered-indexes (->> ordered-indexes (remove #(= % parent-id)))
to-move-shapes (map (d/getf objects) ordered-indexes) to-move-shapes (map (d/getf objects) ordered-indexes)
changes changes
@ -138,9 +141,7 @@
(pcb/with-objects objects) (pcb/with-objects objects)
(cond-> (not (ctl/any-layout? objects frame-id)) (cond-> (not (ctl/any-layout? objects frame-id))
(pcb/update-shapes ordered-indexes ctl/remove-layout-item-data)) (pcb/update-shapes ordered-indexes ctl/remove-layout-item-data))
(pcb/update-shapes ordered-indexes #(cond-> % (pcb/update-shapes ordered-indexes #(cond-> % (cph/frame-shape? %) (assoc :hide-in-viewer true)))
(and (cph/frame-shape? %) (not= (:parent-id %) uuid/zero))
(assoc :hide-in-viewer true)))
(pcb/change-parent frame-id to-move-shapes 0) (pcb/change-parent frame-id to-move-shapes 0)
(cond-> (ctl/grid-layout? objects frame-id) (cond-> (ctl/grid-layout? objects frame-id)
(pcb/update-shapes [frame-id] ctl/assign-cells))))] (pcb/update-shapes [frame-id] ctl/assign-cells))))]

5
frontend/src/app/main/ui/workspace/viewport/hooks.cljs
View file

@ -59,10 +59,9 @@
(fn [] (fn []
(when-not vport (when-not vport
(let [node (mf/ref-val viewport-ref) (let [node (mf/ref-val viewport-ref)
prnt (dom/get-parent node) prnt (dom/get-parent node)]
size (dom/get-client-size prnt)]
;; We schedule the event so it fires after `initialize-page` event ;; We schedule the event so it fires after `initialize-page` event
(timers/schedule #(st/emit! (dw/initialize-viewport size)))))))) (timers/schedule #(st/emit! (dw/initialize-viewport (dom/get-client-size prnt)))))))))
(defn setup-page-loaded [page-id] (defn setup-page-loaded [page-id]