Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: Jump links don't work in preview after first click (#4714)

Ivan Starkov88d4aecfeb66
diff --git a/apps/builder/app/canvas/interceptor.ts b/apps/builder/app/canvas/interceptor.ts
index 900d8b5b86..b78655df2d 100644
--- a/apps/builder/app/canvas/interceptor.ts
+++ b/apps/builder/app/canvas/interceptor.ts
@@ -59,7 +59,7 @@ const switchPageAndUpdateSystem = (href: string, formData?: FormData) => {
}
}
const search = Object.fromEntries(pageHref.searchParams);
- $selectedPageHash.set(pageHref.hash);
+ $selectedPageHash.set({ hash: pageHref.hash });
selectPage(page.id);
updateSystem(page, { params, search });
savePathInHistory(page.id, pageHref.pathname);
diff --git a/apps/builder/app/shared/nano-states/pages.ts b/apps/builder/app/shared/nano-states/pages.ts
index 5025648f20..aab3671571 100644
--- a/apps/builder/app/shared/nano-states/pages.ts
+++ b/apps/builder/app/shared/nano-states/pages.ts
@@ -3,6 +3,6 @@ import type { Page, Pages } from "@webstudio-is/sdk";
export const $pages = atom<undefined | Pages>(undefined);
-export const $selectedPageHash = atom<string>("");
+export const $selectedPageHash = atom<{ hash: string }>({ hash: "" });
export const $editingPageId = atom<undefined | Page["id"]>();
diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.ts
index b1bf3c6b50..d0591b9962 100644
--- a/apps/builder/app/shared/pages/use-switch-page.ts
+++ b/apps/builder/app/shared/pages/use-switch-page.ts
@@ -36,7 +36,7 @@ const setPageStateFromUrl = () => {
findPageByIdOrPath(searchParams.get("pageId") ?? "", pages)?.id ??
pages.homePage.id;
- $selectedPageHash.set(searchParams.get("pageHash") ?? "");
+ $selectedPageHash.set({ hash: searchParams.get("pageHash") ?? "" });
selectPage(pageId);
};
@@ -94,7 +94,7 @@ export const useSyncPageUrl = () => {
// Do not navigate on popstate change
if (
searchParamsPageId === page.id &&
- searchParamsPageHash === pageHash &&
+ searchParamsPageHash === pageHash.hash &&
searParamsMode === builderMode
) {
return;
@@ -104,7 +104,7 @@ export const useSyncPageUrl = () => {
builderPath({
pageId: page.id === pages.homePage.id ? undefined : page.id,
authToken: $authToken.get(),
- pageHash: pageHash === "" ? undefined : pageHash,
+ pageHash: pageHash.hash === "" ? undefined : pageHash.hash,
mode: builderMode === "design" ? undefined : builderMode,
})
);
@@ -118,13 +118,13 @@ export const useHashLinkSync = () => {
const pageHash = useStore($selectedPageHash);
useEffect(() => {
- if (pageHash === "") {
+ if (pageHash.hash === "") {
// native browser behavior is to do nothing if hash is empty
// remix scroll to top, we emulate native
return;
}
- let elementId = decodeURIComponent(pageHash);
+ let elementId = decodeURIComponent(pageHash.hash);
if (elementId.startsWith("#")) {
elementId = elementId.slice(1);
}
@@ -134,6 +134,7 @@ export const useHashLinkSync = () => {
if (element !== null) {
element.scrollIntoView();
}
+
// Remix scroll to top if element not found
// browser do nothing
}, [pageHash]);