diff --git a/src/uxbox/ui/workspace/canvas.cljs b/src/uxbox/ui/workspace/canvas.cljs index 2fa038d92..1f3fb3363 100644 --- a/src/uxbox/ui/workspace/canvas.cljs +++ b/src/uxbox/ui/workspace/canvas.cljs @@ -69,9 +69,7 @@ (for [item (reverse (:shapes page))] (-> (uus/shape item) (rum/with-key (str item)))) - (draw-area)]] - (when (contains? flags :grid) - (grid))]))) + (draw-area)]]]))) (def canvas (mx/component @@ -87,6 +85,7 @@ [own] (let [workspace (rum/react uuwb/workspace-l) page (rum/react uuwb/page-l) + flags (:flags workspace) drawing? (:drawing workspace) zoom (or (:zoom workspace) 1)] (letfn [(on-mouse-down [event] @@ -109,9 +108,11 @@ :on-mouse-up on-mouse-up} [:g.zoom {:transform (str "scale(" zoom ", " zoom ")")} (if page - (canvas page))] - (ruler) - (selrect)])))) + (canvas page)) + (if (contains? flags :grid) + (grid))] + (ruler) + (selrect)])))) (defn- viewport-did-mount [own] diff --git a/src/uxbox/ui/workspace/grid.cljs b/src/uxbox/ui/workspace/grid.cljs index af2813ba1..5e7b8a255 100644 --- a/src/uxbox/ui/workspace/grid.cljs +++ b/src/uxbox/ui/workspace/grid.cljs @@ -20,8 +20,10 @@ (defn- grid-render [own] - (let [{:keys [width height options]} (deref wb/page-l) + (let [options (:options @wb/page-l) color (:grid/color options "#cccccc") + width wb/viewport-width + height wb/viewport-height x-ticks (ticks-range width (:grid/x-axis options 10)) y-ticks (ticks-range height (:grid/y-axis options 10)) path (as-> [] $