From d22ae22aad5d38c353b7348ee82d1b867b618ba7 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Wed, 10 Apr 2024 10:40:35 +0200 Subject: [PATCH 1/4] :bug: Fix no visual cue if user want to create anotation with only spaces --- .../main/ui/workspace/sidebar/options/menus/component.cljs | 2 +- .../main/ui/workspace/sidebar/options/menus/component.scss | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs index 570b25faf8..8ae04081b1 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs @@ -184,7 +184,7 @@ :class (stl/css-case :icon true :icon-tick true - :hidden invalid-text?)} + :invalid invalid-text?)} i/tick] [:div {:class (stl/css :icon :icon-cross) :title (tr "labels.discard") diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss index d024187a78..18300d3714 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss @@ -566,6 +566,13 @@ } } + &.icon-tick.invalid:hover { + cursor: default; + svg { + stroke: var(--icon-foreground); + } + } + &.icon-cross:hover, &.icon-trash:hover { svg { From 2f89512a7567fec32039645042621079ff4faa21 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 11 Apr 2024 07:27:36 +0200 Subject: [PATCH 2/4] :bug: Fix project line shows an extra space after the number of files --- frontend/src/app/main/ui/dashboard/projects.cljs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs index fc0a51f97c..cdd9304e97 100644 --- a/frontend/src/app/main/ui/dashboard/projects.cljs +++ b/frontend/src/app/main/ui/dashboard/projects.cljs @@ -312,11 +312,13 @@ :on-menu-close on-menu-close :on-import on-import}] - [:span {:class (stl/css :info)} (str (tr "labels.num-of-files" (i18n/c file-count)))] + ;; We group these two spans under a div to avoid having extra space between them. + [:div + [:span {:class (stl/css :info)} (str (tr "labels.num-of-files" (i18n/c file-count)))] - (let [time (-> (:modified-at project) - (dt/timeago {:locale locale}))] - [:span {:class (stl/css :recent-files-row-title-info)} (str ", " time)]) + (let [time (-> (:modified-at project) + (dt/timeago {:locale locale}))] + [:span {:class (stl/css :recent-files-row-title-info)} (str ", " time)])] [:div {:class (stl/css-case :project-actions true :pinned-project (:is-pinned project))} From 1b17664ade177b55561c3d01f57e4683fd6bb039 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Thu, 11 Apr 2024 07:19:08 +0200 Subject: [PATCH 3/4] :bug: Fix gradient stroke breaks arrow-ended paths --- frontend/src/app/main/ui/shapes/custom_stroke.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/shapes/custom_stroke.cljs b/frontend/src/app/main/ui/shapes/custom_stroke.cljs index 35d2bd7f0d..ed317cdbdc 100644 --- a/frontend/src/app/main/ui/shapes/custom_stroke.cljs +++ b/frontend/src/app/main/ui/shapes/custom_stroke.cljs @@ -91,7 +91,7 @@ color (cond (some? gradient) - (str/ffmt "url(#stroke-color-gradient-%s-%s)" render-id index) + (str/ffmt "url(#stroke-color-gradient-%-%)" render-id index) (some? image) (str/ffmt "url(#stroke-fill-%-%)" render-id index) From 9cbbe1565d22acc7c58646e20ed386336f019262 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Wed, 10 Apr 2024 15:53:52 +0200 Subject: [PATCH 4/4] :bug: Fix crash on copy paste a orphan copy inside a copy --- common/src/app/common/types/file.cljc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/app/common/types/file.cljc b/common/src/app/common/types/file.cljc index 12775f322f..0c5fbf5726 100644 --- a/common/src/app/common/types/file.cljc +++ b/common/src/app/common/types/file.cljc @@ -219,11 +219,11 @@ (defn advance-shape-ref "Get the shape-ref of the near main of the shape, recursively repeated as many times as the given levels." - [file container libraries shape levels & options] - (let [ref-shape (find-ref-shape file container libraries shape options)] + [file container libraries shape levels & {:keys [include-deleted?] :or {include-deleted? false}}] + (let [ref-shape (find-ref-shape file container libraries shape :include-deleted? include-deleted? :with-context? true)] (if (or (nil? (:shape-ref ref-shape)) (not (pos? levels))) (:id ref-shape) - (advance-shape-ref file container libraries ref-shape (dec levels) options)))) + (advance-shape-ref file (:container (meta ref-shape)) libraries ref-shape (dec levels) :include-deleted? include-deleted?)))) (defn find-ref-component "Locate the nearest component in the local file or libraries that is referenced by the