From a4776cf27fcce34eb89ab59261d01347d35fe84b Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 2 Apr 2024 11:15:11 +0200 Subject: [PATCH 1/8] :bug: Fix problem with comment refreshing --- frontend/src/app/main/data/comments.cljs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/data/comments.cljs b/frontend/src/app/main/data/comments.cljs index 807db96e8..0a441068f 100644 --- a/frontend/src/app/main/data/comments.cljs +++ b/frontend/src/app/main/data/comments.cljs @@ -249,14 +249,16 @@ ptk/UpdateEvent (update [_ state] - (d/update-in-when state [:comments thread-id id] assoc :content content)) + (-> state + (d/update-in-when [:comments thread-id id] assoc :content content))) ptk/WatchEvent (watch [_ state _] - (let [share-id (-> state :viewer-local :share-id)] + (let [file-id (:current-file-id state) + share-id (-> state :viewer-local :share-id)] (->> (rp/cmd! :update-comment {:id id :content content :share-id share-id}) (rx/catch #(rx/throw {:type :comment-error})) - (rx/ignore)))))) + (rx/map #(retrieve-comment-threads file-id))))))) (defn delete-comment-thread-on-workspace [{:keys [id] :as thread}] From b258b05fb26918ce65e7dd37d12f089ba5fc8c3b Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 2 Apr 2024 11:31:13 +0200 Subject: [PATCH 2/8] :bug: Fix problem with rtl --- .../main/ui/workspace/sidebar/options/menus/component.cljs | 7 ++++--- .../main/ui/workspace/sidebar/options/menus/component.scss | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) 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 d5170a8b5..570b25faf 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 @@ -616,9 +616,10 @@ [:div {:class (stl/css :name-wrapper)} [:div {:class (stl/css :component-name)} - (if multi - (tr "settings.multiple") - (cfh/last-path shape-name))] + [:span {:class (stl/css :component-name-inside)} + (if multi + (tr "settings.multiple") + (cfh/last-path shape-name))]] (when (and can-swap? (not multi)) [:div {:class (stl/css :component-parent-name)} 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 c36756069..d024187a7 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 @@ -56,7 +56,6 @@ padding-right: 0.5rem; .component-name-wrapper { width: 100%; - border-radius: $br-8; } } @@ -93,6 +92,7 @@ min-height: $s-32; padding: $s-8 0 $s-8 $s-2; border-radius: $br-8 0 0 $br-8; + overflow: hidden; } .component-name { @@ -103,6 +103,11 @@ min-height: $s-16; } +.component-name-inside { + direction: ltr; + unicode-bidi: bidi-override; +} + .component-parent-name { @include bodySmallTypography; @include textEllipsis; From 5fd72cf9d904df0cc174b26a6b3eeaf922a6e968 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 3 Apr 2024 10:27:48 +0200 Subject: [PATCH 3/8] :bug: Fix problem with flip properties --- common/src/app/common/geom/shapes/transforms.cljc | 12 ++++++++---- common/src/app/common/types/shape.cljc | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/src/app/common/geom/shapes/transforms.cljc b/common/src/app/common/geom/shapes/transforms.cljc index e5eae48eb..ebde6bf80 100644 --- a/common/src/app/common/geom/shapes/transforms.cljc +++ b/common/src/app/common/geom/shapes/transforms.cljc @@ -299,12 +299,16 @@ (cond-> shape (neg? dot-x) - (-> (cr/update! :flip-x not) - (cr/update! :rotation -)) + (cr/update! :flip-x not) + + (neg? dot-x) + (cr/update! :rotation -) (neg? dot-y) - (-> (cr/update! :flip-y not) - (cr/update! :rotation -))))) + (cr/update! :flip-y not) + + (neg? dot-y) + (cr/update! :rotation -)))) (defn- apply-transform-move "Given a new set of points transformed, set up the rectangle so it keeps diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc index 2101f90f7..e76fbe2a6 100644 --- a/common/src/app/common/types/shape.cljc +++ b/common/src/app/common/types/shape.cljc @@ -31,7 +31,7 @@ [app.common.uuid :as uuid] [clojure.set :as set])) -(cr/defrecord Shape [id name type x y width height rotation selrect points transform transform-inverse parent-id frame-id]) +(cr/defrecord Shape [id name type x y width height rotation selrect points transform transform-inverse parent-id frame-id flip-x flip-y]) (defn shape? [o] From 9c36d775732deefb1465a0228c37ba7d9acee6ef Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 3 Apr 2024 10:44:00 +0200 Subject: [PATCH 4/8] :bug: Fix problem with cursor when shapes flipped --- frontend/src/app/main/ui/workspace/viewport/selection.cljs | 6 +++--- 1 file changed, 3 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 ed91e2b6c..8d04c1ac2 100644 --- a/frontend/src/app/main/ui/workspace/viewport/selection.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/selection.cljs @@ -335,8 +335,8 @@ flip-x (get shape :flip-x) flip-y (get shape :flip-y) - half-flip? (or (and (some? flip-x) (not (some? flip-y))) - (and (some? flip-y) (not (some? flip-x))))] + half-flip? (or (and flip-x (not flip-y)) + (and flip-y (not flip-x)))] (when (and (not ^boolean read-only?) (not (:transforming shape)) @@ -357,7 +357,7 @@ (and ^boolean half-flip? (or (= position :top-right) (= position :bottom-left))) - (- rotation 90) + (+ rotation 90) :else rotation) From 4ba7bf664b5cb31b734c595dcfcc4bc4da405b2f Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 3 Apr 2024 16:22:36 +0200 Subject: [PATCH 5/8] :bug: Fix code generation format --- frontend/src/app/util/code_gen/style_css_formats.cljs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/util/code_gen/style_css_formats.cljs b/frontend/src/app/util/code_gen/style_css_formats.cljs index 69f841dc9..0a9cdd515 100644 --- a/frontend/src/app/util/code_gen/style_css_formats.cljs +++ b/frontend/src/app/util/code_gen/style_css_formats.cljs @@ -20,6 +20,8 @@ :height :size :min-width :size :min-height :size + :max-width :size + :max-height :size :background :color :border :border :border-radius :string-or-size-array From 677da04c43fb9e9776b8aa5f4dd397e39a88243a Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 3 Apr 2024 16:22:47 +0200 Subject: [PATCH 6/8] :bug: Fix component name ellipsis --- .../src/app/main/ui/workspace/sidebar/assets/components.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss b/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss index 1fad7eeb8..72706d601 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss @@ -66,8 +66,7 @@ &:hover { .cell-name { - display: grid; - grid-template-columns: 1fr auto; + display: block; } } From d96902f61d77db1f9218974bba49888c9e0dd0f3 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 3 Apr 2024 16:40:01 +0200 Subject: [PATCH 7/8] :bug: Fix filter layers --- frontend/src/app/main/ui/workspace/sidebar/layers.cljs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs index debc36252..afe62a2b1 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs @@ -144,7 +144,10 @@ (conj :rect :circle :path :bool))] (or (= uuid/zero id) (and (or (str/includes? (str/lower (:name shape)) (str/lower search)) - (str/includes? (dm/str (:id shape)) (str/lower search))) + ;; Only for local development we allow search for ids. Otherwise will be hard + ;; search for numbers or single letter shape names (ie: "A") + (and *assert* + (str/includes? (dm/str (:id shape)) (str/lower search)))) (or (empty? filters) (and (contains? filters :component) (contains? shape :component-id)) From bd2630fa1ac961cb23dda08bee3ef90b1c33865d Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 4 Apr 2024 10:07:18 +0200 Subject: [PATCH 8/8] :bug: Add shortcut description for grid layout toggle --- frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs | 1 + frontend/translations/en.po | 3 +++ frontend/translations/es.po | 3 +++ 3 files changed, 7 insertions(+) diff --git a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs index 4fde27d0c..20d41a9f7 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs @@ -189,6 +189,7 @@ ;; shortcuts.unmask ;; shortcuts.v-distribute ;; shortcuts.zoom-selected + ;; shortcuts.toggle-layout-grid (let [translat-pre (case type :sc "shortcuts." :sec "shortcut-section." diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 498fd2597..64d26fe66 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -3023,6 +3023,9 @@ msgstr "Zoom lense increase" msgid "shortcuts.zoom-selected" msgstr "Zoom to selected" +msgid "shortcuts.toggle-layout-grid" +msgstr "Add/remove grid layout" + #: src/app/main/ui/dashboard/team.cljs msgid "team.webhooks.max-length" msgstr "The webhook name must contain at most 2048 characters." diff --git a/frontend/translations/es.po b/frontend/translations/es.po index 02f484954..18ee3b030 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -3069,6 +3069,9 @@ msgstr "Incrementar zoom a objetivo" msgid "shortcuts.zoom-selected" msgstr "Zoom a selección" +msgid "shortcuts.toggle-layout-grid" +msgstr "Añadir/eliminar grid layout" + #: src/app/main/ui/dashboard/team.cljs msgid "team.webhooks.max-length" msgstr "El nombre del webhook debe contener como máximo 2048 caracteres."