yogsototh/freactive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated lens watch behavior.

Browse source
This commit is contained in:
Aaron Craelius 2014-11-12 13:49:11 -05:00
parent 0d88f27fed
commit 961e95cc2d
1 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/clojure/freactive/core.cljs
View file

@ -107,6 +107,27 @@
(-remove-watch ref key) (-remove-watch ref key)
(sully)))) (sully))))
(defn get-add-watch* [ref]
(cond
(satisfies? IInvalidates ref)
add-invalidation-watch
(satisfies? IWatchable ref)
add-watch))
(defn get-remove-watch* [ref]
(cond
(satisfies? IInvalidates ref)
remove-invalidation-watch
(satisfies? IWatchable ref)
remove-watch))
(defn get-add-remove-watch* [ref]
(cond
(satisfies? IInvalidates ref)
[add-invalidation-watch remove-invalidation-watch]
(satisfies? IWatchable ref)
[add-watch remove-watch]))
(deftype ReactiveComputation [^:mutable state ^:mutable dirty f ^:mutable deps meta (deftype ReactiveComputation [^:mutable state ^:mutable dirty f ^:mutable deps meta
^:mutable watches ^:mutable invalidation-watches sully] ^:mutable watches ^:mutable invalidation-watches sully]
Object Object
@ -123,11 +144,7 @@
state state
(binding [*register-dep* (binding [*register-dep*
(fn [ref] (fn [ref]
(cond ((get-add-watch* ref) ref this sully))]
(satisfies? IInvalidates ref)
(-add-invalidation-watch ref this sully)
(satisfies? IWatchable ref)
(-add-watch ref this sully)))]
(set! dirty false) (set! dirty false)
(let [old-val state (let [old-val state
new-val (f)] new-val (f)]
@ -172,12 +189,31 @@
(set! (.-sully reactive) (make-sully-fn reactive)) (set! (.-sully reactive) (make-sully-fn reactive))
reactive)) reactive))
(defn- do-update-state [a new-value] (declare update-lens-state)
(let [old-value (.-state a)]
(defn- add-lens-watch [lens ref]
((get-add-watch* ref)
ref lens
(fn sully-lens
([]
(set! (.-dirty lens) true)
(when-not (empty? (.-watches lens))
(update-lens-state lens ref)))
([_ _]
(remove-invalidation-watch ref lens))
([_ _ old-value new-value]
(remove-watch ref lens)
(sully-lens)))))
(defn- update-lens-state [lens ref]
(set! (.-dirty lens) false)
(add-lens-watch lens ref)
(let [new-value ((.-getter lens) @ref)
old-value (.-state lens)]
(when (not= old-value new-value) (when (not= old-value new-value)
(set! (.-state a) new-value) (set! (.-state lens) new-value)
(when-not (empty? (.-watches a)) (when-not (empty? (.-watches lens))
(-notify-watches a old-value new-value))) (-notify-watches lens old-value new-value)))
new-value)) new-value))
(defn- lens-swap! [ref getter setter f] (defn- lens-swap! [ref getter setter f]
@ -185,7 +221,7 @@
(fn [cur] (fn [cur]
(setter cur (f (getter cur)))))) (setter cur (f (getter cur))))))
(deftype ReactiveLens [ref getter setter state meta watches] (deftype ReactiveLens [ref getter setter dirty state meta watches]
Object Object
(equiv [this other] (equiv [this other]
(-equiv this other)) (-equiv this other))
@ -198,7 +234,9 @@
cljs.core/IDeref cljs.core/IDeref
(-deref [this] (-deref [this]
(register-dep this) (register-dep this)
state) (if dirty
(update-lens-state this ref)
state))
IMeta IMeta
(-meta [_] meta) (-meta [_] meta)
@ -236,11 +274,8 @@
([ref getter] ([ref getter]
(lens ref getter (fn [_ _] (assert false "Lens does not support updates")))) (lens ref getter (fn [_ _] (assert false "Lens does not support updates"))))
([ref getter setter] ([ref getter setter]
(let [lens (ReactiveLens. ref getter setter nil nil nil)] (let [lens (ReactiveLens. ref getter setter true nil nil nil)]
(add-watch ref lens (add-lens-watch lens ref)
(fn [_ _ old-value new-value]
(do-update-state lens (getter new-value))))
(set! (.-state lens) (getter @ref))
lens))) lens)))
(defn cursor [ref korks] (defn cursor [ref korks]