From 2b2a84da6437b88c900038e0858181c0147aa8a8 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 17 Sep 2024 14:49:39 +0200 Subject: [PATCH] :bug: Fix problem with frame guides --- frontend/src/app/main/data/workspace/grid.cljs | 2 +- .../app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs | 2 +- frontend/src/app/plugins/shape.cljs | 2 +- frontend/src/app/plugins/utils.cljs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/data/workspace/grid.cljs b/frontend/src/app/main/data/workspace/grid.cljs index 9183bc06c..3187c925b 100644 --- a/frontend/src/app/main/data/workspace/grid.cljs +++ b/frontend/src/app/main/data/workspace/grid.cljs @@ -28,7 +28,7 @@ (watch [_ state _] (let [page-id (:current-page-id state) page (dm/get-in state [:workspace-data :pages-index page-id]) - params (or (dm/get-in page [:grids :square]) + params (or (dm/get-in page [:default-grids :square]) (:square ctg/default-grid-params)) grid {:type :square :params params diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs index 4b158bf94..732c67b3c 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/frame_grid.cljs @@ -24,7 +24,7 @@ [rumext.v2 :as mf])) (def lens:default-grids - (l/derived :default-grids refs/workspace-data)) + (l/derived :default-grids refs/workspace-page)) (defn- get-size-options [] [{:value nil :label (tr "workspace.options.grid.auto")} diff --git a/frontend/src/app/plugins/shape.cljs b/frontend/src/app/plugins/shape.cljs index 874c3d8f6..6babf9d9f 100644 --- a/frontend/src/app/plugins/shape.cljs +++ b/frontend/src/app/plugins/shape.cljs @@ -1251,7 +1251,7 @@ {:name "rulerGuides" :get (fn [_] - (let [guides (-> (u/locate-page file-id page-id) :options :guides)] + (let [guides (-> (u/locate-page file-id page-id) :guides)] (->> guides (vals) (filter #(= id (:frame-id %))) diff --git a/frontend/src/app/plugins/utils.cljs b/frontend/src/app/plugins/utils.cljs index 81584852f..fe2b555cb 100644 --- a/frontend/src/app/plugins/utils.cljs +++ b/frontend/src/app/plugins/utils.cljs @@ -129,7 +129,7 @@ ruler-id (obj/get proxy "$id") page (locate-page file-id page-id)] (when (some? page) - (d/seek #(= (:id %) ruler-id) (-> page :options :guides vals))))) + (d/seek #(= (:id %) ruler-id) (-> page :guides vals))))) (defn proxy->interaction [proxy]