@riboseinc/anafero-cli 0.0.17 → 0.0.19

package/bootstrap.js

@@ -132635,10 +132635,12 @@ var VersionWorkspace = function({
         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");
+        console.warn("While popping state, could not resolve resource URI or locate resource path", uri, history.state?.res);
         return;
       }
     };
@@ -132660,7 +132662,11 @@ var VersionWorkspace = function({
       dispatch({ type: "activated_resource", uri: res });
     }
   }, [expandResourcePath, locateResource, state.activeResourceURI]);
+  const [resourceContainerElement, setResourceContainerElement] = (0, import_react218.useState)(null);
   const setUpInterceptor = (0, import_react218.useCallback)((resourcesRef) => {
+    if (resourcesRef) {
+      setResourceContainerElement(resourcesRef);
+    }
     intercept_nav_default(resourcesRef, {
       // shadowDom: true,
     }, function handleIntercept(evt, el) {
@@ -132669,12 +132675,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();
@@ -132716,6 +132722,50 @@ 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");
+  const [queuedFragment, setQueuedFragment] = (0, import_react218.useState)("");
+  const scrollToResource = (0, import_react218.useCallback)(() => {
+    if (!queuedFragment) {
+      return;
+    }
+    if (!resourceContainerElement) {
+      console.warn("Cannot scroll to resource: no resource container element");
+      return;
+    }
+    const el = document.getElementById(queuedFragment) ?? resourceContainerElement.querySelector(`[about="${queuedFragment}"]`);
+    if (el) {
+      try {
+        el.scrollIntoView();
+      } catch (e2) {
+        console.error("Failed to scroll element into view", queuedFragment);
+      }
+      setQueuedFragment("");
+    } else {
+      console.error("Element not found for resource to scroll to", queuedFragment);
+    }
+  }, [resourceContainerElement, queuedFragment]);
+  (0, import_react218.useEffect)(() => {
+    if (!isLoading && queuedFragment && resourceContainerElement) {
+      const resourceID = queuedFragment;
+      window.location.hash = `#${encodeURIComponent(resourceID)}`;
+      const observer = new MutationObserver(scrollToResource);
+      scrollToResource();
+      observer.observe(resourceContainerElement, {
+        attributes: false,
+        childList: true,
+        characterData: false,
+        subtree: true
+      });
+      const timeout2 = setTimeout(() => {
+        setQueuedFragment("");
+      }, 5e3);
+      return function() {
+        observer.disconnect();
+        window.clearTimeout(timeout2);
+      };
+    }
+    return function() {
+    };
+  }, [isLoading, queuedFragment, scrollToResource, resourceContainerElement]);
   const lastVisibleResourceMarkerIntersection = useInView({
     threshold: 0,
     initialInView: true