status-im/reagent
2
0
Fork 0
mirror of https://github.com/status-im/reagent.git synced 2025-01-12 12:54:50 +00:00
Code Issues Projects Releases Wiki Activity

Move equal-args out to util

Browse Source
This commit is contained in:
Dan Holmsand 2014-01-06 15:19:12 +01:00
parent 3dc2c0950a
commit dd3f9b10e1
3 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cloact/impl/component.cljs
View File

@ -137,7 +137,7 @@
a2 (-> nextprops .-cljsArgs)]
(assert (vector? a1))
(if (nil? f)
(not (tmpl/equal-args a1 a2))
(not (util/equal-args a1 a2))
;; Call f with oldprops, newprops
(f (props-in-args a1) (props-in-args a2)))))

43
src/cloact/impl/template.cljs
View File

@ -2,7 +2,8 @@
(ns cloact.impl.template
(:require-macros [cloact.debug :refer [dbg prn println]])
(:require [clojure.string :as string]
[cloact.impl.reactimport :as reacts]))
[cloact.impl.reactimport :as reacts]
[cloact.impl.util :as util]))
(def React reacts/React)
@ -72,45 +73,7 @@
(set-tag-extra objprops extra))
objprops))))
(defn identical-parts [v1 v2 from]
;; Compare two vectors, from item with index "from", using identical?
(let [end (count v1)]
(loop [n from]
(if (>= n end)
true
(if (identical? (nth v1 n) (nth v2 n))
(recur (inc n))
false)))))
(def -not-found (js-obj))
(defn shallow-equal-maps [x y]
;; Compare two maps, using identical? on all values
(or (identical? x y)
(when (== (count x) (count y))
(reduce-kv (fn [res k v]
(let [yv (get y k -not-found)]
(if (or (identical? v yv)
;; hack to allow cloact.core/partial
(and (ifn? v) (= v yv)))
res
(reduced false))))
true x))))
(defn equal-args [v1 v2]
;; Compare two "args" vectors, i.e things like [:div {:foo "bar} "baz"],
;; using identical? on all individual parts.
(or (identical? v1 v2)
(let [c1 (count v1)]
(and (= (nth v1 0) (nth v2 0)) ; may be symbol or fn
(identical? c1 (count v2))
(if (< c1 2)
true
(let [props1 (nth v1 1)]
(if (or (nil? props1) (map? props1))
(and (identical-parts v1 v2 2)
(shallow-equal-maps props1 (nth v2 1)))
(identical-parts v1 v2 1))))))))
(declare wrapper)
@ -175,7 +138,7 @@
(defn should-update-wrapped [C nextprops nextstate]
(let [a1 (-> C (aget "props") .-cljsArgs)
a2 (-> nextprops .-cljsArgs)]
(not (equal-args a1 a2))))
(not (util/equal-args a1 a2))))
(def wrapper
(.createClass React (js-obj "render"

40
src/cloact/impl/util.cljs
View File

@ -20,9 +20,45 @@
(if (nil? p1)
p2
(do
(when-not (map? p1)
(.log js/console p1))
(assert (map? p1))
(merge-style p1 (merge-class p1 (merge p1 p2))))))
(defn identical-parts [v1 v2 from]
;; Compare two vectors, from item with index "from", using identical?
(let [end (count v1)]
(loop [n from]
(if (>= n end)
true
(if (identical? (nth v1 n) (nth v2 n))
(recur (inc n))
false)))))
(def -not-found (js-obj))
(defn shallow-equal-maps [x y]
;; Compare two maps, using identical? on all values
(or (identical? x y)
(when (== (count x) (count y))
(reduce-kv (fn [res k v]
(let [yv (get y k -not-found)]
(if (or (identical? v yv)
;; hack to allow cloact.core/partial
(and (ifn? v) (= v yv)))
res
(reduced false))))
true x))))
(defn equal-args [v1 v2]
;; Compare two "args" vectors, i.e things like [:div {:foo "bar} "baz"],
;; using identical? on all individual parts.
(or (identical? v1 v2)
(let [c1 (count v1)]
(and (= (nth v1 0) (nth v2 0)) ; may be symbol or fn
(identical? c1 (count v2))
(if (< c1 2)
true
(let [props1 (nth v1 1)]
(if (or (nil? props1) (map? props1))
(and (identical-parts v1 v2 2)
(shallow-equal-maps props1 (nth v2 1)))
(identical-parts v1 v2 1))))))))