From aa3fe1cd2bc554b060f340e7248d9d08b38eb201 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 12 Dec 2023 14:33:41 +0100 Subject: [PATCH] :bug: Fix problems with assets --- .../src/app/main/ui/workspace/sidebar/assets/colors.scss | 2 -- .../app/main/ui/workspace/sidebar/assets/components.cljs | 6 ++++-- .../app/main/ui/workspace/sidebar/assets/components.scss | 1 - .../src/app/main/ui/workspace/sidebar/assets/graphics.scss | 2 -- .../app/main/ui/workspace/sidebar/assets/typographies.scss | 2 -- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/colors.scss b/frontend/src/app/main/ui/workspace/sidebar/assets/colors.scss index 022a05ab5..aed7ab119 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/colors.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/colors.scss @@ -88,8 +88,6 @@ } .drop-space { height: $s-12; - border-radius: $br-8; - background-color: var(--assets-item-background-color); } .dragging { position: absolute; diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs index e9b1c7f77..9905ba70a 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs @@ -95,7 +95,7 @@ on-component-click (mf/use-fn - (mf/deps component-id) + (mf/deps component-id on-asset-click) (fn [event] (dom/stop-propagation event) (on-asset-click component-id unselect-all event))) @@ -141,7 +141,7 @@ on-context-menu (mf/use-fn - (mf/deps component-id) + (mf/deps on-context-menu component-id) (partial on-context-menu component-id))] (if ^boolean new-css-system @@ -449,6 +449,7 @@ toggle-list-style (mf/use-ctx cmm/assets-toggle-list-style) selected (:components selected) + selected-full (into #{} (filter #(contains? selected (:id %))) components) multi-components? (> (count selected) 1) multi-assets? (or (seq (:graphics selected)) @@ -519,6 +520,7 @@ (mf/use-fn (mf/deps selected on-clear-selection read-only?) (fn [component-id event] + (dom/stop-propagation event) (dom/prevent-default event) (let [pos (dom/get-client-position event)] 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 0fc150026..50753ed7b 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss @@ -9,7 +9,6 @@ .component-group { .drop-space { height: $s-12; - border-radius: $br-8; } .asset-grid { display: grid; diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/graphics.scss b/frontend/src/app/main/ui/workspace/sidebar/assets/graphics.scss index 9a0cc186f..48b103eb4 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/graphics.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/graphics.scss @@ -9,8 +9,6 @@ .graphics-group { .drop-space { height: $s-12; - border-radius: $br-8; - background-color: var(--color-foreground-secondary); } .asset-grid { display: grid; diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.scss b/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.scss index 5c5e199ed..01a0bb172 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.scss @@ -22,8 +22,6 @@ padding: 0 0 0 $s-4; .drop-space { height: $s-12; - border-radius: $br-8; - background-color: var(--assets-item-background-color); } .grid-placeholder { height: $s-2;