From 142fbda62623dd12aa6e74a931cc8e996d9db7f6 Mon Sep 17 00:00:00 2001 From: Oleg Isonen Date: Wed, 14 Dec 2022 23:51:01 +0000 Subject: [PATCH] defaultStyle presetStyle --- packages/project/src/shared/tree-utils/populate.ts | 6 +++--- packages/react-sdk/src/components/body.ws.tsx | 4 ++-- packages/react-sdk/src/components/box.ws.ts | 4 ++-- packages/react-sdk/src/components/component-type.ts | 4 ++-- packages/react-sdk/src/components/form.ws.tsx | 4 ++-- packages/react-sdk/src/components/image.ws.tsx | 4 ++-- packages/react-sdk/src/components/italic.ws.tsx | 4 ++-- packages/react-sdk/src/components/link.ws.tsx | 4 ++-- packages/react-sdk/src/components/text-block.ws.tsx | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/project/src/shared/tree-utils/populate.ts b/packages/project/src/shared/tree-utils/populate.ts index e647a46b92..4578b108fd 100644 --- a/packages/project/src/shared/tree-utils/populate.ts +++ b/packages/project/src/shared/tree-utils/populate.ts @@ -3,7 +3,7 @@ import { type Instance, getComponentMeta } from "@webstudio-is/react-sdk"; /** * Populate instance with: - * - defaultStyles + * - presetStyle * @todo rewrite using immer */ export const populateInstance = ( @@ -12,10 +12,10 @@ export const populateInstance = ( ): Instance => { const populatedInstance = { ...instance }; const componentMeta = getComponentMeta(instance.component); - if (componentMeta !== undefined && "defaultStyle" in componentMeta) { + if (componentMeta !== undefined && "presetStyle" in componentMeta) { const cssRule = { breakpoint, - style: componentMeta.defaultStyle ?? {}, + style: componentMeta.presetStyle ?? {}, }; populatedInstance.cssRules.push(cssRule); } diff --git a/packages/react-sdk/src/components/body.ws.tsx b/packages/react-sdk/src/components/body.ws.tsx index 227259ccb0..7e75e27e9e 100644 --- a/packages/react-sdk/src/components/body.ws.tsx +++ b/packages/react-sdk/src/components/body.ws.tsx @@ -2,7 +2,7 @@ import { BodyIcon } from "@webstudio-is/icons"; import type { WsComponentMeta, MetaProps } from "./component-type"; import props from "./__generated__/body.props.json"; -const defaultStyle = { +const presetStyle = { marginTop: { type: "unit", unit: "px", @@ -57,7 +57,7 @@ const meta: WsComponentMeta = { label: "Body", Icon: BodyIcon, props: props as MetaProps, - defaultStyle, + presetStyle, }; export default meta; diff --git a/packages/react-sdk/src/components/box.ws.ts b/packages/react-sdk/src/components/box.ws.ts index 93b721f832..3a5cbeb964 100644 --- a/packages/react-sdk/src/components/box.ws.ts +++ b/packages/react-sdk/src/components/box.ws.ts @@ -2,7 +2,7 @@ import { SquareIcon } from "@webstudio-is/icons"; import type { WsComponentMeta, MetaProps } from "./component-type"; import props from "./__generated__/box.props.json"; -const defaultStyle = { +const presetStyle = { boxSizing: { type: "keyword", value: "border-box", @@ -13,7 +13,7 @@ const meta: WsComponentMeta = { type: "container", label: "Box", Icon: SquareIcon, - defaultStyle, + presetStyle, props: props as MetaProps, }; diff --git a/packages/react-sdk/src/components/component-type.ts b/packages/react-sdk/src/components/component-type.ts index d1101faab2..f66bc5c9b7 100644 --- a/packages/react-sdk/src/components/component-type.ts +++ b/packages/react-sdk/src/components/component-type.ts @@ -23,7 +23,7 @@ export type WsComponentMeta = { | "rich-text-child"; label: string; Icon: FunctionComponent; - defaultStyle?: Style; + presetStyle?: Style; children?: Array; props: MetaProps; initialProps?: Array; @@ -83,7 +83,7 @@ export const WsComponentMeta = z.lazy(() => ]), label: z.string(), Icon: z.any(), - defaultStyle: z.optional(z.any()), + presetStyle: z.optional(z.any()), children: z.optional(z.array(z.string())), props: Props, initialProps: z.optional(z.array(z.string())), diff --git a/packages/react-sdk/src/components/form.ws.tsx b/packages/react-sdk/src/components/form.ws.tsx index 5b6bc57e3a..ef006eabae 100644 --- a/packages/react-sdk/src/components/form.ws.tsx +++ b/packages/react-sdk/src/components/form.ws.tsx @@ -2,7 +2,7 @@ import { FormIcon } from "@webstudio-is/icons"; import type { WsComponentMeta, MetaProps } from "./component-type"; import props from "./__generated__/form.props.json"; -const defaultStyle = { +const presetStyle = { minHeight: { type: "unit", unit: "px", @@ -18,7 +18,7 @@ const meta: WsComponentMeta = { type: "container", label: "Form", Icon: FormIcon, - defaultStyle, + presetStyle, props: props as MetaProps, }; diff --git a/packages/react-sdk/src/components/image.ws.tsx b/packages/react-sdk/src/components/image.ws.tsx index d8143b7670..8103341de4 100644 --- a/packages/react-sdk/src/components/image.ws.tsx +++ b/packages/react-sdk/src/components/image.ws.tsx @@ -2,7 +2,7 @@ import { ImageIcon } from "@webstudio-is/icons"; import type { WsComponentMeta, MetaProps } from "./component-type"; import props from "./__generated__/image.props.json"; -const defaultStyle = { +const presetStyle = { // Otherwise on new image insert onto canvas it can overfit screen size multiple times maxWidth: { type: "unit", @@ -21,7 +21,7 @@ const meta: WsComponentMeta = { type: "embed", label: "Image", Icon: ImageIcon, - defaultStyle, + presetStyle, props: props as MetaProps, initialProps: ["src", "width", "height", "alt", "loading"], }; diff --git a/packages/react-sdk/src/components/italic.ws.tsx b/packages/react-sdk/src/components/italic.ws.tsx index 7ebadde5c7..e3da72e976 100644 --- a/packages/react-sdk/src/components/italic.ws.tsx +++ b/packages/react-sdk/src/components/italic.ws.tsx @@ -2,7 +2,7 @@ import { FontItalicIcon } from "@webstudio-is/icons"; import type { WsComponentMeta, MetaProps } from "./component-type"; import props from "./__generated__/italic.props.json"; -const defaultStyle = { +const presetStyle = { fontStyle: { type: "keyword", value: "italic", @@ -13,7 +13,7 @@ const meta: WsComponentMeta = { type: "rich-text-child", label: "Italic Text", Icon: FontItalicIcon, - defaultStyle, + presetStyle, props: props as MetaProps, }; diff --git a/packages/react-sdk/src/components/link.ws.tsx b/packages/react-sdk/src/components/link.ws.tsx index 6fa9409556..28be250c5c 100644 --- a/packages/react-sdk/src/components/link.ws.tsx +++ b/packages/react-sdk/src/components/link.ws.tsx @@ -2,7 +2,7 @@ import { Link2Icon } from "@webstudio-is/icons"; import type { WsComponentMeta, MetaProps } from "./component-type"; import props from "./__generated__/link.props.json"; -const defaultStyle = { +const presetStyle = { minHeight: { type: "unit", unit: "em", @@ -18,7 +18,7 @@ const meta: WsComponentMeta = { type: "rich-text", label: "Link", Icon: Link2Icon, - defaultStyle, + presetStyle, children: ["Link text you can edit"], props: props as MetaProps, }; diff --git a/packages/react-sdk/src/components/text-block.ws.tsx b/packages/react-sdk/src/components/text-block.ws.tsx index 91c90bda2b..1c868e2465 100644 --- a/packages/react-sdk/src/components/text-block.ws.tsx +++ b/packages/react-sdk/src/components/text-block.ws.tsx @@ -2,7 +2,7 @@ import { TextIcon } from "@webstudio-is/icons"; import type { WsComponentMeta, MetaProps } from "./component-type"; import props from "./__generated__/text-block.props.json"; -const defaultStyle = { +const presetStyle = { minHeight: { type: "unit", unit: "em", @@ -14,7 +14,7 @@ const meta: WsComponentMeta = { type: "rich-text", label: "Text Block", Icon: TextIcon, - defaultStyle, + presetStyle, children: ["Block of text you can edit"], props: props as MetaProps, };