Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-08 08:09:14 -05:00
Code Issues Activity

Fix on-submit taking old ref-values when user submits before errors have been validated

Browse source
This commit is contained in:
Florian Schroedl 2024-06-25 11:30:53 +02:00
parent 05f6cfc4b0
commit eac7d9288b
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
frontend/src/app/main/ui/workspace/tokens/form.cljs
View file

@ -128,14 +128,18 @@
name-schema (mf/use-memo name-schema (mf/use-memo
(mf/deps existing-token-names) (mf/deps existing-token-names)
#(token-name-schema existing-token-names)) #(token-name-schema existing-token-names))
on-update-name (mf/use-callback on-update-name-debounced (mf/use-callback
(debounce (fn [e] (debounce (fn [e]
(let [value (dom/get-target-val e) (let [value (dom/get-target-val e)
errors (->> (finalize-name value) errors (->> (finalize-name value)
(m/explain name-schema))] (m/explain name-schema))]
(reset! name-ref value)
(reset! name-errors errors) (reset! name-errors errors)
(update-form-touched))))) (update-form-touched)))))
on-update-name (mf/use-callback
(mf/deps on-update-name-debounced)
(fn [e]
(reset! name-ref (dom/get-target-val e))
(on-update-name-debounced e)))
valid-name-field? (and valid-name-field? (and
(not @name-errors) (not @name-errors)
(valid-name? @name-ref)) (valid-name? @name-ref))
@ -149,25 +153,33 @@
(= token-or-err :error/token-direct-self-reference) :error/token-self-reference (= token-or-err :error/token-direct-self-reference) :error/token-self-reference
(= token-or-err :error/token-missing-reference) :error/token-missing-reference (= token-or-err :error/token-missing-reference) :error/token-missing-reference
(:resolved-value token-or-err) (:resolved-value token-or-err))] (:resolved-value token-or-err) (:resolved-value token-or-err))]
(reset! value-ref v)
(reset! token-resolve-result v)))) (reset! token-resolve-result v))))
on-update-value (use-debonced-resolve-callback name-ref token tokens set-resolve-value) on-update-value-debounced (use-debonced-resolve-callback name-ref token tokens set-resolve-value)
on-update-value (mf/use-callback
(mf/deps on-update-value-debounced)
(fn [e]
(reset! value-ref (dom/get-target-val e))
(on-update-value-debounced e)))
value-error? (when (keyword? @token-resolve-result) value-error? (when (keyword? @token-resolve-result)
(= (namespace @token-resolve-result) "error")) (= (namespace @token-resolve-result) "error"))
valid-value-field? (and valid-value-field? (and
(not value-error?) (not value-error?)
(valid-value? (or @token-resolve-result @value-ref))) (valid-value? @token-resolve-result))
;; Description ;; Description
description-ref (mf/use-var (:description token)) description-ref (mf/use-var (:description token))
description-errors (mf/use-state nil) description-errors (mf/use-state nil)
on-update-description (mf/use-callback on-update-description-debounced (mf/use-callback
(debounce (fn [e] (debounce (fn [e]
(let [value (dom/get-target-val e) (let [value (dom/get-target-val e)
errors (m/explain token-description-schema value)] errors (m/explain token-description-schema value)]
(reset! description-ref value)
(reset! description-errors errors) (reset! description-errors errors)
(update-form-touched))))) (update-form-touched)))))
on-update-description (mf/use-callback
(mf/deps on-update-description-debounced)
(fn [e]
(reset! description-ref (dom/get-target-val e))
(on-update-description-debounced e)))
valid-description-field? (not @description-errors) valid-description-field? (not @description-errors)
;; Form ;; Form