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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
refactor: rewrite core components templates with jsx (#4756)
Bogdan Chadkin94f219c249b5
diff --git a/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx b/apps/builder/app/builder/features/command-panel/command-panel.stories.tsxindex b3ed6df193..b8192f152c 100644--- a/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx+++ b/apps/builder/app/builder/features/command-panel/command-panel.stories.tsx@@ -1,7 +1,6 @@import type { Meta, StoryFn } from "@storybook/react";import { useEffect } from "react";-import { initialBreakpoints } from "@webstudio-is/sdk";-import { coreMetas } from "@webstudio-is/react-sdk";+import { initialBreakpoints, coreMetas } from "@webstudio-is/sdk";import { createDefaultPages } from "@webstudio-is/project-build";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";import {diff --git a/apps/builder/app/builder/features/command-panel/command-panel.tsx b/apps/builder/app/builder/features/command-panel/command-panel.tsxindex 5cd1b6852b..c3320ca91f 100644--- a/apps/builder/app/builder/features/command-panel/command-panel.tsx+++ b/apps/builder/app/builder/features/command-panel/command-panel.tsx@@ -2,7 +2,6 @@ import { atom, computed } from "nanostores";import { useStore } from "@nanostores/react";import { useState } from "react";import { matchSorter } from "match-sorter";-import { collectionComponent } from "@webstudio-is/react-sdk";import { isFeatureEnabled } from "@webstudio-is/feature-flags";import {Command,@@ -22,7 +21,7 @@ import {Separator,} from "@webstudio-is/design-system";import { compareMedia } from "@webstudio-is/css-engine";-import { componentCategories } from "@webstudio-is/sdk";+import { componentCategories, collectionComponent } from "@webstudio-is/sdk";import type { Breakpoint, Page } from "@webstudio-is/sdk";import type { TemplateMeta } from "@webstudio-is/template";import {diff --git a/apps/builder/app/builder/features/components/components.tsx b/apps/builder/app/builder/features/components/components.tsxindex 3686f53086..2aae750aaf 100644--- a/apps/builder/app/builder/features/components/components.tsx+++ b/apps/builder/app/builder/features/components/components.tsx@@ -4,8 +4,11 @@ import { computed } from "nanostores";import { useStore } from "@nanostores/react";import { XIcon } from "@webstudio-is/icons";import { isFeatureEnabled } from "@webstudio-is/feature-flags";-import { type WsComponentMeta, componentCategories } from "@webstudio-is/sdk";-import { collectionComponent } from "@webstudio-is/react-sdk";+import {+ type WsComponentMeta,+ componentCategories,+ collectionComponent,+} from "@webstudio-is/sdk";import {theme,Flex,diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxindex c53db364e8..2d37445b7e 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -2,7 +2,7 @@ import { useRef } from "react";import { computed } from "nanostores";import { useStore } from "@nanostores/react";import type { Instance } from "@webstudio-is/sdk";-import { rootComponent } from "@webstudio-is/react-sdk";+import { rootComponent } from "@webstudio-is/sdk";import {theme,PanelTabs,diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsxindex dc666509ed..81b12525da 100644--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx@@ -19,16 +19,14 @@ import {TreeSortableItem,type TreeDropTarget,} from "@webstudio-is/design-system";+import { showAttribute } from "@webstudio-is/react-sdk";import {+ ROOT_INSTANCE_ID,collectionComponent,blockComponent,rootComponent,- showAttribute,blockTemplateComponent,descendantComponent,-} from "@webstudio-is/react-sdk";-import {- ROOT_INSTANCE_ID,type Instance,type WsComponentMeta,} from "@webstudio-is/sdk";diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex 7179331a06..88a0ba5247 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -2,7 +2,7 @@ import { computed } from "nanostores";import { useState } from "react";import { useStore } from "@nanostores/react";import { matchSorter } from "match-sorter";-import type { Instance } from "@webstudio-is/sdk";+import { type Instance, descendantComponent } from "@webstudio-is/sdk";import {theme,Combobox,@@ -11,10 +11,7 @@ import {Box,Grid,} from "@webstudio-is/design-system";-import {- descendantComponent,- isAttributeNameSafe,-} from "@webstudio-is/react-sdk";+import { isAttributeNameSafe } from "@webstudio-is/react-sdk";import {$propValuesByInstanceSelector,$propsIndex,diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.tsindex edc6e1e0c2..d44c556790 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts@@ -1,13 +1,9 @@import { nanoid } from "nanoid";+import { useStore } from "@nanostores/react";import type { PropMeta, Instance, Prop } from "@webstudio-is/sdk";-import {- showAttribute,- textContentAttribute,- collectionComponent,- descendantComponent,-} from "@webstudio-is/react-sdk";+import { collectionComponent, descendantComponent } from "@webstudio-is/sdk";+import { showAttribute, textContentAttribute } from "@webstudio-is/react-sdk";import type { PropValue } from "../shared";-import { useStore } from "@nanostores/react";import {$isContentMode,$registeredComponentMetas,diff --git a/apps/builder/app/builder/features/style-panel/shared/model.tsx b/apps/builder/app/builder/features/style-panel/shared/model.tsxindex 72a99ba63e..9a01092d13 100644--- a/apps/builder/app/builder/features/style-panel/shared/model.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/model.tsx@@ -20,7 +20,7 @@ import {type StyleDecl,type WsComponentMeta,} from "@webstudio-is/sdk";-import { rootComponent } from "@webstudio-is/react-sdk";+import { rootComponent } from "@webstudio-is/sdk";import {$breakpoints,$instances,diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-utils.ts b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-utils.tsindex 5648a0147e..42895b04d5 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-utils.ts+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-utils.ts@@ -1,5 +1,5 @@-import { blockTemplateComponent } from "@webstudio-is/react-sdk";import type { Instance, Instances } from "@webstudio-is/sdk";+import { blockTemplateComponent } from "@webstudio-is/sdk";import { shallowEqual } from "shallow-equal";import { selectInstance } from "~/shared/awareness";import {diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex b400053261..185d170d54 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -1,5 +1,5 @@import { nanoid } from "nanoid";-import { blockTemplateComponent } from "@webstudio-is/react-sdk";+import { blockTemplateComponent } from "@webstudio-is/sdk";import type { Instance } from "@webstudio-is/sdk";import { toast } from "@webstudio-is/design-system";import { createCommandsEmitter, type Command } from "~/shared/commands-emitter";diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 8142e839aa..6feb2554c4 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -1,12 +1,9 @@import { useMemo, useEffect, useState, useLayoutEffect, useRef } from "react";import { ErrorBoundary, type FallbackProps } from "react-error-boundary";import { useStore } from "@nanostores/react";-import type { Instances } from "@webstudio-is/sdk";-import {- type Components,- coreMetas,- corePropsMetas,-} from "@webstudio-is/react-sdk";+import { type Instances, coreMetas, corePropsMetas } from "@webstudio-is/sdk";+import { coreTemplates } from "@webstudio-is/sdk/core-templates";+import type { Components } from "@webstudio-is/react-sdk";import { wsImageLoader } from "@webstudio-is/image";import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";import * as baseComponents from "@webstudio-is/sdk-components-react";@@ -225,7 +222,7 @@ export const Canvas = () => {components: {},metas: coreMetas,propsMetas: corePropsMetas,- templates: {},+ templates: coreTemplates,});registerComponentLibrary({components: baseComponents,diff --git a/apps/builder/app/canvas/features/build-mode/block.tsx b/apps/builder/app/canvas/features/build-mode/block.tsxindex 0cc1e137c8..5e183dee67 100644--- a/apps/builder/app/canvas/features/build-mode/block.tsx+++ b/apps/builder/app/canvas/features/build-mode/block.tsx@@ -1,6 +1,6 @@import { useStore } from "@nanostores/react";+import { blockTemplateComponent } from "@webstudio-is/sdk";import {- blockTemplateComponent,idAttribute,selectorIdAttribute,type AnyComponent,diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 96a452d55c..235ed9548c 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -20,7 +20,13 @@ import type {Prop,WsComponentMeta,} from "@webstudio-is/sdk";-import { findTreeInstanceIds } from "@webstudio-is/sdk";+import {+ findTreeInstanceIds,+ collectionComponent,+ descendantComponent,+ blockComponent,+ blockTemplateComponent,+} from "@webstudio-is/sdk";import {idAttribute,componentAttribute,@@ -28,12 +34,8 @@ import {selectorIdAttribute,indexAttribute,getIndexesWithinAncestors,- collectionComponent,type AnyComponent,textContentAttribute,- descendantComponent,- blockComponent,- blockTemplateComponent,editingPlaceholderVariable,editablePlaceholderVariable,} from "@webstudio-is/react-sdk";diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 6ac01ac403..2e735cfb9f 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -5,6 +5,8 @@ import {Instance,ROOT_INSTANCE_ID,getStyleDeclKey,+ descendantComponent,+ rootComponent,type StyleDecl,type StyleSourceSelection,} from "@webstudio-is/sdk";@@ -14,8 +16,6 @@ import {editingPlaceholderVariable,addGlobalRules,createImageValueTransformer,- descendantComponent,- rootComponent,editablePlaceholderVariable,componentAttribute,} from "@webstudio-is/react-sdk";diff --git a/apps/builder/app/shared/awareness.ts b/apps/builder/app/shared/awareness.tsindex bf45ce2b54..67ec28108a 100644--- a/apps/builder/app/shared/awareness.ts+++ b/apps/builder/app/shared/awareness.ts@@ -5,8 +5,8 @@ import {Instances,ROOT_INSTANCE_ID,type Page,+ rootComponent,} from "@webstudio-is/sdk";-import { rootComponent } from "@webstudio-is/react-sdk";import { $pages } from "./nano-states/pages";import { $instances, $selectedInstanceSelector } from "./nano-states/instances";diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts b/apps/builder/app/shared/copy-paste/plugin-instance.test.tsindex b5caa4fc63..fe4246323c 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts@@ -8,13 +8,13 @@ import type {DataSource,DataSources,} from "@webstudio-is/sdk";-import { encodeDataSourceVariable } from "@webstudio-is/sdk";-import type { Project } from "@webstudio-is/project";import {+ encodeDataSourceVariable,collectionComponent,coreMetas,portalComponent,-} from "@webstudio-is/react-sdk";+} from "@webstudio-is/sdk";+import type { Project } from "@webstudio-is/project";import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";import { registerContainers } from "../sync";import {diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.tsindex 01c5708cdf..5faeb5f7de 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts@@ -1,12 +1,12 @@import { shallowEqual } from "shallow-equal";import { z } from "zod";import { toast } from "@webstudio-is/design-system";-import { portalComponent } from "@webstudio-is/react-sdk";import {Instance,Instances,WebstudioFragment,findTreeInstanceIdsExcludingSlotDescendants,+ portalComponent,} from "@webstudio-is/sdk";import {$selectedInstanceSelector,diff --git a/apps/builder/app/shared/instance-utils.test.tsx b/apps/builder/app/shared/instance-utils.test.tsxindex c08bd8585b..acce118cba 100644--- a/apps/builder/app/shared/instance-utils.test.tsx+++ b/apps/builder/app/shared/instance-utils.test.tsx@@ -1,6 +1,5 @@import { enableMapSet } from "immer";import { describe, test, expect, beforeEach } from "vitest";-import { portalComponent, collectionComponent } from "@webstudio-is/react-sdk";import type { Project } from "@webstudio-is/project";import { createDefaultPages } from "@webstudio-is/project-build";import {@@ -11,7 +10,6 @@ import {renderTemplate,} from "@webstudio-is/template";import { parseCss } from "@webstudio-is/css-data";-import { coreMetas } from "@webstudio-is/react-sdk";import * as defaultMetas from "@webstudio-is/sdk-components-react/metas";import * as radixMetas from "@webstudio-is/sdk-components-react-radix/metas";import type {@@ -32,7 +30,13 @@ import type {WebstudioFragment,WsComponentMeta,} from "@webstudio-is/sdk";-import { encodeDataSourceVariable, getStyleDeclKey } from "@webstudio-is/sdk";+import {+ encodeDataSourceVariable,+ getStyleDeclKey,+ coreMetas,+ portalComponent,+ collectionComponent,+} from "@webstudio-is/sdk";import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";import {findClosestEditableInstanceSelector,diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex 3a2d988866..c99d1bb514 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -26,12 +26,10 @@ import {transpileExpression,getExpressionIdentifiers,ROOT_INSTANCE_ID,-} from "@webstudio-is/sdk";-import {- generateDataFromEmbedTemplate,portalComponent,collectionComponent,-} from "@webstudio-is/react-sdk";+} from "@webstudio-is/sdk";+import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";import {$props,$styles,diff --git a/apps/builder/app/shared/matcher.test.tsx b/apps/builder/app/shared/matcher.test.tsxindex 1db35bac79..8fd56595bd 100644--- a/apps/builder/app/shared/matcher.test.tsx+++ b/apps/builder/app/shared/matcher.test.tsx@@ -5,7 +5,7 @@ import {ExpressionValue,renderTemplate,} from "@webstudio-is/template";-import { coreMetas } from "@webstudio-is/react-sdk";+import { coreMetas } from "@webstudio-is/sdk";import * as baseMetas from "@webstudio-is/sdk-components-react/metas";import * as radixMetas from "@webstudio-is/sdk-components-react-radix/metas";import type { Matcher, WsComponentMeta } from "@webstudio-is/sdk";diff --git a/apps/builder/app/shared/nano-states/canvas.ts b/apps/builder/app/shared/nano-states/canvas.tsindex bdc94007eb..ab4c6ea97a 100644--- a/apps/builder/app/shared/nano-states/canvas.ts+++ b/apps/builder/app/shared/nano-states/canvas.ts@@ -1,12 +1,9 @@import { atom, computed } from "nanostores";import type { Instance, Instances } from "@webstudio-is/sdk";+import { blockComponent, blockTemplateComponent } from "@webstudio-is/sdk";import type { FontWeight } from "@webstudio-is/fonts";import { $instances } from "./instances";import type { InstanceSelector } from "../tree-utils";-import {- blockComponent,- blockTemplateComponent,-} from "@webstudio-is/react-sdk";export type TextToolbarState = {selectionRect: undefined | DOMRect;diff --git a/apps/builder/app/shared/nano-states/props.test.ts b/apps/builder/app/shared/nano-states/props.test.tsindex f21d2ce36e..1ea4305028 100644--- a/apps/builder/app/shared/nano-states/props.test.ts+++ b/apps/builder/app/shared/nano-states/props.test.ts@@ -2,11 +2,12 @@ import { beforeEach, expect, test } from "vitest";import { cleanStores } from "nanostores";import { createDefaultPages } from "@webstudio-is/project-build";import { setEnv } from "@webstudio-is/feature-flags";-import { encodeDataSourceVariable, type Instance } from "@webstudio-is/sdk";import {+ type Instance,+ encodeDataSourceVariable,collectionComponent,- textContentAttribute,-} from "@webstudio-is/react-sdk";+} from "@webstudio-is/sdk";+import { textContentAttribute } from "@webstudio-is/react-sdk";import { $instances } from "./instances";import {$propValuesByInstanceSelector,diff --git a/apps/builder/app/shared/nano-states/props.ts b/apps/builder/app/shared/nano-states/props.tsindex 52997cf3c1..94c6cf61b3 100644--- a/apps/builder/app/shared/nano-states/props.ts+++ b/apps/builder/app/shared/nano-states/props.ts@@ -12,17 +12,14 @@ import {decodeDataSourceVariable,encodeDataSourceVariable,transpileExpression,+ collectionComponent,+ portalComponent,} from "@webstudio-is/sdk";import {createJsonStringifyProxy,isPlainObject,} from "@webstudio-is/sdk/runtime";-import {- collectionComponent,- normalizeProps,- portalComponent,- textContentAttribute,-} from "@webstudio-is/react-sdk";+import { normalizeProps, textContentAttribute } from "@webstudio-is/react-sdk";import { isFeatureEnabled } from "@webstudio-is/feature-flags";import { mapGroupBy } from "~/shared/shim";import { $instances } from "./instances";diff --git a/apps/builder/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.tsindex 74a58330c1..6103996631 100644--- a/apps/builder/app/shared/tree-utils.ts+++ b/apps/builder/app/shared/tree-utils.ts@@ -11,8 +11,7 @@ import type {StyleSourceSelection,WsComponentMeta,} from "@webstudio-is/sdk";-import { findTreeInstanceIds } from "@webstudio-is/sdk";-import { collectionComponent } from "@webstudio-is/react-sdk";+import { findTreeInstanceIds, collectionComponent } from "@webstudio-is/sdk";// slots can have multiple parents so instance should be addressed// with full rendered path to avoid double selections with slotsdiff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex 6619561981..b33a6e6a4e 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -23,8 +23,6 @@ import {normalizeProps,generateRemixRoute,generateRemixParams,- isCoreComponent,- coreMetas,} from "@webstudio-is/react-sdk";import type {Instance,@@ -47,6 +45,8 @@ import {generatePageMeta,getStaticSiteMapXml,replaceFormActionsWithResources,+ isCoreComponent,+ coreMetas,} from "@webstudio-is/sdk";import type { Data } from "@webstudio-is/http-client";import { wsImageLoader } from "@webstudio-is/image";diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.tsindex eadbf192f6..b110511f83 100644--- a/packages/react-sdk/src/component-generator.ts+++ b/packages/react-sdk/src/component-generator.ts@@ -12,14 +12,12 @@ import {generateExpression,decodeDataSourceVariable,transpileExpression,-} from "@webstudio-is/sdk";-import { indexAttribute, isAttributeNameSafe, showAttribute } from "./props";-import {blockComponent,blockTemplateComponent,collectionComponent,descendantComponent,-} from "./core-components";+} from "@webstudio-is/sdk";+import { indexAttribute, isAttributeNameSafe, showAttribute } from "./props";import type { IndexesWithinAncestors } from "./instance-utils";/**diff --git a/packages/react-sdk/src/core-components.ts b/packages/react-sdk/src/core-components.tsdeleted file mode 100644index 928e5afb04..0000000000--- a/packages/react-sdk/src/core-components.ts+++ /dev/null@@ -1,457 +0,0 @@-import {- ContentBlockIcon,- ListViewIcon,- PaintBrushIcon,- SettingsIcon,- AddTemplateInstanceIcon,-} from "@webstudio-is/icons/svg";-import { html } from "@webstudio-is/sdk/normalize.css";-import type { WsComponentMeta, WsComponentPropsMeta } from "@webstudio-is/sdk";--export const rootComponent = "ws:root";--const rootMeta: WsComponentMeta = {- category: "hidden",- type: "container",- label: "Global Root",- icon: SettingsIcon,- presetStyle: {- html,- },-};--const rootPropsMeta: WsComponentPropsMeta = {- props: {},-};--export const portalComponent = "Slot";--export const collectionComponent = "ws:collection";--const collectionMeta: WsComponentMeta = {- category: "data",- order: 2,- type: "container",- label: "Collection",- icon: ListViewIcon,- stylable: false,- template: [- {- type: "instance",- component: collectionComponent,- props: [- {- name: "data",- type: "json",- value: [- "Collection Item 1",- "Collection Item 2",- "Collection Item 3",- ],- },- {- name: "item",- type: "parameter",- variableName: "collectionItem",- variableAlias: "Collection Item",- },- ],- children: [- {- type: "instance",- component: "Box",- children: [- {- type: "instance",- component: "Text",- children: [{ type: "expression", value: "collectionItem" }],- },- ],- },- ],- },- ],-};--const collectionPropsMeta: WsComponentPropsMeta = {- props: {- data: {- required: true,- control: "json",- type: "json",- },- },- initialProps: ["data"],-};--export const descendantComponent = "ws:descendant";--const descendantMeta: WsComponentMeta = {- category: "internal",- type: "control",- label: "Descendant",- icon: PaintBrushIcon,- constraints: {- relation: "parent",- component: { $in: ["HtmlEmbed", "MarkdownEmbed"] },- },-};--const descendantPropsMeta: WsComponentPropsMeta = {- props: {- selector: {- required: true,- type: "string",- control: "select",- options: [- " p",- " h1",- " h2",- " h3",- " h4",- " h5",- " h6",- " :where(strong, b)",- " :where(em, i)",- " a",- " img",- " blockquote",- " code",- " :where(ul, ol)",- " li",- " hr",- ],- },- },- initialProps: ["selector"],-};--export const blockComponent = "ws:block";--export const blockTemplateComponent = "ws:block-template";--export const blockTemplateMeta: WsComponentMeta = {- category: "hidden",- type: "container",- icon: AddTemplateInstanceIcon,- stylable: false,- constraints: {- relation: "parent",- component: { $eq: blockComponent },- },-};--const blockTemplatePropsMeta: WsComponentPropsMeta = {- props: {},- initialProps: [],-};--const blockMeta: WsComponentMeta = {- category: "typography",- type: "container",- label: "Content Block",- icon: ContentBlockIcon,- constraints: [- {- relation: "ancestor",- component: { $nin: [collectionComponent, blockComponent] },- },- {- relation: "child",- component: { $eq: blockTemplateComponent },- },- ],- stylable: false,- template: [- {- type: "instance",- component: blockComponent,- props: [],- children: [- {- component: blockTemplateComponent,- type: "instance",- label: "Templates",- children: [- {- component: "Paragraph",- type: "instance",- children: [],- },- {- component: "Heading",- type: "instance",- label: "Heading 1",- props: [- {- name: "tag",- type: "string",- value: "h1",- },- ],- children: [],- },- {- component: "Heading",- type: "instance",- label: "Heading 2",- props: [- {- name: "tag",- type: "string",- value: "h2",- },- ],- children: [],- },- {- component: "Heading",- type: "instance",- label: "Heading 3",- props: [- {- name: "tag",- type: "string",- value: "h3",- },- ],- children: [],- },- {- component: "Heading",- type: "instance",- label: "Heading 4",- props: [- {- name: "tag",- type: "string",- value: "h4",- },- ],- children: [],- },- {- component: "Heading",- type: "instance",- label: "Heading 5",- props: [- {- name: "tag",- type: "string",- value: "h5",- },- ],- children: [],- },- {- component: "Heading",- type: "instance",- label: "Heading 6",- props: [- {- name: "tag",- type: "string",- value: "h6",- },- ],- children: [],- },- {- component: "List",- type: "instance",- label: "List (Unordered)",- children: [- {- component: "ListItem",- type: "instance",- children: [],- },- ],- },- {- component: "List",- type: "instance",- label: "List (Ordered)",- props: [- {- name: "ordered",- type: "boolean",- value: true,- },- ],- children: [- {- component: "ListItem",- type: "instance",- children: [],- },- ],- },- {- component: "Link",- type: "instance",- children: [],- },- {- component: "Image",- type: "instance",- styles: [- {- property: "marginRight",- value: {- type: "keyword",- value: "auto",- },- },- {- property: "marginLeft",- value: {- type: "keyword",- value: "auto",- },- },- {- property: "width",- value: {- type: "unit",- unit: "%",- value: 100,- },- },- {- property: "height",- value: {- type: "keyword",- value: "auto",- },- },- ],- children: [],- },- {- component: "Separator",- type: "instance",- children: [],- },- {- component: "Blockquote",- type: "instance",- children: [],- },- {- component: "HtmlEmbed",- type: "instance",- children: [],- },- {- component: "CodeText",- type: "instance",- children: [],- },- ],- },- {- type: "instance",- component: "Paragraph",- children: [- {- type: "text",- value:- "The Content Block component designates regions on the page where pre-styled instances can be inserted in ",- },- {- type: "instance",- component: "RichTextLink",- children: [- {- type: "text",- value: "Content mode",- },- ],- props: [- {- type: "string",- name: "href",- value: "https://wstd.us/content-block",- },- ],- },- {- type: "text",- value: ".",- },- ],- },- {- type: "instance",- component: "List",- children: [- {- type: "instance",- component: "ListItem",- children: [- {- type: "text",- value:- "In Content mode, you can edit any direct child instances that were pre-added to the Content Block, as well as add new instances predefined in Templates.",- },- ],- },- {- type: "instance",- component: "ListItem",- children: [- {- type: "text",- value:- "To predefine instances for insertion in Content mode, switch to Design mode and add them to the Templates container.",- },- ],- },- {- type: "instance",- component: "ListItem",- children: [- {- type: "text",- value:- "To insert predefined instances in Content mode, click the + button while hovering over the Content Block on the canvas and choose an instance from the list.",- },- ],- },- ],- },- ],- },- ],-};--const blockPropsMeta: WsComponentPropsMeta = {- props: {},- initialProps: [],-};--export const coreMetas = {- [rootComponent]: rootMeta,- [collectionComponent]: collectionMeta,- [descendantComponent]: descendantMeta,- [blockComponent]: blockMeta,- [blockTemplateComponent]: blockTemplateMeta,-};--export const corePropsMetas = {- [rootComponent]: rootPropsMeta,- [collectionComponent]: collectionPropsMeta,- [descendantComponent]: descendantPropsMeta,- [blockComponent]: blockPropsMeta,- [blockTemplateComponent]: blockTemplatePropsMeta,-};--// components with custom implementation-// should not be imported as react component-export const isCoreComponent = (component: string) =>- component === rootComponent ||- component === collectionComponent ||- component === descendantComponent ||- component === blockComponent ||- component === blockTemplateComponent;diff --git a/packages/react-sdk/src/css/css.test.tsx b/packages/react-sdk/src/css/css.test.tsxindex 7a25bff19e..def15a0e74 100644--- a/packages/react-sdk/src/css/css.test.tsx+++ b/packages/react-sdk/src/css/css.test.tsx@@ -1,8 +1,8 @@import { expect, test } from "vitest";import type { Breakpoint } from "@webstudio-is/sdk";+import { descendantComponent, rootComponent } from "@webstudio-is/sdk";import { $, renderJsx } from "@webstudio-is/template";import { generateCss, type CssConfig } from "./css";-import { descendantComponent, rootComponent } from "../core-components";const toMap = <T extends { id: string }>(list: T[]) =>new Map(list.map((item) => [item.id, item] as const));diff --git a/packages/react-sdk/src/css/css.ts b/packages/react-sdk/src/css/css.tsindex a0b3cfc816..5b4f1bbb2c 100644--- a/packages/react-sdk/src/css/css.ts+++ b/packages/react-sdk/src/css/css.ts@@ -8,6 +8,8 @@ import {ROOT_INSTANCE_ID,createScope,parseComponentName,+ descendantComponent,+ rootComponent,type Assets,type Breakpoints,type Instance,@@ -17,7 +19,6 @@ import {type Styles,type WsComponentMeta,} from "@webstudio-is/sdk";-import { descendantComponent, rootComponent } from "../core-components";import { addGlobalRules } from "./global-rules";import { kebabCase } from "change-case";diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.tsindex 567baf6eb7..ff51e35902 100644--- a/packages/react-sdk/src/index.ts+++ b/packages/react-sdk/src/index.ts@@ -1,6 +1,5 @@export * from "./remix";export * from "./css/index";-export * from "./core-components";export * from "./components/components-utils";export * from "./embed-template";export * from "./props";diff --git a/packages/sdk-cli/src/generate-stories.ts b/packages/sdk-cli/src/generate-stories.tsindex a75232020c..b4db61b09c 100644--- a/packages/sdk-cli/src/generate-stories.ts+++ b/packages/sdk-cli/src/generate-stories.ts@@ -6,13 +6,13 @@ import {type Instances,type Instance,type Scope,+ type WsComponentMeta,createScope,parseComponentName,getStyleDeclKey,- WsComponentMeta,+ coreMetas,} from "@webstudio-is/sdk";import {- coreMetas,generateCss,generateWebstudioComponent,getIndexesWithinAncestors,diff --git a/packages/sdk/package.json b/packages/sdk/package.jsonindex fc044e6ab6..af154d45f2 100644--- a/packages/sdk/package.json+++ b/packages/sdk/package.json@@ -21,6 +21,11 @@"webstudio": "./src/__generated__/normalize.css.ts","types": "./lib/types/__generated__/normalize.css.d.ts","import": "./lib/__generated__/normalize.css.js"+ },+ "./core-templates": {+ "webstudio": "./src/core-templates.tsx",+ "types": "./lib/types/core-templates.d.ts",+ "import": "./lib/core-templates.js"}},"files": [@@ -32,12 +37,13 @@"typecheck": "tsc","test": "vitest run","build:normalize.css": "tsx --conditions=webstudio ./scripts/normalize.css.ts && prettier --write src/__generated__/normalize.css.ts",- "build": "rm -rf lib && esbuild src/index.ts src/runtime.ts src/__generated__/normalize.css.ts --outdir=lib --bundle --format=esm --packages=external",+ "build": "rm -rf lib && esbuild src/index.ts src/runtime.ts src/__generated__/normalize.css.ts src/core-templates.tsx --outdir=lib --bundle --format=esm --packages=external","dts": "tsc --project tsconfig.dts.json"},"dependencies": {"@webstudio-is/css-engine": "workspace:*","@webstudio-is/fonts": "workspace:*",+ "@webstudio-is/icons": "workspace:*","acorn": "^8.14.0","acorn-walk": "^8.3.4","reserved-identifiers": "^1.0.0",diff --git a/packages/sdk/src/core-metas.ts b/packages/sdk/src/core-metas.tsnew file mode 100644index 0000000000..751842a037--- /dev/null+++ b/packages/sdk/src/core-metas.ts@@ -0,0 +1,154 @@+import {+ ContentBlockIcon,+ ListViewIcon,+ PaintBrushIcon,+ SettingsIcon,+ AddTemplateInstanceIcon,+} from "@webstudio-is/icons/svg";+import { html } from "./__generated__/normalize.css";+import type {+ WsComponentMeta,+ WsComponentPropsMeta,+} from "./schema/component-meta";++export const rootComponent = "ws:root";++const rootMeta: WsComponentMeta = {+ type: "container",+ label: "Global Root",+ icon: SettingsIcon,+ presetStyle: {+ html,+ },+};++const rootPropsMeta: WsComponentPropsMeta = {+ props: {},+};++export const portalComponent = "Slot";++export const collectionComponent = "ws:collection";++const collectionMeta: WsComponentMeta = {+ type: "container",+ label: "Collection",+ icon: ListViewIcon,+ stylable: false,+};++const collectionPropsMeta: WsComponentPropsMeta = {+ props: {+ data: {+ required: true,+ control: "json",+ type: "json",+ },+ },+ initialProps: ["data"],+};++export const descendantComponent = "ws:descendant";++const descendantMeta: WsComponentMeta = {+ type: "control",+ label: "Descendant",+ icon: PaintBrushIcon,+ constraints: {+ relation: "parent",+ component: { $in: ["HtmlEmbed", "MarkdownEmbed"] },+ },+};++const descendantPropsMeta: WsComponentPropsMeta = {+ props: {+ selector: {+ required: true,+ type: "string",+ control: "select",+ options: [+ " p",+ " h1",+ " h2",+ " h3",+ " h4",+ " h5",+ " h6",+ " :where(strong, b)",+ " :where(em, i)",+ " a",+ " img",+ " blockquote",+ " code",+ " :where(ul, ol)",+ " li",+ " hr",+ ],+ },+ },+ initialProps: ["selector"],+};++export const blockComponent = "ws:block";++export const blockTemplateComponent = "ws:block-template";++export const blockTemplateMeta: WsComponentMeta = {+ type: "container",+ icon: AddTemplateInstanceIcon,+ stylable: false,+ constraints: {+ relation: "parent",+ component: { $eq: blockComponent },+ },+};++const blockTemplatePropsMeta: WsComponentPropsMeta = {+ props: {},+};++const blockMeta: WsComponentMeta = {+ type: "container",+ label: "Content Block",+ icon: ContentBlockIcon,+ constraints: [+ {+ relation: "ancestor",+ component: { $nin: [collectionComponent, blockComponent] },+ },+ {+ relation: "child",+ component: { $eq: blockTemplateComponent },+ },+ ],+ stylable: false,+};++const blockPropsMeta: WsComponentPropsMeta = {+ props: {},+};++export const coreMetas = {+ [rootComponent]: rootMeta,+ [collectionComponent]: collectionMeta,+ [descendantComponent]: descendantMeta,+ [blockComponent]: blockMeta,+ [blockTemplateComponent]: blockTemplateMeta,+};++export const corePropsMetas = {+ [rootComponent]: rootPropsMeta,+ [collectionComponent]: collectionPropsMeta,+ [descendantComponent]: descendantPropsMeta,+ [blockComponent]: blockPropsMeta,+ [blockTemplateComponent]: blockTemplatePropsMeta,+};++// components with custom implementation+// should not be imported as react component+export const isCoreComponent = (component: string) =>+ component === rootComponent ||+ component === collectionComponent ||+ component === descendantComponent ||+ component === blockComponent ||+ component === blockTemplateComponent;diff --git a/packages/sdk/src/core-templates.tsx b/packages/sdk/src/core-templates.tsxnew file mode 100644index 0000000000..609199c301--- /dev/null+++ b/packages/sdk/src/core-templates.tsx@@ -0,0 +1,103 @@+import {+ $,+ css,+ expression,+ Parameter,+ ws,+ type TemplateMeta,+} from "@webstudio-is/template";+import {+ blockComponent,+ collectionComponent,+ descendantComponent,+} from "./core-metas";++const collectionItem = new Parameter("collectionItem");++const collectionMeta: TemplateMeta = {+ category: "data",+ order: 2,+ template: (+ <ws.collection+ data={["Collection Item 1", "Collection Item 2", "Collection Item 3"]}+ item={collectionItem}+ >+ <$.Box>+ <$.Text>{expression`${collectionItem}`}</$.Text>+ </$.Box>+ </ws.collection>+ ),+};++const descendantMeta: TemplateMeta = {+ category: "internal",+ template: <ws.descendant selector=" p" />,+};++const BlockTemplate = ws["block-template"];++const blockMeta: TemplateMeta = {+ category: "typography",+ template: (+ <ws.block>+ <BlockTemplate ws:label="Templates">+ <$.Paragraph></$.Paragraph>+ <$.Heading ws:label="Heading 1" tag="h1"></$.Heading>+ <$.Heading ws:label="Heading 2" tag="h2"></$.Heading>+ <$.Heading ws:label="Heading 3" tag="h3"></$.Heading>+ <$.Heading ws:label="Heading 4" tag="h4"></$.Heading>+ <$.Heading ws:label="Heading 5" tag="h5"></$.Heading>+ <$.Heading ws:label="Heading 6" tag="h6"></$.Heading>+ <$.List ws:label="List (Unordered)">+ <$.ListItem></$.ListItem>+ </$.List>+ <$.List ws:label="List (Ordered)" ordered={true}>+ <$.ListItem></$.ListItem>+ </$.List>+ <$.Link></$.Link>+ <$.Image+ ws:style={css`+ margin-right: auto;+ margin-left: auto;+ width: 100%;+ height: auto;+ `}+ />+ <$.Separator />+ <$.Blockquote></$.Blockquote>+ <$.HtmlEmbed />+ <$.CodeText />+ </BlockTemplate>+ <$.Paragraph>+ The Content Block component designates regions on the page where+ pre-styled instances can be inserted in{" "}+ <$.RichTextLink href="https://wstd.us/content-block">+ Content mode+ </$.RichTextLink>+ .+ </$.Paragraph>+ <$.List>+ <$.ListItem>+ In Content mode, you can edit any direct child instances that were+ pre-added to the Content Block, as well as add new instances+ predefined in Templates.+ </$.ListItem>+ <$.ListItem>+ To predefine instances for insertion in Content mode, switch to Design+ mode and add them to the Templates container.+ </$.ListItem>+ <$.ListItem>+ To insert predefined instances in Content mode, click the + button+ while hovering over the Content Block on the canvas and choose an+ instance from the list.+ </$.ListItem>+ </$.List>+ </ws.block>+ ),+};++export const coreTemplates = {+ [collectionComponent]: collectionMeta,+ [descendantComponent]: descendantMeta,+ [blockComponent]: blockMeta,+};diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.tsindex e54bed562f..12c7f3be66 100644--- a/packages/sdk/src/index.ts+++ b/packages/sdk/src/index.ts@@ -14,6 +14,7 @@ export * from "./schema/prop-meta";export * from "./schema/embed-template";export * from "./schema/component-meta";+export * from "./core-metas";export * from "./instances-utils";export * from "./page-utils";export * from "./scope";diff --git a/packages/template/src/jsx.test.tsx b/packages/template/src/jsx.test.tsxindex d7a1af0275..f8d7da3f90 100644--- a/packages/template/src/jsx.test.tsx+++ b/packages/template/src/jsx.test.tsx@@ -7,6 +7,7 @@ import {expression,ExpressionValue,PageValue,+ Parameter,ParameterValue,PlaceholderValue,renderTemplate,@@ -457,6 +458,41 @@ test("render variable inside of action", () => {]);});+test("render parameter bound to prop expression", () => {+ const system = new Parameter("system");+ const { props, dataSources } = renderTemplate(+ <$.Body+ ws:id="body"+ data-param={system}+ data-value={expression`${system}`}+ ></$.Body>+ );+ expect(props).toEqual([+ {+ id: "body:data-param",+ instanceId: "body",+ name: "data-param",+ type: "parameter",+ value: "0",+ },+ {+ id: "body:data-value",+ instanceId: "body",+ name: "data-value",+ type: "expression",+ value: "$ws$dataSource$0",+ },+ ]);+ expect(dataSources).toEqual([+ {+ type: "parameter",+ id: "0",+ scopeInstanceId: "body",+ name: "system",+ },+ ]);+});+test("render ws:show attribute", () => {const { props } = renderTemplate(<$.Body ws:id="body" ws:show={true}></$.Body>diff --git a/packages/template/src/jsx.ts b/packages/template/src/jsx.tsindex ad92d76a74..f1f5184017 100644--- a/packages/template/src/jsx.ts+++ b/packages/template/src/jsx.ts@@ -24,10 +24,17 @@ export class Variable {}}+export class Parameter {+ name: string;+ constructor(name: string) {+ this.name = name;+ }+}+class Expression {chunks: string[];- variables: Variable[];- constructor(chunks: string[], variables: Variable[]) {+ variables: Array<Variable | Parameter>;+ constructor(chunks: string[], variables: Array<Variable | Parameter>) {this.chunks = chunks;this.variables = variables;}@@ -39,7 +46,7 @@ class Expression {export const expression = (chunks: TemplateStringsArray,- ...variables: Variable[]+ ...variables: Array<Variable | Parameter>): Expression => {return new Expression(Array.from(chunks), variables);};@@ -150,7 +157,7 @@ export const renderTemplate = (root: JSX.Element): WebstudioFragment => {const styleSources: StyleSource[] = [];const styleSourceSelections: StyleSourceSelection[] = [];const styles: StyleDecl[] = [];- const dataSources = new Map<Variable, DataSource>();+ const dataSources = new Map<Variable | Parameter, DataSource>();const ids = new Map<unknown, string>();const getId = (key: unknown) => {let id = ids.get(key);@@ -161,28 +168,41 @@ export const renderTemplate = (root: JSX.Element): WebstudioFragment => {}return id;};- const getVariableId = (instanceId: string, variable: Variable) => {+ const getVariableId = (+ instanceId: string,+ variable: Variable | Parameter+ ) => {const id = getId(variable);if (dataSources.has(variable)) {return id;}- let value: Extract<DataSource, { type: "variable" }>["value"];- if (typeof variable.initialValue === "string") {- value = { type: "string", value: variable.initialValue };- } else if (typeof variable.initialValue === "number") {- value = { type: "number", value: variable.initialValue };- } else if (typeof variable.initialValue === "boolean") {- value = { type: "boolean", value: variable.initialValue };- } else {- value = { type: "json", value: variable.initialValue };+ if (variable instanceof Variable) {+ let value: Extract<DataSource, { type: "variable" }>["value"];+ if (typeof variable.initialValue === "string") {+ value = { type: "string", value: variable.initialValue };+ } else if (typeof variable.initialValue === "number") {+ value = { type: "number", value: variable.initialValue };+ } else if (typeof variable.initialValue === "boolean") {+ value = { type: "boolean", value: variable.initialValue };+ } else {+ value = { type: "json", value: variable.initialValue };+ }+ dataSources.set(variable, {+ type: "variable",+ scopeInstanceId: instanceId,+ id,+ name: variable.name,+ value,+ });+ }+ if (variable instanceof Parameter) {+ dataSources.set(variable, {+ type: "parameter",+ scopeInstanceId: instanceId,+ id,+ name: variable.name,+ });}- dataSources.set(variable, {- type: "variable",- scopeInstanceId: instanceId,- id,- name: variable.name,- value,- });return id;};// lazily create breakpoint@@ -238,6 +258,14 @@ export const renderTemplate = (root: JSX.Element): WebstudioFragment => {props.push({ ...base, type: "expression", value: expression });continue;}+ if (value instanceof Parameter) {+ props.push({+ ...base,+ type: "parameter",+ value: getVariableId(instanceId, value),+ });+ continue;+ }if (value instanceof ExpressionValue) {props.push({ ...base, type: "expression", value: value.value });continue;diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex b997f46316..e613de6b2d 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1770,6 +1770,9 @@ importers:'@webstudio-is/fonts':specifier: workspace:*version: link:../fonts+ '@webstudio-is/icons':+ specifier: workspace:*+ version: link:../iconsacorn:specifier: ^8.14.0version: 8.14.0