From ce3e30ea026832fcfaf69188096a558ce20df8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Tue, 21 Mar 2023 16:52:19 +0100 Subject: [PATCH] :bug: Fix linter issues --- backend/src/app/rpc/commands/files_update.clj | 2 +- frontend/resources/styles/main/partials/forms.scss | 2 +- frontend/src/app/main/data/comments.cljs | 2 +- .../app/main/data/workspace/grid_layout/editor.cljs | 4 ++-- frontend/src/app/main/data/workspace/selection.cljs | 13 ++----------- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/backend/src/app/rpc/commands/files_update.clj b/backend/src/app/rpc/commands/files_update.clj index c31ea398a..aebaddd1c 100644 --- a/backend/src/app/rpc/commands/files_update.clj +++ b/backend/src/app/rpc/commands/files_update.clj @@ -21,7 +21,7 @@ [app.metrics :as mtx] [app.msgbus :as mbus] [app.rpc :as-alias rpc] - [app.rpc.climit :as-alias climit] + [app.rpc.climit :as climit] [app.rpc.commands.files :as files] [app.rpc.doc :as-alias doc] [app.rpc.helpers :as rph] diff --git a/frontend/resources/styles/main/partials/forms.scss b/frontend/resources/styles/main/partials/forms.scss index e3959df3b..ffb67d647 100644 --- a/frontend/resources/styles/main/partials/forms.scss +++ b/frontend/resources/styles/main/partials/forms.scss @@ -276,7 +276,7 @@ textarea { max-width: 85%; overflow: hidden; text-overflow: ellipsis; - line-height: $lh-115; // Original value was 16px; 16px/14px = 114.285714286% => $lh-115 (rounded) + line-height: $lh-115; // Original value was 16px; 16px/14px = 114.285714286% => $lh-115 (rounded) font-size: $fs14; color: $color-black; } 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..b9eb203d2 100644 --- a/frontend/src/app/main/data/workspace/selection.cljs +++ b/frontend/src/app/main/data/workspace/selection.cljs @@ -140,22 +140,13 @@ (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) + objects (or objects (wsh/lookup-page-objects state page-id)) selection (-> state wsh/lookup-selected (conj id))]