eddev 0.3.3 → 0.3.5

package/blocks/inlineEditing.d.ts

@@ -1,4 +1,4 @@
-import { ElementType, FunctionComponent } from "react";
+import { ElementType, FunctionComponent, ComponentPropsWithoutRef } from "react";
 import { ContentBlocksSettings } from ".";
 declare type PropTypes<T extends ElementType> = {
     /** The 'key' of this editable text value */
@@ -13,7 +13,7 @@ declare type PropTypes<T extends ElementType> = {
     defaultValue?: string;
     /** Append a new block when the user hits 'Enter' */
     appendOnEnter?: boolean;
-} & React.ComponentPropsWithoutRef<T>;
+} & ComponentPropsWithoutRef<T>;
 export declare function EditableText<T extends ElementType>({ id, as, appendOnEnter, ...props }: PropTypes<T>): import("react/jsx-runtime").JSX.Element | null;
 declare type AppenderConfig = {
     type: "default" | "button" | FunctionComponent<any>;

package/components/BrowserRouter.js

@@ -41,6 +41,24 @@ function BrowserRouter(props) {
     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; });
+    var scrollTo = function (value) {
+        if (typeof value !== "number")
+            return;
+        if (routing_1.customRouterScrollHandler.handler) {
+            routing_1.customRouterScrollHandler.handler.set(value);
+        }
+        else if (document.scrollingElement) {
+            document.scrollingElement.scrollTop = value;
+        }
+    };
+    var getScroll = function () {
+        if (routing_1.customRouterScrollHandler.handler) {
+            return routing_1.customRouterScrollHandler.handler.get();
+        }
+        else if (document.scrollingElement) {
+            return document.scrollingElement.scrollTop;
+        }
+    };
     (0, react_1.useEffect)(function () {
         if (data.errorStack) {
             (0, reportErrorStack_1.reportErrorStack)(data.errorStack);
@@ -74,7 +92,7 @@ function BrowserRouter(props) {
             var view = views_1.default[data.view];
             var nextUrl = data.canonical || pending.url;
             var finish = function () {
-                var _a, _b;
+                var _a;
                 setState({
                     url: nextUrl,
                     data: data,
@@ -92,7 +110,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.replaceState({ scrollPosition: getScroll() }, "", document.location.href);
                     history.pushState({}, "", nextUrl);
                 }
             };
@@ -109,12 +127,12 @@ 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]);
+    // const [scrollPosition, setScrollPosition] = useState({ value: null as null | number })
+    // useEffect(() => {
+    //   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) {
@@ -123,10 +141,14 @@ function BrowserRouter(props) {
             }
         }, onNavigated: function () {
             if (pending && typeof pending.scrollPosition === "number") {
-                setScrollPosition({ value: pending.scrollPosition });
+                // setScrollPosition({ value: pending.scrollPosition })
+                // document.scrollingElement!.scrollTop = pending.scrollPosition
+                scrollTo(pending.scrollPosition);
             }
             else {
-                setScrollPosition({ value: 0 });
+                // setScrollPosition({ value: 0 })
+                // document.scrollingElement!.scrollTop = 0
+                scrollTo(0);
             }
         } }, { children: props.children }), void 0));
 }

package/entry/Root.js

@@ -38,12 +38,10 @@ var routing_1 = require("../routing");
 var loader_1 = require("../dev-ui/loader");
 var next_1 = require("@trpc/next");
 function Root() {
+    var _a, _b;
     var route = (0, routing_1.useRoute)();
-    return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [process.devUI && (0, jsx_runtime_1.jsx)(loader_1.DevUILoader, {}, void 0), (0, jsx_runtime_1.jsx)(views_1.App, { children: (0, jsx_runtime_1.jsx)(routing_1.Switch, { children: Object.entries(views_1.default).map(function (_a) {
-                        var _b, _c;
-                        var name = _a[0], Component = _a[1];
-                        return ((0, jsx_runtime_1.jsx)(routing_1.Route, __assign({ match: function (route) { var _a; return ((_a = route.data) === null || _a === void 0 ? void 0 : _a.view) === name; } }, { children: (0, jsx_runtime_1.jsx)(Component, __assign({}, (_c = (_b = route.data) === null || _b === void 0 ? void 0 : _b.viewData) === null || _c === void 0 ? void 0 : _c.data), void 0) }), name));
-                    }) }, void 0) }, void 0)] }, void 0));
+    var Component = views_1.default[(_a = route.data) === null || _a === void 0 ? void 0 : _a.view];
+    return ((0, jsx_runtime_1.jsx)(react_1.Fragment, { children: (0, jsx_runtime_1.jsxs)(routing_1.RouteItemContext, __assign({ route: route }, { children: [process.devUI && (0, jsx_runtime_1.jsx)(loader_1.DevUILoader, {}, void 0), (0, jsx_runtime_1.jsx)(views_1.App, __assign({ path: route.pathname }, { children: Component ? (0, jsx_runtime_1.jsx)(Component, __assign({}, (_b = route.data) === null || _b === void 0 ? void 0 : _b.viewData.data), void 0) : null }), void 0)] }), void 0) }, void 0));
 }
 exports.default = process.rpcEnabled
     ? (0, next_1.withTRPC)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -24,7 +24,6 @@
     "@types/react-dom": "^18.2.7",
     "@types/react-inspector": "^4.0.2",
     "@types/rimraf": "^3.0.2",
-    "@types/url-parse": "^1.4.4",
     "@types/webpack-dev-server": "^3.11.2",
     "csstype": "^3.0.9",
     "next": "^12.1.6",
@@ -33,6 +32,7 @@
     "typescript": "4.5.5"
   },
   "dependencies": {
+    "@types/url-parse": "^1.4.4",
     "@babel/core": "^7.15.5",
     "@babel/generator": "^7.15.4",
     "@babel/preset-env": "^7.15.4",

package/routing/routing.d.ts

@@ -52,6 +52,14 @@ declare type RouteContextType = {
 };
 export declare function useRoute(): RouteItem;
 export declare function useRouter(): RouteContextType | undefined;
+export declare type RouterScrollHandler = {
+    set: (value: number) => void;
+    get: () => number;
+};
+export declare const customRouterScrollHandler: {
+    handler: RouterScrollHandler | null;
+};
+export declare function useCustomRouterScrollHandler(handler: RouterScrollHandler): void;
 export declare type RouteProps = RouteContextConfig & {
     children: ReactNode;
 };

package/routing/routing.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteItemContext = exports.Switch = exports.Link = exports.urlDescendentsMatch = exports.urlPathsMatch = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useRouter = exports.useRoute = void 0;
+exports.RouteItemContext = exports.Switch = exports.Link = exports.urlDescendentsMatch = exports.urlPathsMatch = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useCustomRouterScrollHandler = exports.customRouterScrollHandler = exports.useRouter = exports.useRoute = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var react_merge_refs_1 = require("react-merge-refs");
@@ -236,6 +236,18 @@ function useRouter() {
     return (0, react_1.useContext)(RouterContext);
 }
 exports.useRouter = useRouter;
+exports.customRouterScrollHandler = {
+    handler: null,
+};
+function useCustomRouterScrollHandler(handler) {
+    exports.customRouterScrollHandler.handler = handler;
+    (0, react_1.useEffect)(function () {
+        return function () {
+            exports.customRouterScrollHandler.handler = null;
+        };
+    }, []);
+}
+exports.useCustomRouterScrollHandler = useCustomRouterScrollHandler;
 function Route(props) {
     var ctx = useForkedRouter({
         match: props.match,