Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-09 16:30:37 -05:00
Code Issues Activity

Merge pull request #2227 from penpot/palba-fix-colorpicker

Browse source 
🐛 Fix color-picker recent colors
This commit is contained in:
Andrey Antukh 2022-09-05 15:54:55 +02:00 committed by GitHub
commit 6018df480e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -17,6 +17,7 @@
- Fix path tools blocking elements underneath [#2050](https://github.com/penpot/penpot/issues/2050) - Fix path tools blocking elements underneath [#2050](https://github.com/penpot/penpot/issues/2050)
- Fix frame titles deforming when resize [#2207](https://github.com/penpot/penpot/issues/2207) - Fix frame titles deforming when resize [#2207](https://github.com/penpot/penpot/issues/2207)
- Fix export simple line path [#3890](https://tree.taiga.io/project/penpot/issue/3890) - Fix export simple line path [#3890](https://tree.taiga.io/project/penpot/issue/3890)
- Fix color-picker recent colors [Taiga #4013](https://tree.taiga.io/project/penpot/issue/4013)
## 1.15.1-beta ## 1.15.1-beta

30
frontend/src/app/main/ui/workspace/colorpicker.cljs
View file

@ -61,8 +61,17 @@
set-harmony-tab! (mf/use-fn #(reset! active-tab :harmony)) set-harmony-tab! (mf/use-fn #(reset! active-tab :harmony))
set-hsva-tab! (mf/use-fn #(reset! active-tab :hsva)) set-hsva-tab! (mf/use-fn #(reset! active-tab :hsva))
drag? (mf/use-state false)
handle-change-color handle-change-color
(mf/use-fn #(st/emit! (dc/update-colorpicker-color %))) (mf/use-fn
(mf/deps @drag?)
(fn [color]
(let [recent-color (merge color)
recent-color (dc/materialize-color-components recent-color)]
(when (not @drag?)
(st/emit! (dwl/add-recent-color recent-color)))
(st/emit! (dc/update-colorpicker-color color)))))
handle-click-picker handle-click-picker
(mf/use-fn (mf/use-fn
@ -96,14 +105,17 @@
on-activate-radial-gradient on-activate-radial-gradient
(mf/use-fn #(st/emit! (dc/activate-colorpicker-gradient :radial-gradient))) (mf/use-fn #(st/emit! (dc/activate-colorpicker-gradient :radial-gradient)))
on-start-drag
(mf/use-fn
(fn []
(reset! drag? true)
(st/emit! (dwu/start-undo-transaction))))
on-finish-drag on-finish-drag
(mf/use-fn (mf/use-fn
(mf/deps state)
(fn [] (fn []
(let [color (dc/get-color-from-colorpicker-state state)] (reset! drag? false)
(st/emit! (st/emit! (dwu/commit-undo-transaction))))]
(dwl/add-recent-color color)
(dwu/commit-undo-transaction)))))]
;; Initialize colorpicker state ;; Initialize colorpicker state
(mf/with-effect [] (mf/with-effect []
@ -194,21 +206,21 @@
{:color current-color {:color current-color
:disable-opacity disable-opacity :disable-opacity disable-opacity
:on-change handle-change-color :on-change handle-change-color
:on-start-drag #(st/emit! (dwu/start-undo-transaction)) :on-start-drag on-start-drag
:on-finish-drag on-finish-drag}] :on-finish-drag on-finish-drag}]
:harmony :harmony
[:& harmony-selector [:& harmony-selector
{:color current-color {:color current-color
:disable-opacity disable-opacity :disable-opacity disable-opacity
:on-change handle-change-color :on-change handle-change-color
:on-start-drag #(st/emit! (dwu/start-undo-transaction)) :on-start-drag on-start-drag
:on-finish-drag on-finish-drag}] :on-finish-drag on-finish-drag}]
:hsva :hsva
[:& hsva-selector [:& hsva-selector
{:color current-color {:color current-color
:disable-opacity disable-opacity :disable-opacity disable-opacity
:on-change handle-change-color :on-change handle-change-color
:on-start-drag #(st/emit! (dwu/start-undo-transaction)) :on-start-drag on-start-drag
:on-finish-drag on-finish-drag}] :on-finish-drag on-finish-drag}]
nil)) nil))