From 4be046406d6b570fb4f4010124cc441ca87d0ca9 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 3 Dec 2025 11:15:57 +0100 Subject: [PATCH 1/3] :zap: Pass direct args instead of a vector to toggle-values on sidebar assets --- frontend/src/app/main/ui/workspace/sidebar/assets.cljs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs index 2227de25b9..a908cbc46d 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs @@ -68,7 +68,7 @@ :filters filters}])) (defn- toggle-values - [v [a b]] + [v a b] (if (= v a) b a)) (mf/defc assets-toolbox* @@ -97,7 +97,7 @@ (mf/use-fn (mf/deps ordering) (fn [] - (let [new-value (toggle-values ordering [:asc :desc])] + (let [new-value (toggle-values ordering :asc :desc)] (swap! filters* assoc :ordering new-value) (dwa/set-current-assets-ordering! new-value)))) @@ -105,7 +105,7 @@ (mf/use-fn (mf/deps list-style) (fn [] - (let [new-value (toggle-values list-style [:thumbs :list])] + (let [new-value (toggle-values list-style :thumbs :list)] (swap! filters* assoc :list-style new-value) (dwa/set-current-assets-list-style! new-value)))) From 9245ba6bc2b444bf798c6d4221128a39b64590e8 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 3 Dec 2025 11:17:32 +0100 Subject: [PATCH 2/3] :lipstick: Adapt component style for assets-local-library on sidebar assets --- frontend/src/app/main/ui/workspace/sidebar/assets.cljs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs index a908cbc46d..d899f20d67 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs @@ -56,9 +56,8 @@ (update file :data dissoc :pages-index)) refs/file)) -(mf/defc assets-local-library - {::mf/wrap [mf/memo] - ::mf/wrap-props false} +(mf/defc assets-local-library* + {::mf/private true} [{:keys [filters]}] (let [file (mf/deref ref:local-library)] [:> file-library* @@ -209,5 +208,5 @@ [:& (mf/provider cmm/assets-toggle-ordering) {:value toggle-ordering} [:& (mf/provider cmm/assets-toggle-list-style) {:value toggle-list-style} [:* - [:& assets-local-library {:filters filters}] + [:> assets-local-library* {:filters filters}] [:> assets-libraries* {:filters filters}]]]]]])) From 84273508adf5ad72427ca371ec277a67fd17d74c Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 3 Dec 2025 15:59:17 +0100 Subject: [PATCH 3/3] :bug: Fix incorrect interaction betwen hower and scroll on assets sidebar --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/sidebar/assets/groups.scss | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1f541a0a9e..78b4f28a3e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -91,6 +91,7 @@ example. It's still usable as before, we just removed the example. - Fix problem with plugins content attribute [Plugins #209](https://github.com/penpot/penpot-plugins/issues/209) - Fix U and E icon displayed in project list [Taiga #12806](https://tree.taiga.io/project/penpot/issue/12806) - Fix unpublish library modal not scrolling a long file list [Taiga #12285](https://tree.taiga.io/project/penpot/issue/12285) +- Fix incorrect interaction betwen hower and scroll on assets sidebar [Taiga #12389](https://tree.taiga.io/project/penpot/issue/12389) ## 2.11.1 diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/groups.scss b/frontend/src/app/main/ui/workspace/sidebar/assets/groups.scss index 223a6d920e..1237c53323 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/groups.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/groups.scss @@ -15,7 +15,7 @@ cursor: pointer; .title-menu { - display: block; + visibility: visible; } } } @@ -25,7 +25,7 @@ } .title-menu { - display: none; + visibility: hidden; } .group-title {