johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #7894 from penpot/niwinz-staging-bugfix-4

Browse Source 
🐛 Fix incorrect interaction betwen hower and scroll on assets sidebar
This commit is contained in:
Alejandro Alonso
2025-12-04 10:58:54 +01:00
committed by GitHub
parent 84c747cd31 84273508ad
commit bd5bbcae26
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@@ -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 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 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 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 ## 2.11.1

13
frontend/src/app/main/ui/workspace/sidebar/assets.cljs
View File

@@ -56,9 +56,8 @@
(update file :data dissoc :pages-index)) (update file :data dissoc :pages-index))
refs/file)) refs/file))
(mf/defc assets-local-library (mf/defc assets-local-library*
{::mf/wrap [mf/memo] {::mf/private true}
::mf/wrap-props false}
[{:keys [filters]}] [{:keys [filters]}]
(let [file (mf/deref ref:local-library)] (let [file (mf/deref ref:local-library)]
[:> file-library* [:> file-library*
@@ -68,7 +67,7 @@
:filters filters}])) :filters filters}]))
(defn- toggle-values (defn- toggle-values
[v [a b]] [v a b]
(if (= v a) b a)) (if (= v a) b a))
(mf/defc assets-toolbox* (mf/defc assets-toolbox*
@@ -97,7 +96,7 @@
(mf/use-fn (mf/use-fn
(mf/deps ordering) (mf/deps ordering)
(fn [] (fn []
(let [new-value (toggle-values ordering [:asc :desc])] (let [new-value (toggle-values ordering :asc :desc)]
(swap! filters* assoc :ordering new-value) (swap! filters* assoc :ordering new-value)
(dwa/set-current-assets-ordering! new-value)))) (dwa/set-current-assets-ordering! new-value))))
@@ -105,7 +104,7 @@
(mf/use-fn (mf/use-fn
(mf/deps list-style) (mf/deps list-style)
(fn [] (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) (swap! filters* assoc :list-style new-value)
(dwa/set-current-assets-list-style! new-value)))) (dwa/set-current-assets-list-style! new-value))))
@@ -209,5 +208,5 @@
[:& (mf/provider cmm/assets-toggle-ordering) {:value toggle-ordering} [:& (mf/provider cmm/assets-toggle-ordering) {:value toggle-ordering}
[:& (mf/provider cmm/assets-toggle-list-style) {:value toggle-list-style} [:& (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}]]]]]])) [:> assets-libraries* {:filters filters}]]]]]]))

4
frontend/src/app/main/ui/workspace/sidebar/assets/groups.scss
View File

@@ -15,7 +15,7 @@
cursor: pointer; cursor: pointer;
.title-menu { .title-menu {
display: block; visibility: visible;
} }
} }
} }
@@ -25,7 +25,7 @@
} }
.title-menu { .title-menu {
display: none; visibility: hidden;
} }
.group-title { .group-title {