eddev 0.1.37 → 0.1.40-beta-2

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) {
@@ -45,9 +48,12 @@ function BrowserRouter(props) {
         hasPopulatedCache = true;
         (0, remoteProps_1.setInitialProps)(url, data);
     }
+    (0, react_1.useEffect)(function () {
+        history.scrollRestoration = "manual";
+    }, []);
     (0, react_1.useEffect)(function () {
         var handle = function (e) {
-            setPendingUrl({ popped: true, url: document.location.href });
+            setPendingUrl({ popped: true, url: document.location.href, scrollPosition: e.state.scrollPosition });
         };
         window.addEventListener("popstate", handle);
         return function () {
@@ -64,9 +70,12 @@ function BrowserRouter(props) {
         (0, remoteProps_1.fetchProps)(pending.url).then(function (data) {
             var view = views_1.default[data.view];
             var finish = function () {
-                var _a;
-                setUrl(pending.url);
-                setData(data);
+                var _a, _b;
+                setState({
+                    url: pending.url,
+                    data: data,
+                });
+                // setData(data)
                 if (data.appData) {
                     setAppData(data.appData.data);
                 }
@@ -76,6 +85,7 @@ function BrowserRouter(props) {
                     (0, updateHeadTags_1.updateHeadTags)(data.meta.head);
                 setIsLoading(false);
                 if (!pending.popped) {
+                    history.replaceState({ scrollPosition: (_b = document.scrollingElement) === null || _b === void 0 ? void 0 : _b.scrollTop }, "", document.location.href);
                     history.pushState({}, "", pending.url);
                 }
             };
@@ -92,12 +102,25 @@ function BrowserRouter(props) {
             cancelled = true;
         };
     }, [pending]);
+    var _c = (0, react_1.useState)({ value: null }), scrollPosition = _c[0], setScrollPosition = _c[1];
+    (0, react_1.useEffect)(function () {
+        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) {
             setPendingUrl({ popped: false, url: url });
         }, onPreload: function (url) {
             if ((0, remoteProps_1.isSameOrigin)(url)) {
                 (0, remoteProps_1.fetchProps)(url);
             }
-        }, onNavigated: function () { } }, { children: props.children }), void 0));
+        }, onNavigated: function () {
+            if (pending && typeof pending.scrollPosition === "number") {
+                setScrollPosition({ value: pending.scrollPosition });
+            }
+            else {
+                setScrollPosition({ value: 0 });
+            }
+        } }, { children: props.children }), void 0));
 }
 exports.BrowserRouter = BrowserRouter;

package/package.json

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

package/routing/remoteProps.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasCachedProps = exports.fetchProps = exports.isSameOrigin = exports.setInitialProps = exports.parseURL = void 0;
 var url_parse_1 = __importDefault(require("url-parse"));
 var qs_1 = __importDefault(require("qs"));
+var pending = {};
 var cache = {};
 function parseURL(url) {
     return (0, url_parse_1.default)(url, qs_1.default.parse);
@@ -63,26 +64,26 @@ function isSameOrigin(url) {
 exports.isSameOrigin = isSameOrigin;
 function fetchProps(url) {
     return __awaiter(this, void 0, void 0, function () {
-        var parsed, cacheKey, requestUrl, response, data;
+        var parsed, cacheKey, requestUrl, promise;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    parsed = parseURL(url);
-                    cacheKey = getRouteCacheKey(url);
-                    // Cached value?
-                    if (cache[cacheKey])
-                        return [2 /*return*/, Promise.resolve(cache[cacheKey])];
-                    parsed.query["_props"] = "1";
-                    requestUrl = parsed.toString();
-                    return [4 /*yield*/, fetch(requestUrl)];
-                case 1:
-                    response = _a.sent();
-                    return [4 /*yield*/, response.json()];
-                case 2:
-                    data = _a.sent();
-                    cache[cacheKey] = data;
-                    return [2 /*return*/, data];
-            }
+            parsed = parseURL(url);
+            cacheKey = getRouteCacheKey(url);
+            // Cached value?
+            if (cacheKey in cache)
+                return [2 /*return*/, Promise.resolve(cache[cacheKey])];
+            if (cacheKey in pending)
+                return [2 /*return*/, pending[cacheKey]];
+            parsed.query["_props"] = "1";
+            requestUrl = parsed.toString();
+            promise = fetch(requestUrl)
+                .then(function (response) { return response.json(); })
+                .then(function (data) {
+                delete pending[cacheKey];
+                cache[cacheKey] = data;
+                return data;
+            });
+            pending[cacheKey] = promise;
+            return [2 /*return*/, promise];
         });
     });
 }

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

@@ -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]);
@@ -301,6 +293,9 @@ function RouterRoot(props) {
             ctx.propagateCandidate(item, ctx.item).then(function () {
                 if (!cancelled) {
                     ctx.propagateChange(item, true);
+                    if (props.onNavigated) {
+                        props.onNavigated(item);
+                    }
                 }
             });
             return function () {
@@ -308,6 +303,15 @@ function RouterRoot(props) {
             };
         }
     }, [props.url, props.data]);
+    // useEffect(() => {
+    //   return ctx.subscribe((route, status) => {
+    //     if (status === "active") {
+    //       if (props.onNavigated) {
+    //         props.onNavigated(route.pathname)
+    //       }
+    //     }
+    //   })
+    // }, [props.onNavigated])
     return (0, jsx_runtime_1.jsx)(RouterContext.Provider, __assign({ value: ctx }, { children: props.children }), void 0);
 }
 exports.RouterRoot = RouterRoot;