eddev 0.1.38 → 0.1.39

package/blocks/inlineEditing.js

@@ -40,6 +40,7 @@ function EditableText(_a) {
     }
     else {
         var value = (0, blockAttributes_1.useInlineEditableValue)(id)[0];
+        var router_1 = (0, __1.useRouter)();
         var otherProps = __assign({}, props);
         delete otherProps.inlineToolbar;
         delete otherProps.disableLineBreaks;
@@ -54,7 +55,6 @@ function EditableText(_a) {
                 return null;
             }
         }
-        var router_1 = (0, __1.useRouter)();
         return (0, react_1.createElement)(as || "div", __assign({ dangerouslySetInnerHTML: { __html: value }, onClick: function (e) {
                 if (e.target && e.target instanceof HTMLAnchorElement) {
                     if ((0, remoteProps_1.isSameOrigin)(e.target.href) && router_1) {

package/components/BrowserRouter.js

@@ -29,12 +29,15 @@ var updateHeadTags_1 = require("../routing/updateHeadTags");
 var hasPopulatedCache = false;
 function BrowserRouter(props) {
     var setAppData = (0, hooks_1.useAppDataStore)(function (s) { return s.setAppData; });
-    var _a = (0, react_1.useState)(function () { return document.location.href; }), url = _a[0], setUrl = _a[1];
-    var _b = (0, react_1.useState)(function () {
+    var _a = (0, react_1.useState)(function () {
         setAppData(_PAGE_DATA.appData.data);
-        return _PAGE_DATA;
-    }), data = _b[0], setData = _b[1];
-    var _c = (0, react_1.useState)(null), pending = _c[0], setPendingUrl = _c[1];
+        return {
+            url: document.location.href,
+            data: _PAGE_DATA,
+        };
+    }), state = _a[0], setState = _a[1];
+    var url = state.url, data = state.data;
+    var _b = (0, react_1.useState)(null), pending = _b[0], setPendingUrl = _b[1];
     var setIsLoading = (0, usePageLoad_1.usePageLoad)(function (s) { return s.setIsLoading; });
     (0, react_1.useEffect)(function () {
         if (data.errorStack) {
@@ -68,8 +71,11 @@ function BrowserRouter(props) {
             var view = views_1.default[data.view];
             var finish = function () {
                 var _a, _b;
-                setUrl(pending.url);
-                setData(data);
+                setState({
+                    url: pending.url,
+                    data: data,
+                });
+                // setData(data)
                 if (data.appData) {
                     setAppData(data.appData.data);
                 }
@@ -106,6 +112,13 @@ function BrowserRouter(props) {
             cancelled = true;
         };
     }, [pending]);
+    console.log("Passing", url, data);
+    var _c = (0, react_1.useState)(null), scrollPosition = _c[0], setScrollPosition = _c[1];
+    (0, react_1.useEffect)(function () {
+        if (document.scrollingElement && typeof scrollPosition === "number") {
+            document.scrollingElement.scrollTop = scrollPosition;
+        }
+    }, [scrollPosition]);
     return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: url, data: data, onNavigateRequest: function (url) {
             setPendingUrl({ popped: false, url: url });
         }, onPreload: function (url) {
@@ -113,7 +126,12 @@ function BrowserRouter(props) {
                 (0, remoteProps_1.fetchProps)(url);
             }
         }, onNavigated: function () {
-            console.log("Navigated");
+            if (pending && typeof pending.scrollPosition === "number") {
+                setScrollPosition(pending.scrollPosition);
+            }
+            else {
+                setScrollPosition(0);
+            }
         } }, { children: props.children }), void 0));
 }
 exports.BrowserRouter = BrowserRouter;

package/package.json

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

package/routing/routing.d.ts

@@ -55,7 +55,7 @@ declare type RouterRootProps = {
     children: ReactNode;
     onNavigateRequest?: (url: string) => void;
     onPreload?: (url: string) => void;
-    onNavigated?: (url: string) => void;
+    onNavigated?: (item: RouteItem) => void;
 };
 export declare function RouterRoot(props: RouterRootProps): JSX.Element;
 declare type SwitchProps = {

package/routing/routing.js

@@ -301,7 +301,9 @@ function RouterRoot(props) {
             ctx.propagateCandidate(item, ctx.item).then(function () {
                 if (!cancelled) {
                     ctx.propagateChange(item, true);
-                    console.log("Really finished");
+                    if (props.onNavigated) {
+                        props.onNavigated(item);
+                    }
                 }
             });
             return function () {