3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-13 22:06:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problem with numeric inputs

Browse source
This commit is contained in:
alonso.torres 2024-02-05 16:56:09 +01:00 • committed by Andrey Antukh
parent 512e9b2070
commit 4c683bb10c
3 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/app/main/ui/components/numeric_input.cljs
View file

@ -58,6 +58,10 @@
;; We need to store the handle-blur ref so we can call it on unmount ;; We need to store the handle-blur ref so we can call it on unmount
dirty-ref (mf/use-ref false) dirty-ref (mf/use-ref false)
;; Last value input by the user we need to store to save on unmount
last-value* (mf/use-var nil)
parse-value parse-value
(mf/use-fn (mf/use-fn
(mf/deps min-value max-value value nillable? default) (mf/deps min-value max-value value nillable? default)
@ -102,7 +106,20 @@
(mf/use-fn (mf/use-fn
(mf/deps wrap-value? min-value max-value parse-value apply-value) (mf/deps wrap-value? min-value max-value parse-value apply-value)
(fn [event up? down?] (fn [event up? down?]
(let [current-value (parse-value)] (let [current-value (parse-value)
current-value
(cond
(and (not current-value) down? max-value)
max-value
(and (not current-value) up? min-value)
min-value
(not current-value)
(d/nilv default 0)
:else
current-value)]
(when current-value (when current-value
(let [increment (cond (let [increment (cond
(kbd/shift? event) (kbd/shift? event)
@ -152,6 +169,13 @@
(update-input value-str) (update-input value-str)
(dom/blur! node))))) (dom/blur! node)))))
handle-key-up
(mf/use-fn
(mf/deps parse-value)
(fn []
;; Store the last value inputed
(reset! last-value* (parse-value))))
handle-mouse-wheel handle-mouse-wheel
(mf/use-fn (mf/use-fn
(mf/deps set-delta) (mf/deps set-delta)
@ -167,7 +191,7 @@
(mf/use-fn (mf/use-fn
(mf/deps parse-value apply-value update-input on-blur) (mf/deps parse-value apply-value update-input on-blur)
(fn [event] (fn [event]
(let [new-value (or (parse-value) default)] (let [new-value (or @last-value* default)]
(if (or nillable? new-value) (if (or nillable? new-value)
(apply-value event new-value) (apply-value event new-value)
(update-input new-value))) (update-input new-value)))
@ -208,6 +232,7 @@
(obj/set! "defaultValue" (fmt/format-number value)) (obj/set! "defaultValue" (fmt/format-number value))
(obj/set! "title" title) (obj/set! "title" title)
(obj/set! "onKeyDown" handle-key-down) (obj/set! "onKeyDown" handle-key-down)
(obj/set! "onKeyUp" handle-key-up)
(obj/set! "onBlur" handle-blur) (obj/set! "onBlur" handle-blur)
(obj/set! "onFocus" handle-focus))] (obj/set! "onFocus" handle-focus))]

4
frontend/src/app/main/ui/flex_controls/margin.cljs
View file

@ -71,8 +71,8 @@
[:rect.margin-rect [:rect.margin-rect
{:x (:x rect-data) {:x (:x rect-data)
:y (:y rect-data) :y (:y rect-data)
:width (:width rect-data) :width (max 0 (:width rect-data))
:height (:height rect-data) :height (max 0 (:height rect-data))
:on-pointer-enter on-pointer-enter :on-pointer-enter on-pointer-enter
:on-pointer-leave on-pointer-leave :on-pointer-leave on-pointer-leave
:on-pointer-down on-pointer-down :on-pointer-down on-pointer-down

1
frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
View file

@ -255,6 +255,7 @@
:on-focus on-focus :on-focus on-focus
:on-blur on-blur :on-blur on-blur
:on-change handle-opacity-change :on-change handle-opacity-change
:default 100
:min 0 :min 0
:max 100}]])] :max 100}]])]