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: use editing page scope instead of selected page (#2923)

Bogdan Chadkinc74b4fc6e848
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
index 80a221f082..b741cfaf61 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
@@ -1,5 +1,5 @@
import { nanoid } from "nanoid";
-import { computed } from "nanostores";
+import { atom, computed } from "nanostores";
import { createRootFolder } from "@webstudio-is/project-build";
import {
decodeDataSourceVariable,
@@ -29,7 +29,6 @@ import {
$dataSources,
$pages,
$selectedInstanceSelector,
- $selectedPage,
$selectedPageId,
$variableValuesByInstanceSelector,
} from "~/shared/nano-states";
@@ -297,17 +296,29 @@ export const getExistingRoutePaths = (pages?: Pages): Set<string> => {
return paths;
};
+export const $editingPagesItemId = atom<undefined | Page["id"]>();
+
+const $editingPage = computed(
+ [$editingPagesItemId, $pages],
+ (editingPagesItemId, pages) => {
+ if (editingPagesItemId === undefined || pages === undefined) {
+ return;
+ }
+ return findPageByIdOrPath(editingPagesItemId, pages);
+ }
+);
+
export const $pageRootScope = computed(
- [$selectedPage, $variableValuesByInstanceSelector, $dataSources],
- (selectedPage, variableValuesByInstanceSelector, dataSources) => {
+ [$editingPage, $variableValuesByInstanceSelector, $dataSources],
+ (editingPage, variableValuesByInstanceSelector, dataSources) => {
const scope: Record<string, unknown> = {};
const aliases = new Map<string, string>();
const variableValues = new Map<string, unknown>();
- if (selectedPage === undefined) {
+ if (editingPage === undefined) {
return { variableValues, scope, aliases };
}
const values = variableValuesByInstanceSelector.get(
- JSON.stringify([selectedPage.rootInstanceId])
+ JSON.stringify([editingPage.rootInstanceId])
);
if (values) {
for (const [dataSourceId, value] of values) {
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
index fcb84262e8..29ead3f02e 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
import { useStore } from "@nanostores/react";
import {
DeprecatedIconButton,
@@ -30,6 +30,7 @@ import { NewPageSettings, PageSettings } from "./page-settings";
import { $pages, $selectedPageId } from "~/shared/nano-states";
import { switchPage } from "~/shared/pages";
import {
+ $editingPagesItemId,
getAllChildrenAndSelf,
reparentOrphansMutable,
toTreeData,
@@ -385,7 +386,7 @@ const FolderEditor = ({
export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
const currentPageId = useStore($selectedPageId);
- const [editingItemId, setEditingItemId] = useState<string>();
+ const editingItemId = useStore($editingPagesItemId);
const pages = useStore($pages);
if (currentPageId === undefined || pages === undefined) {
@@ -397,12 +398,14 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
<PagesPanel
onClose={() => onSetActiveTab("none")}
onCreateNewFolder={() => {
- setEditingItemId(
+ $editingPagesItemId.set(
editingItemId === newFolderId ? undefined : newFolderId
);
}}
onCreateNewPage={() =>
- setEditingItemId(editingItemId === newPageId ? undefined : newPageId)
+ $editingPagesItemId.set(
+ editingItemId === newPageId ? undefined : newPageId
+ )
}
onSelect={(itemId) => {
if (isFolder(itemId, pages.folders)) {
@@ -412,7 +415,7 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
onSetActiveTab("none");
}}
selectedPageId={currentPageId}
- onEdit={setEditingItemId}
+ onEdit={$editingPagesItemId.set}
editingItemId={editingItemId}
/>
@@ -421,12 +424,12 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
{isFolder(editingItemId, pages.folders) ? (
<FolderEditor
editingFolderId={editingItemId}
- setEditingFolderId={setEditingItemId}
+ setEditingFolderId={$editingPagesItemId.set}
/>
) : (
<PageEditor
editingPageId={editingItemId}
- setEditingPageId={setEditingItemId}
+ setEditingPageId={$editingPagesItemId.set}
/>
)}
</SettingsPanel>