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: allow inserting instances into the body when it has text content (#3987)

Oleg Isonen53f3050216b5
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
index 440d854dac..668e8ed872 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts
@@ -188,6 +188,7 @@ export const usePropsLogic = ({
const canHaveTextContent =
instanceMeta?.type === "container" &&
instance.component !== collectionComponent;
+
const hasNoChildren = instance.children.length === 0;
const hasOnlyTextChild =
instance.children.length === 1 && instance.children[0].type === "text";
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx
index 44a4cbfb3e..c80bed8a8c 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx
@@ -5,7 +5,7 @@ import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";
import { Grid, theme } from "@webstudio-is/design-system";
import { $assets, $project } from "~/shared/nano-states";
import { createDefaultPages } from "@webstudio-is/project-build";
-import { isRoot } from "@webstudio-is/sdk";
+import { isRootFolder } from "@webstudio-is/sdk";
export default {
component: PageSettings,
@@ -59,7 +59,7 @@ pages.pages.push({
rootInstanceId: "root-instance-id",
systemDataSourceId: "systemDataSourceId",
});
-const rootFolder = pages.folders.find(isRoot);
+const rootFolder = pages.folders.find(isRootFolder);
rootFolder?.children.push("pageId");
$pages.set(pages);
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
index 0b5a0f2c53..75004191d8 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
@@ -29,6 +29,7 @@ import {
isLiteralExpression,
type System,
documentTypes,
+ isRootFolder,
} from "@webstudio-is/sdk";
import {
theme,
@@ -99,7 +100,6 @@ import {
deletePageMutable,
$pageRootScope,
duplicatePage,
- isRootId,
toTreeData,
isPathAvailable,
} from "./page-utils";
@@ -762,7 +762,7 @@ const FormFields = ({
“{values.name}” is the home page
</Text>
</>
- ) : isRootId(values.parentFolderId) === false ? (
+ ) : isRootFolder({ id: values.parentFolderId }) === false ? (
<>
<HomeIcon color={rawTheme.colors.foregroundSubtle} />
<Text
@@ -1527,7 +1527,7 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {
oldHomePage.name = "Old Home";
oldHomePage.path = nameToPath(pages, oldHomePage.name);
- const rootFolder = pages.folders.find((folder) => isRootId(folder.id));
+ const rootFolder = pages.folders.find((folder) => isRootFolder(folder));
if (rootFolder === undefined) {
throw new Error("Root folder not found");
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
index 719ac18555..877e15b5bf 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
@@ -1,7 +1,7 @@
import { describe, expect, test } from "@jest/globals";
import { createDefaultPages } from "@webstudio-is/project-build";
import {
- isRoot,
+ isRootFolder,
type Folder,
ROOT_FOLDER_ID,
type Page,
@@ -73,7 +73,7 @@ const createPages = () => {
const register = (children: Array<Page | Folder>, root: boolean = true) => {
const childIds = [];
- const rootFolder = folders.find(isRoot);
+ const rootFolder = folders.find(isRootFolder);
for (const child of children) {
childIds.push(child.id);
@@ -274,7 +274,7 @@ describe("reparentOrphansMutable", () => {
children: [],
});
reparentOrphansMutable(pages);
- const rootFolder = pages.folders.find(isRoot);
+ const rootFolder = pages.folders.find(isRootFolder);
expect(rootFolder).toEqual({
id: ROOT_FOLDER_ID,
name: "Root",
@@ -295,7 +295,7 @@ describe("cleanupChildRefsMutable", () => {
slug: "folder",
children: [],
});
- const rootFolder = folders.find(isRoot);
+ const rootFolder = folders.find(isRootFolder);
rootFolder?.children.push("folderId");
cleanupChildRefsMutable("folderId", folders);
expect(rootFolder).toEqual({
@@ -320,7 +320,7 @@ describe("isSlugAvailable", () => {
f("folder2-2", ""),
]);
- const rootFolder = folders.find(isRoot)!;
+ const rootFolder = folders.find(isRootFolder)!;
test("available in the root", () => {
expect(isSlugAvailable("folder", folders, rootFolder.id)).toBe(true);
@@ -394,7 +394,7 @@ describe("registerFolderChildMutable", () => {
pages: { folders },
} = createPages();
registerFolderChildMutable(folders, "folderId");
- const rootFolder = folders.find(isRoot);
+ const rootFolder = folders.find(isRootFolder);
expect(rootFolder?.children).toEqual(["homePageId", "folderId"]);
});
@@ -424,7 +424,7 @@ describe("registerFolderChildMutable", () => {
children: [],
};
folders.push(folder);
- const rootFolder = folders.find(isRoot);
+ const rootFolder = folders.find(isRootFolder);
registerFolderChildMutable(folders, "folderId", ROOT_FOLDER_ID);
registerFolderChildMutable(folders, "folderId2", ROOT_FOLDER_ID);
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 040d8fd328..d1d6d7c951 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
@@ -2,16 +2,16 @@ import { atom, computed } from "nanostores";
import { createRootFolder } from "@webstudio-is/project-build";
import {
type Page,
- Pages,
type Folder,
- findPageByIdOrPath,
- ROOT_FOLDER_ID,
- isRoot,
type WebstudioData,
+ type System,
+ Pages,
+ findPageByIdOrPath,
getPagePath,
findParentFolderByChildId,
encodeDataSourceVariable,
- type System,
+ ROOT_FOLDER_ID,
+ isRootFolder,
} from "@webstudio-is/sdk";
import { removeByMutable } from "~/shared/array-utils";
import {
@@ -50,10 +50,6 @@ export type TreeData = TreeFolder | TreePage;
type Index = Map<string, TreeData>;
-const PAGES_ROOT_ID = "root";
-
-export const isRootId = (id: string) => id === PAGES_ROOT_ID;
-
/**
* Return a nested tree structure from flat pages and folders.
* To be used for rendering.
@@ -102,7 +98,7 @@ export const toTreeData = (
children: Array.from(children.values()),
} satisfies TreeFolder;
};
- const rootFolder = foldersMap.get(PAGES_ROOT_ID);
+ const rootFolder = foldersMap.get(ROOT_FOLDER_ID);
if (rootFolder === undefined) {
throw new Error("Root folder not found");
}
@@ -142,7 +138,7 @@ export const reparentOrphansMutable = (pages: Pages) => {
children.push(...folder.children);
}
- let rootFolder = pages.folders.find(isRoot);
+ let rootFolder = pages.folders.find(isRootFolder);
// Should never happen, but just in case.
if (rootFolder === undefined) {
rootFolder = createRootFolder();
@@ -235,7 +231,7 @@ export const registerFolderChildMutable = (
) => {
const parentFolder =
folders.find((folder) => folder.id === parentFolderId) ??
- folders.find(isRoot);
+ folders.find(isRootFolder);
cleanupChildRefsMutable(id, folders);
parentFolder?.children.push(id);
};
diff --git a/apps/builder/app/shared/instance-utils.test.ts b/apps/builder/app/shared/instance-utils.test.ts
index 46ee19b70d..af5a8ac1d8 100644
--- a/apps/builder/app/shared/instance-utils.test.ts
+++ b/apps/builder/app/shared/instance-utils.test.ts
@@ -456,6 +456,23 @@ describe("find closest droppable target", () => {
});
});
+ test("puts in the end of root instance when root only has text", () => {
+ const instances = new Map([
+ createInstancePair("body", "Body", [{ type: "text", value: "text" }]),
+ ]);
+ expect(
+ findClosestDroppableTarget(
+ defaultMetasMap,
+ instances,
+ ["body"],
+ emptyInsertConstraints
+ )
+ ).toEqual({
+ parentSelector: ["body"],
+ position: "end",
+ });
+ });
+
test("finds closest container and puts after its child within selection", () => {
const instances = new Map([
createInstancePair("body", "Body", [{ type: "id", value: "paragraph" }]),
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index 46b146ecf9..ce4f57709e 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -363,6 +363,14 @@ export const findClosestDroppableTarget = (
instanceSelector: InstanceSelector,
insertConstraints: InsertConstraints
): undefined | DroppableTarget => {
+ // We want to always allow dropping into the root.
+ // For example when body has text content and the only viable option is to insert at the end.
+ if (instanceSelector.length === 1) {
+ return {
+ parentSelector: instanceSelector,
+ position: "end",
+ };
+ }
const droppableIndex = findClosestDroppableComponentIndex({
metas,
constraints: insertConstraints,
@@ -370,6 +378,7 @@ export const findClosestDroppableTarget = (
instanceSelector,
allowInsertIntoTextContainer: false,
});
+
if (droppableIndex === -1) {
return;
}
diff --git a/packages/sdk/src/page-utils.ts b/packages/sdk/src/page-utils.ts
index fb134ddbfe..f68611936b 100644
--- a/packages/sdk/src/page-utils.ts
+++ b/packages/sdk/src/page-utils.ts
@@ -7,7 +7,8 @@ export const ROOT_FOLDER_ID = "root";
/**
* Returns true if folder is the root folder.
*/
-export const isRoot = (folder: Folder) => folder.id === ROOT_FOLDER_ID;
+export const isRootFolder = ({ id }: { id: Folder["id"] }) =>
+ id === ROOT_FOLDER_ID;
/**
* Find a page by id or path.