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: Improve invalid ancestors config (#2870)

Oleg Isonenfb70166359f6
diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.json
index 004375aac1..c9f140436c 100644
--- a/packages/sdk-components-react-radix/package.json
+++ b/packages/sdk-components-react-radix/package.json
@@ -41,7 +41,7 @@
"scripts": {
"dev": "rm -rf lib && esbuild 'src/**/*.ts' 'src/**/*.tsx' --outdir=lib --watch",
"build": "rm -rf lib && esbuild src/components.ts src/metas.ts src/props.ts src/hooks.ts --outdir=lib --bundle --format=esm --packages=external",
- "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.tsx' -e asChild -e modal -e defaultValue -e defaultOpen -e defaultChecked && prettier --write \"**/*.props.ts\"",
+ "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts' -e asChild -e modal -e defaultValue -e defaultOpen -e defaultChecked && prettier --write \"**/*.props.ts\"",
"build:tailwind": "tsx scripts/generate-tailwind-theme.ts && prettier --write src/theme/__generated__",
"build:stories": "webstudio-sdk generate-stories && prettier --write \"src/__generated__/*.stories.tsx\"",
"dts": "tsc --project tsconfig.dts.json",
diff --git a/packages/sdk-components-react-radix/src/dialog.ws.tsx b/packages/sdk-components-react-radix/src/dialog.ws.ts
similarity index 100%
rename from packages/sdk-components-react-radix/src/dialog.ws.tsx
rename to packages/sdk-components-react-radix/src/dialog.ws.ts
diff --git a/packages/sdk-components-react-radix/src/popover.ws.tsx b/packages/sdk-components-react-radix/src/popover.ws.ts
similarity index 100%
rename from packages/sdk-components-react-radix/src/popover.ws.tsx
rename to packages/sdk-components-react-radix/src/popover.ws.ts
diff --git a/packages/sdk-components-react-radix/src/sheet.ws.tsx b/packages/sdk-components-react-radix/src/sheet.ws.ts
similarity index 100%
rename from packages/sdk-components-react-radix/src/sheet.ws.tsx
rename to packages/sdk-components-react-radix/src/sheet.ws.ts
diff --git a/packages/sdk-components-react-radix/src/tooltip.ws.tsx b/packages/sdk-components-react-radix/src/tooltip.ws.ts
similarity index 100%
rename from packages/sdk-components-react-radix/src/tooltip.ws.tsx
rename to packages/sdk-components-react-radix/src/tooltip.ws.ts
diff --git a/packages/sdk-components-react-remix/package.json b/packages/sdk-components-react-remix/package.json
index be90171213..4ff69c7155 100644
--- a/packages/sdk-components-react-remix/package.json
+++ b/packages/sdk-components-react-remix/package.json
@@ -35,7 +35,7 @@
"scripts": {
"dev": "rm -rf lib && esbuild 'src/**/*.ts' 'src/**/*.tsx' --outdir=lib --watch",
"build": "rm -rf lib && esbuild src/components.ts src/metas.ts src/props.ts --outdir=lib --bundle --format=esm --packages=external",
- "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.tsx' && prettier --write \"**/*.props.ts\"",
+ "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.ts' && prettier --write \"**/*.props.ts\"",
"dts": "tsc --project tsconfig.dts.json",
"typecheck": "tsc",
"checks": "pnpm typecheck"
diff --git a/packages/sdk-components-react-remix/src/body.ws.tsx b/packages/sdk-components-react-remix/src/body.ws.ts
similarity index 100%
rename from packages/sdk-components-react-remix/src/body.ws.tsx
rename to packages/sdk-components-react-remix/src/body.ws.ts
diff --git a/packages/sdk-components-react-remix/src/form.ws.tsx b/packages/sdk-components-react-remix/src/form.ws.ts
similarity index 83%
rename from packages/sdk-components-react-remix/src/form.ws.tsx
rename to packages/sdk-components-react-remix/src/form.ws.ts
index 5d0dee0ac7..9a875870f3 100644
--- a/packages/sdk-components-react-remix/src/form.ws.tsx
+++ b/packages/sdk-components-react-remix/src/form.ws.ts
@@ -1,30 +1,13 @@
-import { FormIcon } from "@webstudio-is/icons/svg";
-import { form } from "@webstudio-is/react-sdk/css-normalize";
+import { Form as baseMeta } from "@webstudio-is/sdk-components-react/metas";
import {
- type PresetStyle,
type WsComponentMeta,
type WsComponentPropsMeta,
showAttribute,
} from "@webstudio-is/react-sdk";
-import type { defaultTag } from "./form";
import { props } from "./__generated__/form.props";
-const presetStyle = {
- form: [
- ...form,
- { property: "minHeight", value: { type: "unit", unit: "px", value: 20 } },
- ],
-} satisfies PresetStyle<typeof defaultTag>;
-
export const meta: WsComponentMeta = {
- category: "forms",
- type: "container",
- invalidAncestors: ["Form"],
- label: "Form",
- description: "Collect information from your users using validation rules.",
- icon: FormIcon,
- presetStyle,
- order: 0,
+ ...baseMeta,
states: [
{ selector: "[data-state=error]", label: "Error" },
{ selector: "[data-state=success]", label: "Success" },
diff --git a/packages/sdk-components-react-remix/src/rich-text-link.ws.tsx b/packages/sdk-components-react-remix/src/rich-text-link.ws.ts
similarity index 100%
rename from packages/sdk-components-react-remix/src/rich-text-link.ws.tsx
rename to packages/sdk-components-react-remix/src/rich-text-link.ws.ts
diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.json
index ba555718ac..5f79227036 100644
--- a/packages/sdk-components-react/package.json
+++ b/packages/sdk-components-react/package.json
@@ -35,7 +35,7 @@
"scripts": {
"dev": "rm -rf lib && esbuild 'src/**/*.ts' 'src/**/*.tsx' --outdir=lib --watch",
"build": "rm -rf lib && esbuild src/components.ts src/metas.ts src/props.ts --outdir=lib --bundle --format=esm --packages=external",
- "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.tsx' && prettier --write \"**/*.props.ts\"",
+ "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts' && prettier --write \"**/*.props.ts\"",
"dts": "tsc --project tsconfig.dts.json",
"typecheck": "tsc",
"checks": "pnpm typecheck",
diff --git a/packages/sdk-components-react/src/blockquote.ws.tsx b/packages/sdk-components-react/src/blockquote.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/blockquote.ws.tsx
rename to packages/sdk-components-react/src/blockquote.ws.ts
diff --git a/packages/sdk-components-react/src/body.ws.tsx b/packages/sdk-components-react/src/body.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/body.ws.tsx
rename to packages/sdk-components-react/src/body.ws.ts
diff --git a/packages/sdk-components-react/src/bold.ws.tsx b/packages/sdk-components-react/src/bold.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/bold.ws.tsx
rename to packages/sdk-components-react/src/bold.ws.ts
diff --git a/packages/sdk-components-react/src/button.ws.tsx b/packages/sdk-components-react/src/button.ws.ts
similarity index 96%
rename from packages/sdk-components-react/src/button.ws.tsx
rename to packages/sdk-components-react/src/button.ws.ts
index 7bc04b0107..2977dd242e 100644
--- a/packages/sdk-components-react/src/button.ws.tsx
+++ b/packages/sdk-components-react/src/button.ws.ts
@@ -16,7 +16,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
type: "container",
- invalidAncestors: ["Button"],
+ invalidAncestors: ["Button", "Link"],
label: "Button",
description:
"Use a button to submit forms or trigger actions within a page. Do not use a button to navigate users to another resource or another page - that’s what a link is used for.",
diff --git a/packages/sdk-components-react/src/checkbox.ws.tsx b/packages/sdk-components-react/src/checkbox.ws.ts
similarity index 97%
rename from packages/sdk-components-react/src/checkbox.ws.tsx
rename to packages/sdk-components-react/src/checkbox.ws.ts
index 985dd444f6..40d7bb8c3a 100644
--- a/packages/sdk-components-react/src/checkbox.ws.tsx
+++ b/packages/sdk-components-react/src/checkbox.ws.ts
@@ -21,7 +21,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
- invalidAncestors: ["Button"],
+ invalidAncestors: ["Button", "Link"],
type: "control",
label: "Checkbox",
description:
diff --git a/packages/sdk-components-react/src/code-text.ws.tsx b/packages/sdk-components-react/src/code-text.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/code-text.ws.tsx
rename to packages/sdk-components-react/src/code-text.ws.ts
diff --git a/packages/sdk-components-react/src/form.ws.tsx b/packages/sdk-components-react/src/form.ws.ts
similarity index 97%
rename from packages/sdk-components-react/src/form.ws.tsx
rename to packages/sdk-components-react/src/form.ws.ts
index 5d1512cf33..5451326c48 100644
--- a/packages/sdk-components-react/src/form.ws.tsx
+++ b/packages/sdk-components-react/src/form.ws.ts
@@ -19,7 +19,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
type: "container",
- invalidAncestors: ["Form"],
+ invalidAncestors: ["Form", "Button", "Link"],
label: "Form",
description: "Collect information from your users using validation rules.",
icon: FormIcon,
diff --git a/packages/sdk-components-react/src/heading.ws.tsx b/packages/sdk-components-react/src/heading.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/heading.ws.tsx
rename to packages/sdk-components-react/src/heading.ws.ts
diff --git a/packages/sdk-components-react/src/html-embed.ws.ts b/packages/sdk-components-react/src/html-embed.ws.ts
index dd69081a72..20d520b6cc 100644
--- a/packages/sdk-components-react/src/html-embed.ws.ts
+++ b/packages/sdk-components-react/src/html-embed.ws.ts
@@ -18,7 +18,6 @@ export const meta: WsComponentMeta = {
export const propsMeta: WsComponentPropsMeta = {
props: {
...props,
-
executeScriptOnCanvas: {
...props.executeScriptOnCanvas,
label: "Run script on canvas",
diff --git a/packages/sdk-components-react/src/image.ws.tsx b/packages/sdk-components-react/src/image.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/image.ws.tsx
rename to packages/sdk-components-react/src/image.ws.ts
diff --git a/packages/sdk-components-react/src/input.ws.tsx b/packages/sdk-components-react/src/input.ws.ts
similarity index 97%
rename from packages/sdk-components-react/src/input.ws.tsx
rename to packages/sdk-components-react/src/input.ws.ts
index 42f4a0e545..b189e183c3 100644
--- a/packages/sdk-components-react/src/input.ws.tsx
+++ b/packages/sdk-components-react/src/input.ws.ts
@@ -21,7 +21,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
- invalidAncestors: ["Button"],
+ invalidAncestors: ["Button", "Link"],
type: "control",
label: "Text Input",
description:
diff --git a/packages/sdk-components-react/src/italic.ws.tsx b/packages/sdk-components-react/src/italic.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/italic.ws.tsx
rename to packages/sdk-components-react/src/italic.ws.ts
diff --git a/packages/sdk-components-react/src/label.ws.tsx b/packages/sdk-components-react/src/label.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/label.ws.tsx
rename to packages/sdk-components-react/src/label.ws.ts
diff --git a/packages/sdk-components-react/src/link.ws.tsx b/packages/sdk-components-react/src/link.ws.ts
similarity index 97%
rename from packages/sdk-components-react/src/link.ws.tsx
rename to packages/sdk-components-react/src/link.ws.ts
index 6be83c9fa7..6c0122a5cf 100644
--- a/packages/sdk-components-react/src/link.ws.tsx
+++ b/packages/sdk-components-react/src/link.ws.ts
@@ -30,7 +30,7 @@ export const meta: WsComponentMeta = {
description:
"Use a link to send your users to another page, section, or resource. Configure links in the Settings panel.",
icon: LinkIcon,
- invalidAncestors: ["Link"],
+ invalidAncestors: ["Link", "Button"],
presetStyle,
order: 1,
states: [
diff --git a/packages/sdk-components-react/src/list-item.ws.tsx b/packages/sdk-components-react/src/list-item.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/list-item.ws.tsx
rename to packages/sdk-components-react/src/list-item.ws.ts
diff --git a/packages/sdk-components-react/src/list.ws.tsx b/packages/sdk-components-react/src/list.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/list.ws.tsx
rename to packages/sdk-components-react/src/list.ws.ts
diff --git a/packages/sdk-components-react/src/paragraph.ws.tsx b/packages/sdk-components-react/src/paragraph.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/paragraph.ws.tsx
rename to packages/sdk-components-react/src/paragraph.ws.ts
diff --git a/packages/sdk-components-react/src/radio-button.ws.tsx b/packages/sdk-components-react/src/radio-button.ws.ts
similarity index 97%
rename from packages/sdk-components-react/src/radio-button.ws.tsx
rename to packages/sdk-components-react/src/radio-button.ws.ts
index 281dad66bd..2ae2cec42e 100644
--- a/packages/sdk-components-react/src/radio-button.ws.tsx
+++ b/packages/sdk-components-react/src/radio-button.ws.ts
@@ -21,7 +21,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
- invalidAncestors: ["Button"],
+ invalidAncestors: ["Button", "Link"],
type: "control",
label: "Radio",
description:
diff --git a/packages/sdk-components-react/src/rich-text-link.ws.tsx b/packages/sdk-components-react/src/rich-text-link.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/rich-text-link.ws.tsx
rename to packages/sdk-components-react/src/rich-text-link.ws.ts
diff --git a/packages/sdk-components-react/src/separator.ws.tsx b/packages/sdk-components-react/src/separator.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/separator.ws.tsx
rename to packages/sdk-components-react/src/separator.ws.ts
diff --git a/packages/sdk-components-react/src/span.ws.tsx b/packages/sdk-components-react/src/span.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/span.ws.tsx
rename to packages/sdk-components-react/src/span.ws.ts
diff --git a/packages/sdk-components-react/src/subscript.ws.tsx b/packages/sdk-components-react/src/subscript.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/subscript.ws.tsx
rename to packages/sdk-components-react/src/subscript.ws.ts
diff --git a/packages/sdk-components-react/src/superscript.ws.tsx b/packages/sdk-components-react/src/superscript.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/superscript.ws.tsx
rename to packages/sdk-components-react/src/superscript.ws.ts
diff --git a/packages/sdk-components-react/src/text.ws.tsx b/packages/sdk-components-react/src/text.ws.ts
similarity index 100%
rename from packages/sdk-components-react/src/text.ws.tsx
rename to packages/sdk-components-react/src/text.ws.ts
diff --git a/packages/sdk-components-react/src/textarea.ws.tsx b/packages/sdk-components-react/src/textarea.ws.ts
similarity index 97%
rename from packages/sdk-components-react/src/textarea.ws.tsx
rename to packages/sdk-components-react/src/textarea.ws.ts
index ab2aa6b39c..78a62dbe18 100644
--- a/packages/sdk-components-react/src/textarea.ws.tsx
+++ b/packages/sdk-components-react/src/textarea.ws.ts
@@ -30,6 +30,7 @@ export const meta: WsComponentMeta = {
icon: FormTextAreaIcon,
presetStyle,
order: 4,
+ invalidAncestors: ["Button", "Link"],
states: [
...defaultStates,
{ selector: "::placeholder", label: "Placeholder" },
diff --git a/packages/sdk-components-react/src/vimeo.ws.ts b/packages/sdk-components-react/src/vimeo.ws.ts
index 8b11aac57c..90f401e479 100644
--- a/packages/sdk-components-react/src/vimeo.ws.ts
+++ b/packages/sdk-components-react/src/vimeo.ws.ts
@@ -24,6 +24,7 @@ export const meta: WsComponentMeta = {
icon: VimeoIcon,
states: defaultStates,
presetStyle,
+ invalidAncestors: ["Button", "Heading", "Link"],
template: [
{
type: "instance",