eddev 0.1.40-beta-1 → 0.1.40-beta-2

package/components/BrowserRouter.js

@@ -87,16 +87,6 @@ function BrowserRouter(props) {
                 if (!pending.popped) {
                     history.replaceState({ scrollPosition: (_b = document.scrollingElement) === null || _b === void 0 ? void 0 : _b.scrollTop }, "", document.location.href);
                     history.pushState({}, "", pending.url);
-                    // if (document.scrollingElement) {
-                    //   console.log("Scroll to top")
-                    //   document.scrollingElement.scrollTop = 0
-                    // }
-                }
-                else {
-                    // if (document.scrollingElement) {
-                    //   console.log("Scroll to", pending.scrollPosition)
-                    //   document.scrollingElement.scrollTop = pending.scrollPosition || 0
-                    // }
                 }
             };
             if (view && view.preload) {
@@ -112,11 +102,10 @@ function BrowserRouter(props) {
             cancelled = true;
         };
     }, [pending]);
-    console.log("Passing", url, data);
-    var _c = (0, react_1.useState)(null), scrollPosition = _c[0], setScrollPosition = _c[1];
+    var _c = (0, react_1.useState)({ value: null }), scrollPosition = _c[0], setScrollPosition = _c[1];
     (0, react_1.useEffect)(function () {
-        if (document.scrollingElement && typeof scrollPosition === "number") {
-            document.scrollingElement.scrollTop = scrollPosition;
+        if (document.scrollingElement && typeof scrollPosition.value === "number") {
+            document.scrollingElement.scrollTop = scrollPosition.value;
         }
     }, [scrollPosition]);
     return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: url, data: data, onNavigateRequest: function (url) {
@@ -127,10 +116,10 @@ function BrowserRouter(props) {
             }
         }, onNavigated: function () {
             if (pending && typeof pending.scrollPosition === "number") {
-                setScrollPosition(pending.scrollPosition);
+                setScrollPosition({ value: pending.scrollPosition });
             }
             else {
-                setScrollPosition(0);
+                setScrollPosition({ value: 0 });
             }
         } }, { children: props.children }), void 0));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.1.40-beta-1",
+  "version": "0.1.40-beta-2",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/routing/routing.js

@@ -213,15 +213,7 @@ function useForkedRouter(conf, opts) {
     var ctx = (0, react_1.useMemo)(function () {
         return parent.fork(conf, opts);
     }, [parent]);
-    // useEffect(() => {
-    //   if (onChange) {
-    //     return ctx.subscribe(onChange);
-    //   }
-    // }, [ctx, onChange]);
     Object.assign(ctx.config, conf);
-    // ctx.config.match = conf.match;
-    // ctx.config.beforeLeave = conf.beforeLeave;
-    // ctx.config.beforeLeave = conf.beforeLeave;
     (0, react_1.useEffect)(function () {
         return function () { return ctx.dispose(); };
     }, [ctx]);