diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx index 41fd172d61c2..ee9d7e6ddbea 100644 --- a/apps/builder/app/canvas/canvas.tsx +++ b/apps/builder/app/canvas/canvas.tsx @@ -8,12 +8,10 @@ import { wsImageLoader } from "@webstudio-is/image"; import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime"; import * as baseComponents from "@webstudio-is/sdk-components-react"; import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas"; -import * as baseComponentPropsMetas from "@webstudio-is/sdk-components-react/props"; import { hooks as baseComponentHooks } from "@webstudio-is/sdk-components-react/hooks"; import * as baseComponentTemplates from "@webstudio-is/sdk-components-react/templates"; import * as animationComponents from "@webstudio-is/sdk-components-animation"; import * as animationComponentMetas from "@webstudio-is/sdk-components-animation/metas"; -import * as animationComponentPropsMetas from "@webstudio-is/sdk-components-animation/props"; import * as animationTemplates from "@webstudio-is/sdk-components-animation/templates"; import { hooks as animationComponentHooks } from "@webstudio-is/sdk-components-animation/hooks"; import * as radixComponents from "@webstudio-is/sdk-components-react-radix"; @@ -248,7 +246,7 @@ export const Canvas = () => { registerComponentLibrary({ components: baseComponents, metas: baseComponentMetas, - propsMetas: baseComponentPropsMetas, + propsMetas: {}, hooks: baseComponentHooks, templates: baseComponentTemplates, }); @@ -274,7 +272,7 @@ export const Canvas = () => { namespace: "@webstudio-is/sdk-components-animation", components: animationComponents, metas: animationComponentMetas, - propsMetas: animationComponentPropsMetas, + propsMetas: {}, hooks: animationComponentHooks, templates: animationTemplates, }); diff --git a/packages/sdk-components-animation/package.json b/packages/sdk-components-animation/package.json index ba918737088d..3e68f10509e9 100644 --- a/packages/sdk-components-animation/package.json +++ b/packages/sdk-components-animation/package.json @@ -24,11 +24,6 @@ "types": "./lib/types/metas.d.ts", "import": "./lib/metas.js" }, - "./props": { - "webstudio": "./src/props.ts", - "types": "./lib/types/props.d.ts", - "import": "./lib/props.js" - }, "./hooks": { "webstudio": "./src/hooks.ts", "types": "./lib/types/hooks.d.ts", diff --git a/packages/sdk-components-animation/src/animate-children.ws.ts b/packages/sdk-components-animation/src/animate-children.ws.ts index 1f06ca3bc239..10a4cc204cb0 100644 --- a/packages/sdk-components-animation/src/animate-children.ws.ts +++ b/packages/sdk-components-animation/src/animate-children.ws.ts @@ -1,5 +1,5 @@ import { AnimationGroupIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { animation } from "./shared/meta"; export const meta: WsComponentMeta = { @@ -17,9 +17,7 @@ export const meta: WsComponentMeta = { animation.VideoAnimation, ], }, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["action"], props: { action: { required: false, @@ -28,5 +26,4 @@ export const propsMeta: WsComponentPropsMeta = { description: "Animation Action", }, }, - initialProps: ["action"], }; diff --git a/packages/sdk-components-animation/src/animate-text.ws.ts b/packages/sdk-components-animation/src/animate-text.ws.ts index 95153962a7b4..c2849192c82d 100644 --- a/packages/sdk-components-animation/src/animate-text.ws.ts +++ b/packages/sdk-components-animation/src/animate-text.ws.ts @@ -1,5 +1,5 @@ import { TextAnimationIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { div } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/animate-text.props"; @@ -14,12 +14,7 @@ export const meta: WsComponentMeta = { category: "none", children: ["instance"], }, - presetStyle: { - div, - }, -}; - -export const propsMeta: WsComponentPropsMeta = { - props, + presetStyle: { div }, initialProps: ["slidingWindow", "easing", "splitBy"], + props, }; diff --git a/packages/sdk-components-animation/src/props.ts b/packages/sdk-components-animation/src/props.ts deleted file mode 100644 index 6887fe4cb143..000000000000 --- a/packages/sdk-components-animation/src/props.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { propsMeta as AnimateChildren } from "./animate-children.ws"; -export { propsMeta as AnimateText } from "./animate-text.ws"; -export { propsMeta as StaggerAnimation } from "./stagger-animation.ws"; -export { propsMeta as VideoAnimation } from "./video-animation.ws"; diff --git a/packages/sdk-components-animation/src/stagger-animation.ws.ts b/packages/sdk-components-animation/src/stagger-animation.ws.ts index 6e885badb401..8f5fdb17a0ae 100644 --- a/packages/sdk-components-animation/src/stagger-animation.ws.ts +++ b/packages/sdk-components-animation/src/stagger-animation.ws.ts @@ -1,5 +1,5 @@ import { StaggerAnimationIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { div } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/stagger-animation.props"; @@ -14,12 +14,7 @@ export const meta: WsComponentMeta = { category: "none", children: ["instance"], }, - presetStyle: { - div, - }, -}; - -export const propsMeta: WsComponentPropsMeta = { - props, + presetStyle: { div }, initialProps: ["slidingWindow", "easing"], + props, }; diff --git a/packages/sdk-components-animation/src/video-animation.ws.ts b/packages/sdk-components-animation/src/video-animation.ws.ts index 1f2a94cf8306..bc8e843123e6 100644 --- a/packages/sdk-components-animation/src/video-animation.ws.ts +++ b/packages/sdk-components-animation/src/video-animation.ws.ts @@ -1,5 +1,5 @@ import { PlayIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/video-animation.props"; import { div } from "@webstudio-is/sdk/normalize.css"; @@ -10,12 +10,7 @@ export const meta: WsComponentMeta = { category: "none", children: ["instance"], }, - presetStyle: { - div, - }, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { div }, props, initialProps: ["timeline"], }; diff --git a/packages/sdk-components-react-radix/src/props.ts b/packages/sdk-components-react-radix/src/props.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/sdk-components-react-remix/src/props.ts b/packages/sdk-components-react-remix/src/props.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/sdk-components-react-router/src/props.ts b/packages/sdk-components-react-router/src/props.ts deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.json index ee91364ac9d4..2dcc9a4e17a4 100644 --- a/packages/sdk-components-react/package.json +++ b/packages/sdk-components-react/package.json @@ -23,11 +23,6 @@ "types": "./lib/types/metas.d.ts", "import": "./lib/metas.js" }, - "./props": { - "webstudio": "./src/props.ts", - "types": "./lib/types/props.d.ts", - "import": "./lib/props.js" - }, "./hooks": { "webstudio": "./src/hooks.ts", "types": "./lib/types/hooks.d.ts", diff --git a/packages/sdk-components-react/src/blockquote.ws.ts b/packages/sdk-components-react/src/blockquote.ws.ts index 85506c5882b7..17e16783543d 100644 --- a/packages/sdk-components-react/src/blockquote.ws.ts +++ b/packages/sdk-components-react/src/blockquote.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import type { defaultTag } from "./blockquote"; import { props } from "./__generated__/blockquote.props"; @@ -64,9 +63,6 @@ export const meta: WsComponentMeta = { icon: BlockquoteIcon, states: defaultStates, presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "cite"], props, - initialProps: ["id", "className", "cite"], }; diff --git a/packages/sdk-components-react/src/body.ws.ts b/packages/sdk-components-react/src/body.ws.ts index 8fff174b074f..994c1d668270 100644 --- a/packages/sdk-components-react/src/body.ws.ts +++ b/packages/sdk-components-react/src/body.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { body } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/body.props"; @@ -27,9 +26,6 @@ export const meta: WsComponentMeta = { icon: BodyIcon, states: defaultStates, presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/bold.ws.ts b/packages/sdk-components-react/src/bold.ws.ts index 435fb0520968..9dc9ee9d6748 100644 --- a/packages/sdk-components-react/src/bold.ws.ts +++ b/packages/sdk-components-react/src/bold.ws.ts @@ -1,26 +1,13 @@ import { BoldIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type PresetStyle, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { b } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/bold.props"; -import type { defaultTag } from "./bold"; - -const presetStyle = { - b, -} satisfies PresetStyle; export const meta: WsComponentMeta = { label: "Bold Text", icon: BoldIcon, states: defaultStates, - presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { b }, + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/box.ws.ts b/packages/sdk-components-react/src/box.ws.ts index ed99c8027af4..2d5970e11159 100644 --- a/packages/sdk-components-react/src/box.ws.ts +++ b/packages/sdk-components-react/src/box.ws.ts @@ -1,9 +1,5 @@ import { BoxIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { div, address, @@ -37,9 +33,7 @@ export const meta: WsComponentMeta = { section, }, order: 0, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["tag", "id", "class"], props: { ...props, tag: { @@ -61,5 +55,4 @@ export const propsMeta: WsComponentPropsMeta = { ], }, }, - initialProps: ["tag", "id", "className"], }; diff --git a/packages/sdk-components-react/src/button.ws.ts b/packages/sdk-components-react/src/button.ws.ts index 14fe4cad8e65..c5f2cc349f7d 100644 --- a/packages/sdk-components-react/src/button.ws.ts +++ b/packages/sdk-components-react/src/button.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { button } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/button.props"; @@ -21,9 +20,6 @@ export const meta: WsComponentMeta = { { selector: ":disabled", label: "Disabled" }, { selector: ":enabled", label: "Enabled" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "type", "aria-label"], props, - initialProps: ["id", "className", "type", "aria-label"], }; diff --git a/packages/sdk-components-react/src/checkbox.ws.ts b/packages/sdk-components-react/src/checkbox.ws.ts index f4503ff28d1a..32dbdf3d0149 100644 --- a/packages/sdk-components-react/src/checkbox.ws.ts +++ b/packages/sdk-components-react/src/checkbox.ws.ts @@ -1,7 +1,6 @@ import { CheckboxCheckedIcon } from "@webstudio-is/icons/svg"; import { type WsComponentMeta, - type WsComponentPropsMeta, type PresetStyle, defaultStates, } from "@webstudio-is/sdk"; @@ -32,9 +31,6 @@ export const meta: WsComponentMeta = { { selector: ":read-only", label: "Read Only" }, { selector: ":read-write", label: "Read Write" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "name", "value", "required", "checked"], props, - initialProps: ["id", "className", "name", "value", "required", "checked"], }; diff --git a/packages/sdk-components-react/src/code-text.ws.ts b/packages/sdk-components-react/src/code-text.ws.ts index c1ec4faafebb..f6a983ab792d 100644 --- a/packages/sdk-components-react/src/code-text.ws.ts +++ b/packages/sdk-components-react/src/code-text.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { code } from "@webstudio-is/sdk/normalize.css"; import type { defaultTag } from "./code-text"; @@ -51,9 +50,7 @@ export const meta: WsComponentMeta = { states: defaultStates, presetStyle, order: 5, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "lang", "code"], props: { ...props, code: { @@ -62,5 +59,4 @@ export const propsMeta: WsComponentPropsMeta = { type: "string", }, }, - initialProps: ["id", "className", "lang", "code"], }; diff --git a/packages/sdk-components-react/src/form.ws.ts b/packages/sdk-components-react/src/form.ws.ts index 2cdbca7c2a14..34fe4b7e29d2 100644 --- a/packages/sdk-components-react/src/form.ws.ts +++ b/packages/sdk-components-react/src/form.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { form } from "@webstudio-is/sdk/normalize.css"; import type { defaultTag } from "./form"; @@ -24,9 +23,6 @@ export const meta: WsComponentMeta = { states: defaultStates, presetStyle, order: 0, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "action"], props, - initialProps: ["id", "className", "action"], }; diff --git a/packages/sdk-components-react/src/fragment.ws.ts b/packages/sdk-components-react/src/fragment.ws.ts index b73096b2644b..43327c3a5aac 100644 --- a/packages/sdk-components-react/src/fragment.ws.ts +++ b/packages/sdk-components-react/src/fragment.ws.ts @@ -1,9 +1,5 @@ -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; export const meta: WsComponentMeta = { icon: "", }; - -export const propsMeta: WsComponentPropsMeta = { - props: {}, -}; diff --git a/packages/sdk-components-react/src/head-link.ws.ts b/packages/sdk-components-react/src/head-link.ws.ts index e4c893d3c2f6..d62a16246184 100644 --- a/packages/sdk-components-react/src/head-link.ws.ts +++ b/packages/sdk-components-react/src/head-link.ws.ts @@ -1,8 +1,5 @@ import { ResourceIcon } from "@webstudio-is/icons/svg"; -import { - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/head-link.props"; export const meta: WsComponentMeta = { @@ -11,9 +8,6 @@ export const meta: WsComponentMeta = { category: "none", children: [], }, -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: ["rel", "hrefLang", "href", "type", "as"], + props, }; diff --git a/packages/sdk-components-react/src/head-meta.ws.ts b/packages/sdk-components-react/src/head-meta.ws.ts index b6f4203b9e62..4306fb693352 100644 --- a/packages/sdk-components-react/src/head-meta.ws.ts +++ b/packages/sdk-components-react/src/head-meta.ws.ts @@ -1,8 +1,5 @@ import { WindowInfoIcon } from "@webstudio-is/icons/svg"; -import { - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/head-meta.props"; export const meta: WsComponentMeta = { @@ -11,9 +8,6 @@ export const meta: WsComponentMeta = { category: "none", children: [], }, -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: ["name", "property", "content"], + props, }; diff --git a/packages/sdk-components-react/src/head-slot.ws.ts b/packages/sdk-components-react/src/head-slot.ws.ts index 6cbc2d6ed1a9..f18aaa71c480 100644 --- a/packages/sdk-components-react/src/head-slot.ws.ts +++ b/packages/sdk-components-react/src/head-slot.ws.ts @@ -1,8 +1,5 @@ import { HeaderIcon } from "@webstudio-is/icons/svg"; -import { - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/head-slot.props"; export const meta: WsComponentMeta = { @@ -12,9 +9,5 @@ export const meta: WsComponentMeta = { category: "instance", children: ["HeadLink", "HeadMeta", "HeadTitle"], }, -}; - -export const propsMeta: WsComponentPropsMeta = { props, - initialProps: [], }; diff --git a/packages/sdk-components-react/src/head-title.ws.ts b/packages/sdk-components-react/src/head-title.ws.ts index 7c3394781b70..49139a220725 100644 --- a/packages/sdk-components-react/src/head-title.ws.ts +++ b/packages/sdk-components-react/src/head-title.ws.ts @@ -1,5 +1,5 @@ import { WindowTitleIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/head-title.props"; export const meta: WsComponentMeta = { @@ -8,8 +8,5 @@ export const meta: WsComponentMeta = { category: "none", children: ["text"], }, -}; - -export const propsMeta: WsComponentPropsMeta = { props, }; diff --git a/packages/sdk-components-react/src/heading.ws.ts b/packages/sdk-components-react/src/heading.ws.ts index d77736a5ecd0..1e488429a028 100644 --- a/packages/sdk-components-react/src/heading.ws.ts +++ b/packages/sdk-components-react/src/heading.ws.ts @@ -1,9 +1,5 @@ import { HeadingIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { h1, h2, h3, h4, h5, h6 } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/heading.props"; @@ -19,9 +15,7 @@ export const meta: WsComponentMeta = { h5, h6, }, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["tag", "id", "class"], props: { ...props, tag: { @@ -31,5 +25,4 @@ export const propsMeta: WsComponentPropsMeta = { options: ["h1", "h2", "h3", "h4", "h5", "h6"], }, }, - initialProps: ["tag", "id", "className"], }; diff --git a/packages/sdk-components-react/src/html-embed.ws.ts b/packages/sdk-components-react/src/html-embed.ws.ts index 3b02b914c03c..ba84666ddefc 100644 --- a/packages/sdk-components-react/src/html-embed.ws.ts +++ b/packages/sdk-components-react/src/html-embed.ws.ts @@ -1,9 +1,5 @@ import { EmbedIcon } from "@webstudio-is/icons/svg"; -import { - descendantComponent, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { descendantComponent, type WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/html-embed.props"; export const meta: WsComponentMeta = { @@ -28,9 +24,7 @@ export const meta: WsComponentMeta = { }, ], }, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["class", "clientOnly", "executeScriptOnCanvas"], props: { ...props, clientOnly: { @@ -51,5 +45,4 @@ export const propsMeta: WsComponentPropsMeta = { type: "string", }, }, - initialProps: ["className", "clientOnly", "executeScriptOnCanvas"], }; diff --git a/packages/sdk-components-react/src/image.ws.ts b/packages/sdk-components-react/src/image.ws.ts index 570c7d58d347..4fbf2c173270 100644 --- a/packages/sdk-components-react/src/image.ws.ts +++ b/packages/sdk-components-react/src/image.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { img } from "@webstudio-is/sdk/normalize.css"; import type { defaultTag } from "./image"; @@ -42,9 +41,16 @@ export const meta: WsComponentMeta = { states: defaultStates, presetStyle, order: 0, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: [ + "id", + "class", + "src", + "width", + "height", + "alt", + "loading", + "optimize", + ], props: { ...props, // Automatically generated props don't have the right control. @@ -55,14 +61,4 @@ export const propsMeta: WsComponentPropsMeta = { required: false, }, }, - initialProps: [ - "id", - "className", - "src", - "width", - "height", - "alt", - "loading", - "optimize", - ], }; diff --git a/packages/sdk-components-react/src/input.ws.ts b/packages/sdk-components-react/src/input.ws.ts index d8c75646db0d..b3a04a4da192 100644 --- a/packages/sdk-components-react/src/input.ws.ts +++ b/packages/sdk-components-react/src/input.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { input } from "@webstudio-is/sdk/normalize.css"; import type { defaultTag } from "./input"; @@ -40,18 +39,15 @@ export const meta: WsComponentMeta = { //{ selector: ":read-only", label: "Read Only" }, //{ selector: ":read-write", label: "Read Write" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: [ "id", - "className", + "class", "name", "value", "type", "placeholder", "required", - "autoFocus", + "autofocus", ], + props, }; diff --git a/packages/sdk-components-react/src/italic.ws.ts b/packages/sdk-components-react/src/italic.ws.ts index 57850862d353..083683e2b191 100644 --- a/packages/sdk-components-react/src/italic.ws.ts +++ b/packages/sdk-components-react/src/italic.ws.ts @@ -4,7 +4,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { i } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/italic.props"; @@ -24,9 +23,6 @@ export const meta: WsComponentMeta = { icon: TextItalicIcon, states: defaultStates, presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/label.ws.ts b/packages/sdk-components-react/src/label.ws.ts index ec4b111f3a3e..10bdefd4917a 100644 --- a/packages/sdk-components-react/src/label.ws.ts +++ b/packages/sdk-components-react/src/label.ws.ts @@ -1,7 +1,6 @@ import { LabelIcon } from "@webstudio-is/icons/svg"; import { type WsComponentMeta, - type WsComponentPropsMeta, type PresetStyle, defaultStates, } from "@webstudio-is/sdk"; @@ -21,9 +20,6 @@ export const meta: WsComponentMeta = { icon: LabelIcon, states: defaultStates, presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "for"], props, - initialProps: ["id", "className", "htmlFor"], }; diff --git a/packages/sdk-components-react/src/link.ws.ts b/packages/sdk-components-react/src/link.ws.ts index 6b75f3ace59c..77b439b3c09c 100644 --- a/packages/sdk-components-react/src/link.ws.ts +++ b/packages/sdk-components-react/src/link.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { a } from "@webstudio-is/sdk/normalize.css"; import type { defaultTag } from "./link"; @@ -35,9 +34,7 @@ export const meta: WsComponentMeta = { label: "Current page", }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "href", "target", "prefetch", "download"], props: { ...props, href: { @@ -46,5 +43,4 @@ export const propsMeta: WsComponentPropsMeta = { required: false, }, }, - initialProps: ["id", "className", "href", "target", "prefetch", "download"], }; diff --git a/packages/sdk-components-react/src/list-item.ws.ts b/packages/sdk-components-react/src/list-item.ws.ts index 9b4decb703c9..afbe23338e89 100644 --- a/packages/sdk-components-react/src/list-item.ws.ts +++ b/packages/sdk-components-react/src/list-item.ws.ts @@ -1,9 +1,5 @@ import { ListItemIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { li } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/list-item.props"; @@ -11,12 +7,7 @@ export const meta: WsComponentMeta = { placeholder: "List item", icon: ListItemIcon, states: defaultStates, - presetStyle: { - li, - }, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { li }, + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/list.ws.ts b/packages/sdk-components-react/src/list.ws.ts index 291efb4ce216..ce62825d86fa 100644 --- a/packages/sdk-components-react/src/list.ws.ts +++ b/packages/sdk-components-react/src/list.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { ol, ul } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/list.props"; @@ -46,9 +45,6 @@ export const meta: WsComponentMeta = { icon: ListIcon, states: defaultStates, presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "ordered", "start", "reversed"], props, - initialProps: ["id", "className", "ordered", "start", "reversed"], }; diff --git a/packages/sdk-components-react/src/markdown-embed.ws.ts b/packages/sdk-components-react/src/markdown-embed.ws.ts index bcd5ae668d13..9587412cffa7 100644 --- a/packages/sdk-components-react/src/markdown-embed.ws.ts +++ b/packages/sdk-components-react/src/markdown-embed.ws.ts @@ -1,9 +1,5 @@ import { MarkdownEmbedIcon } from "@webstudio-is/icons/svg"; -import { - descendantComponent, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { descendantComponent, type WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/markdown-embed.props"; export const meta: WsComponentMeta = { @@ -24,9 +20,7 @@ export const meta: WsComponentMeta = { }, ], }, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["class"], props: { ...props, code: { @@ -36,5 +30,4 @@ export const propsMeta: WsComponentPropsMeta = { type: "string", }, }, - initialProps: ["className"], }; diff --git a/packages/sdk-components-react/src/option.ws.ts b/packages/sdk-components-react/src/option.ws.ts index c0c7f70704b0..1062045cce9a 100644 --- a/packages/sdk-components-react/src/option.ws.ts +++ b/packages/sdk-components-react/src/option.ws.ts @@ -1,9 +1,5 @@ import { ItemIcon } from "@webstudio-is/icons/svg"; -import type { - PresetStyle, - WsComponentMeta, - WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import type { PresetStyle, WsComponentMeta } from "@webstudio-is/sdk"; import type { defaultTag } from "./option"; import { props } from "./__generated__/option.props"; @@ -40,9 +36,6 @@ export const meta: WsComponentMeta = { { selector: ":hover", label: "Hover" }, { selector: ":disabled", label: "Disabled" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: ["label", "selected", "value", "label", "disabled"], + props, }; diff --git a/packages/sdk-components-react/src/paragraph.ws.ts b/packages/sdk-components-react/src/paragraph.ws.ts index 987e93ad92b0..2b698824eda5 100644 --- a/packages/sdk-components-react/src/paragraph.ws.ts +++ b/packages/sdk-components-react/src/paragraph.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { p } from "@webstudio-is/sdk/normalize.css"; import type { defaultTag } from "./paragraph"; @@ -18,9 +17,6 @@ export const meta: WsComponentMeta = { icon: TextAlignLeftIcon, states: defaultStates, presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/props.ts b/packages/sdk-components-react/src/props.ts deleted file mode 100644 index 0abcfc95b9c3..000000000000 --- a/packages/sdk-components-react/src/props.ts +++ /dev/null @@ -1,45 +0,0 @@ -export { propsMeta as Slot } from "./slot.ws"; -export { propsMeta as Fragment } from "./fragment.ws"; -export { propsMeta as HtmlEmbed } from "./html-embed.ws"; -export { propsMeta as MarkdownEmbed } from "./markdown-embed.ws"; -export { propsMeta as Body } from "./body.ws"; -export { propsMeta as Box } from "./box.ws"; -export { propsMeta as Text } from "./text.ws"; -export { propsMeta as Heading } from "./heading.ws"; -export { propsMeta as Paragraph } from "./paragraph.ws"; -export { propsMeta as Link } from "./link.ws"; -export { propsMeta as RichTextLink } from "./rich-text-link.ws"; -export { propsMeta as Span } from "./span.ws"; -export { propsMeta as Bold } from "./bold.ws"; -export { propsMeta as Italic } from "./italic.ws"; -export { propsMeta as Superscript } from "./superscript.ws"; -export { propsMeta as Subscript } from "./subscript.ws"; -export { propsMeta as Button } from "./button.ws"; -export { propsMeta as Input } from "./input.ws"; -export { propsMeta as Form } from "./webhook-form.ws"; -export { propsMeta as RemixForm } from "./form.ws"; -export { propsMeta as Image } from "./image.ws"; -export { propsMeta as Blockquote } from "./blockquote.ws"; -export { propsMeta as List } from "./list.ws"; -export { propsMeta as ListItem } from "./list-item.ws"; -export { propsMeta as Separator } from "./separator.ws"; -export { propsMeta as CodeText } from "./code-text.ws"; -export { propsMeta as Label } from "./label.ws"; -export { propsMeta as Textarea } from "./textarea.ws"; -export { propsMeta as RadioButton } from "./radio-button.ws"; -export { propsMeta as Checkbox } from "./checkbox.ws"; -export { propsMeta as Vimeo } from "./vimeo.ws"; -export { propsMeta as YouTube } from "./youtube.ws"; -export { propsMeta as VimeoPreviewImage } from "./vimeo-preview-image.ws"; -export { propsMeta as VimeoPlayButton } from "./vimeo-play-button.ws"; -export { propsMeta as VimeoSpinner } from "./vimeo-spinner.ws"; -export { propsMeta as XmlNode } from "./xml-node.ws"; -export { propsMeta as XmlTime } from "./xml-time.ws"; -export { propsMeta as Time } from "./time.ws"; -export { propsMeta as Select } from "./select.ws"; -export { propsMeta as Option } from "./option.ws"; -export { propsMeta as HeadSlot } from "./head-slot.ws"; -export { propsMeta as HeadLink } from "./head-link.ws"; -export { propsMeta as HeadMeta } from "./head-meta.ws"; -export { propsMeta as HeadTitle } from "./head-title.ws"; -export { propsMeta as Video } from "./video.ws"; diff --git a/packages/sdk-components-react/src/radio-button.ws.ts b/packages/sdk-components-react/src/radio-button.ws.ts index eb7f645ef1bb..a026b36b2584 100644 --- a/packages/sdk-components-react/src/radio-button.ws.ts +++ b/packages/sdk-components-react/src/radio-button.ws.ts @@ -1,7 +1,6 @@ import { RadioCheckedIcon } from "@webstudio-is/icons/svg"; import { type WsComponentMeta, - type WsComponentPropsMeta, type PresetStyle, defaultStates, } from "@webstudio-is/sdk"; @@ -34,9 +33,6 @@ export const meta: WsComponentMeta = { //{ selector: ":read-only", label: "Read Only" }, //{ selector: ":read-write", label: "Read Write" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "name", "value", "required", "checked"], props, - initialProps: ["id", "className", "name", "value", "required", "checked"], }; 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 7d17f8e202ac..78a869621228 100644 --- a/packages/sdk-components-react/src/rich-text-link.ws.ts +++ b/packages/sdk-components-react/src/rich-text-link.ws.ts @@ -1,6 +1,4 @@ -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; -import { meta as linkMeta, propsMeta as linkPropsMeta } from "./link.ws"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; +import { meta as linkMeta } from "./link.ws"; 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 251b2518e725..2c295356cae3 100644 --- a/packages/sdk-components-react/src/select.ws.ts +++ b/packages/sdk-components-react/src/select.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { select } from "@webstudio-is/sdk/normalize.css"; import type { defaultTag } from "./select"; @@ -30,17 +29,14 @@ export const meta: WsComponentMeta = { { selector: ":required", label: "Required" }, { selector: ":optional", label: "Optional" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: [ "id", - "className", + "class", "name", "value", "multiple", "required", - "autoFocus", + "autofocus", ], + props, }; diff --git a/packages/sdk-components-react/src/separator.ws.ts b/packages/sdk-components-react/src/separator.ws.ts index f0bffdbc4e6d..06ecd260ae14 100644 --- a/packages/sdk-components-react/src/separator.ws.ts +++ b/packages/sdk-components-react/src/separator.ws.ts @@ -3,7 +3,6 @@ import { defaultStates, type PresetStyle, type WsComponentMeta, - type WsComponentPropsMeta, } from "@webstudio-is/sdk"; import { hr } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/separator.props"; @@ -48,9 +47,6 @@ export const meta: WsComponentMeta = { states: defaultStates, presetStyle, order: 3, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/slot.ws.ts b/packages/sdk-components-react/src/slot.ws.ts index 5b6146fce4e2..717db8fa4eb0 100644 --- a/packages/sdk-components-react/src/slot.ws.ts +++ b/packages/sdk-components-react/src/slot.ws.ts @@ -1,5 +1,5 @@ import { SlotComponentIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; export const meta: WsComponentMeta = { category: "general", @@ -8,7 +8,3 @@ export const meta: WsComponentMeta = { icon: SlotComponentIcon, order: 5, }; - -export const propsMeta: WsComponentPropsMeta = { - props: {}, -}; diff --git a/packages/sdk-components-react/src/span.ws.ts b/packages/sdk-components-react/src/span.ws.ts index c23c1675450b..fbdd0ad2584c 100644 --- a/packages/sdk-components-react/src/span.ws.ts +++ b/packages/sdk-components-react/src/span.ws.ts @@ -1,26 +1,13 @@ import { PaintBrushIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type PresetStyle, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { span } from "@webstudio-is/sdk/normalize.css"; -import type { defaultTag } from "./span"; import { props } from "./__generated__/span.props"; -const presetStyle = { - span, -} satisfies PresetStyle; - export const meta: WsComponentMeta = { label: "Text", icon: PaintBrushIcon, states: defaultStates, - presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { span }, + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/subscript.ws.ts b/packages/sdk-components-react/src/subscript.ws.ts index f5bef6181edf..dbf52b25a118 100644 --- a/packages/sdk-components-react/src/subscript.ws.ts +++ b/packages/sdk-components-react/src/subscript.ws.ts @@ -1,26 +1,13 @@ import { SubscriptIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type PresetStyle, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { sub } from "@webstudio-is/sdk/normalize.css"; -import type { defaultTag } from "./subscript"; import { props } from "./__generated__/subscript.props"; -const presetStyle = { - sub, -} satisfies PresetStyle; - export const meta: WsComponentMeta = { label: "Subscript Text", icon: SubscriptIcon, states: defaultStates, - presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { sub }, + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/superscript.ws.ts b/packages/sdk-components-react/src/superscript.ws.ts index febf5335b242..041fa6ca92e3 100644 --- a/packages/sdk-components-react/src/superscript.ws.ts +++ b/packages/sdk-components-react/src/superscript.ws.ts @@ -1,26 +1,13 @@ import { SuperscriptIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type PresetStyle, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { sup } from "@webstudio-is/sdk/normalize.css"; -import type { defaultTag } from "./superscript"; import { props } from "./__generated__/superscript.props"; -const presetStyle = { - sup, -} satisfies PresetStyle; - export const meta: WsComponentMeta = { label: "Superscript Text", icon: SuperscriptIcon, states: defaultStates, - presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { sup }, + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/text.ws.ts b/packages/sdk-components-react/src/text.ws.ts index 9ab5ea1ba823..1e5427781886 100644 --- a/packages/sdk-components-react/src/text.ws.ts +++ b/packages/sdk-components-react/src/text.ws.ts @@ -1,9 +1,5 @@ import { TextIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { div } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/text.props"; @@ -19,9 +15,7 @@ export const meta: WsComponentMeta = { }, ], }, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["tag", "id", "class"], props: { ...props, tag: { @@ -31,5 +25,4 @@ export const propsMeta: WsComponentPropsMeta = { options: ["div", "cite", "figcaption", "span"], }, }, - initialProps: ["tag", "id", "className"], }; diff --git a/packages/sdk-components-react/src/textarea.ws.ts b/packages/sdk-components-react/src/textarea.ws.ts index eae2230e6adf..bf664514e55c 100644 --- a/packages/sdk-components-react/src/textarea.ws.ts +++ b/packages/sdk-components-react/src/textarea.ws.ts @@ -1,7 +1,6 @@ import { FormTextAreaIcon } from "@webstudio-is/icons/svg"; import { type WsComponentMeta, - type WsComponentPropsMeta, type PresetStyle, defaultStates, } from "@webstudio-is/sdk"; @@ -46,17 +45,14 @@ export const meta: WsComponentMeta = { //{ selector: ":read-only", label: "Read Only" }, //{ selector: ":read-write", label: "Read Write" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: [ "id", - "className", + "class", "name", "value", "placeholder", "required", - "autoFocus", + "autofocus", ], + props, }; diff --git a/packages/sdk-components-react/src/time.ws.ts b/packages/sdk-components-react/src/time.ws.ts index fac7407f7b73..803ff7a8f0b4 100644 --- a/packages/sdk-components-react/src/time.ws.ts +++ b/packages/sdk-components-react/src/time.ws.ts @@ -1,27 +1,17 @@ import { CalendarIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type PresetStyle, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { time } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/time.props"; -const presetStyle = { - time, -} satisfies PresetStyle<"time">; - export const meta: WsComponentMeta = { category: "localization", description: "Converts machine-readable date and time to a human-readable format.", icon: CalendarIcon, states: defaultStates, - presetStyle, -}; - -export const propsMeta: WsComponentPropsMeta = { - props, + presetStyle: { + time, + }, initialProps: ["datetime", "language", "country", "dateStyle", "timeStyle"], + props, }; diff --git a/packages/sdk-components-react/src/video.ws.ts b/packages/sdk-components-react/src/video.ws.ts index a5130f1a528d..dc1f8b92197b 100644 --- a/packages/sdk-components-react/src/video.ws.ts +++ b/packages/sdk-components-react/src/video.ws.ts @@ -1,8 +1,5 @@ import { VideoIcon } from "@webstudio-is/icons/svg"; -import { - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/video.props"; @@ -20,23 +17,9 @@ export const meta: WsComponentMeta = { }, ], }, -}; - -export const propsMeta: WsComponentPropsMeta = { - props: { - ...props, - // Automatically generated props don't have the right control. - src: { - type: "string", - control: "file", - label: "Source", - required: false, - accept: ".mp4,.webm,.mpg,.mpeg,.mov", - }, - }, initialProps: [ "id", - "className", + "class", "width", "height", "src", @@ -47,4 +30,15 @@ export const propsMeta: WsComponentPropsMeta = { "preload", "playsInline", ], + props: { + ...props, + // Automatically generated props don't have the right control. + src: { + type: "string", + control: "file", + label: "Source", + required: false, + accept: ".mp4,.webm,.mpg,.mpeg,.mov", + }, + }, }; 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 3aff78787cbe..0647f58cd9c1 100644 --- a/packages/sdk-components-react/src/vimeo-play-button.ws.ts +++ b/packages/sdk-components-react/src/vimeo-play-button.ws.ts @@ -1,8 +1,4 @@ -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { ButtonElementIcon } from "@webstudio-is/icons/svg"; import { button } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/vimeo-play-button.props"; @@ -16,12 +12,7 @@ export const meta: WsComponentMeta = { category: "none", children: ["instance"], }, - presetStyle: { - button, - }, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { button }, + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/vimeo-preview-image.ws.ts b/packages/sdk-components-react/src/vimeo-preview-image.ws.ts index 4674e356ddbf..a9a443d8e38b 100644 --- a/packages/sdk-components-react/src/vimeo-preview-image.ws.ts +++ b/packages/sdk-components-react/src/vimeo-preview-image.ws.ts @@ -1,5 +1,5 @@ -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; -import { propsMeta as imagePropsMeta, meta as imageMeta } from "./image.ws"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; +import { meta as imageMeta } from "./image.ws"; import { props } from "./__generated__/vimeo-preview-image.props"; export const meta: WsComponentMeta = { @@ -10,9 +10,7 @@ export const meta: WsComponentMeta = { category: "none", children: [], }, -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: imageMeta.initialProps, props: { ...props, // Automatically generated props don't have the right control. @@ -23,5 +21,4 @@ export const propsMeta: WsComponentPropsMeta = { required: false, }, }, - initialProps: imagePropsMeta.initialProps, }; diff --git a/packages/sdk-components-react/src/vimeo-spinner.ws.ts b/packages/sdk-components-react/src/vimeo-spinner.ws.ts index 21e949c625fd..f91d67b93cc9 100644 --- a/packages/sdk-components-react/src/vimeo-spinner.ws.ts +++ b/packages/sdk-components-react/src/vimeo-spinner.ws.ts @@ -1,8 +1,4 @@ -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { div } from "@webstudio-is/sdk/normalize.css"; import { BoxIcon } from "@webstudio-is/icons/svg"; import { props } from "./__generated__/vimeo-spinner.props"; @@ -16,12 +12,7 @@ export const meta: WsComponentMeta = { category: "none", children: ["instance"], }, - presetStyle: { - div, - }, -}; - -export const propsMeta: WsComponentPropsMeta = { + presetStyle: { div }, + initialProps: ["id", "class"], props, - initialProps: ["id", "className"], }; diff --git a/packages/sdk-components-react/src/vimeo.ws.ts b/packages/sdk-components-react/src/vimeo.ws.ts index 4237dc2da74b..8bc257a8e976 100644 --- a/packages/sdk-components-react/src/vimeo.ws.ts +++ b/packages/sdk-components-react/src/vimeo.ws.ts @@ -1,27 +1,10 @@ import type { ComponentProps } from "react"; import { VimeoIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { div } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/vimeo.props"; import type { Vimeo } from "./vimeo"; -export const meta: WsComponentMeta = { - icon: VimeoIcon, - states: defaultStates, - contentModel: { - category: "instance", - children: ["instance"], - descendants: ["VimeoSpinner", "VimeoPlayButton", "VimeoPreviewImage"], - }, - presetStyle: { - div, - }, -}; - const initialProps: Array> = [ "id", "className", @@ -42,7 +25,15 @@ const initialProps: Array> = [ "playsinline", ]; -export const propsMeta: WsComponentPropsMeta = { - props, +export const meta: WsComponentMeta = { + icon: VimeoIcon, + states: defaultStates, + contentModel: { + category: "instance", + children: ["instance"], + descendants: ["VimeoSpinner", "VimeoPlayButton", "VimeoPreviewImage"], + }, + presetStyle: { div }, initialProps, + props, }; diff --git a/packages/sdk-components-react/src/webhook-form.ws.ts b/packages/sdk-components-react/src/webhook-form.ws.ts index 499f34aea501..06954343fd2e 100644 --- a/packages/sdk-components-react/src/webhook-form.ws.ts +++ b/packages/sdk-components-react/src/webhook-form.ws.ts @@ -1,5 +1,5 @@ import { WebhookFormIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { form } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/webhook-form.props"; @@ -13,9 +13,7 @@ export const meta: WsComponentMeta = { { selector: "[data-state=error]", label: "Error" }, { selector: "[data-state=success]", label: "Success" }, ], -}; - -export const propsMeta: WsComponentPropsMeta = { + initialProps: ["id", "class", "state", "action"], props: { ...props, action: { @@ -26,5 +24,4 @@ export const propsMeta: WsComponentPropsMeta = { required: false, }, }, - initialProps: ["id", "className", "state", "action"], }; diff --git a/packages/sdk-components-react/src/xml-node.ws.ts b/packages/sdk-components-react/src/xml-node.ws.ts index 785895c8a71c..ee36f7164c09 100644 --- a/packages/sdk-components-react/src/xml-node.ws.ts +++ b/packages/sdk-components-react/src/xml-node.ws.ts @@ -1,5 +1,5 @@ import { XmlIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/xml-node.props"; export const meta: WsComponentMeta = { @@ -7,9 +7,6 @@ export const meta: WsComponentMeta = { order: 6, icon: XmlIcon, description: "XML Node", -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: ["tag"], + props, }; diff --git a/packages/sdk-components-react/src/xml-time.ws.ts b/packages/sdk-components-react/src/xml-time.ws.ts index 08dbc6e155b0..c73e95cf3614 100644 --- a/packages/sdk-components-react/src/xml-time.ws.ts +++ b/packages/sdk-components-react/src/xml-time.ws.ts @@ -1,5 +1,5 @@ import { CalendarIcon } from "@webstudio-is/icons/svg"; -import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk"; +import type { WsComponentMeta } from "@webstudio-is/sdk"; import { props } from "./__generated__/xml-time.props"; export const meta: WsComponentMeta = { @@ -7,9 +7,6 @@ export const meta: WsComponentMeta = { description: "Converts machine-readable date and time to ISO format.", icon: CalendarIcon, order: 7, -}; - -export const propsMeta: WsComponentPropsMeta = { - props, initialProps: ["datetime", "dateStyle"], + props, }; diff --git a/packages/sdk-components-react/src/youtube.ws.ts b/packages/sdk-components-react/src/youtube.ws.ts index 6fe7da83e6ef..3eb03b2c25a6 100644 --- a/packages/sdk-components-react/src/youtube.ws.ts +++ b/packages/sdk-components-react/src/youtube.ws.ts @@ -1,27 +1,10 @@ import type { ComponentProps } from "react"; import { YoutubeIcon } from "@webstudio-is/icons/svg"; -import { - defaultStates, - type WsComponentMeta, - type WsComponentPropsMeta, -} from "@webstudio-is/sdk"; +import { defaultStates, type WsComponentMeta } from "@webstudio-is/sdk"; import { div } from "@webstudio-is/sdk/normalize.css"; import { props } from "./__generated__/youtube.props"; import type { YouTube } from "./youtube"; -export const meta: WsComponentMeta = { - icon: YoutubeIcon, - states: defaultStates, - contentModel: { - category: "instance", - children: ["instance"], - descendants: ["VimeoSpinner", "VimeoPlayButton", "VimeoPreviewImage"], - }, - presetStyle: { - div, - }, -}; - const initialProps: Array> = [ "id", "className", @@ -52,7 +35,15 @@ const initialProps: Array> = [ "playlist", ]; -export const propsMeta: WsComponentPropsMeta = { - props, +export const meta: WsComponentMeta = { + icon: YoutubeIcon, + states: defaultStates, + contentModel: { + category: "instance", + children: ["instance"], + descendants: ["VimeoSpinner", "VimeoPlayButton", "VimeoPreviewImage"], + }, + presetStyle: { div }, initialProps, + props, }; diff --git a/vite.sdk-components.config.ts b/vite.sdk-components.config.ts index 14df1b943616..fcd5e1157f26 100644 --- a/vite.sdk-components.config.ts +++ b/vite.sdk-components.config.ts @@ -15,7 +15,6 @@ export default defineConfig({ entry: [ hasPrivateFolders ? "private-src/components.ts" : "src/components.ts", "src/metas.ts", - "src/props.ts", "src/hooks.ts", "src/templates.ts", ],