mirror of
https://github.com/penpot/penpot.git
synced 2025-04-29 17:06:21 +02:00
🐛 Fix colorpicker scroll when dropdown displayed
This commit is contained in:
parent
965d2d4036
commit
ccb6e25914
4 changed files with 5 additions and 3 deletions
|
@ -5,6 +5,7 @@
|
||||||
### :bug: Bugs fixed
|
### :bug: Bugs fixed
|
||||||
|
|
||||||
- Fix webhooks not shown in list [Taiga #10763](https://tree.taiga.io/project/penpot/issue/10763)
|
- Fix webhooks not shown in list [Taiga #10763](https://tree.taiga.io/project/penpot/issue/10763)
|
||||||
|
- Fix colorpicker scroll when dropdown displayed [Taiga #10696](https://tree.taiga.io/project/penpot/issue/10696)
|
||||||
|
|
||||||
## 2.6.0
|
## 2.6.0
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
[item item item]))
|
[item item item]))
|
||||||
|
|
||||||
(mf/defc select
|
(mf/defc select
|
||||||
[{:keys [default-value options class dropdown-class is-open? on-change on-pointer-enter-option on-pointer-leave-option disabled]}]
|
[{:keys [default-value options class dropdown-class is-open? on-change on-pointer-enter-option on-pointer-leave-option disabled data-direction]}]
|
||||||
(let [label-index (mf/with-memo [options]
|
(let [label-index (mf/with-memo [options]
|
||||||
(into {} (map as-key-value) options))
|
(into {} (map as-key-value) options))
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@
|
||||||
[:span {:class (stl/css :current-label)} current-label]
|
[:span {:class (stl/css :current-label)} current-label]
|
||||||
[:span {:class (stl/css :dropdown-button)} i/arrow]
|
[:span {:class (stl/css :dropdown-button)} i/arrow]
|
||||||
[:& dropdown {:show is-open? :on-close close-dropdown}
|
[:& dropdown {:show is-open? :on-close close-dropdown}
|
||||||
[:ul {:ref dropdown-element* :data-direction @dropdown-direction*
|
[:ul {:ref dropdown-element* :data-direction (or data-direction @dropdown-direction*)
|
||||||
:class (dm/str dropdown-class " " (stl/css :custom-select-dropdown))}
|
:class (dm/str dropdown-class " " (stl/css :custom-select-dropdown))}
|
||||||
(for [[index item] (d/enumerate options)]
|
(for [[index item] (d/enumerate options)]
|
||||||
(if (= :separator item)
|
(if (= :separator item)
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
.colorpicker {
|
.colorpicker {
|
||||||
border-radius: $br-8;
|
border-radius: $br-8;
|
||||||
overflow: auto;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.colorpicker-tabs {
|
.colorpicker-tabs {
|
||||||
|
|
|
@ -124,6 +124,7 @@
|
||||||
[:div {:class (stl/css :select-wrapper)}
|
[:div {:class (stl/css :select-wrapper)}
|
||||||
[:& select
|
[:& select
|
||||||
{:class (stl/css :shadow-type-select)
|
{:class (stl/css :shadow-type-select)
|
||||||
|
:data-direction "up"
|
||||||
:default-value (or (d/name selected) "recent")
|
:default-value (or (d/name selected) "recent")
|
||||||
:options options
|
:options options
|
||||||
:on-change on-library-change}]]
|
:on-change on-library-change}]]
|
||||||
|
|
Loading…
Add table
Reference in a new issue