From 00f706688a82e9d4d069ca5972555b972810cb89 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 22 Dec 2015 00:17:33 +1100 Subject: [PATCH] Make router work with 0.6.0 of reagent (and be backwards compatible) --- src/re_frame/router.cljs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/re_frame/router.cljs b/src/re_frame/router.cljs index 3915818..8056ff8 100644 --- a/src/re_frame/router.cljs +++ b/src/re_frame/router.cljs @@ -1,5 +1,6 @@ (ns re-frame.router - (:require [reagent.impl.batching :refer [do-later]] + (:require [reagent.impl.batching] + [reagent.core] [re-frame.handlers :refer [handle]] [re-frame.utils :refer [error]] [goog.async.nextTick])) @@ -59,7 +60,9 @@ ;; A map from event metadata keys to the corresponding "run later" functions (def later-fns - {:flush-dom do-later ;; after next annimation frame + {:flush-dom (if (exists? reagent.core/after-render) ;; after next annimation frame + (.-after-render reagent.core) ;; reagent >= 0.6.0 + (.-do-later reagent.impl.batching)) ;; reagent < 0.6.0 :yield goog.async.nextTick}) ;; almost immediately (defprotocol IEventQueue