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.

Add requiredAncestors and invalidAncestors to meta (#1684)

Bogdan Chadkin7c66afef740f
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
index bfde348da4..359b3378e8 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
@@ -9,7 +9,6 @@ import {
useDrag,
ComponentCard,
} from "@webstudio-is/design-system";
-import { findClosestDroppableTarget } from "~/shared/tree-utils";
import {
instancesStore,
registeredComponentMetasStore,
@@ -22,7 +21,10 @@ import {
isCanvasPointerEventsEnabledStore,
scaleStore,
} from "~/builder/shared/nano-states";
-import { insertNewComponentInstance } from "~/shared/instance-utils";
+import {
+ findClosestDroppableTarget,
+ insertNewComponentInstance,
+} from "~/shared/instance-utils";
import { MetaIcon } from "~/builder/shared/meta-icon";
const DragLayer = ({
@@ -155,6 +157,7 @@ export const useDraggable = ({
return;
}
const dropTarget = findClosestDroppableTarget(
+ registeredComponentMetasStore.get(),
instancesStore.get(),
// fallback to root as drop target
selectedInstanceSelectorStore.get() ?? [selectedPage.rootInstanceId],
diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsx
index 652e6ad6ed..755f10954f 100644
--- a/apps/builder/app/builder/shared/navigator-tree.tsx
+++ b/apps/builder/app/builder/shared/navigator-tree.tsx
@@ -1,5 +1,6 @@
-import { useCallback } from "react";
+import { useCallback, useMemo } from "react";
import { useStore } from "@nanostores/react";
+import { shallowEqual } from "shallow-equal";
import type { Instance } from "@webstudio-is/project-build";
import {
hoveredInstanceSelectorStore,
@@ -9,23 +10,62 @@ import {
useDragAndDropState,
textEditingInstanceSelectorStore,
selectedStyleSourceSelectorStore,
+ registeredComponentMetasStore,
} from "~/shared/nano-states";
import type { InstanceSelector } from "~/shared/tree-utils";
-import { reparentInstance } from "~/shared/instance-utils";
+import {
+ findClosestDroppableComponentIndex,
+ reparentInstance,
+} from "~/shared/instance-utils";
import { InstanceTree } from "./tree";
-import { shallowEqual } from "shallow-equal";
export const NavigatorTree = () => {
const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);
const rootInstance = useStore(rootInstanceStore);
const instances = useStore(instancesStore);
+ const metas = useStore(registeredComponentMetasStore);
const [state, setState] = useDragAndDropState();
+ const dragPayload = state.dragPayload;
+
const dragItemSelector =
- state.dragPayload?.type === "reparent"
- ? state.dragPayload.dragInstanceSelector
+ dragPayload?.type === "reparent"
+ ? dragPayload.dragInstanceSelector
: undefined;
+ const dragComponent = useMemo(() => {
+ let dragComponent: undefined | string;
+ if (dragPayload?.type === "insert") {
+ dragComponent = dragPayload.dragComponent;
+ }
+ if (dragPayload?.type === "reparent") {
+ dragComponent = instances.get(
+ dragPayload.dragInstanceSelector[0]
+ )?.component;
+ }
+ return dragComponent;
+ }, [dragPayload, instances]);
+
+ const findClosestDroppableIndex = useCallback(
+ (instanceSelector: InstanceSelector) => {
+ if (dragComponent === undefined) {
+ return -1;
+ }
+ const componentSelector: string[] = [];
+ for (const instanceId of instanceSelector) {
+ const component = instances.get(instanceId)?.component;
+ if (component === undefined) {
+ return -1;
+ }
+ componentSelector.push(component);
+ }
+ return findClosestDroppableComponentIndex(metas, componentSelector, [
+ dragComponent,
+ ]);
+ },
+ [instances, metas, dragComponent]
+ );
+
const isItemHidden = useCallback(
(instanceId: Instance["id"]) =>
// fragment is internal component to group other instances
@@ -73,6 +113,7 @@ export const NavigatorTree = () => {
dragItemSelector={dragItemSelector}
dropTarget={state.dropTarget}
isItemHidden={isItemHidden}
+ findClosestDroppableIndex={findClosestDroppableIndex}
onSelect={handleSelect}
onHover={hoveredInstanceSelectorStore.set}
onDragItemChange={(dragInstanceSelector) => {
diff --git a/apps/builder/app/builder/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsx
index 250eef3134..da3b2f1cd9 100644
--- a/apps/builder/app/builder/shared/tree/index.tsx
+++ b/apps/builder/app/builder/shared/tree/index.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo } from "react";
+import { useCallback } from "react";
import { useStore } from "@nanostores/react";
import {
Tree,
@@ -9,11 +9,10 @@ import {
} from "@webstudio-is/design-system";
import type { Instance } from "@webstudio-is/project-build";
import {
- canAcceptComponent,
getComponentMeta,
type WsComponentMeta,
} from "@webstudio-is/react-sdk";
-import { instancesStore, useDragAndDropState } from "~/shared/nano-states";
+import { instancesStore } from "~/shared/nano-states";
import { MetaIcon } from "../meta-icon";
const instanceRelatedProps = {
@@ -35,29 +34,10 @@ const instanceRelatedProps = {
export const InstanceTree = (
props: Omit<
TreeProps<Instance>,
- | keyof typeof instanceRelatedProps
- | "canLeaveParent"
- | "canAcceptChild"
- | "getItemChildren"
+ keyof typeof instanceRelatedProps | "canLeaveParent" | "getItemChildren"
>
) => {
const instances = useStore(instancesStore);
- const [state] = useDragAndDropState();
-
- const dragPayload = state.dragPayload;
-
- const dragComponent = useMemo(() => {
- let dragComponent: undefined | string;
- if (dragPayload?.type === "insert") {
- dragComponent = dragPayload.dragComponent;
- }
- if (dragPayload?.type === "reparent") {
- dragComponent = instances.get(
- dragPayload.dragInstanceSelector[0]
- )?.component;
- }
- return dragComponent;
- }, [dragPayload, instances]);
const canLeaveParent = useCallback(
(instanceId: Instance["id"]) => {
@@ -71,17 +51,6 @@ export const InstanceTree = (
[instances]
);
- const canAcceptChild = useCallback(
- (instanceId: Instance["id"]) => {
- const instance = instances.get(instanceId);
- if (instance === undefined || dragComponent === undefined) {
- return false;
- }
- return canAcceptComponent(instance.component, dragComponent);
- },
- [instances, dragComponent]
- );
-
const getItemChildren = useCallback(
(instanceId: Instance["id"]) => {
const instance = instances.get(instanceId);
@@ -110,7 +79,6 @@ export const InstanceTree = (
{...props}
{...instanceRelatedProps}
canLeaveParent={canLeaveParent}
- canAcceptChild={canAcceptChild}
getItemChildren={getItemChildren}
/>
);
diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.ts
index 57e2433e55..c1aedcbb9e 100644
--- a/apps/builder/app/canvas/shared/use-drag-drop.ts
+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts
@@ -9,11 +9,15 @@ import {
useDrop,
computeIndicatorPlacement,
} from "@webstudio-is/design-system";
-import { canAcceptComponent, getComponentMeta } from "@webstudio-is/react-sdk";
-import { instancesStore } from "~/shared/nano-states";
+import { getComponentMeta } from "@webstudio-is/react-sdk";
+import {
+ instancesStore,
+ registeredComponentMetasStore,
+} from "~/shared/nano-states";
import { textEditingInstanceSelectorStore } from "~/shared/nano-states";
import { publish, useSubscribe } from "~/shared/pubsub";
import {
+ findClosestDroppableComponentIndex,
insertNewComponentInstance,
reparentInstance,
} from "~/shared/instance-utils";
@@ -84,15 +88,29 @@ const findClosestDroppableInstanceSelector = (
dragPayload.dragInstanceSelector[0]
)?.component;
}
+ if (dragComponent === undefined) {
+ return;
+ }
+
+ const componentSelector: string[] = [];
for (const instanceId of instanceSelector) {
- const instance = instances.get(instanceId);
- if (instance !== undefined && dragComponent !== undefined) {
- if (canAcceptComponent(instance.component, dragComponent)) {
- return getAncestorInstanceSelector(instanceSelector, instanceId);
- }
+ const component = instances.get(instanceId)?.component;
+ if (component === undefined) {
+ return;
}
+ componentSelector.push(component);
}
- return;
+
+ const droppableIndex = findClosestDroppableComponentIndex(
+ registeredComponentMetasStore.get(),
+ componentSelector,
+ [dragComponent]
+ );
+ if (droppableIndex === -1) {
+ return;
+ }
+ const droppableInstanceSelector = instanceSelector.slice(droppableIndex);
+ return droppableInstanceSelector;
};
const initialState: {
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index 08ad64d0df..77548ca970 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -22,10 +22,10 @@ import {
selectedStyleSourceSelectorStore,
assetsStore,
projectStore,
+ registeredComponentMetasStore,
} from "../nano-states";
import {
type InstanceSelector,
- findClosestDroppableTarget,
insertInstancesCopyMutable,
insertPropsCopyMutable,
insertStylesCopyMutable,
@@ -34,7 +34,7 @@ import {
findLocalStyleSourcesWithinInstances,
mergeNewBreakpointsMutable,
} from "../tree-utils";
-import { deleteInstance } from "../instance-utils";
+import { deleteInstance, findClosestDroppableTarget } from "../instance-utils";
import { getMapValuesBy, getMapValuesByKeysSet } from "../array-utils";
import { Asset } from "@webstudio-is/asset-uploader";
@@ -240,6 +240,7 @@ export const onPaste = (clipboardData: string) => {
];
const dragComponent = data.instances[0].component;
const dropTarget = findClosestDroppableTarget(
+ registeredComponentMetasStore.get(),
instancesStore.get(),
instanceSelector,
[dragComponent]
diff --git a/apps/builder/app/shared/copy-paste/plugin-markdown.ts b/apps/builder/app/shared/copy-paste/plugin-markdown.ts
index 2bd51e44fc..208f8c99c7 100644
--- a/apps/builder/app/shared/copy-paste/plugin-markdown.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-markdown.ts
@@ -4,13 +4,12 @@ import type { Root } from "mdast";
import { fromMarkdown } from "mdast-util-from-markdown";
import type { Instance, Prop } from "@webstudio-is/project-build";
import { nanoid } from "nanoid";
-import {
- findClosestDroppableTarget,
- insertInstancesMutable,
-} from "../tree-utils";
+import { insertInstancesMutable } from "../tree-utils";
+import { findClosestDroppableTarget } from "../instance-utils";
import {
instancesStore,
propsStore,
+ registeredComponentMetasStore,
selectedInstanceSelectorStore,
selectedPageStore,
} from "../nano-states";
@@ -218,6 +217,7 @@ export const onPaste = (clipboardData: string) => {
}
}
const dropTarget = findClosestDroppableTarget(
+ registeredComponentMetasStore.get(),
instancesStore.get(),
instanceSelector,
dragComponents
diff --git a/apps/builder/app/shared/instance-utils.test.ts b/apps/builder/app/shared/instance-utils.test.ts
new file mode 100644
index 0000000000..c29af9aa33
--- /dev/null
+++ b/apps/builder/app/shared/instance-utils.test.ts
@@ -0,0 +1,242 @@
+import { describe, it, expect } from "@jest/globals";
+import { defaultMetas, type WsComponentMeta } from "@webstudio-is/react-sdk";
+import type { Instance } from "@webstudio-is/project-build";
+import {
+ findClosestDroppableComponentIndex,
+ findClosestDroppableTarget,
+} from "./instance-utils";
+
+const defaultMetasMap = new Map(Object.entries(defaultMetas));
+
+describe("find closest droppable component index", () => {
+ const createFakeComponentMetas = (
+ itemMeta: Partial<WsComponentMeta>,
+ anotherItemMeta?: Partial<WsComponentMeta>
+ ): Map<string, WsComponentMeta> => {
+ const base = {
+ label: "",
+ Icon: () => null,
+ };
+ const configs = {
+ Item: { ...base, type: "container", ...itemMeta },
+ AnotherItem: { ...base, type: "container", ...anotherItemMeta },
+ Bold: { ...base, type: "rich-text-child" },
+ TextBlock: { ...base, type: "rich-text" },
+ Form: { ...base, type: "container" },
+ Box: { ...base, type: "container" },
+ Div: { ...base, type: "container" },
+ Body: { ...base, type: "container" },
+ } as const;
+ return new Map(Object.entries(configs)) as Map<string, WsComponentMeta>;
+ };
+
+ it("finds container", () => {
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({}),
+ ["Box", "Body"],
+ ["Item"]
+ )
+ ).toEqual(0);
+ });
+
+ it("skips non containers", () => {
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({}),
+ ["Bold", "TextBlock", "Box", "Body"],
+ ["Item"]
+ )
+ ).toEqual(2);
+ });
+
+ it("can be dropped into itself", () => {
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({}),
+ ["Box", "Item", "Body"],
+ ["Item"]
+ )
+ ).toEqual(0);
+ });
+
+ it("can be forbidden to drop into itself", () => {
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({
+ invalidAncestors: ["Item"],
+ }),
+ ["Box", "Item", "Body"],
+ ["Item"]
+ )
+ ).toEqual(2);
+ });
+
+ it("requires some ancestor", () => {
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({
+ requiredAncestors: ["Form"],
+ }),
+ ["Box", "Body"],
+ ["Item"]
+ )
+ ).toEqual(-1);
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({
+ requiredAncestors: ["Form"],
+ }),
+ ["Box", "Form", "Body"],
+ ["Item"]
+ )
+ ).toEqual(0);
+ });
+
+ it("considers both required and invalid ancestors", () => {
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({
+ requiredAncestors: ["Form"],
+ invalidAncestors: ["Box"],
+ }),
+ ["Div", "Box", "Form", "Body"],
+ ["Item"]
+ )
+ ).toEqual(2);
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas({
+ requiredAncestors: ["Form"],
+ invalidAncestors: ["Box"],
+ }),
+ ["Div", "Form", "Box", "Body"],
+ ["Item"]
+ )
+ ).toEqual(-1);
+ });
+
+ it("considers multiple children", () => {
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas(
+ {
+ requiredAncestors: ["Form"],
+ },
+ {
+ requiredAncestors: ["Box"],
+ }
+ ),
+ ["Div", "Form", "Body"],
+ ["Item", "AnotherItem"]
+ )
+ ).toEqual(0);
+ expect(
+ findClosestDroppableComponentIndex(
+ createFakeComponentMetas(
+ {
+ requiredAncestors: ["Form"],
+ },
+ {
+ requiredAncestors: ["Box"],
+ }
+ ),
+ ["Div", "Box", "Body"],
+ ["Item", "AnotherItem"]
+ )
+ ).toEqual(0);
+ });
+});
+
+describe("find closest droppable target", () => {
+ const createInstancePair = (
+ id: Instance["id"],
+ component: string,
+ children: Instance["children"]
+ ): [Instance["id"], Instance] => {
+ return [id, { type: "instance", id, component, children }];
+ };
+
+ it("puts in the end if closest instance is container", () => {
+ const instances = new Map([
+ createInstancePair("body", "Body", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", [{ type: "id", value: "paragraph" }]),
+ createInstancePair("paragraph", "Paragraph", [
+ { type: "id", value: "bold" },
+ ]),
+ ]);
+ expect(
+ findClosestDroppableTarget(
+ defaultMetasMap,
+ instances,
+ ["box", "body"],
+ ["Box"]
+ )
+ ).toEqual({
+ parentSelector: ["box", "body"],
+ position: "end",
+ });
+ expect(
+ findClosestDroppableTarget(
+ defaultMetasMap,
+ instances,
+ ["not-existing", "body"],
+ ["Box"]
+ )
+ ).toEqual(undefined);
+ });
+
+ it("puts in the end of root instance", () => {
+ const instances = new Map([
+ createInstancePair("body", "Body", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", [{ type: "id", value: "paragraph" }]),
+ ]);
+ expect(
+ findClosestDroppableTarget(defaultMetasMap, instances, ["body"], ["Box"])
+ ).toEqual({
+ parentSelector: ["body"],
+ position: "end",
+ });
+ });
+
+ it("finds closest container and puts after its child within selection", () => {
+ const instances = new Map([
+ createInstancePair("body", "Body", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", [{ type: "id", value: "paragraph" }]),
+ createInstancePair("paragraph", "Paragraph", [
+ { type: "id", value: "bold" },
+ ]),
+ createInstancePair("bold", "Bold", []),
+ ]);
+ expect(
+ findClosestDroppableTarget(
+ defaultMetasMap,
+ instances,
+ ["bold", "paragraph", "box", "body"],
+ ["Box"]
+ )
+ ).toEqual({
+ parentSelector: ["box", "body"],
+ position: 1,
+ });
+ });
+
+ it("puts multiple children", () => {
+ const instances = new Map([
+ createInstancePair("body", "Body", [{ type: "id", value: "box" }]),
+ createInstancePair("box", "Box", [{ type: "id", value: "paragraph" }]),
+ createInstancePair("paragraph", "Paragraph", []),
+ ]);
+ expect(
+ findClosestDroppableTarget(
+ defaultMetasMap,
+ instances,
+ ["paragraph", "box", "body"],
+ ["Box", "Form"]
+ )
+ ).toEqual({
+ parentSelector: ["box", "body"],
+ position: 1,
+ });
+ });
+});
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index 36bb54dc53..d701907149 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -1,35 +1,130 @@
-import { findTreeInstanceIdsExcludingSlotDescendants } from "@webstudio-is/project-build";
+import store from "immerhin";
+import {
+ Instances,
+ findTreeInstanceIdsExcludingSlotDescendants,
+} from "@webstudio-is/project-build";
import {
- generateDataFromEmbedTemplate,
- getComponentMeta,
type WsEmbedTemplate,
+ type WsComponentMeta,
+ generateDataFromEmbedTemplate,
} from "@webstudio-is/react-sdk";
-import store from "immerhin";
-import { removeByMutable } from "./array-utils";
-import { isBaseBreakpoint } from "./breakpoints";
import {
- breakpointsStore,
- instancesStore,
propsStore,
+ stylesStore,
selectedInstanceSelectorStore,
- selectedStyleSourceSelectorStore,
styleSourceSelectionsStore,
styleSourcesStore,
- stylesStore,
+ instancesStore,
+ selectedStyleSourceSelectorStore,
textEditingInstanceSelectorStore,
+ breakpointsStore,
+ registeredComponentMetasStore,
} from "./nano-states";
import {
+ type DroppableTarget,
+ type InstanceSelector,
findLocalStyleSourcesWithinInstances,
- getAncestorInstanceSelector,
insertInstancesMutable,
+ reparentInstanceMutable,
+ getAncestorInstanceSelector,
insertPropsCopyMutable,
- insertStylesCopyMutable,
insertStyleSourcesCopyMutable,
insertStyleSourceSelectionsCopyMutable,
- reparentInstanceMutable,
- type DroppableTarget,
- type InstanceSelector,
+ insertStylesCopyMutable,
} from "./tree-utils";
+import { removeByMutable } from "./array-utils";
+import { isBaseBreakpoint } from "./breakpoints";
+
+export const findClosestDroppableComponentIndex = (
+ metas: Map<string, WsComponentMeta>,
+ componentSelector: string[],
+ childComponents: string[]
+) => {
+ const requiredAncestors = new Set<string>();
+ const invalidAncestors = new Set<string>();
+ for (const childComponent of childComponents) {
+ const childMeta = metas.get(childComponent);
+ if (childMeta?.requiredAncestors) {
+ for (const ancestorComponent of childMeta.requiredAncestors) {
+ requiredAncestors.add(ancestorComponent);
+ }
+ }
+ if (childMeta?.invalidAncestors) {
+ for (const ancestorComponent of childMeta.invalidAncestors) {
+ invalidAncestors.add(ancestorComponent);
+ }
+ }
+ }
+
+ let containerIndex = -1;
+ let requiredFound = false;
+ for (let index = 0; index < componentSelector.length; index += 1) {
+ const ancestorComponent = componentSelector[index];
+ if (invalidAncestors.has(ancestorComponent) === true) {
+ containerIndex = -1;
+ requiredFound = false;
+ continue;
+ }
+ if (requiredAncestors.has(ancestorComponent) === true) {
+ requiredFound = true;
+ }
+ const ancestorMeta = metas.get(ancestorComponent);
+ if (containerIndex === -1 && ancestorMeta?.type === "container") {
+ containerIndex = index;
+ }
+ }
+
+ if (requiredFound || requiredAncestors.size === 0) {
+ return containerIndex;
+ }
+ return -1;
+};
+
+export const findClosestDroppableTarget = (
+ metas: Map<string, WsComponentMeta>,
+ instances: Instances,
+ instanceSelector: InstanceSelector,
+ dragComponents: string[]
+): undefined | DroppableTarget => {
+ const componentSelector: string[] = [];
+ for (const instanceId of instanceSelector) {
+ const component = instances.get(instanceId)?.component;
+ if (component === undefined) {
+ return;
+ }
+ componentSelector.push(component);
+ }
+
+ const droppableIndex = findClosestDroppableComponentIndex(
+ metas,
+ componentSelector,
+ dragComponents
+ );
+ if (droppableIndex === -1) {
+ return;
+ }
+ if (droppableIndex === 0) {
+ return {
+ parentSelector: instanceSelector,
+ position: "end",
+ };
+ }
+
+ const dropTargetSelector = instanceSelector.slice(droppableIndex);
+ const dropTargetInstanceId = instanceSelector[droppableIndex];
+ const dropTargetInstance = instances.get(dropTargetInstanceId);
+ if (dropTargetInstance === undefined) {
+ return;
+ }
+ const lastChildInstanceId = instanceSelector[droppableIndex - 1];
+ const lastChildPosition = dropTargetInstance.children.findIndex(
+ (child) => child.type === "id" && child.value === lastChildInstanceId
+ );
+ return {
+ parentSelector: dropTargetSelector,
+ position: lastChildPosition + 1,
+ };
+};
export const insertTemplate = (
template: WsEmbedTemplate,
@@ -38,7 +133,6 @@ export const insertTemplate = (
const breakpoints = breakpointsStore.get();
const breakpointValues = Array.from(breakpoints.values());
const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);
-
if (baseBreakpoint === undefined) {
return;
}
@@ -93,7 +187,8 @@ export const insertNewComponentInstance = (
component: string,
dropTarget: DroppableTarget
) => {
- const componentMeta = getComponentMeta(component);
+ const metas = registeredComponentMetasStore.get();
+ const componentMeta = metas.get(component);
// when template not specified fallback to template with the component
const template = componentMeta?.template ?? [
{
diff --git a/apps/builder/app/shared/tree-utils.test.ts b/apps/builder/app/shared/tree-utils.test.ts
index a84ea9cf14..53d8aa64b1 100644
--- a/apps/builder/app/shared/tree-utils.test.ts
+++ b/apps/builder/app/shared/tree-utils.test.ts
@@ -13,7 +13,6 @@ import { getStyleDeclKey } from "@webstudio-is/project-build";
import {
type InstanceSelector,
cloneStyles,
- findClosestDroppableTarget,
findLocalStyleSourcesWithinInstances,
getAncestorInstanceSelector,
insertInstancesCopyMutable,
@@ -143,82 +142,6 @@ test("get ancestor instance selector", () => {
expect(getAncestorInstanceSelector(instanceSelector, "1")).toEqual(["1"]);
});
-test("find closest droppable target", () => {
- const instances = new Map([
- createInstancePair("root", "Body", [
- { type: "id", value: "box1" },
- { type: "id", value: "box2" },
- { type: "id", value: "box3" },
- ]),
- createInstancePair("box1", "Box", [
- { type: "id", value: "box11" },
- { type: "id", value: "box12" },
- { type: "id", value: "box13" },
- ]),
- createInstancePair("box11", "Box", []),
- createInstancePair("box12", "Box", []),
- createInstancePair("box13", "Box", []),
- createInstancePair("box2", "Box", [
- { type: "id", value: "paragraph21" },
- { type: "id", value: "box22" },
- ]),
- createInstancePair("paragraph21", "Paragraph", [
- { type: "id", value: "bold" },
- ]),
- createInstancePair("bold", "Bold", []),
- createInstancePair("box22", "Box", []),
- createInstancePair("box3", "Box", [
- { type: "id", value: "box31" },
- { type: "id", value: "box32" },
- { type: "id", value: "list33" },
- ]),
- createInstancePair("box31", "Box", []),
- createInstancePair("box32", "Box", []),
- createInstancePair("list33", "List", []),
- ]);
-
- expect(
- findClosestDroppableTarget(
- instances,
- ["bold", "paragraph21", "box2", "root"],
- ["Box"]
- )
- ).toEqual({
- parentSelector: ["box2", "root"],
- position: 1,
- });
- expect(
- findClosestDroppableTarget(instances, ["box3", "root"], ["Box"])
- ).toEqual({
- parentSelector: ["box3", "root"],
- position: "end",
- });
- expect(findClosestDroppableTarget(instances, ["root"], ["Box"])).toEqual({
- parentSelector: ["root"],
- position: "end",
- });
- expect(
- findClosestDroppableTarget(instances, ["box4", "root"], ["Box"])
- ).toEqual(undefined);
- expect(
- findClosestDroppableTarget(
- instances,
- ["box32", "box3", "root"],
- ["Box", "ListItem"]
- )
- ).toEqual(undefined);
- expect(
- findClosestDroppableTarget(
- instances,
- ["list33", "box3", "root"],
- ["Box", "ListItem"]
- )
- ).toEqual({
- parentSelector: ["list33", "box3", "root"],
- position: "end",
- });
-});
-
test("insert instances tree into target", () => {
const instances = new Map([
createInstancePair("root", "Body", [{ type: "id", value: "box1" }]),
diff --git a/apps/builder/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.ts
index a1caa89e66..cc03597fe5 100644
--- a/apps/builder/app/shared/tree-utils.ts
+++ b/apps/builder/app/shared/tree-utils.ts
@@ -18,7 +18,6 @@ import {
StyleSourceSelectionsList,
StyleSourcesList,
} from "@webstudio-is/project-build";
-import { canAcceptComponent } from "@webstudio-is/react-sdk";
import { equalMedia } from "@webstudio-is/css-engine";
// slots can have multiple parents so instance should be addressed
@@ -55,45 +54,6 @@ export type DroppableTarget = {
position: number | "end";
};
-export const findClosestDroppableTarget = (
- instances: Instances,
- instanceSelector: InstanceSelector,
- dragComponents: string[]
-): undefined | DroppableTarget => {
- // fallback to root as drop target when selector is stale
- let position = -1;
- let lastChild: undefined | Instance = undefined;
- for (const instanceId of instanceSelector) {
- const instance = instances.get(instanceId);
- if (instance === undefined) {
- return;
- }
- // find the index of child from selector
- if (lastChild) {
- const lastChildId = lastChild.id;
- position = instance.children.findIndex(
- (child) => child.type === "id" && child.value === lastChildId
- );
- }
- lastChild = instance;
- const canAcceptAllDragComponents = dragComponents.every((dragComponent) =>
- canAcceptComponent(instance.component, dragComponent)
- );
- if (canAcceptAllDragComponents) {
- const parentSelector = getAncestorInstanceSelector(
- instanceSelector,
- instance.id
- );
- if (parentSelector !== undefined) {
- return {
- parentSelector: parentSelector,
- position: position === -1 ? "end" : position + 1,
- };
- }
- }
- }
-};
-
const getInstanceOrCreateFragmentIfNecessary = (
instances: Instances,
instanceId: Instance["id"]
diff --git a/packages/design-system/src/components/tree/horizontal-shift.test.ts b/packages/design-system/src/components/tree/horizontal-shift.test.ts
index 35b1a6235a..049f647b81 100644
--- a/packages/design-system/src/components/tree/horizontal-shift.test.ts
+++ b/packages/design-system/src/components/tree/horizontal-shift.test.ts
@@ -112,8 +112,8 @@ const render = (
placementIndicator,
getIsExpanded: (itemSelector: ItemSelector) =>
(findItemById(tree, itemSelector[0])?.children.length ?? 0) > 0,
- canAcceptChild: (itemId: ItemId) =>
- findItemById(tree, itemId)?.canAcceptChildren ?? false,
+ canAcceptChild: (itemSelector: ItemSelector) =>
+ findItemById(tree, itemSelector[0])?.canAcceptChildren ?? false,
getItemChildren: (itemId: ItemId) =>
findItemById(tree, itemId)?.children ?? [],
isItemHidden: (_itemId: ItemId) => false,
diff --git a/packages/design-system/src/components/tree/horizontal-shift.ts b/packages/design-system/src/components/tree/horizontal-shift.ts
index a9379058e8..bf1cb5d49e 100644
--- a/packages/design-system/src/components/tree/horizontal-shift.ts
+++ b/packages/design-system/src/components/tree/horizontal-shift.ts
@@ -19,7 +19,7 @@ export const useHorizontalShift = <Data extends { id: ItemId }>({
getItemChildren,
}: {
getItemChildren: (itemId: ItemId) => Data[];
- canAcceptChild: (itemId: ItemId) => boolean;
+ canAcceptChild: (itemSelector: ItemSelector) => boolean;
isItemHidden: (itemId: ItemId) => boolean;
dragItemSelector: undefined | ItemSelector;
dropTarget: ItemDropTarget | undefined;
@@ -107,17 +107,16 @@ export const useHorizontalShift = <Data extends { id: ItemId }>({
) {
break;
}
- if (canAcceptChild(dropItemSelector[index])) {
- newParentSelector = dropItemSelector.slice(index);
+ const currentItemSelector = dropItemSelector.slice(index);
+ if (canAcceptChild(currentItemSelector)) {
+ newParentSelector = currentItemSelector;
const children = getItemChildren(dropItemSelector[index]);
const childId = dropItemSelector[index - 1] ?? children.at(-1)?.id;
const childPosition = children.findIndex(
(item) => item.id === childId
);
newPosition = childPosition + 1;
- continue;
}
- break;
}
const shifted = newParentSelector.length - dropItemSelector.length;
@@ -181,12 +180,16 @@ export const useHorizontalShift = <Data extends { id: ItemId }>({
let newPosition = deepestAtTheBottomPosition;
for (
- let index = deepestAtTheBottomItemSelector.length - desiredDepth;
+ let index = Math.max(
+ 0,
+ deepestAtTheBottomItemSelector.length - desiredDepth
+ );
index < deepestAtTheBottomItemSelector.length;
index += 1
) {
- if (canAcceptChild(deepestAtTheBottomItemSelector[index])) {
- newParentSelector = deepestAtTheBottomItemSelector.slice(index);
+ const currentItemSelector = deepestAtTheBottomItemSelector.slice(index);
+ if (canAcceptChild(currentItemSelector)) {
+ newParentSelector = currentItemSelector;
const children = getItemChildren(
deepestAtTheBottomItemSelector[index]
);
diff --git a/packages/design-system/src/components/tree/tree.stories.tsx b/packages/design-system/src/components/tree/tree.stories.tsx
index 14b8818010..8888fc09d3 100644
--- a/packages/design-system/src/components/tree/tree.stories.tsx
+++ b/packages/design-system/src/components/tree/tree.stories.tsx
@@ -84,12 +84,14 @@ export const StressTest = () => {
return (
<Flex css={{ width: 300, height: 500, flexDirection: "column" }}>
<Tree
- canAcceptChild={(itemId) => {
- const item = findItemById(root, itemId);
- return (
- (item?.canAcceptChildren ?? false) &&
- (item?.isHidden ?? false) === false
- );
+ findClosestDroppableIndex={(itemSelector) => {
+ return itemSelector.findIndex((itemId) => {
+ const item = findItemById(root, itemId);
+ return (
+ (item?.canAcceptChildren ?? false) &&
+ (item?.isHidden ?? false) === false
+ );
+ });
}}
canLeaveParent={() => true}
getItemChildren={(itemId) => findItemById(root, itemId)?.children ?? []}
diff --git a/packages/design-system/src/components/tree/tree.tsx b/packages/design-system/src/components/tree/tree.tsx
index 3a04a618e2..b59243be05 100644
--- a/packages/design-system/src/components/tree/tree.tsx
+++ b/packages/design-system/src/components/tree/tree.tsx
@@ -30,7 +30,7 @@ export type TreeProps<Data extends { id: string }> = {
dropTarget: undefined | ItemDropTarget;
canLeaveParent: (itemId: ItemId) => boolean;
- canAcceptChild: (itemId: ItemId) => boolean;
+ findClosestDroppableIndex: (itemSelector: ItemSelector) => number;
getItemChildren: (itemId: ItemId) => Data[];
isItemHidden: (itemId: ItemId) => boolean;
renderItem: (props: TreeItemRenderProps<Data>) => React.ReactNode;
@@ -65,7 +65,7 @@ export const Tree = <Data extends { id: string }>({
dragItemSelector,
dropTarget,
canLeaveParent,
- canAcceptChild,
+ findClosestDroppableIndex,
getItemChildren,
isItemHidden,
renderItem,
@@ -100,6 +100,14 @@ export const Tree = <Data extends { id: string }>({
});
}, [dropTarget]);
+ const canAcceptChild = useCallback(
+ (itemSelector: ItemSelector) => {
+ const ancestorIndex = findClosestDroppableIndex(itemSelector);
+ return ancestorIndex === 0;
+ },
+ [findClosestDroppableIndex]
+ );
+
const [shiftedDropTarget, setHorizontalShift] = useHorizontalShift({
dragItemSelector,
dropTarget,
@@ -157,9 +165,7 @@ export const Tree = <Data extends { id: string }>({
}
// select closest droppable
- const ancestorIndex = newDropItemSelector.findIndex((itemId) =>
- canAcceptChild(itemId)
- );
+ const ancestorIndex = findClosestDroppableIndex(newDropItemSelector);
if (ancestorIndex === -1) {
return;
}
diff --git a/packages/react-sdk/src/components/button.ws.tsx b/packages/react-sdk/src/components/button.ws.tsx
index 2a498ad6eb..859d71c179 100644
--- a/packages/react-sdk/src/components/button.ws.tsx
+++ b/packages/react-sdk/src/components/button.ws.tsx
@@ -16,6 +16,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
type: "container",
+ invalidAncestors: ["Button"],
label: "Button",
icon: ButtonElementIcon,
presetStyle,
diff --git a/packages/react-sdk/src/components/component-meta.ts b/packages/react-sdk/src/components/component-meta.ts
index 885406b79e..400cfe1b91 100644
--- a/packages/react-sdk/src/components/component-meta.ts
+++ b/packages/react-sdk/src/components/component-meta.ts
@@ -55,7 +55,8 @@ const WsComponentMeta = z.object({
"rich-text",
"rich-text-child",
]),
- acceptedParents: z.optional(z.array(z.string())),
+ requiredAncestors: z.optional(z.array(z.string())),
+ invalidAncestors: z.optional(z.array(z.string())),
label: z.string(),
icon: z.string(),
presetStyle: z.optional(z.record(z.string(), EmbedTemplateStyleDecl)),
diff --git a/packages/react-sdk/src/components/index.ts b/packages/react-sdk/src/components/index.ts
index 56a95280e9..5bd9379be1 100644
--- a/packages/react-sdk/src/components/index.ts
+++ b/packages/react-sdk/src/components/index.ts
@@ -157,18 +157,3 @@ export const defaultPropsMetas: Record<string, WsComponentPropsMeta> = {
CheckboxField: CheckboxFieldPropsMeta,
Checkbox: CheckboxPropsMeta,
};
-
-export const canAcceptComponent = (
- parentComponent: string,
- childComponent: string
-) => {
- const parentMeta = getComponentMeta(parentComponent);
- const childMeta = getComponentMeta(childComponent);
- if (parentMeta?.type !== "container" || childMeta === undefined) {
- return false;
- }
- return (
- childMeta.acceptedParents === undefined ||
- childMeta.acceptedParents.includes(parentComponent)
- );
-};
diff --git a/packages/react-sdk/src/components/list-item.ws.tsx b/packages/react-sdk/src/components/list-item.ws.tsx
index 4b4b20dd27..2281b655f7 100644
--- a/packages/react-sdk/src/components/list-item.ws.tsx
+++ b/packages/react-sdk/src/components/list-item.ws.tsx
@@ -16,7 +16,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "typography",
type: "rich-text",
- acceptedParents: ["List"],
+ requiredAncestors: ["List"],
label: "List Item",
icon: ListItemIcon,
states: defaultStates,