status-im
/
reagent
mirror of https://github.com/status-im/reagent.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make reaction notify only when it actually changes

This commit is contained in:
Dan Holmsand 2015-09-11 19:36:55 +02:00
parent 2895c9bed7
commit b0395b5461
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/reagent/ratom.cljs
View File

@ -305,8 +305,11 @@
(-update-watching this derefed)) (-update-watching this derefed))
(set! dirtyness clean) (set! dirtyness clean)
(when-not nocache? (when-not nocache?
(set! state res)) (set! state res)
(-notify-watches this oldstate state) ;; Use = to determine equality from reactions, since
;; they are likely to produce new data structures.
(when (not= oldstate res)
(-notify-watches this oldstate res)))
res)) res))
IDeref IDeref

31
test/reagenttest/testwrap.cljs
View File

@ -175,8 +175,8 @@
(is (= @ran 7))))))) (is (= @ran 7)))))))
(deftest test-cursor (deftest test-cursor
(let [state (r/atom {:a 1 (let [state (r/atom {:a {:v 1}
:b 2}) :b {:v 2}})
a-count (r/atom 0) a-count (r/atom 0)
b-count (r/atom 0) b-count (r/atom 0)
derefer (fn derefer [cur count] derefer (fn derefer [cur count]
@ -191,26 +191,32 @@
(is (= @a-count 1)) (is (= @a-count 1))
(is (= @b-count 1)) (is (= @b-count 1))
(swap! state update-in [:a] inc) (swap! state update-in [:a :v] inc)
(is (= @a-count 1)) (is (= @a-count 1))
(r/flush) (r/flush)
(is (= @a-count 2)) (is (= @a-count 2))
(is (= @b-count 1)) (is (= @b-count 1))
(reset! state @state) (reset! state {:a {:v 2} :b {:v 2}})
(r/flush) (r/flush)
(is (= @a-count 2)) (is (= @a-count 2))
(is (= @b-count 1))
(reset! state {:a {:v 3} :b {:v 2}})
(r/flush)
(is (= @a-count 3))
(is (= @b-count 1)))))) (is (= @b-count 1))))))
(deftest test-fn-cursor (deftest test-fn-cursor
(let [state (r/atom {:a 1 (let [state (r/atom {:a {:v 1}
:b 2}) :b {:v 2}})
statec (r/cursor state [])
a-count (r/atom 0) a-count (r/atom 0)
b-count (r/atom 0) b-count (r/atom 0)
derefer (fn derefer [cur count] derefer (fn derefer [cur count]
[:div @cur]) [:div @cur])
f (fn [[x y]] (swap! y inc) (get-in @state x)) f (fn [[x y]] (swap! y inc) (get-in @statec x))
ac (r/cursor f [[:a] a-count]) ac (r/cursor f [[:a] a-count])
bc (r/cursor f [[:b] b-count]) bc (r/cursor f [[:b] b-count])
comp (fn test-cursor [] comp (fn test-cursor []
@ -222,7 +228,7 @@
(is (= @a-count 1)) (is (= @a-count 1))
(is (= @b-count 1)) (is (= @b-count 1))
(swap! state update-in [:a] inc) (swap! state update-in [:a :v] inc)
(is (= @a-count 1)) (is (= @a-count 1))
(is (= @b-count 1)) (is (= @b-count 1))
@ -230,7 +236,12 @@
(is (= @a-count 2)) (is (= @a-count 2))
(is (= @b-count 2)) (is (= @b-count 2))
(reset! state @state) (reset! state {:a {:v 2} :b {:v 2}})
(r/flush) (r/flush)
(is (= @a-count 2)) (is (= @a-count 2))
(is (= @b-count 2)))))) (is (= @b-count 2))
(reset! state {:a {:v 3} :b {:v 2}})
(r/flush)
(is (= @a-count 3))
(is (= @b-count 3))))))