Merge pull request #3136 from penpot/alotor-hotfix-1.18.3

Alotor hotfix 1.18.3

CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 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
 
 ### :bug: Bugs fixed

frontend/src/app/main/data/workspace/shapes.cljs

@@ -129,6 +129,9 @@
             objects (wsh/lookup-page-objects state page-id)
 
             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)
 
             changes
@@ -137,9 +140,7 @@
                   (pcb/with-objects objects)
                   (cond-> (not (ctl/any-layout? objects frame-id))
                     (pcb/update-shapes ordered-indexes  ctl/remove-layout-item-data))
-                  (pcb/update-shapes ordered-indexes #(cond-> %
-                                                        (and (cph/frame-shape? %) (not= (:parent-id %) uuid/zero))
-                                                        (assoc :hide-in-viewer true)))
+                  (pcb/update-shapes ordered-indexes #(cond-> % (cph/frame-shape? %) (assoc :hide-in-viewer true)))
                   (pcb/change-parent frame-id to-move-shapes 0)
                   (cond-> (ctl/grid-layout? objects frame-id)
                     (pcb/update-shapes [frame-id] ctl/assign-cells))))]

frontend/src/app/main/ui/workspace/viewport/hooks.cljs

@@ -59,10 +59,9 @@
    (fn []
      (when-not vport
        (let [node (mf/ref-val viewport-ref)
-             prnt (dom/get-parent node)
-             size (dom/get-client-size prnt)]
+             prnt (dom/get-parent node)]
          ;; 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-cursor [cursor alt? mod? space? panning drawing-tool drawing-path? path-editing? z? workspace-read-only?]
   (mf/use-effect

version.txt

@@ -1 +1 @@
-1.18.2
+1.18.3