Skip to content

Commit

Permalink
Fix regression and simplify impl of #219
Browse files Browse the repository at this point in the history
  • Loading branch information
superstructor committed Jan 21, 2021
1 parent 342d92e commit cb3037a
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/re_com/misc.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@
;; can be done thus avoiding the flicker.
on-change-handler (fn []
(when (fn? on-change)
(let [num-args (.-length on-change)]
(let [num-args (.-length on-change)
reset-fn #(reset! external-model @internal-model)]
(if (= num-args 2)
(let [p (new js/Promise #(on-change @internal-model %))]
(.then p #(reset! external-model @internal-model)))
(reset! external-model @internal-model)))))]
(on-change @internal-model reset-fn)
(do
(on-change @internal-model)
(reset-fn))))))]
(when (not= @external-model latest-ext-model) ;; Has model changed externally?
(reset! external-model latest-ext-model)
(reset! internal-model latest-ext-model))
Expand Down Expand Up @@ -162,7 +164,8 @@
(not disabled?)
(if validation-regex (re-find validation-regex new-val) true))
(reset! internal-model new-val)
(on-change-handler))))
(when-not change-on-blur?
(on-change-handler)))))
:on-blur (handler-fn
(when (and
change-on-blur?
Expand Down

0 comments on commit cb3037a

Please sign in to comment.