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.

Reset selected instance on page manipulation (#1494)

Bogdan Chadkin6c57597b6c30
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
index 4e86613c4e..4fa9500cfc 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
@@ -38,6 +38,7 @@ import { deleteInstance } from "~/shared/instance-utils";
import {
instancesStore,
pagesStore,
+ selectedInstanceSelectorStore,
selectedPageIdStore,
} from "~/shared/nano-states";
import { nanoid } from "nanoid";
@@ -293,6 +294,7 @@ export const NewPageSettings = ({
component: "Body",
children: [],
});
+ selectedInstanceSelectorStore.set(undefined);
}
);
onSuccess(pageId);
@@ -420,6 +422,7 @@ const deletePage = (pageId: Page["id"]) => {
// deselect page before deleting to avoid flash of content
if (selectedPageIdStore.get() === pageId) {
selectedPageIdStore.set(pages?.homePage.id);
+ selectedInstanceSelectorStore.set(undefined);
}
const rootInstanceId = pages?.pages.find(
(page) => page.id === pageId
diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.ts
index 3fccbfde46..efa5b2b151 100644
--- a/apps/builder/app/shared/pages/use-switch-page.ts
+++ b/apps/builder/app/shared/pages/use-switch-page.ts
@@ -1,7 +1,11 @@
import { useNavigate } from "@remix-run/react";
import type { Page } from "@webstudio-is/project-build";
import { projectContainer } from "~/builder/shared/nano-states";
-import { authTokenStore, pagesStore } from "~/shared/nano-states";
+import {
+ authTokenStore,
+ pagesStore,
+ selectedInstanceSelectorStore,
+} from "~/shared/nano-states";
import { builderPath } from "~/shared/router-utils";
import { useSubscribe } from "~/shared/pubsub";
@@ -19,6 +23,8 @@ export const useSwitchPage = () => {
return;
}
+ selectedInstanceSelectorStore.set(undefined);
+
navigate(
builderPath({
projectId: project.id,