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.

refactor: describe descendants in component content model (#5140)

Bogdan Chadkina449f66c774b
diff --git a/apps/builder/app/shared/content-model.test.tsx b/apps/builder/app/shared/content-model.test.tsx
index 2c985c51d1..5278344b59 100644
--- a/apps/builder/app/shared/content-model.test.tsx
+++ b/apps/builder/app/shared/content-model.test.tsx
@@ -561,41 +561,6 @@ describe("component content model", () => {
).toBeFalsy();
});
- test("prevent self nesting with descendants restriction", () => {
- expect(
- isTreeSatisfyingContentModel({
- ...renderData(
- <ws.element ws:tag="body" ws:id="bodyId">
- <$.Vimeo>
- <$.VimeoSpinner>
- <$.VimeoSpinner></$.VimeoSpinner>
- </$.VimeoSpinner>
- </$.Vimeo>
- </ws.element>
- ),
- metas: defaultMetas,
- instanceSelector: ["bodyId"],
- })
- ).toBeFalsy();
- expect(
- isTreeSatisfyingContentModel({
- ...renderData(
- <ws.element ws:tag="body" ws:id="bodyId">
- <$.Vimeo>
- <$.VimeoSpinner>
- <$.Vimeo>
- <$.VimeoSpinner></$.VimeoSpinner>
- </$.Vimeo>
- </$.VimeoSpinner>
- </$.Vimeo>
- </ws.element>
- ),
- metas: defaultMetas,
- instanceSelector: ["bodyId"],
- })
- ).toBeTruthy();
- });
-
test("pass constraints when check deep in the tree", () => {
expect(
isTreeSatisfyingContentModel({
diff --git a/apps/builder/app/shared/content-model.ts b/apps/builder/app/shared/content-model.ts
index 815ad42e22..2e59acaa5f 100644
--- a/apps/builder/app/shared/content-model.ts
+++ b/apps/builder/app/shared/content-model.ts
@@ -178,7 +178,7 @@ const computeAllowedCategories = ({
const defaultComponentContentModel: ContentModel = {
category: "instance",
- children: ["rich-text", "instance", "transparent"],
+ children: ["rich-text", "instance"],
};
const getComponentContentModel = (meta: undefined | WsComponentMeta) =>
@@ -187,45 +187,29 @@ const getComponentContentModel = (meta: undefined | WsComponentMeta) =>
const isComponentSatisfyingContentModel = ({
metas,
component,
- allowedCategories,
+ allowedParentCategories,
+ allowedAncestorCategories,
}: {
metas: Metas;
component: string;
- allowedCategories: undefined | string[];
+ allowedParentCategories: undefined | string[];
+ allowedAncestorCategories: undefined | string[];
}) => {
const contentModel = getComponentContentModel(metas.get(component));
return (
// body does not have parent
- allowedCategories === undefined ||
+ allowedParentCategories === undefined ||
// parents may restrict specific components with none category
// any instances
// or nothing
- allowedCategories.includes(component) ||
- allowedCategories.includes(contentModel.category)
+ allowedParentCategories.includes(component) ||
+ allowedParentCategories.includes(contentModel.category) ||
+ allowedAncestorCategories?.includes(component) === true ||
+ allowedAncestorCategories?.includes(contentModel.category) === true
);
};
-const getComponentChildrenCategories = ({
- metas,
- component,
- allowedCategories,
-}: {
- metas: Metas;
- component: string;
- allowedCategories: undefined | string[];
-}) => {
- const contentModel = getComponentContentModel(metas.get(component));
- let childrenCategories = contentModel.children;
- // transparent categories makes component inherit constraints from parent
- if (childrenCategories.includes("transparent") && allowedCategories) {
- childrenCategories = Array.from(
- new Set([...childrenCategories, ...allowedCategories])
- );
- }
- return childrenCategories;
-};
-
-const computeAllowedComponentCategories = ({
+const computeAllowedAncestorCategories = ({
instances,
metas,
instanceSelector,
@@ -234,24 +218,43 @@ const computeAllowedComponentCategories = ({
metas: Metas;
instanceSelector: InstanceSelector;
}) => {
- let instance: undefined | Instance;
let allowedCategories: undefined | string[];
// skip selected instance for which these constraints are computed
for (const instanceId of instanceSelector.slice(1).reverse()) {
- instance = instances.get(instanceId);
+ const instance = instances.get(instanceId);
// collection item can be undefined
if (instance === undefined) {
continue;
}
- allowedCategories = getComponentChildrenCategories({
- metas,
- component: instance.component,
- allowedCategories,
- });
+ const contentModel = getComponentContentModel(
+ metas.get(instance.component)
+ );
+ if (contentModel.descendants) {
+ allowedCategories ??= [];
+ allowedCategories = [...allowedCategories, ...contentModel.descendants];
+ }
}
return allowedCategories;
};
+const getAllowedParentCategories = ({
+ instances,
+ metas,
+ instanceSelector,
+}: {
+ instances: Instances;
+ metas: Metas;
+ instanceSelector: InstanceSelector;
+}) => {
+ const instanceId = instanceSelector[1];
+ const instance = instances.get(instanceId);
+ if (instance === undefined) {
+ return;
+ }
+ const contentModel = getComponentContentModel(metas.get(instance.component));
+ return contentModel.children;
+};
+
/**
* Check all tags starting with specified instance select
* for example
@@ -294,7 +297,8 @@ export const isTreeSatisfyingContentModel = ({
instanceSelector,
onError,
_allowedCategories: allowedCategories,
- _allowedComponentCategories: allowedComponentCategories,
+ _allowedAncestorCategories: allowedAncestorCategories,
+ _allowedParentCategories: allowedParentCategories,
}: {
instances: Instances;
props: Props;
@@ -302,7 +306,8 @@ export const isTreeSatisfyingContentModel = ({
instanceSelector: InstanceSelector;
onError?: (message: string) => void;
_allowedCategories?: string[];
- _allowedComponentCategories?: string[];
+ _allowedAncestorCategories?: string[];
+ _allowedParentCategories?: string[];
}): boolean => {
// compute constraints only when not passed from parent
allowedCategories ??= computeAllowedCategories({
@@ -311,7 +316,12 @@ export const isTreeSatisfyingContentModel = ({
props,
metas,
});
- allowedComponentCategories ??= computeAllowedComponentCategories({
+ allowedParentCategories ??= getAllowedParentCategories({
+ instanceSelector,
+ instances,
+ metas,
+ });
+ allowedAncestorCategories ??= computeAllowedAncestorCategories({
instanceSelector,
instances,
metas,
@@ -344,7 +354,8 @@ export const isTreeSatisfyingContentModel = ({
const isComponentSatisfying = isComponentSatisfyingContentModel({
metas,
component: instance.component,
- allowedCategories: allowedComponentCategories,
+ allowedParentCategories,
+ allowedAncestorCategories,
});
if (isComponentSatisfying === false) {
const [_namespace, name] = parseComponentName(instance.component);
@@ -363,6 +374,16 @@ export const isTreeSatisfyingContentModel = ({
}
}
let isSatisfying = isTagSatisfying && isComponentSatisfying;
+ const contentModel = getComponentContentModel(metas.get(instance.component));
+ allowedCategories = getTagChildrenCategories(tag, allowedCategories);
+ allowedParentCategories = contentModel.children;
+ if (contentModel.descendants) {
+ allowedAncestorCategories ??= [];
+ allowedAncestorCategories = [
+ ...allowedAncestorCategories,
+ ...contentModel.descendants,
+ ];
+ }
for (const child of instance.children) {
if (child.type === "id") {
isSatisfying &&= isTreeSatisfyingContentModel({
@@ -371,12 +392,9 @@ export const isTreeSatisfyingContentModel = ({
metas,
instanceSelector: [child.value, ...instanceSelector],
onError,
- _allowedCategories: getTagChildrenCategories(tag, allowedCategories),
- _allowedComponentCategories: getComponentChildrenCategories({
- metas,
- component: instance.component,
- allowedCategories: allowedComponentCategories,
- }),
+ _allowedCategories: allowedCategories,
+ _allowedParentCategories: allowedParentCategories,
+ _allowedAncestorCategories: allowedAncestorCategories,
});
}
}
diff --git a/packages/sdk-components-animation/src/animate-children.ws.ts b/packages/sdk-components-animation/src/animate-children.ws.ts
index 361b4cbcd8..b79effca6c 100644
--- a/packages/sdk-components-animation/src/animate-children.ws.ts
+++ b/packages/sdk-components-animation/src/animate-children.ws.ts
@@ -1,5 +1,6 @@
import { AnimationGroupIcon } from "@webstudio-is/icons/svg";
import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
+import { animation } from "./shared/meta";
export const meta: WsComponentMeta = {
category: "animations",
@@ -8,9 +9,14 @@ export const meta: WsComponentMeta = {
icon: AnimationGroupIcon,
order: 5,
label: "Animation Group",
- constraints: {
- relation: "child",
- text: false,
+ contentModel: {
+ category: "instance",
+ children: [
+ "instance",
+ animation.AnimateText,
+ animation.StaggerAnimation,
+ animation.VideoAnimation,
+ ],
},
};
diff --git a/packages/sdk-components-animation/src/animate-text.ws.ts b/packages/sdk-components-animation/src/animate-text.ws.ts
index 43841609b0..ceafc62250 100644
--- a/packages/sdk-components-animation/src/animate-text.ws.ts
+++ b/packages/sdk-components-animation/src/animate-text.ws.ts
@@ -1,8 +1,7 @@
import { TextAnimationIcon } from "@webstudio-is/icons/svg";
import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
-import { animation } from "./shared/meta";
-import { props } from "./__generated__/animate-text.props";
import { div } from "@webstudio-is/sdk/normalize.css";
+import { props } from "./__generated__/animate-text.props";
export const meta: WsComponentMeta = {
category: "animations",
@@ -12,13 +11,10 @@ export const meta: WsComponentMeta = {
icon: TextAnimationIcon,
order: 6,
label: "Text Animation",
- constraints: [
- { relation: "parent", component: { $eq: animation.AnimateChildren } },
- {
- relation: "child",
- text: false,
- },
- ],
+ contentModel: {
+ category: "none",
+ children: ["instance"],
+ },
presetStyle: {
div,
},
diff --git a/packages/sdk-components-animation/src/stagger-animation.ws.ts b/packages/sdk-components-animation/src/stagger-animation.ws.ts
index 7d598fe044..696075104e 100644
--- a/packages/sdk-components-animation/src/stagger-animation.ws.ts
+++ b/packages/sdk-components-animation/src/stagger-animation.ws.ts
@@ -1,8 +1,7 @@
import { StaggerAnimationIcon } from "@webstudio-is/icons/svg";
import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
-import { animation } from "./shared/meta";
-import { props } from "./__generated__/stagger-animation.props";
import { div } from "@webstudio-is/sdk/normalize.css";
+import { props } from "./__generated__/stagger-animation.props";
export const meta: WsComponentMeta = {
category: "animations",
@@ -12,13 +11,10 @@ export const meta: WsComponentMeta = {
icon: StaggerAnimationIcon,
order: 6,
label: "Stagger Animation",
- constraints: [
- { relation: "parent", component: { $eq: animation.AnimateChildren } },
- {
- relation: "child",
- text: false,
- },
- ],
+ contentModel: {
+ category: "none",
+ children: ["instance"],
+ },
presetStyle: {
div,
},
diff --git a/packages/sdk-components-animation/src/video-animation.ws.ts b/packages/sdk-components-animation/src/video-animation.ws.ts
index 1ccfdfb803..c36e91d618 100644
--- a/packages/sdk-components-animation/src/video-animation.ws.ts
+++ b/packages/sdk-components-animation/src/video-animation.ws.ts
@@ -1,19 +1,15 @@
import { Youtube1cIcon } from "@webstudio-is/icons/svg";
import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
-import { animation } from "./shared/meta";
import { props } from "./__generated__/video-animation.props";
export const meta: WsComponentMeta = {
type: "container",
icon: Youtube1cIcon,
label: "Video Animation",
- constraints: [
- { relation: "parent", component: { $eq: animation.AnimateChildren } },
- {
- relation: "child",
- text: false,
- },
- ],
+ contentModel: {
+ category: "none",
+ children: ["instance"],
+ },
};
export const propsMeta: WsComponentPropsMeta = {
diff --git a/packages/sdk-components-react/src/blockquote.ws.ts b/packages/sdk-components-react/src/blockquote.ws.ts
index dc6137e4f8..85506c5882 100644
--- a/packages/sdk-components-react/src/blockquote.ws.ts
+++ b/packages/sdk-components-react/src/blockquote.ws.ts
@@ -60,7 +60,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
placeholder: "Blockquote",
icon: BlockquoteIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/body.ws.ts b/packages/sdk-components-react/src/body.ws.ts
index 318bcc97f6..8fff174b07 100644
--- a/packages/sdk-components-react/src/body.ws.ts
+++ b/packages/sdk-components-react/src/body.ws.ts
@@ -24,7 +24,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
icon: BodyIcon,
states: defaultStates,
presetStyle,
diff --git a/packages/sdk-components-react/src/bold.ws.ts b/packages/sdk-components-react/src/bold.ws.ts
index d6b3843590..435fb05209 100644
--- a/packages/sdk-components-react/src/bold.ws.ts
+++ b/packages/sdk-components-react/src/bold.ws.ts
@@ -14,7 +14,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
label: "Bold Text",
icon: BoldIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/box.ws.ts b/packages/sdk-components-react/src/box.ws.ts
index 0b40c52201..ed99c8027a 100644
--- a/packages/sdk-components-react/src/box.ws.ts
+++ b/packages/sdk-components-react/src/box.ws.ts
@@ -20,7 +20,6 @@ import { props } from "./__generated__/box.props";
export const meta: WsComponentMeta = {
category: "general",
- type: "container",
description:
"A container for content. By default this is a Div, but the tag can be changed in settings.",
icon: BoxIcon,
diff --git a/packages/sdk-components-react/src/button.ws.ts b/packages/sdk-components-react/src/button.ws.ts
index d39135ce62..14fe4cad8e 100644
--- a/packages/sdk-components-react/src/button.ws.ts
+++ b/packages/sdk-components-react/src/button.ws.ts
@@ -15,7 +15,6 @@ const presetStyle = {
export const meta: WsComponentMeta = {
icon: ButtonElementIcon,
- type: "container",
presetStyle,
states: [
...defaultStates,
diff --git a/packages/sdk-components-react/src/form.ws.ts b/packages/sdk-components-react/src/form.ws.ts
index 64680f9cd3..2cdbca7c2a 100644
--- a/packages/sdk-components-react/src/form.ws.ts
+++ b/packages/sdk-components-react/src/form.ws.ts
@@ -18,7 +18,6 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
- type: "container",
label: "Form",
description: "Create filters, surveys, searches and more.",
icon: FormIcon,
diff --git a/packages/sdk-components-react/src/fragment.ws.ts b/packages/sdk-components-react/src/fragment.ws.ts
index 709ab7e280..b73096b264 100644
--- a/packages/sdk-components-react/src/fragment.ws.ts
+++ b/packages/sdk-components-react/src/fragment.ws.ts
@@ -1,7 +1,6 @@
import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
export const meta: WsComponentMeta = {
- type: "container",
icon: "",
};
diff --git a/packages/sdk-components-react/src/head-slot.ws.ts b/packages/sdk-components-react/src/head-slot.ws.ts
index 28991e1dd5..d9fe19f216 100644
--- a/packages/sdk-components-react/src/head-slot.ws.ts
+++ b/packages/sdk-components-react/src/head-slot.ws.ts
@@ -7,7 +7,6 @@ import { props } from "./__generated__/head.props";
export const meta: WsComponentMeta = {
icon: HeaderIcon,
- type: "container",
description: "Inserts children into the head of the document",
contentModel: {
category: "instance",
diff --git a/packages/sdk-components-react/src/head-title.ws.ts b/packages/sdk-components-react/src/head-title.ws.ts
index 55bd6b3cdf..7c3394781b 100644
--- a/packages/sdk-components-react/src/head-title.ws.ts
+++ b/packages/sdk-components-react/src/head-title.ws.ts
@@ -1,13 +1,9 @@
import { WindowTitleIcon } from "@webstudio-is/icons/svg";
-import {
- type WsComponentMeta,
- type WsComponentPropsMeta,
-} from "@webstudio-is/sdk";
+import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
import { props } from "./__generated__/head-title.props";
export const meta: WsComponentMeta = {
icon: WindowTitleIcon,
- type: "container",
contentModel: {
category: "none",
children: ["text"],
diff --git a/packages/sdk-components-react/src/heading.ws.ts b/packages/sdk-components-react/src/heading.ws.ts
index 3a31343b6f..d77736a5ec 100644
--- a/packages/sdk-components-react/src/heading.ws.ts
+++ b/packages/sdk-components-react/src/heading.ws.ts
@@ -8,7 +8,6 @@ import { h1, h2, h3, h4, h5, h6 } from "@webstudio-is/sdk/normalize.css";
import { props } from "./__generated__/heading.props";
export const meta: WsComponentMeta = {
- type: "container",
placeholder: "Heading",
icon: HeadingIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/html-embed.ws.ts b/packages/sdk-components-react/src/html-embed.ws.ts
index e1e0ac0006..3b02b914c0 100644
--- a/packages/sdk-components-react/src/html-embed.ws.ts
+++ b/packages/sdk-components-react/src/html-embed.ws.ts
@@ -8,7 +8,6 @@ import { props } from "./__generated__/html-embed.props";
export const meta: WsComponentMeta = {
category: "general",
- type: "container",
label: "HTML Embed",
description: "Used to add HTML code to the page, such as an SVG or script.",
icon: EmbedIcon,
diff --git a/packages/sdk-components-react/src/italic.ws.ts b/packages/sdk-components-react/src/italic.ws.ts
index 258c59b53c..57850862d3 100644
--- a/packages/sdk-components-react/src/italic.ws.ts
+++ b/packages/sdk-components-react/src/italic.ws.ts
@@ -20,7 +20,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
label: "Italic Text",
icon: TextItalicIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/label.ws.ts b/packages/sdk-components-react/src/label.ws.ts
index d14e241e8e..ec4b111f3a 100644
--- a/packages/sdk-components-react/src/label.ws.ts
+++ b/packages/sdk-components-react/src/label.ws.ts
@@ -17,7 +17,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
label: "Input Label",
icon: LabelIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/link.ws.ts b/packages/sdk-components-react/src/link.ws.ts
index 930f20eb3a..6b75f3ace5 100644
--- a/packages/sdk-components-react/src/link.ws.ts
+++ b/packages/sdk-components-react/src/link.ws.ts
@@ -20,7 +20,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
placeholder: "Link",
icon: LinkIcon,
presetStyle,
diff --git a/packages/sdk-components-react/src/list-item.ws.ts b/packages/sdk-components-react/src/list-item.ws.ts
index b7c8b91b49..9b4decb703 100644
--- a/packages/sdk-components-react/src/list-item.ws.ts
+++ b/packages/sdk-components-react/src/list-item.ws.ts
@@ -8,7 +8,6 @@ import { li } from "@webstudio-is/sdk/normalize.css";
import { props } from "./__generated__/list-item.props";
export const meta: WsComponentMeta = {
- type: "container",
placeholder: "List item",
icon: ListItemIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/list.ws.ts b/packages/sdk-components-react/src/list.ws.ts
index 2af94a0d54..291efb4ce2 100644
--- a/packages/sdk-components-react/src/list.ws.ts
+++ b/packages/sdk-components-react/src/list.ws.ts
@@ -43,7 +43,6 @@ const presetStyle = {
} satisfies PresetStyle<ListTag>;
export const meta: WsComponentMeta = {
- type: "container",
icon: ListIcon,
states: defaultStates,
presetStyle,
diff --git a/packages/sdk-components-react/src/markdown-embed.ws.ts b/packages/sdk-components-react/src/markdown-embed.ws.ts
index 48d1120644..bcd5ae668d 100644
--- a/packages/sdk-components-react/src/markdown-embed.ws.ts
+++ b/packages/sdk-components-react/src/markdown-embed.ws.ts
@@ -7,7 +7,6 @@ import {
import { props } from "./__generated__/markdown-embed.props";
export const meta: WsComponentMeta = {
- type: "container",
icon: MarkdownEmbedIcon,
contentModel: {
category: "instance",
diff --git a/packages/sdk-components-react/src/paragraph.ws.ts b/packages/sdk-components-react/src/paragraph.ws.ts
index 8147d73900..987e93ad92 100644
--- a/packages/sdk-components-react/src/paragraph.ws.ts
+++ b/packages/sdk-components-react/src/paragraph.ws.ts
@@ -14,7 +14,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
placeholder: "Paragraph",
icon: TextAlignLeftIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/rich-text-link.ws.ts b/packages/sdk-components-react/src/rich-text-link.ws.ts
index a5328bae44..7d17f8e202 100644
--- a/packages/sdk-components-react/src/rich-text-link.ws.ts
+++ b/packages/sdk-components-react/src/rich-text-link.ws.ts
@@ -1,9 +1,6 @@
import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
import { meta as linkMeta, propsMeta as linkPropsMeta } from "./link.ws";
-export const meta: WsComponentMeta = {
- ...linkMeta,
- type: "container",
-};
+export const meta: WsComponentMeta = linkMeta;
export const propsMeta: WsComponentPropsMeta = linkPropsMeta;
diff --git a/packages/sdk-components-react/src/select.ws.ts b/packages/sdk-components-react/src/select.ws.ts
index 2609905924..251b2518e7 100644
--- a/packages/sdk-components-react/src/select.ws.ts
+++ b/packages/sdk-components-react/src/select.ws.ts
@@ -20,7 +20,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
icon: SelectIcon,
presetStyle,
states: [
diff --git a/packages/sdk-components-react/src/slot.ws.ts b/packages/sdk-components-react/src/slot.ws.ts
index 8b2caa58df..5b6146fce4 100644
--- a/packages/sdk-components-react/src/slot.ws.ts
+++ b/packages/sdk-components-react/src/slot.ws.ts
@@ -3,7 +3,6 @@ import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";
export const meta: WsComponentMeta = {
category: "general",
- type: "container",
description:
"Slot is a container for content that you want to reference across the project. Changes made to a Slot's children will be reflected in all other instances of that Slot.",
icon: SlotComponentIcon,
diff --git a/packages/sdk-components-react/src/span.ws.ts b/packages/sdk-components-react/src/span.ws.ts
index 5a53475e4f..c23c167545 100644
--- a/packages/sdk-components-react/src/span.ws.ts
+++ b/packages/sdk-components-react/src/span.ws.ts
@@ -14,7 +14,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
label: "Text",
icon: PaintBrushIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/subscript.ws.ts b/packages/sdk-components-react/src/subscript.ws.ts
index 56d132092a..f5bef6181e 100644
--- a/packages/sdk-components-react/src/subscript.ws.ts
+++ b/packages/sdk-components-react/src/subscript.ws.ts
@@ -14,7 +14,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
label: "Subscript Text",
icon: SubscriptIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/superscript.ws.ts b/packages/sdk-components-react/src/superscript.ws.ts
index 57b3916b09..febf5335b2 100644
--- a/packages/sdk-components-react/src/superscript.ws.ts
+++ b/packages/sdk-components-react/src/superscript.ws.ts
@@ -14,7 +14,6 @@ const presetStyle = {
} satisfies PresetStyle<typeof defaultTag>;
export const meta: WsComponentMeta = {
- type: "container",
label: "Superscript Text",
icon: SuperscriptIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/text.ws.ts b/packages/sdk-components-react/src/text.ws.ts
index 30eb6c7e25..9ab5ea1ba8 100644
--- a/packages/sdk-components-react/src/text.ws.ts
+++ b/packages/sdk-components-react/src/text.ws.ts
@@ -8,7 +8,6 @@ import { div } from "@webstudio-is/sdk/normalize.css";
import { props } from "./__generated__/text.props";
export const meta: WsComponentMeta = {
- type: "container",
icon: TextIcon,
states: defaultStates,
presetStyle: {
diff --git a/packages/sdk-components-react/src/time.ws.ts b/packages/sdk-components-react/src/time.ws.ts
index 2de9877e03..fac7407f7b 100644
--- a/packages/sdk-components-react/src/time.ws.ts
+++ b/packages/sdk-components-react/src/time.ws.ts
@@ -14,7 +14,6 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "localization",
- type: "container",
description:
"Converts machine-readable date and time to a human-readable format.",
icon: CalendarIcon,
diff --git a/packages/sdk-components-react/src/vimeo-play-button.ws.ts b/packages/sdk-components-react/src/vimeo-play-button.ws.ts
index 94e8370cc7..3aff78787c 100644
--- a/packages/sdk-components-react/src/vimeo-play-button.ws.ts
+++ b/packages/sdk-components-react/src/vimeo-play-button.ws.ts
@@ -9,7 +9,6 @@ import { props } from "./__generated__/vimeo-play-button.props";
export const meta: WsComponentMeta = {
category: "hidden",
- type: "container",
label: "Play Button",
icon: ButtonElementIcon,
states: defaultStates,
diff --git a/packages/sdk-components-react/src/vimeo-spinner.ws.ts b/packages/sdk-components-react/src/vimeo-spinner.ws.ts
index 78ce97d307..21e949c625 100644
--- a/packages/sdk-components-react/src/vimeo-spinner.ws.ts
+++ b/packages/sdk-components-react/src/vimeo-spinner.ws.ts
@@ -8,7 +8,6 @@ import { BoxIcon } from "@webstudio-is/icons/svg";
import { props } from "./__generated__/vimeo-spinner.props";
export const meta: WsComponentMeta = {
- type: "container",
icon: BoxIcon,
states: defaultStates,
category: "hidden",
diff --git a/packages/sdk-components-react/src/vimeo.ws.ts b/packages/sdk-components-react/src/vimeo.ws.ts
index 8e3136e209..4237dc2da7 100644
--- a/packages/sdk-components-react/src/vimeo.ws.ts
+++ b/packages/sdk-components-react/src/vimeo.ws.ts
@@ -10,17 +10,12 @@ import { props } from "./__generated__/vimeo.props";
import type { Vimeo } from "./vimeo";
export const meta: WsComponentMeta = {
- type: "container",
icon: VimeoIcon,
states: defaultStates,
contentModel: {
category: "instance",
- children: [
- "instance",
- "VimeoSpinner",
- "VimeoPlayButton",
- "VimeoPreviewImage",
- ],
+ children: ["instance"],
+ descendants: ["VimeoSpinner", "VimeoPlayButton", "VimeoPreviewImage"],
},
presetStyle: {
div,
diff --git a/packages/sdk-components-react/src/webhook-form.ws.ts b/packages/sdk-components-react/src/webhook-form.ws.ts
index e9313a6e7f..499f34aea5 100644
--- a/packages/sdk-components-react/src/webhook-form.ws.ts
+++ b/packages/sdk-components-react/src/webhook-form.ws.ts
@@ -6,7 +6,6 @@ import { props } from "./__generated__/webhook-form.props";
export const meta: WsComponentMeta = {
label: "Webhook Form",
icon: WebhookFormIcon,
- type: "container",
presetStyle: {
form,
},
diff --git a/packages/sdk-components-react/src/xml-node.ws.ts b/packages/sdk-components-react/src/xml-node.ws.ts
index 678f5bede4..785895c8a7 100644
--- a/packages/sdk-components-react/src/xml-node.ws.ts
+++ b/packages/sdk-components-react/src/xml-node.ws.ts
@@ -5,7 +5,6 @@ import { props } from "./__generated__/xml-node.props";
export const meta: WsComponentMeta = {
category: "xml",
order: 6,
- type: "container",
icon: XmlIcon,
description: "XML Node",
};
diff --git a/packages/sdk-components-react/src/xml-time.ws.ts b/packages/sdk-components-react/src/xml-time.ws.ts
index 0fc759466a..08dbc6e155 100644
--- a/packages/sdk-components-react/src/xml-time.ws.ts
+++ b/packages/sdk-components-react/src/xml-time.ws.ts
@@ -4,7 +4,6 @@ import { props } from "./__generated__/xml-time.props";
export const meta: WsComponentMeta = {
category: "xml",
- type: "container",
description: "Converts machine-readable date and time to ISO format.",
icon: CalendarIcon,
order: 7,
diff --git a/packages/sdk-components-react/src/youtube.ws.ts b/packages/sdk-components-react/src/youtube.ws.ts
index 188ec528a0..6fe7da83e6 100644
--- a/packages/sdk-components-react/src/youtube.ws.ts
+++ b/packages/sdk-components-react/src/youtube.ws.ts
@@ -10,17 +10,12 @@ import { props } from "./__generated__/youtube.props";
import type { YouTube } from "./youtube";
export const meta: WsComponentMeta = {
- type: "container",
icon: YoutubeIcon,
states: defaultStates,
contentModel: {
category: "instance",
- children: [
- "instance",
- "VimeoSpinner",
- "VimeoPlayButton",
- "VimeoPreviewImage",
- ],
+ children: ["instance"],
+ descendants: ["VimeoSpinner", "VimeoPlayButton", "VimeoPreviewImage"],
},
presetStyle: {
div,
diff --git a/packages/sdk/src/core-metas.ts b/packages/sdk/src/core-metas.ts
index b1921edab5..07f2fa7d10 100644
--- a/packages/sdk/src/core-metas.ts
+++ b/packages/sdk/src/core-metas.ts
@@ -125,7 +125,6 @@ const blockMeta: WsComponentMeta = {
contentModel: {
category: "instance",
children: [blockTemplateComponent, "instance"],
- // @todo prevent deleting block template
},
};
diff --git a/packages/sdk/src/schema/component-meta.ts b/packages/sdk/src/schema/component-meta.ts
index c5c7b8dbd6..c7fbc56da7 100644
--- a/packages/sdk/src/schema/component-meta.ts
+++ b/packages/sdk/src/schema/component-meta.ts
@@ -64,6 +64,15 @@ export const defaultStates: ComponentState[] = [
{ selector: ":focus-within", label: "Focus Within" },
];
+/**
+ * rich-text - can be edited as rich text
+ * instance - other instances accepted
+ * ComponentName - accept specific components with none category
+ */
+const ComponentContent = z.string() as z.ZodType<
+ "instance" | "rich-text" | (string & {})
+>;
+
export const ContentModel = z.object({
/*
* instance - accepted by any parent with "instance" in children categories
@@ -71,14 +80,13 @@ export const ContentModel = z.object({
*/
category: z.union([z.literal("instance"), z.literal("none")]),
/**
- * transparent - pass through possible children from parent
- * rich-text - can be edited as rich text
- * instance - other instances accepted
- * ComponentName - accept specific components with none category
+ * enforce direct children of category or components
+ */
+ children: z.array(ComponentContent),
+ /**
+ * enforce descendants of category or components
*/
- children: z.array(z.string()) as z.ZodType<
- Array<"transparent" | "instance" | "rich-text" | (string & {})>
- >,
+ descendants: z.array(ComponentContent).optional(),
});
export type ContentModel = z.infer<typeof ContentModel>;