@riboseinc/anafero-cli 0.0.16 → 0.0.18

package/bootstrap.js

@@ -132617,25 +132617,42 @@ var VersionWorkspace = function({
       hasFragment ? `#${rpath.split("#")[1]}` : null
     ];
   }, [expandUnversionedPath]);
+  const scrollToResource = (0, import_react218.useCallback)((resourceURI) => {
+    const el = document.getElementById(resourceURI) ?? document.querySelector(`[about="${resourceURI}"]`);
+    if (el) {
+      try {
+        el.scrollIntoView();
+      } catch (e2) {
+        console.error("Failed to scroll element into view", resourceURI);
+      }
+    } else {
+      console.error("Element not found for resource to scroll to", resourceURI);
+    }
+  }, []);
   (0, import_react218.useEffect)(() => {
     const handlePopState = function() {
       const uri = typeof history.state?.res === "string" ? history.state.res : void 0;
       let path = null;
-      try {
-        path = locateResource(uri);
-      } catch (e2) {
-        console.error("Error locating resource while popping state", e2);
+      if (uri) {
+        try {
+          path = locateResource(uri);
+        } catch (e2) {
+          console.error("Error locating resource while popping state", e2);
+          path = null;
+        }
+      } else {
         path = null;
       }
       if (uri && path) {
         const [, fragment] = expandResourcePath(path);
         dispatch({ type: "activated_resource", uri });
         if (fragment) {
-          window.location.hash = fragment;
+          setTimeout(() => {
+            setQueuedFragment(fragment.slice(1));
+          }, 200);
         }
       } else {
-        console.warn("When popping state, could not resolve resource URI or locate resource path");
-        window.location.reload();
+        console.warn("While popping state, could not resolve resource URI or locate resource path", uri, history.state?.res);
         return;
       }
     };
@@ -132657,6 +132674,7 @@ var VersionWorkspace = function({
       dispatch({ type: "activated_resource", uri: res });
     }
   }, [expandResourcePath, locateResource, state.activeResourceURI]);
+  const [queuedFragment, setQueuedFragment] = (0, import_react218.useState)("");
   const setUpInterceptor = (0, import_react218.useCallback)((resourcesRef) => {
     intercept_nav_default(resourcesRef, {
       // shadowDom: true,
@@ -132666,12 +132684,12 @@ var VersionWorkspace = function({
         return;
       }
       const url2 = new URL(href, document.baseURI);
-      const absoluteHref = url2.pathname;
+      const absoluteHref = decodeURIComponent(url2.pathname);
       const resourceURI = reverseResource(absoluteHref);
       if (resourceURI) {
         dispatch({ type: "activated_resource", uri: resourceURI });
         if (url2.hash) {
-          window.location.hash = url2.hash;
+          setQueuedFragment(decodeURIComponent(url2.hash.slice(1)));
         }
         evt.stopPropagation();
         evt.preventDefault();
@@ -132713,6 +132731,16 @@ var VersionWorkspace = function({
   }, [hierarchy, state.expandedResourceURIs, actualSelected]);
   const routerProps = (0, import_react218.useMemo)(() => ({ router: { navigate } }), [navigate]);
   const isLoading = Object.values(resourceDeps).find((val) => typeof val === "function");
+  (0, import_react218.useEffect)(() => {
+    if (!isLoading && queuedFragment) {
+      const elID = queuedFragment;
+      window.location.hash = `#${encodeURIComponent(elID)}`;
+      setTimeout(() => {
+        scrollToResource(elID);
+        setQueuedFragment("");
+      }, 500);
+    }
+  }, [isLoading, queuedFragment]);
   const lastVisibleResourceMarkerIntersection = useInView({
     threshold: 0,
     initialInView: true