@tanstack/react-router 0.0.1-beta.196 → 0.0.1-beta.198

package/build/umd/index.development.js

@@ -163,13 +163,16 @@
   };
   function createHistory(opts) {
     let location = opts.getLocation();
-    let unsub = () => {};
     let subscribers = new Set();
     let blockers = [];
     let queue = [];
-    const tryFlush = () => {
+    const onUpdate = () => {
+      location = opts.getLocation();
+      subscribers.forEach(subscriber => subscriber());
+    };
+    const tryUnblock = () => {
       if (blockers.length) {
-        blockers[0]?.(tryFlush, () => {
+        blockers[0]?.(tryUnblock, () => {
           blockers = [];
           stopBlocking();
         });
@@ -178,32 +181,20 @@
       while (queue.length) {
         queue.shift()?.();
       }
-      if (!opts.subscriber) {
-        onUpdate();
-      }
+      onUpdate();
     };
     const queueTask = task => {
       queue.push(task);
-      tryFlush();
-    };
-    const onUpdate = () => {
-      location = opts.getLocation();
-      subscribers.forEach(subscriber => subscriber());
+      tryUnblock();
     };
     return {
       get location() {
         return location;
       },
       subscribe: cb => {
-        if (subscribers.size === 0) {
-          unsub = typeof opts.subscriber === 'function' ? opts.subscriber(onUpdate) : () => {};
-        }
         subscribers.add(cb);
         return () => {
           subscribers.delete(cb);
-          if (subscribers.size === 0) {
-            unsub();
-          }
         };
       },
       push: (path, state) => {
@@ -248,7 +239,9 @@
           }
         };
       },
-      flush: () => opts.flush?.()
+      flush: () => opts.flush?.(),
+      destroy: () => opts.destroy?.(),
+      update: onUpdate
     };
   }
   function assignKey(state) {
@@ -332,44 +325,43 @@
         scheduled = Promise.resolve().then(() => flush());
       }
     };
-    return createHistory({
+    const history = createHistory({
       getLocation,
-      subscriber: onUpdate => {
-        window.addEventListener(pushStateEvent, () => {
-          currentLocation = parseLocation(getHref(), window.history.state);
-          onUpdate();
-        });
-        window.addEventListener(popStateEvent, () => {
-          currentLocation = parseLocation(getHref(), window.history.state);
-          onUpdate();
-        });
-        var pushState = window.history.pushState;
-        window.history.pushState = function () {
-          let res = pushState.apply(history, arguments);
-          if (tracking) onUpdate();
-          return res;
-        };
-        var replaceState = window.history.replaceState;
-        window.history.replaceState = function () {
-          let res = replaceState.apply(history, arguments);
-          if (tracking) onUpdate();
-          return res;
-        };
-        return () => {
-          window.history.pushState = pushState;
-          window.history.replaceState = replaceState;
-          window.removeEventListener(pushStateEvent, onUpdate);
-          window.removeEventListener(popStateEvent, onUpdate);
-        };
-      },
       pushState: (path, state, onUpdate) => queueHistoryAction('push', path, state, onUpdate),
       replaceState: (path, state, onUpdate) => queueHistoryAction('replace', path, state, onUpdate),
       back: () => window.history.back(),
       forward: () => window.history.forward(),
       go: n => window.history.go(n),
       createHref: path => createHref(path),
-      flush
+      flush,
+      destroy: () => {
+        window.history.pushState = pushState;
+        window.history.replaceState = replaceState;
+        window.removeEventListener(pushStateEvent, history.update);
+        window.removeEventListener(popStateEvent, history.update);
+      }
+    });
+    window.addEventListener(pushStateEvent, () => {
+      currentLocation = parseLocation(getHref(), window.history.state);
+      history.update;
     });
+    window.addEventListener(popStateEvent, () => {
+      currentLocation = parseLocation(getHref(), window.history.state);
+      history.update;
+    });
+    var pushState = window.history.pushState;
+    window.history.pushState = function () {
+      let res = pushState.apply(window.history, arguments);
+      if (tracking) history.update();
+      return res;
+    };
+    var replaceState = window.history.replaceState;
+    window.history.replaceState = function () {
+      let res = replaceState.apply(window.history, arguments);
+      if (tracking) history.update();
+      return res;
+    };
+    return history;
   }
   function createHashHistory() {
     return createBrowserHistory({
@@ -388,7 +380,6 @@
     const getLocation = () => parseLocation(entries[index], currentState);
     return createHistory({
       getLocation,
-      subscriber: false,
       pushState: (path, state) => {
         currentState = state;
         entries.push(path);