From 5d77f7e5b110118a08350fc1248941046c5f7b65 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 21 Mar 2023 17:00:42 +0100 Subject: [PATCH] :bug: Fix linter issues --- backend/src/app/rpc/commands/fonts.clj | 2 +- frontend/src/app/main/data/comments.cljs | 2 +- .../main/data/workspace/grid_layout/editor.cljs | 4 ++-- .../src/app/main/data/workspace/selection.cljs | 16 ++++------------ 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/backend/src/app/rpc/commands/fonts.clj b/backend/src/app/rpc/commands/fonts.clj index 67be5f526..6df517e63 100644 --- a/backend/src/app/rpc/commands/fonts.clj +++ b/backend/src/app/rpc/commands/fonts.clj @@ -15,7 +15,7 @@ [app.loggers.webhooks :as-alias webhooks] [app.media :as media] [app.rpc :as-alias rpc] - [app.rpc.climit :as-alias climit] + [app.rpc.climit :as climit] [app.rpc.commands.files :as files] [app.rpc.commands.projects :as projects] [app.rpc.commands.teams :as teams] diff --git a/frontend/src/app/main/data/comments.cljs b/frontend/src/app/main/data/comments.cljs index aced66cdc..637edce3b 100644 --- a/frontend/src/app/main/data/comments.cljs +++ b/frontend/src/app/main/data/comments.cljs @@ -105,7 +105,7 @@ (defn created-thread-on-viewer [{:keys [id comment page-id] :as thread}] - (ptk/reify ::created-thread-on-workspace + (ptk/reify ::created-thread-on-viewer ptk/UpdateEvent (update [_ state] (-> state diff --git a/frontend/src/app/main/data/workspace/grid_layout/editor.cljs b/frontend/src/app/main/data/workspace/grid_layout/editor.cljs index 7cd464a05..6f9bf9a8e 100644 --- a/frontend/src/app/main/data/workspace/grid_layout/editor.cljs +++ b/frontend/src/app/main/data/workspace/grid_layout/editor.cljs @@ -24,14 +24,14 @@ (defn select-grid-cell [grid-id row column] - (ptk/reify ::hover-grid-cell + (ptk/reify ::select-grid-cell ptk/UpdateEvent (update [_ state] (assoc-in state [:workspace-grid-edition grid-id :selected] [row column])))) (defn remove-selection [grid-id] - (ptk/reify ::hover-grid-cell + (ptk/reify ::remove-selection ptk/UpdateEvent (update [_ state] (update-in state [:workspace-grid-edition grid-id] dissoc :selected)))) diff --git a/frontend/src/app/main/data/workspace/selection.cljs b/frontend/src/app/main/data/workspace/selection.cljs index 3b5c50bc2..3ac7ffecb 100644 --- a/frontend/src/app/main/data/workspace/selection.cljs +++ b/frontend/src/app/main/data/workspace/selection.cljs @@ -140,22 +140,14 @@ (update-in state [:workspace-local :selected] disj id)))) (defn shift-select-shapes + ([id] + (shift-select-shapes id nil)) + ([id objects] (ptk/reify ::shift-select-shapes ptk/UpdateEvent (update [_ state] - (let [selection (-> state - wsh/lookup-selected - (conj id))] - (-> state - (assoc-in [:workspace-local :selected] - (cph/expand-region-selection objects selection))))))) - ([id] - (ptk/reify ::shift-select-shapes - ptk/UpdateEvent - (update [_ state] - (let [page-id (:current-page-id state) - objects (wsh/lookup-page-objects state page-id) + (let [objects (or objects (wsh/lookup-page-objects state)) selection (-> state wsh/lookup-selected (conj id))]