@webstudio-is/react-sdk 0.60.0 → 0.62.0

package/src/components/button.ws.tsx

@@ -1,20 +1,28 @@
 import { ButtonElementIcon } from "@webstudio-is/icons";
-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";
-import { props } from "./__generated__/button.props";
 import { button } from "../css/normalize";
+import type {
+  PresetStyle,
+  WsComponentMeta,
+  WsComponentPropsMeta,
+} from "./component-meta";
+import { props } from "./__generated__/button.props";
 import type { defaultTag } from "./button";
-import type { Style } from "@webstudio-is/css-data";
 
 const presetStyle = {
   button,
-} as const satisfies Record<typeof defaultTag, Style>;
+} satisfies PresetStyle<typeof defaultTag>;
 
 export const meta: WsComponentMeta = {
-  category: "forms",
+  category: "general",
   type: "container",
   label: "Button",
   Icon: ButtonElementIcon,
   presetStyle,
+  states: [
+    { selector: ":active", label: "Active" },
+    { selector: ":disabled", label: "Disabled" },
+    { selector: ":enabled", label: "Enabled" },
+  ],
 };
 
 export const propsMeta: WsComponentPropsMeta = {

package/src/components/checkbox-field.tsx

@@ -0,0 +1,10 @@
+import { forwardRef, type ElementRef, type ComponentProps } from "react";
+
+export const defaultTag = "label";
+
+export const CheckboxField = forwardRef<
+  ElementRef<typeof defaultTag>,
+  Omit<ComponentProps<typeof defaultTag>, "htmlFor">
+>((props, ref) => <label {...props} ref={ref} />);
+
+CheckboxField.displayName = "CheckboxField";

package/src/components/checkbox-field.ws.tsx

@@ -0,0 +1,38 @@
+import { CheckboxCheckedIcon } from "@webstudio-is/icons";
+import type {
+  WsComponentMeta,
+  WsComponentPropsMeta,
+  PresetStyle,
+} from "./component-meta";
+import { props } from "./__generated__/checkbox-field.props";
+import type { defaultTag } from "./checkbox-field";
+import { label } from "../css/normalize";
+
+const presetStyle = {
+  label: [
+    ...label,
+    { property: "display", value: { type: "keyword", value: "flex" } },
+  ],
+} satisfies PresetStyle<typeof defaultTag>;
+
+export const meta: WsComponentMeta = {
+  category: "forms",
+  type: "container",
+  label: "Checkbox Field",
+  Icon: CheckboxCheckedIcon,
+  presetStyle,
+  children: [
+    { type: "instance", component: "Checkbox", props: [], children: [] },
+    {
+      type: "instance",
+      component: "TextBlock",
+      props: [],
+      children: [{ type: "text", value: "Checkbox" }],
+    },
+  ],
+};
+
+export const propsMeta: WsComponentPropsMeta = {
+  props,
+  initialProps: [],
+};

package/src/components/checkbox.tsx

@@ -0,0 +1,13 @@
+import { forwardRef, type ElementRef, type ComponentProps } from "react";
+
+export const defaultTag = "input";
+
+export const Checkbox = forwardRef<
+  ElementRef<typeof defaultTag>,
+  Omit<ComponentProps<typeof defaultTag>, "type">
+  // Make sure children are not passed down to an input, because this will result in error.
+>(({ children: _children, ...props }, ref) => (
+  <input {...props} type="checkbox" ref={ref} />
+));
+
+Checkbox.displayName = "Checkbox";

package/src/components/checkbox.ws.tsx

@@ -0,0 +1,40 @@
+import { CheckboxCheckedIcon } from "@webstudio-is/icons";
+import type {
+  WsComponentMeta,
+  WsComponentPropsMeta,
+  PresetStyle,
+} from "./component-meta";
+import type { defaultTag } from "./checkbox";
+import { input } from "../css/normalize";
+import { props } from "./__generated__/checkbox.props";
+
+const presetStyle = {
+  input: [
+    ...input,
+    {
+      property: "marginRight",
+      value: { type: "unit", unit: "em", value: 0.5 },
+    },
+  ],
+} satisfies PresetStyle<typeof defaultTag>;
+
+export const meta: WsComponentMeta = {
+  type: "control",
+  label: "Checkbox",
+  Icon: CheckboxCheckedIcon,
+  presetStyle,
+  states: [
+    { selector: ":checked", label: "Checked" },
+    { selector: ":required", label: "Required" },
+    { selector: ":optional", label: "Optional" },
+    { selector: ":disabled", label: "Disabled" },
+    { selector: ":enabled", label: "Enabled" },
+    { selector: ":read-only", label: "Read Only" },
+    { selector: ":read-write", label: "Read Write" },
+  ],
+};
+
+export const propsMeta: WsComponentPropsMeta = {
+  props,
+  initialProps: ["name"],
+};

package/src/components/code.ws.tsx

@@ -1,44 +1,38 @@
 import { CodeIcon } from "@webstudio-is/icons";
-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";
+import type {
+  PresetStyle,
+  WsComponentMeta,
+  WsComponentPropsMeta,
+} from "./component-meta";
 import { type defaultTag, displayVarNamespace } from "./code";
 import { props } from "./__generated__/code.props";
-import type { Style, StyleValue } from "@webstudio-is/css-data";
 import { code } from "../css/normalize";
 
-const display: StyleValue = {
-  type: "var",
-  value: displayVarNamespace,
-  fallbacks: [
-    {
-      type: "keyword",
-      value: "inline-block",
-    },
-  ],
-};
-
 const presetStyle = {
-  code: {
+  code: [
     ...code,
-    display,
-    paddingLeft: {
-      type: "unit",
-      value: 0.2,
-      unit: "em",
+    {
+      property: "display",
+      value: {
+        type: "var",
+        value: displayVarNamespace,
+        fallbacks: [{ type: "keyword", value: "inline-block" }],
+      },
     },
-    paddingRight: {
-      type: "unit",
-      value: 0.2,
-      unit: "em",
+    {
+      property: "paddingLeft",
+      value: { type: "unit", value: 0.2, unit: "em" },
     },
-    backgroundColor: {
-      type: "rgb",
-      r: 238,
-      g: 238,
-      b: 238,
-      alpha: 1,
+    {
+      property: "paddingRight",
+      value: { type: "unit", value: 0.2, unit: "em" },
     },
-  },
-} as const satisfies Record<typeof defaultTag, Style>;
+    {
+      property: "backgroundColor",
+      value: { type: "rgb", r: 238, g: 238, b: 238, alpha: 1 },
+    },
+  ],
+} satisfies PresetStyle<typeof defaultTag>;
 
 export const meta: WsComponentMeta = {
   category: "general",
@@ -46,7 +40,7 @@ export const meta: WsComponentMeta = {
   label: "Code",
   Icon: CodeIcon,
   presetStyle,
-  children: ["Code you can edit"],
+  children: [{ type: "text", value: "Code you can edit" }],
 };
 
 export const propsMeta: WsComponentPropsMeta = {

package/src/components/component-meta.ts

@@ -1,11 +1,13 @@
 import { z } from "zod";
 import type { FunctionComponent } from "react";
 import type { IconProps } from "@webstudio-is/icons";
-import type { Style } from "@webstudio-is/css-data";
 import { PropMeta } from "@webstudio-is/generate-arg-types";
 import type { htmlTags as HtmlTags } from "html-tags";
+import { EmbedTemplateStyleDecl, WsEmbedTemplate } from "../embed-template";
 
-type PresetStyle = Partial<Record<HtmlTags, Style>>;
+export type PresetStyle<Tag extends HtmlTags = HtmlTags> = Partial<
+  Record<Tag, EmbedTemplateStyleDecl[]>
+>;
 
 // props are separated from the rest of the meta
 // so they can be exported separately and potentially tree-shaken
@@ -44,11 +46,12 @@ const WsComponentMeta = z.object({
     "rich-text",
     "rich-text-child",
   ]),
+  acceptedParents: z.optional(z.array(z.string())),
   label: z.string(),
   Icon: z.function(),
   presetStyle: z.optional(z.any()),
   states: z.optional(z.array(ComponentState)),
-  children: z.optional(z.array(z.string())),
+  children: z.optional(WsEmbedTemplate),
 });
 
 export type WsComponentMeta = Omit<

package/src/components/components-utils.ts

@@ -1,3 +1,4 @@
+import type { forwardRef } from "react";
 import * as components from "./components";
 import { registeredComponents } from "./index";
 
@@ -34,6 +35,14 @@ const componentNames = Object.keys({
   ListItem: 1,
   Separator: 1,
   Code: 1,
+  Label: 1,
+  SuccessMessage: 1,
+  ErrorMessage: 1,
+  Textarea: 1,
+  RadioButtonField: 1,
+  RadioButton: 1,
+  CheckboxField: 1,
+  Checkbox: 1,
 } satisfies { [K in keyof typeof components]: 1 }) as Array<
   keyof typeof components
 >;
@@ -47,17 +56,16 @@ export const getComponentNames = (): ComponentName[] => {
   return Array.from(uniqueNames) as ComponentName[];
 };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type AnyComponent = ReturnType<typeof forwardRef<any, any>>;
+
 /**
  * Now used only in builder app
  * @todo Consider using the same approach in the builder app as in the published apps . A dynamic import is needed
  */
-export const getComponent = (
-  name: string
-): undefined | (typeof components)[ComponentName] => {
+export const getComponent = (name: string): undefined | AnyComponent => {
   return registeredComponents != null && name in registeredComponents
-    ? (registeredComponents[
-        name as ComponentName
-      ] as (typeof components)[ComponentName])
+    ? (registeredComponents[name as ComponentName] as AnyComponent)
     : components[name as ComponentName];
 };
 
@@ -68,11 +76,9 @@ export const getComponent = (
  * see example /packages/sdk-size-test/app/routes/$.tsx
  **/
 export const createGetComponent = (comps: Partial<typeof components>) => {
-  return (name: string) => {
+  return (name: string): undefined | AnyComponent => {
     return registeredComponents != null && name in registeredComponents
-      ? (registeredComponents[
-          name as ComponentName
-        ] as (typeof components)[ComponentName])
+      ? (registeredComponents[name as ComponentName] as AnyComponent)
       : comps[name as ComponentName];
   };
 };

package/src/components/components.ts

@@ -29,3 +29,11 @@ export { List } from "./list";
 export { ListItem } from "./list-item";
 export { Separator } from "./separator";
 export { Code } from "./code";
+export { Label } from "./label";
+export { SuccessMessage } from "./success-message";
+export { ErrorMessage } from "./error-message";
+export { Textarea } from "./textarea";
+export { RadioButtonField } from "./radio-button-field";
+export { RadioButton } from "./radio-button";
+export { CheckboxField } from "./checkbox-field";
+export { Checkbox } from "./checkbox";

package/src/components/error-message.tsx

@@ -0,0 +1,10 @@
+import { forwardRef, type ElementRef, type ComponentProps } from "react";
+
+export const defaultTag = "div";
+
+export const ErrorMessage = forwardRef<
+  ElementRef<typeof defaultTag>,
+  ComponentProps<typeof defaultTag>
+>((props, ref) => <div {...props} ref={ref} />);
+
+ErrorMessage.displayName = "ErrorMessage";

package/src/components/error-message.ws.tsx

@@ -0,0 +1,24 @@
+import { BoxIcon } from "@webstudio-is/icons";
+import type {
+  WsComponentMeta,
+  WsComponentPropsMeta,
+  PresetStyle,
+} from "./component-meta";
+import { props } from "./__generated__/error-message.props";
+import { div } from "../css/normalize";
+
+const presetStyle = {
+  div,
+} satisfies PresetStyle<"div">;
+
+export const meta: WsComponentMeta = {
+  type: "container",
+  label: "Error Message",
+  Icon: BoxIcon,
+  presetStyle,
+};
+
+export const propsMeta: WsComponentPropsMeta = {
+  props,
+  initialProps: [],
+};

package/src/components/form.tsx

@@ -5,6 +5,10 @@ export const defaultTag = "form";
 export const Form = forwardRef<
   ElementRef<typeof defaultTag>,
   ComponentProps<typeof defaultTag>
->((props, ref) => <form {...props} ref={ref} />);
+>(({ children, ...props }, ref) => (
+  <form {...props} ref={ref}>
+    {children}
+  </form>
+));
 
 Form.displayName = "Form";

package/src/components/form.ws.tsx

@@ -1,20 +1,19 @@
-import type { Style } from "@webstudio-is/css-data";
 import { FormIcon } from "@webstudio-is/icons";
 import { form } from "../css/normalize";
-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";
+import type {
+  PresetStyle,
+  WsComponentMeta,
+  WsComponentPropsMeta,
+} from "./component-meta";
 import type { defaultTag } from "./form";
 import { props } from "./__generated__/form.props";
 
 const presetStyle = {
-  form: {
+  form: [
     ...form,
-    minHeight: {
-      type: "unit",
-      unit: "px",
-      value: 20,
-    },
-  },
-} as const satisfies Record<typeof defaultTag, Style>;
+    { property: "minHeight", value: { type: "unit", unit: "px", value: 20 } },
+  ],
+} satisfies PresetStyle<typeof defaultTag>;
 
 export const meta: WsComponentMeta = {
   category: "forms",
@@ -22,8 +21,38 @@ export const meta: WsComponentMeta = {
   label: "Form",
   Icon: FormIcon,
   presetStyle,
+  children: [
+    {
+      type: "instance",
+      component: "Label",
+      children: [{ type: "text", value: "Name" }],
+    },
+    {
+      type: "instance",
+      component: "Input",
+      props: [{ type: "string", name: "name", value: "name" }],
+      children: [],
+    },
+    {
+      type: "instance",
+      component: "Label",
+      children: [{ type: "text", value: "Email" }],
+    },
+    {
+      type: "instance",
+      component: "Input",
+      props: [{ type: "string", name: "email", value: "email" }],
+      children: [],
+    },
+    {
+      type: "instance",
+      component: "Button",
+      children: [{ type: "text", value: "Submit" }],
+    },
+  ],
 };
 
 export const propsMeta: WsComponentPropsMeta = {
   props,
+  initialProps: [],
 };

package/src/components/heading.ws.tsx

@@ -1,8 +1,11 @@
-import type { Style } from "@webstudio-is/css-data";
 import { HeadingIcon } from "@webstudio-is/icons";
 import type { ComponentProps } from "react";
 import { h1, h2, h3, h4, h5, h6 } from "../css/normalize";
-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";
+import type {
+  PresetStyle,
+  WsComponentMeta,
+  WsComponentPropsMeta,
+} from "./component-meta";
 import type { Heading } from "./heading";
 import { props } from "./__generated__/heading.props";
 
@@ -15,14 +18,14 @@ const presetStyle = {
   h4,
   h5,
   h6,
-} as const satisfies Record<HeadingTags, Style>;
+} satisfies PresetStyle<HeadingTags>;
 
 export const meta: WsComponentMeta = {
   category: "typography",
   type: "rich-text",
   label: "Heading",
   Icon: HeadingIcon,
-  children: ["Heading you can edit"],
+  children: [{ type: "text", value: "Heading you can edit" }],
   presetStyle,
 };
 

package/src/components/image.ws.tsx

@@ -1,28 +1,30 @@
-import type { Style } from "@webstudio-is/css-data";
 import { ImageIcon } from "@webstudio-is/icons";
 import { img } from "../css/normalize";
-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";
+import type {
+  PresetStyle,
+  WsComponentMeta,
+  WsComponentPropsMeta,
+} from "./component-meta";
 import type { defaultTag } from "./image";
 import { props } from "./__generated__/image.props";
 
 const presetStyle = {
-  img: {
+  img: [
     ...img,
 
     // Otherwise on new image insert onto canvas it can overfit screen size multiple times
-    maxWidth: {
-      type: "unit",
-      unit: "%",
-      value: 100,
+    {
+      property: "maxWidth",
+      value: { type: "unit", unit: "%", value: 100 },
     },
     // inline | inline-block is not suitable because without line-height: 0 on the parent you get unsuitable spaces/margins
     // see https://stackoverflow.com/questions/24771194/is-the-margin-of-inline-block-4px-is-static-for-all-browsers
-    display: {
-      type: "keyword",
-      value: "block",
+    {
+      property: "display",
+      value: { type: "keyword", value: "block" },
     },
-  },
-} as const satisfies Record<typeof defaultTag, Style>;
+  ],
+} satisfies PresetStyle<typeof defaultTag>;
 
 export const meta: WsComponentMeta = {
   category: "media",

package/src/components/index.ts

@@ -25,6 +25,14 @@ import { meta as ListMeta } from "./list.ws";
 import { meta as ListItemMeta } from "./list-item.ws";
 import { meta as SeparatorMeta } from "./separator.ws";
 import { meta as CodeMeta } from "./code.ws";
+import { meta as LabelMeta } from "./label.ws";
+import { meta as SuccessMessageMeta } from "./success-message.ws";
+import { meta as ErrorMessageMeta } from "./error-message.ws";
+import { meta as TextareaMeta } from "./textarea.ws";
+import { meta as RadioButtonFieldMeta } from "./radio-button-field.ws";
+import { meta as RadioButtonMeta } from "./radio-button.ws";
+import { meta as CheckboxFieldMeta } from "./checkbox-field.ws";
+import { meta as CheckboxMeta } from "./checkbox.ws";
 
 // these are huge JSON objects that we want to be tree-shaken when not used!
 import { propsMeta as SlotMetaPropsMeta } from "./slot.ws";
@@ -51,6 +59,14 @@ import { propsMeta as ListPropsMeta } from "./list.ws";
 import { propsMeta as ListItemPropsMeta } from "./list-item.ws";
 import { propsMeta as SeparatorPropsMeta } from "./separator.ws";
 import { propsMeta as CodePropsMeta } from "./code.ws";
+import { propsMeta as LabelPropsMeta } from "./label.ws";
+import { propsMeta as SuccessMessagePropsMeta } from "./success-message.ws";
+import { propsMeta as ErrorMessagePropsMeta } from "./error-message.ws";
+import { propsMeta as TextareaPropsMeta } from "./textarea.ws";
+import { propsMeta as RadioButtonFieldPropsMeta } from "./radio-button-field.ws";
+import { propsMeta as RadioButtonPropsMeta } from "./radio-button.ws";
+import { propsMeta as CheckboxFieldPropsMeta } from "./checkbox-field.ws";
+import { propsMeta as CheckboxPropsMeta } from "./checkbox.ws";
 
 // @todo this list should not be hardcoded!
 const defaultMetas: Record<string, WsComponentMeta> = {
@@ -78,6 +94,14 @@ const defaultMetas: Record<string, WsComponentMeta> = {
   ListItem: ListItemMeta,
   Separator: SeparatorMeta,
   Code: CodeMeta,
+  Label: LabelMeta,
+  SuccessMessage: SuccessMessageMeta,
+  ErrorMessage: ErrorMessageMeta,
+  Textarea: TextareaMeta,
+  RadioButtonField: RadioButtonFieldMeta,
+  RadioButton: RadioButtonMeta,
+  CheckboxField: CheckboxFieldMeta,
+  Checkbox: CheckboxMeta,
 };
 
 let currentMetas = defaultMetas;
@@ -122,6 +146,14 @@ const defaultPropsMetasRaw = {
   ListItem: ListItemPropsMeta,
   Separator: SeparatorPropsMeta,
   Code: CodePropsMeta,
+  Label: LabelPropsMeta,
+  SuccessMessage: SuccessMessagePropsMeta,
+  ErrorMessage: ErrorMessagePropsMeta,
+  Textarea: TextareaPropsMeta,
+  RadioButtonField: RadioButtonFieldPropsMeta,
+  RadioButton: RadioButtonPropsMeta,
+  CheckboxField: CheckboxFieldPropsMeta,
+  Checkbox: CheckboxPropsMeta,
 } as const;
 
 const defaultPropsMetas: Record<string, WsComponentPropsMeta> =
@@ -219,3 +251,18 @@ const computeInitialProps = (
   // order of initialProps must be preserved
   return [...initialProps, ...requiredProps];
 };
+
+export const canAcceptComponent = (
+  parentComponent: string,
+  childComponent: string
+) => {
+  const parentMeta = getComponentMeta(parentComponent);
+  const childMeta = getComponentMeta(childComponent);
+  if (parentMeta?.type !== "container" || childMeta === undefined) {
+    return false;
+  }
+  return (
+    childMeta.acceptedParents === undefined ||
+    childMeta.acceptedParents.includes(parentComponent)
+  );
+};

package/src/components/input.tsx

@@ -4,7 +4,9 @@ export const defaultTag = "input";
 
 export const Input = forwardRef<
   ElementRef<typeof defaultTag>,
-  ComponentProps<typeof defaultTag>
+  ComponentProps<typeof defaultTag> & {
+    type?: "text" | "email" | "password" | "number" | "tel" | "url";
+  }
   // Make sure children are not passed down to an input, because this will result in error.
 >(({ children: _children, ...props }, ref) => <input {...props} ref={ref} />);
 

package/src/components/input.ws.tsx

@@ -1,22 +1,37 @@
-import type { Style } from "@webstudio-is/css-data";
 import { FormTextFieldIcon } from "@webstudio-is/icons";
 import { input } from "../css/normalize";
-import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";
+import type {
+  PresetStyle,
+  WsComponentMeta,
+  WsComponentPropsMeta,
+} from "./component-meta";
 import type { defaultTag } from "./input";
 import { props } from "./__generated__/input.props";
 
 const presetStyle = {
   input,
-} as const satisfies Record<typeof defaultTag, Style>;
+} satisfies PresetStyle<typeof defaultTag>;
 
 export const meta: WsComponentMeta = {
   category: "forms",
   type: "control",
-  label: "Input",
+  label: "Text Field",
   Icon: FormTextFieldIcon,
   presetStyle,
+  states: [
+    { selector: "::placeholder", label: "Placeholder" },
+    { selector: ":valid", label: "Valid" },
+    { selector: ":invalid", label: "Invalid" },
+    { selector: ":required", label: "Required" },
+    { selector: ":optional", label: "Optional" },
+    { selector: ":disabled", label: "Disabled" },
+    { selector: ":enabled", label: "Enabled" },
+    { selector: ":read-only", label: "Read Only" },
+    { selector: ":read-write", label: "Read Write" },
+  ],
 };
 
 export const propsMeta: WsComponentPropsMeta = {
   props,
+  initialProps: ["name", "type", "placeholder", "required", "autoFocus"],
 };