From a9052e2690fc10e92a5bdfee830199df7640a44b Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 9 Apr 2024 12:01:56 +0200 Subject: [PATCH 1/5] :bug: Fix problem changing fill images --- frontend/src/app/main/data/workspace/colors.cljs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/main/data/workspace/colors.cljs b/frontend/src/app/main/data/workspace/colors.cljs index 287b6c3447..5e9028424a 100644 --- a/frontend/src/app/main/data/workspace/colors.cljs +++ b/frontend/src/app/main/data/workspace/colors.cljs @@ -602,9 +602,11 @@ (update-in state [:stops stop] (fn [data] (->> changes (merge data) (materialize-color-components)))) + (-> state (dissoc :gradient :stops :editing-stop) - (assoc :type :color))))))) + (cond-> (not= :image (:type state)) + (assoc :type :color)))))))) ptk/WatchEvent (watch [_ state _] (when add-recent? From b7c4cb1f58261569c22cdf20d6c6f20ba0f29dea Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 9 Apr 2024 12:03:06 +0200 Subject: [PATCH 2/5] :bug: Fix project name being cut --- frontend/src/app/main/ui/dashboard/projects.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/app/main/ui/dashboard/projects.scss b/frontend/src/app/main/ui/dashboard/projects.scss index eb73b2e891..e3b57fba55 100644 --- a/frontend/src/app/main/ui/dashboard/projects.scss +++ b/frontend/src/app/main/ui/dashboard/projects.scss @@ -85,6 +85,9 @@ line-height: 0.8; color: var(--title-foreground-color-hover); cursor: pointer; + height: $s-16; + display: inline-flex; + align-items: center; } .info-wrapper { From 27010ae0fb308d790ba66981049834e0aaadc5ab Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 9 Apr 2024 12:03:59 +0200 Subject: [PATCH 3/5] :bug: Fix problem when moving horizontal/vertical lines --- .../main/ui/workspace/viewport/selection.cljs | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/viewport/selection.cljs b/frontend/src/app/main/ui/workspace/viewport/selection.cljs index 8d04c1ac24..5789e2ff11 100644 --- a/frontend/src/app/main/ui/workspace/viewport/selection.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/selection.cljs @@ -36,6 +36,8 @@ (def selection-rect-width 1) (def min-selrect-side 10) (def small-selrect-side 30) +(def min-selrect-width 10) +(def min-selrect-height 10) (mf/defc selection-rect {::mf/wrap-props false} @@ -43,12 +45,27 @@ (let [x (dm/get-prop rect :x) y (dm/get-prop rect :y) width (dm/get-prop rect :width) - height (dm/get-prop rect :height)] + height (dm/get-prop rect :height) + + ;; This is a calculation to create a "minimum" interactable rect + ;; Is necesary so that small shapes in x/y (like lines) can be moved + ;; better + [x width] + (if (< width (/ min-selrect-width zoom)) + (let [width' (/ min-selrect-width zoom)] + [(- x (/ (- width' width) 2)) width']) + [x width]) + + [y height] + (if (< height (/ min-selrect-height zoom)) + (let [height' (/ min-selrect-height zoom)] + [(- y (/ (- height' height) 2)) height']) + [y height])] [:rect.main.viewport-selrect {:x x :y y - :width width - :height height + :width (max width (/ 10 zoom)) + :height (max height (/ 10 zoom)) :transform (str transform) :on-pointer-down on-move-selected :on-context-menu on-context-menu From 8f0e11d0205d6d902d9a324b7013ae4163901df8 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 9 Apr 2024 12:05:02 +0200 Subject: [PATCH 4/5] :bug: Fix component name ellipsis --- frontend/src/app/main/ui/components/editable_label.scss | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/ui/components/editable_label.scss b/frontend/src/app/main/ui/components/editable_label.scss index 1f72eaf7ab..a8c3991589 100644 --- a/frontend/src/app/main/ui/components/editable_label.scss +++ b/frontend/src/app/main/ui/components/editable_label.scss @@ -20,12 +20,8 @@ color: var(--input-foreground-color-active); } -.editable-label { - display: flex; - - &.is-hidden { - display: none; - } +.editable-label.is-hidden { + display: none; } .editable-label-close { From f6c62075229c2047dfbc7bc7338a92a02199d0fa Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 9 Apr 2024 12:07:17 +0200 Subject: [PATCH 5/5] :bug: Fix problem renaming boards from viewport --- frontend/src/app/main/data/workspace.cljs | 6 +++--- .../src/app/main/ui/workspace/sidebar/layer_name.cljs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index a6487e3637..91a080b711 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -682,12 +682,12 @@ (defn end-rename-shape "End the ongoing shape rename process" - ([] (end-rename-shape nil)) - ([name] + ([] (end-rename-shape nil nil)) + ([shape-id name] (ptk/reify ::end-rename-shape ptk/WatchEvent (watch [_ state _] - (when-let [shape-id (dm/get-in state [:workspace-local :shape-for-rename])] + (when-let [shape-id (d/nilv shape-id (dm/get-in state [:workspace-local :shape-for-rename]))] (let [shape (wsh/lookup-shape state shape-id) name (str/trim name) clean-name (cfh/clean-path name) diff --git a/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs b/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs index 45d0a9015e..43d87b40d3 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/layer_name.cljs @@ -51,21 +51,21 @@ accept-edit (mf/use-fn - (mf/deps on-stop-edit) + (mf/deps shape-id on-stop-edit) (fn [] (let [name-input (mf/ref-val ref) name (str/trim (dom/get-value name-input))] (on-stop-edit) (reset! edition* false) - (st/emit! (dw/end-rename-shape name))))) + (st/emit! (dw/end-rename-shape shape-id name))))) cancel-edit (mf/use-fn - (mf/deps on-stop-edit) + (mf/deps shape-id on-stop-edit) (fn [] (on-stop-edit) (reset! edition* false) - (st/emit! (dw/end-rename-shape nil)))) + (st/emit! (dw/end-rename-shape shape-id nil)))) on-key-down (mf/use-fn