Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

experimental: add content embed aka rich text component (#3315)

Bogdan Chadkincacfbee30701
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.tsx
index 49ee8484a6..ac79cfbdf4 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
@@ -1,7 +1,9 @@
import { useState } from "react";
import { useStore } from "@nanostores/react";
+import { matchSorter } from "match-sorter";
import type { Instance } from "@webstudio-is/sdk";
import { theme, Combobox, Separator, Flex } from "@webstudio-is/design-system";
+import { descendantComponent } from "@webstudio-is/react-sdk";
import {
$propValuesByInstanceSelector,
$propsIndex,
@@ -17,7 +19,6 @@ import {
} from "./use-props-logic";
import { Row } from "../shared";
import { serverSyncStore } from "~/shared/sync";
-import { matchSorter } from "match-sorter";
const itemToString = (item: NameAndLabel | null) =>
item?.label || item?.name || "";
@@ -222,11 +223,16 @@ export const PropsSectionContainer = ({
}
return (
- <PropsSection
- propsLogic={logic}
- propValues={propValues ?? new Map()}
- component={instance.component}
- instanceId={instance.id}
- />
+ <fieldset
+ style={{ display: "contents" }}
+ disabled={instance.component === descendantComponent}
+ >
+ <PropsSection
+ propsLogic={logic}
+ propValues={propValues ?? new Map()}
+ component={instance.component}
+ instanceId={instance.id}
+ />
+ </fieldset>
);
};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
index 0b5b1ff25a..67fa555d07 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx
@@ -58,6 +58,13 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
return false;
}
+ if (
+ isFeatureEnabled("internalComponents") === false &&
+ category === "internal"
+ ) {
+ return;
+ }
+
return true;
})
.map((category) => (
@@ -81,8 +88,8 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {
return;
}
if (
- isFeatureEnabled("internalComponents") === false &&
- meta.category === "internal"
+ isFeatureEnabled("cms") === false &&
+ component === "ContentEmbed"
) {
return;
}
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
index 471f9dfd90..0027957b8e 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -27,7 +27,7 @@ import {
collectionComponent,
type AnyComponent,
textContentAttribute,
- descendentComponent,
+ descendantComponent,
} from "@webstudio-is/react-sdk";
import {
$propValuesByInstanceSelector,
@@ -329,7 +329,7 @@ export const WebstudioComponentCanvas = forwardRef<
}
}
- if (instance.component === descendentComponent) {
+ if (instance.component === descendantComponent) {
return <></>;
}
@@ -453,7 +453,7 @@ export const WebstudioComponentPreview = forwardRef<
}
}
- if (instance.component === descendentComponent) {
+ if (instance.component === descendantComponent) {
return <></>;
}
diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.ts
index 6ec3546020..20f97fcc9a 100644
--- a/apps/builder/app/canvas/shared/styles.ts
+++ b/apps/builder/app/canvas/shared/styles.ts
@@ -13,7 +13,7 @@ import {
addGlobalRules,
createImageValueTransformer,
getPresetStyleRules,
- descendentComponent,
+ descendantComponent,
type Params,
} from "@webstudio-is/react-sdk";
import {
@@ -163,14 +163,14 @@ const toVarValue = (styleDecl: StyleDecl): undefined | VarValue => {
}
};
-const $descendentSelectors = computed(
+const $descendantSelectors = computed(
[$instances, $props],
(instances, props) => {
const parentIdByInstanceId = new Map<Instance["id"], Instance["id"]>();
- const descendentInstanceIds: Instance["id"][] = [];
+ const descendantInstanceIds: Instance["id"][] = [];
for (const instance of instances.values()) {
- if (instance.component === descendentComponent) {
- descendentInstanceIds.push(instance.id);
+ if (instance.component === descendantComponent) {
+ descendantInstanceIds.push(instance.id);
}
for (const child of instance.children) {
if (child.type === "id") {
@@ -178,24 +178,24 @@ const $descendentSelectors = computed(
}
}
}
- const descendentSelectorByInstanceId = new Map<Instance["id"], string>();
+ const descendantSelectorByInstanceId = new Map<Instance["id"], string>();
for (const prop of props.values()) {
if (prop.name === "selector" && prop.type === "string") {
- descendentSelectorByInstanceId.set(prop.instanceId, prop.value);
+ descendantSelectorByInstanceId.set(prop.instanceId, prop.value);
}
}
- const descendentSelectors = new Map<Instance["id"], string>();
- for (const instanceId of descendentInstanceIds) {
+ const descendantSelectors = new Map<Instance["id"], string>();
+ for (const instanceId of descendantInstanceIds) {
const parentId = parentIdByInstanceId.get(instanceId);
- const selector = descendentSelectorByInstanceId.get(instanceId);
+ const selector = descendantSelectorByInstanceId.get(instanceId);
if (parentId && selector) {
- descendentSelectors.set(
+ descendantSelectors.set(
instanceId,
`[${idAttribute}="${parentId}"]${selector}`
);
}
}
- return descendentSelectors;
+ return descendantSelectors;
}
);
@@ -267,18 +267,18 @@ export const subscribeStyles = () => {
}
);
- const unsubscribeDescendentSelectors = $descendentSelectors.subscribe(
- (descendentSelectors) => {
+ const unsubscribeDescendantSelectors = $descendantSelectors.subscribe(
+ (descendantSelectors) => {
let selectorsUpdated = false;
- for (const [instanceId, descendentSelector] of descendentSelectors) {
- // access descendent component rule
+ for (const [instanceId, descendantSelector] of descendantSelectors) {
+ // access descendant component rule
// and change its selector to parent id + selector prop
const key = `[${idAttribute}="${instanceId}"]`;
const rule = userSheet.addNestingRule(key);
// invalidate only when necessary
- if (rule.getSelector() !== descendentSelector) {
+ if (rule.getSelector() !== descendantSelector) {
selectorsUpdated = true;
- rule.setSelector(descendentSelector);
+ rule.setSelector(descendantSelector);
}
}
if (selectorsUpdated) {
@@ -291,7 +291,7 @@ export const subscribeStyles = () => {
unsubscribeBreakpoints();
unsubscribeStyles();
unsubscribeStyleSourceSelections();
- unsubscribeDescendentSelectors();
+ unsubscribeDescendantSelectors();
if (animationFrameId) {
cancelAnimationFrame(animationFrameId);
}
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
index 354c70eeb7..fdaa9178ad 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts
@@ -461,7 +461,7 @@ test("when paste into copied instance insert after it", () => {
);
});
-test("prevent pasting portal into own descendents", () => {
+test("prevent pasting portal into own descendants", () => {
const instances = toMap([
createInstance("body", "Body", [{ type: "id", value: "portal" }]),
createInstance("portal", portalComponent, [
diff --git a/packages/css-engine/src/core/atomic.test.ts b/packages/css-engine/src/core/atomic.test.ts
index be03d71868..6b02135902 100644
--- a/packages/css-engine/src/core/atomic.test.ts
+++ b/packages/css-engine/src/core/atomic.test.ts
@@ -176,7 +176,7 @@ test("distinct similar declarations from different breakpoints", () => {
`);
});
-test("support descendent suffix", () => {
+test("support descendant suffix", () => {
const sheet = createRegularStyleSheet();
sheet.addMediaRule("x");
const rule1 = sheet.addNestingRule("instance");
diff --git a/packages/css-engine/src/core/atomic.ts b/packages/css-engine/src/core/atomic.ts
index 352cd73c6e..0eb72910de 100644
--- a/packages/css-engine/src/core/atomic.ts
+++ b/packages/css-engine/src/core/atomic.ts
@@ -13,10 +13,10 @@ export const generateAtomic = (sheet: StyleSheet, options: Options) => {
const atomicRules = new Map<string, NestingRule>();
const classesMap = new Map<string, string[]>();
for (const rule of sheet.nestingRules.values()) {
- const descendentSuffix = rule.getDescendentSuffix();
+ const descendantSuffix = rule.getDescendantSuffix();
const groupKey = getKey(rule);
// a few rules can be in the same group
- // when rule have descendent suffix
+ // when rule have descendant suffix
let classList = classesMap.get(groupKey);
if (classList === undefined) {
classList = [];
@@ -25,7 +25,7 @@ export const generateAtomic = (sheet: StyleSheet, options: Options) => {
// convert each declaration into separate rule
for (const declaration of rule.getDeclarations()) {
const atomicHash = hash(
- descendentSuffix +
+ descendantSuffix +
declaration.breakpoint +
declaration.selector +
declaration.property +
@@ -39,7 +39,7 @@ export const generateAtomic = (sheet: StyleSheet, options: Options) => {
atomicRule = new NestingRule(
new Map(),
`.${className}`,
- descendentSuffix
+ descendantSuffix
);
atomicRule.setDeclaration(declaration);
atomicRules.set(atomicHash, atomicRule);
diff --git a/packages/css-engine/src/core/rules.ts b/packages/css-engine/src/core/rules.ts
index 53511be085..4a5967afd9 100644
--- a/packages/css-engine/src/core/rules.ts
+++ b/packages/css-engine/src/core/rules.ts
@@ -71,7 +71,7 @@ export class MixinRule {
*/
export class NestingRule {
#selector: string;
- #descendentSuffix: string;
+ #descendantSuffix: string;
#mixinRules = new Map<string, MixinRule>();
#mixins = new Set<string>();
// use map to avoid duplicated properties
@@ -84,10 +84,10 @@ export class NestingRule {
constructor(
mixinRules: Map<string, MixinRule>,
selector: string,
- descendentSuffix: string
+ descendantSuffix: string
) {
this.#selector = selector;
- this.#descendentSuffix = descendentSuffix;
+ this.#descendantSuffix = descendantSuffix;
this.#mixinRules = mixinRules;
}
getSelector() {
@@ -97,8 +97,8 @@ export class NestingRule {
this.#selector = selector;
this.#cache.clear();
}
- getDescendentSuffix() {
- return this.#descendentSuffix;
+ getDescendantSuffix() {
+ return this.#descendantSuffix;
}
addMixin(mixin: string) {
this.#mixins.add(mixin);
@@ -167,7 +167,7 @@ export class NestingRule {
continue;
}
const { selector: nestedSelector, property, value } = declaration;
- const selector = this.#selector + this.#descendentSuffix + nestedSelector;
+ const selector = this.#selector + this.#descendantSuffix + nestedSelector;
const lines = linesBySelector.get(selector) ?? "";
const propertyString = toProperty(property);
const valueString = toValue(value, transformValue);
diff --git a/packages/css-engine/src/core/style-sheet-regular.test.ts b/packages/css-engine/src/core/style-sheet-regular.test.ts
index efd5f5e996..5c290fa22b 100644
--- a/packages/css-engine/src/core/style-sheet-regular.test.ts
+++ b/packages/css-engine/src/core/style-sheet-regular.test.ts
@@ -935,7 +935,7 @@ describe("Style Sheet Regular", () => {
`);
});
- test("support descendent suffix", () => {
+ test("support descendant suffix", () => {
const sheet = createRegularStyleSheet();
sheet.addMediaRule("base", {});
const rule1 = sheet.addNestingRule(".instance");
diff --git a/packages/css-engine/src/core/style-sheet.ts b/packages/css-engine/src/core/style-sheet.ts
index e3b6dc6b28..d46c263033 100644
--- a/packages/css-engine/src/core/style-sheet.ts
+++ b/packages/css-engine/src/core/style-sheet.ts
@@ -66,11 +66,11 @@ export class StyleSheet {
}
return rule;
}
- addNestingRule(selector: string, descendentSuffix: string = "") {
- const key = selector + descendentSuffix;
+ addNestingRule(selector: string, descendantSuffix: string = "") {
+ const key = selector + descendantSuffix;
let rule = this.nestingRules.get(key);
if (rule === undefined) {
- rule = new NestingRule(this.#mixinRules, selector, descendentSuffix);
+ rule = new NestingRule(this.#mixinRules, selector, descendantSuffix);
this.nestingRules.set(key, rule);
}
return rule;
diff --git a/packages/icons/icons/content-embed.svg b/packages/icons/icons/content-embed.svg
new file mode 100644
index 0000000000..f2cb2404d3
--- /dev/null
+++ b/packages/icons/icons/content-embed.svg
@@ -0,0 +1,15 @@
+<svg
+ width="16"
+ height="16"
+ viewBox="0 0 16 16"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+>
+ <path
+ d="M12.5 7.85416V4.05416C12.5 2.93405 12.5 2.374 12.282 1.94618C12.0902 1.56985 11.7843 1.26389 11.408 1.07214C10.9801 0.854156 10.4201 0.854156 9.29998 0.854156H5.03331C3.91321 0.854156 3.35316 0.854156 2.92533 1.07214C2.54901 1.26389 2.24305 1.56985 2.0513 1.94618C1.83331 2.374 1.83331 2.93405 1.83331 4.05416V10.9875C1.83331 12.1076 1.83331 12.6676 2.0513 13.0955C2.24305 13.4718 2.54901 13.7778 2.92533 13.9695C3.35316 14.1875 3.91321 14.1875 5.03331 14.1875H7.16665M8.49998 6.85416H4.49998M5.83331 9.52082H4.49998M9.83331 4.18749H4.49998M12.4166 13.7847L14.1666 12.0833L12.4166 10.3819M8.91665 10.3819L7.16665 12.0833L8.91665 13.7847M11.3666 9.02082L9.96665 15.1458"
+ stroke="currentcolor"
+ stroke-width="1.3"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ />
+</svg>
diff --git a/packages/icons/src/__generated__/content-embed.tsx b/packages/icons/src/__generated__/content-embed.tsx
new file mode 100644
index 0000000000..1c2ffd1206
--- /dev/null
+++ b/packages/icons/src/__generated__/content-embed.tsx
@@ -0,0 +1,15 @@
+// Generated from icons/content-embed.svg
+
+import { forwardRef } from "react";
+import type { IconProps } from "../types";
+
+// prettier-ignore
+export const ContentEmbedIcon = forwardRef<SVGSVGElement, IconProps>(
+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path stroke="currentcolor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="1.3" d="M12.5 7.854v-3.8c0-1.12 0-1.68-.218-2.108a2 2 0 0 0-.874-.874C10.98.854 10.42.854 9.3.854H5.033c-1.12 0-1.68 0-2.108.218a2 2 0 0 0-.874.874c-.218.428-.218.988-.218 2.108v6.934c0 1.12 0 1.68.218 2.107a2 2 0 0 0 .874.874c.428.219.988.219 2.108.219h2.134M8.5 6.854h-4m1.333 2.667H4.5m5.333-5.334H4.5m7.917 9.598 1.75-1.702-1.75-1.701m-3.5 0-1.75 1.701 1.75 1.702m2.45-4.764-1.4 6.125" /></svg>
+ );
+ }
+);
+
+ContentEmbedIcon.displayName = "ContentEmbedIcon";
diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.ts
index 21b8439949..2492816c60 100644
--- a/packages/icons/src/__generated__/index.ts
+++ b/packages/icons/src/__generated__/index.ts
@@ -69,6 +69,7 @@ export * from "./cloud";
export * from "./code-text";
export * from "./collapsible";
export * from "./commit";
+export * from "./content-embed";
export * from "./content";
export * from "./copy";
export * from "./custom-code";
diff --git a/packages/icons/src/__generated__/svg/content-embed.ts b/packages/icons/src/__generated__/svg/content-embed.ts
new file mode 100644
index 0000000000..d18ff8de16
--- /dev/null
+++ b/packages/icons/src/__generated__/svg/content-embed.ts
@@ -0,0 +1 @@
+export const ContentEmbedIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" width="100%" height="100%" style="display: block;"><path stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.3" d="M12.5 7.854v-3.8c0-1.12 0-1.68-.218-2.108a2 2 0 0 0-.874-.874C10.98.854 10.42.854 9.3.854H5.033c-1.12 0-1.68 0-2.108.218a2 2 0 0 0-.874.874c-.218.428-.218.988-.218 2.108v6.934c0 1.12 0 1.68.218 2.107a2 2 0 0 0 .874.874c.428.219.988.219 2.108.219h2.134M8.5 6.854h-4m1.333 2.667H4.5m5.333-5.334H4.5m7.917 9.598 1.75-1.702-1.75-1.701m-3.5 0-1.75 1.701 1.75 1.702m2.45-4.764-1.4 6.125"/></svg>`;
diff --git a/packages/icons/src/__generated__/svg/index.ts b/packages/icons/src/__generated__/svg/index.ts
index 8b25abf84b..1e33db4d0b 100644
--- a/packages/icons/src/__generated__/svg/index.ts
+++ b/packages/icons/src/__generated__/svg/index.ts
@@ -69,6 +69,7 @@ export { CloudIcon } from "./cloud";
export { CodeTextIcon } from "./code-text";
export { CollapsibleIcon } from "./collapsible";
export { CommitIcon } from "./commit";
+export { ContentEmbedIcon } from "./content-embed";
export { ContentIcon } from "./content";
export { CopyIcon } from "./copy";
export { CustomCodeIcon } from "./custom-code";
diff --git a/packages/react-sdk/src/component-generator.test.ts b/packages/react-sdk/src/component-generator.test.ts
index 22aec21eb6..7afcf494ab 100644
--- a/packages/react-sdk/src/component-generator.test.ts
+++ b/packages/react-sdk/src/component-generator.test.ts
@@ -7,7 +7,7 @@ import {
type Prop,
} from "@webstudio-is/sdk";
import { showAttribute } from "./props";
-import { collectionComponent, descendentComponent } from "./core-components";
+import { collectionComponent, descendantComponent } from "./core-components";
import {
generateJsxChildren,
generateJsxElement,
@@ -944,7 +944,7 @@ data-data={UsedVariableName} />
`);
});
-test("avoid generating descendent component", () => {
+test("avoid generating descendant component", () => {
expect(
generateWebstudioComponent({
classesMap: new Map(),
@@ -954,7 +954,7 @@ test("avoid generating descendent component", () => {
parameters: [],
instances: toMap([
createInstance("body", "Body", [{ type: "id", value: "selector" }]),
- createInstance("descendent", descendentComponent, []),
+ createInstance("descendant", descendantComponent, []),
]),
dataSources: new Map(),
props: new Map(),
diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.ts
index 58ade793f7..9ae357a690 100644
--- a/packages/react-sdk/src/component-generator.ts
+++ b/packages/react-sdk/src/component-generator.ts
@@ -19,7 +19,7 @@ import {
indexAttribute,
showAttribute,
} from "./props";
-import { collectionComponent, descendentComponent } from "./core-components";
+import { collectionComponent, descendantComponent } from "./core-components";
import type { IndexesWithinAncestors } from "./instance-utils";
/**
@@ -253,9 +253,9 @@ export const generateJsxElement = ({
}
}
- // descendent component is used only for styling
+ // descendant component is used only for styling
// and should not be rendered
- if (instance.component === descendentComponent) {
+ if (instance.component === descendantComponent) {
return "";
}
diff --git a/packages/react-sdk/src/core-components.ts b/packages/react-sdk/src/core-components.ts
index 2e68185e56..c6b8c85b1e 100644
--- a/packages/react-sdk/src/core-components.ts
+++ b/packages/react-sdk/src/core-components.ts
@@ -1,4 +1,4 @@
-import { EmbedIcon, ListViewIcon } from "@webstudio-is/icons/svg";
+import { ListViewIcon, PaintBrushIcon } from "@webstudio-is/icons/svg";
import type {
WsComponentMeta,
WsComponentPropsMeta,
@@ -10,7 +10,7 @@ export const collectionComponent = "ws:collection";
const collectionMeta: WsComponentMeta = {
category: "data",
- order: 7,
+ order: 2,
type: "container",
label: "Collection",
icon: ListViewIcon,
@@ -58,21 +58,40 @@ const collectionPropsMeta: WsComponentPropsMeta = {
initialProps: ["data"],
};
-export const descendentComponent = "ws:descendent";
+export const descendantComponent = "ws:descendant";
-const descendentMeta: WsComponentMeta = {
+const descendantMeta: WsComponentMeta = {
category: "internal",
type: "control",
- label: "Descendent",
- icon: EmbedIcon,
+ label: "Descendant",
+ icon: PaintBrushIcon,
+ detachable: false,
};
-const descendentPropsMeta: WsComponentPropsMeta = {
+const descendantPropsMeta: WsComponentPropsMeta = {
props: {
selector: {
required: true,
- control: "text",
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"],
@@ -80,15 +99,15 @@ const descendentPropsMeta: WsComponentPropsMeta = {
export const coreMetas = {
[collectionComponent]: collectionMeta,
- [descendentComponent]: descendentMeta,
+ [descendantComponent]: descendantMeta,
};
export const corePropsMetas = {
[collectionComponent]: collectionPropsMeta,
- [descendentComponent]: descendentPropsMeta,
+ [descendantComponent]: descendantPropsMeta,
};
// components with custom implementation
// should not be imported as react component
export const isCoreComponent = (component: string) =>
- component === collectionComponent || component === descendentComponent;
+ component === collectionComponent || component === descendantComponent;
diff --git a/packages/react-sdk/src/css/css.test.ts b/packages/react-sdk/src/css/css.test.ts
index 32ba943667..f8f222ec0c 100644
--- a/packages/react-sdk/src/css/css.test.ts
+++ b/packages/react-sdk/src/css/css.test.ts
@@ -1,7 +1,7 @@
import { expect, test } from "@jest/globals";
import type { Breakpoint } from "@webstudio-is/sdk";
import { generateCss, type CssConfig } from "./css";
-import { descendentComponent } from "../core-components";
+import { descendantComponent } from "../core-components";
const toMap = <T extends { id: string }>(list: T[]) =>
new Map(list.map((item) => [item.id, item] as const));
@@ -89,7 +89,7 @@ test("generate descendant selector", () => {
{
id: "descendant",
type: "instance",
- component: descendentComponent,
+ component: descendantComponent,
children: [],
},
]),
diff --git a/packages/react-sdk/src/css/css.ts b/packages/react-sdk/src/css/css.ts
index 34c5dee6ea..48db141dd4 100644
--- a/packages/react-sdk/src/css/css.ts
+++ b/packages/react-sdk/src/css/css.ts
@@ -15,7 +15,7 @@ import type {
} from "@webstudio-is/sdk";
import type { WsComponentMeta } from "../components/component-meta";
import { idAttribute } from "../props";
-import { descendentComponent } from "../core-components";
+import { descendantComponent } from "../core-components";
import { addGlobalRules } from "./global-rules";
import { getPresetStyleRules } from "./style-rules";
@@ -78,10 +78,10 @@ export const generateCss = ({
}
}
- const descendentSelectorByInstanceId = new Map<Instance["id"], string>();
+ const descendantSelectorByInstanceId = new Map<Instance["id"], string>();
for (const prop of props.values()) {
if (prop.name === "selector" && prop.type === "string") {
- descendentSelectorByInstanceId.set(prop.instanceId, prop.value);
+ descendantSelectorByInstanceId.set(prop.instanceId, prop.value);
}
}
@@ -121,20 +121,20 @@ export const generateCss = ({
for (const selection of styleSourceSelections.values()) {
let { instanceId } = selection;
const { values } = selection;
- let descendentSuffix = "";
- // render selector component as descendent selector
+ let descendantSuffix = "";
+ // render selector component as descendant selector
const instance = instances.get(instanceId);
- if (instance?.component === descendentComponent) {
+ if (instance?.component === descendantComponent) {
const parentId = parentIdByInstanceId.get(instanceId);
- const descendentSelector = descendentSelectorByInstanceId.get(instanceId);
- if (parentId && descendentSelector) {
- descendentSuffix = descendentSelector;
+ const descendantSelector = descendantSelectorByInstanceId.get(instanceId);
+ if (parentId && descendantSelector) {
+ descendantSuffix = descendantSelector;
instanceId = parentId;
}
}
const rule = sheet.addNestingRule(
`[${idAttribute}="${instanceId}"]`,
- descendentSuffix
+ descendantSuffix
);
rule.applyMixins(values);
instanceByRule.set(rule, instanceId);
diff --git a/packages/sdk-components-react/src/content-embed.ws.ts b/packages/sdk-components-react/src/content-embed.ws.ts
new file mode 100644
index 0000000000..18cc42318f
--- /dev/null
+++ b/packages/sdk-components-react/src/content-embed.ws.ts
@@ -0,0 +1,111 @@
+import { ContentEmbedIcon } from "@webstudio-is/icons/svg";
+import {
+ WsEmbedTemplate,
+ descendantComponent,
+ type WsComponentMeta,
+} from "@webstudio-is/react-sdk";
+
+const imagePlaceholder = `
+<svg
+ width="140"
+ height="140"
+ viewBox="0 0 600 600"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <rect width="600" height="600" fill="#CCCCCC" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M450 170H150C141.716 170 135 176.716 135 185V415C135 423.284 141.716 430 150 430H450C458.284 430 465 423.284 465 415V185C465 176.716 458.284 170 450 170ZM150 145C127.909 145 110 162.909 110 185V415C110 437.091 127.909 455 150 455H450C472.091 455 490 437.091 490 415V185C490 162.909 472.091 145 450 145H150Z"
+ fill="#A2A2A2"
+ />
+ <path
+ d="M237.135 235.012C237.135 255.723 220.345 272.512 199.635 272.512C178.924 272.512 162.135 255.723 162.135 235.012C162.135 214.301 178.924 197.512 199.635 197.512C220.345 197.512 237.135 214.301 237.135 235.012Z"
+ fill="#A2A2A2"
+ />
+ <path
+ d="M160 405V367.205L221.609 306.364L256.552 338.628L358.161 234L440 316.043V405H160Z"
+ fill="#A2A2A2"
+ />
+</svg>
+`.trim();
+
+const htmlSample = `
+<h1>Styling HTML with Content Embed</h1>
+<p>Content Embed allows styling of HTML, which primarily comes from external data.</p>
+<h2>How to Use Content Embed</h2>
+<ul>
+ <li>Every element is shown in the Navigator.</li>
+ <li>Apply styles and Tokens to each element.</li>
+ <li>Adjustments to elements apply universally within this embed, ensuring consistency across your content.</li>
+</ul>
+<hr>
+<h2>This sample text contains all the elements that can be styled.</h2>
+<p>Any elements that were not used above are used below.</p>
+<h3>Heading 3</h3>
+<h4>Heading 4</h4>
+<h5>Heading 5</h5>
+<h6>Heading 6</h6>
+<p><strong>Bold text</strong> makes your important points stand out.</p>
+<p><em>Italic text</em> is great for emphasizing terms.</p>
+<ol>
+ <li>First Step</li>
+ <li>Second Step</li>
+</ol>
+<img src="data:image/svg+xml;base64,${btoa(imagePlaceholder)}">
+<blockquote>Capture attention with a powerful quote.</blockquote>
+<p>Using <code>console.log("Hello World");</code> will log to the console.</p>
+`.trimStart();
+
+const descendant = (label: string, tag: string): WsEmbedTemplate[number] => {
+ return {
+ type: "instance",
+ component: descendantComponent,
+ label,
+ props: [{ type: "string", name: "selector", value: ` ${tag}` }],
+ children: [],
+ };
+};
+
+export const meta: WsComponentMeta = {
+ category: "data",
+ type: "control",
+ label: "Content Embed",
+ description:
+ "Content Embed allows styling of HTML, which can be provided via the Code property statically or loaded dynamically from any Resource, for example, from a CMS.",
+ icon: ContentEmbedIcon,
+ order: 3,
+ template: [
+ {
+ type: "instance",
+ component: "HtmlEmbed",
+ label: "Content Embed",
+ props: [
+ {
+ name: "code",
+ type: "string",
+ value: htmlSample,
+ },
+ ],
+ children: [
+ descendant("Paragraph", "p"),
+ descendant("Heading 1", "h1"),
+ descendant("Heading 2", "h2"),
+ descendant("Heading 3", "h3"),
+ descendant("Heading 4", "h4"),
+ descendant("Heading 5", "h5"),
+ descendant("Heading 6", "h6"),
+ descendant("Bold", ":where(strong, b)"),
+ descendant("Italic", ":where(em, i)"),
+ descendant("Link", "a"),
+ descendant("Image", "img"),
+ descendant("Blockquote", "blockquote"),
+ descendant("Code Text", "code"),
+ descendant("List", ":where(ul, ol)"),
+ descendant("List Item", "li"),
+ descendant("Separator", "hr"),
+ ],
+ },
+ ],
+};
diff --git a/packages/sdk-components-react/src/html-embed.tsx b/packages/sdk-components-react/src/html-embed.tsx
index dc0028cc4c..1a493885dd 100644
--- a/packages/sdk-components-react/src/html-embed.tsx
+++ b/packages/sdk-components-react/src/html-embed.tsx
@@ -190,11 +190,14 @@ type HtmlEmbedProps = {
code: string;
executeScriptOnCanvas?: boolean;
clientOnly?: boolean;
+ // avoid builder passing it to dom
+ children?: never;
};
export const HtmlEmbed = forwardRef<HTMLDivElement, HtmlEmbedProps>(
(props, ref) => {
- const { code, executeScriptOnCanvas, clientOnly, ...rest } = props;
+ const { code, executeScriptOnCanvas, clientOnly, children, ...rest } =
+ props;
const { renderer } = useContext(ReactSdkContext);
const isServer = useIsServer();
diff --git a/packages/sdk-components-react/src/metas.ts b/packages/sdk-components-react/src/metas.ts
index 65932da17a..6f6982980d 100644
--- a/packages/sdk-components-react/src/metas.ts
+++ b/packages/sdk-components-react/src/metas.ts
@@ -1,6 +1,7 @@
export { meta as Slot } from "./slot.ws";
export { meta as Fragment } from "./fragment.ws";
export { meta as HtmlEmbed } from "./html-embed.ws";
+export { meta as ContentEmbed } from "./content-embed.ws";
export { meta as Body } from "./body.ws";
export { meta as Box } from "./box.ws";
export { meta as Text } from "./text.ws";