github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-06-01 05:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Unify color picker input handlers by treating alpha as a property

Browse Source 
Eliminate duplicated on-change-opacity and on-key-down-opacity handlers
by routing alpha through apply-property-change, and extract shared
stepping logic into on-key-down-step.

Signed-off-by: eureka928 <meobius123@gmail.com>
This commit is contained in:
eureka928 2026-02-09 12:37:30 +01:00 committed by Andrey Antukh
parent 7d7dbd4662
commit 307ae374fe
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
frontend/src/app/main/ui/workspace/colorpicker/color_inputs.cljs
View File

@ -73,8 +73,13 @@
(let [val (case property (let [val (case property
:s (/ val 100) :s (/ val 100)
:v (value->hsv-value val) :v (value->hsv-value val)
:alpha (/ val 100)
val)] val)]
(if (#{:r :g :b} property) (cond
(= property :alpha)
(on-change {:alpha val})
(#{:r :g :b} property)
(let [{:keys [r g b]} (merge color (hash-map property val)) (let [{:keys [r g b]} (merge color (hash-map property val))
hex (cc/rgb->hex [r g b]) hex (cc/rgb->hex [r g b])
[h s v] (cc/hex->hsv hex)] [h s v] (cc/hex->hsv hex)]
@ -82,6 +87,7 @@
:h h :s s :v v :h h :s s :v v
:r r :g g :b b})) :r r :g g :b b}))
:else
(let [{:keys [h s v]} (merge color (hash-map property val)) (let [{:keys [h s v]} (merge color (hash-map property val))
hex (cc/hsv->hex [h s v]) hex (cc/hsv->hex [h s v])
[r g b] (cc/hex->rgb hex)] [r g b] (cc/hex->rgb hex)]
@ -96,13 +102,8 @@
(when (some? val) (when (some? val)
(apply-property-change property val))))) (apply-property-change property val)))))
on-change-opacity on-key-down-step
(fn [e] (fn [max-value on-step]
(when-let [new-alpha (-> e dom/get-target-val (mth/clamp 0 100) (/ 100))]
(on-change {:alpha new-alpha})))
on-key-down-property
(fn [property max-value]
(fn [e] (fn [e]
(let [up? (kbd/up-arrow? e) (let [up? (kbd/up-arrow? e)
down? (kbd/down-arrow? e)] down? (kbd/down-arrow? e)]
@ -116,23 +117,11 @@
new-value (mth/clamp (+ current-value step) 0 max-value) new-value (mth/clamp (+ current-value step) 0 max-value)
node (dom/get-target e)] node (dom/get-target e)]
(dom/set-value! node new-value) (dom/set-value! node new-value)
(apply-property-change property new-value))))))) (on-step new-value)))))))
on-key-down-opacity on-key-down-property
(fn [e] (fn [property max-value]
(let [up? (kbd/up-arrow? e) (on-key-down-step max-value #(apply-property-change property %)))]
down? (kbd/down-arrow? e)]
(when (and (or up? down?)
(or (kbd/shift? e) (kbd/alt? e)))
(dom/prevent-default e)
(when-let [current-value (-> e dom/get-target-val d/parse-double)]
(let [step (cond
(kbd/shift? e) (if up? 10 -10)
(kbd/alt? e) (if up? 0.1 -0.1))
new-value (mth/clamp (+ current-value step) 0 100)
node (dom/get-target e)]
(dom/set-value! node new-value)
(on-change {:alpha (/ new-value 100)}))))))]
;; Updates the inputs values when a property is changed in the parent ;; Updates the inputs values when a property is changed in the parent
@ -239,5 +228,5 @@
:step 1 :step 1
:max 100 :max 100
:default-value (if (= alpha :multiple) "" alpha) :default-value (if (= alpha :multiple) "" alpha)
:on-change on-change-opacity :on-change (on-change-property :alpha 100)
:on-key-down on-key-down-opacity}]])]])) :on-key-down (on-key-down-property :alpha 100)}]])]]))