Fixed #40

mobxjs · Jul 24, 2017 · f29ee0b · f29ee0b
1 parent 85447b5
commit f29ee0b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/now.ts b/src/now.ts
@@ -1,3 +1,4 @@
+import {extras} from "mobx";
 import {fromResource, IResource} from "./from-resource";
 
 const tickers:
@@ -33,6 +34,10 @@ const tickers:
  * @returns
  */
 export function now(interval: number | "frame" = 1000) {
+    if (!extras.isComputingDerivation()) {
+        // See #40
+        return Date.now();
+    }
     if (!tickers[interval]) {
         if (typeof interval === "number")
             tickers[interval] = createIntervalTicker(interval);
@@ -58,7 +63,6 @@ function createIntervalTicker(interval: number): IResource<number> {
     );
 }
 
-
 function createAnimationFrameTicker(): IResource<number> {
     let subscriptionHandle: number;
     const frameBasedTicker = fromResource<number>(

diff --git a/test/now.js b/test/now.js
@@ -19,3 +19,15 @@ test('now should tick', t => {
         t.end()
     }, 500)
 })
+
+test('now should be up to date outside reaction, #40', t => {
+    const d1 = utils.now(1000);
+    t.true(typeof d1 === "number");
+    setTimeout(() => {
+        const d2 = utils.now(1000);
+        t.true(typeof d2 === "number");
+        t.notEqual(d1, d2);
+        t.true((d2 - d1) > 400);
+        t.end();
+    }, 500)
+})