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
chore: Rename editable block component (#4489)
Ivan Starkova66a674ad592
diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsxindex 3be4e5c6cc..07c77e0bd6 100644--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx@@ -21,7 +21,7 @@ import {} from "@webstudio-is/design-system";import {collectionComponent,- editableBlockComponent,+ blockComponent,rootComponent,showAttribute,WsComponentMeta,@@ -34,7 +34,7 @@ import {} from "@webstudio-is/icons";import {$dragAndDropState,- $editableBlockChildOutline,+ $blockChildOutline,$editingItemSelector,$hoveredInstanceSelector,$instances,@@ -424,7 +424,7 @@ const canDrag = (instance: Instance, instanceSelector: InstanceSelector) => {return false;}- if (parentInstance.component !== editableBlockComponent) {+ if (parentInstance.component !== blockComponent) {return false;}}@@ -453,16 +453,16 @@ const canDrop = (// Allow dropping into the parent onlyconst isSameParent = dragSelector[1] === dropSelector[0];- const isDropTargetEditableBlock =+ const isDropTargetBlock =isSameParent &&- instances.get(dropSelector[0])?.component === editableBlockComponent;+ instances.get(dropSelector[0])?.component === blockComponent;if ($isContentMode.get()) {- return isDropTargetEditableBlock && dropTarget.indexWithinChildren > 0;+ return isDropTargetBlock && dropTarget.indexWithinChildren > 0;}- if (isDropTargetEditableBlock && dropTarget.indexWithinChildren === 0) {- // We want Templates to be the first child of the editable block+ if (isDropTargetBlock && dropTarget.indexWithinChildren === 0) {+ // We want Templates to be the first child of the content blockreturn false;}@@ -631,7 +631,7 @@ export const NavigatorTree = () => {buttonProps={{onMouseEnter: () => {$hoveredInstanceSelector.set(item.selector);- $editableBlockChildOutline.set(undefined);+ $blockChildOutline.set(undefined);},onMouseLeave: () => $hoveredInstanceSelector.set(undefined),onClick: () => selectInstance(item.selector),diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsxindex cc6f4936e5..6d83efd969 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx@@ -19,7 +19,7 @@ import { ResizeHandles } from "./resize-handles";import { MediaBadge } from "./media-badge";import { applyScale } from "./outline";import { $scale } from "~/builder/shared/nano-states";-import { EditableBlockChildHoveredInstanceOutline } from "./outline/editable-block-instance-outline";+import { BlockChildHoveredInstanceOutline } from "./outline/editable-block-instance-outline";const containerStyle = css({position: "absolute",@@ -76,7 +76,7 @@ export const CanvasTools = () => {<CollaborativeInstanceOutline /><TextToolbar />- <EditableBlockChildHoveredInstanceOutline />+ <BlockChildHoveredInstanceOutline /></>)}</>diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/editable-block-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/editable-block-instance-outline.tsxindex 10d69e357b..1ec08464de 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/editable-block-instance-outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/editable-block-instance-outline.tsx@@ -1,10 +1,10 @@import { useStore } from "@nanostores/react";import {- $editableBlockChildOutline,+ $blockChildOutline,$instances,$isContentMode,$registeredComponentMetas,- type EditableBlockChildOutline,+ type BlockChildOutline,} from "~/shared/nano-states";import {Box,@@ -23,7 +23,7 @@ import {Text,iconButtonSize,} from "@webstudio-is/design-system";-import { EditableBlockChildAddButtonOutline } from "./outline";+import { BlockChildAddButtonOutline } from "./outline";import { applyScale } from "./apply-scale";import { $scale } from "~/builder/shared/nano-states";import { PlusIcon } from "@webstudio-is/icons";@@ -33,8 +33,8 @@ import { isFeatureEnabled } from "@webstudio-is/feature-flags";import type { DroppableTarget, InstanceSelector } from "~/shared/tree-utils";import type { Instance, Instances } from "@webstudio-is/sdk";import {- editableBlockComponent,- editableBlockTemplateComponent,+ blockComponent,+ blockTemplateComponent,} from "@webstudio-is/react-sdk";import {extractWebstudioFragment,@@ -47,7 +47,7 @@ import {import { shallowEqual } from "shallow-equal";import { MetaIcon } from "~/builder/shared/meta-icon";-export const findEditableBlockSelector = (+export const findBlockSelector = (anchor: InstanceSelector,instances: Instances) => {@@ -59,7 +59,7 @@ export const findEditableBlockSelector = (return;}- let editableBlockInstanceSelector: InstanceSelector | undefined = undefined;+ let blockInstanceSelector: InstanceSelector | undefined = undefined;for (let i = 0; i < anchor.length; ++i) {const instanceId = anchor[i];@@ -69,40 +69,37 @@ export const findEditableBlockSelector = (return;}- if (instance.component === editableBlockComponent) {- editableBlockInstanceSelector = anchor.slice(i);+ if (instance.component === blockComponent) {+ blockInstanceSelector = anchor.slice(i);break;}}- if (editableBlockInstanceSelector === undefined) {+ if (blockInstanceSelector === undefined) {return;}- return editableBlockInstanceSelector;+ return blockInstanceSelector;};const findTemplates = (anchor: InstanceSelector, instances: Instances) => {- const editableBlockInstanceSelector = findEditableBlockSelector(- anchor,- instances- );- if (editableBlockInstanceSelector === undefined) {+ const blockInstanceSelector = findBlockSelector(anchor, instances);+ if (blockInstanceSelector === undefined) {toast.error("Editable block not found");return;}- const editableBlockInstance = instances.get(editableBlockInstanceSelector[0]);+ const blockInstance = instances.get(blockInstanceSelector[0]);- if (editableBlockInstance === undefined) {+ if (blockInstance === undefined) {toast.error("Editable block instance not found");return;}- const templateInstanceId = editableBlockInstance.children.find(+ const templateInstanceId = blockInstance.children.find((child) =>child.type === "id" &&- instances.get(child.value)?.component === editableBlockTemplateComponent+ instances.get(child.value)?.component === blockTemplateComponent)?.value;if (templateInstanceId === undefined) {@@ -125,7 +122,7 @@ const findTemplates = (anchor: InstanceSelector, instances: Instances) => {.filter((child) => child !== undefined).map((child) => [child,- [child.id, templateInstanceId, ...editableBlockInstanceSelector],+ [child.id, templateInstanceId, ...blockInstanceSelector],]);return result;@@ -136,29 +133,27 @@ const getInsertionIndex = (instances: Instances,insertBefore: boolean = false) => {- const editableBlockSelector = findEditableBlockSelector(anchor, instances);- if (editableBlockSelector === undefined) {+ const blockSelector = findBlockSelector(anchor, instances);+ if (blockSelector === undefined) {return;}- const insertAtInitialPosition = shallowEqual(editableBlockSelector, anchor);+ const insertAtInitialPosition = shallowEqual(blockSelector, anchor);- const editableBlockInstance = instances.get(editableBlockSelector[0]);+ const blockInstance = instances.get(blockSelector[0]);- if (editableBlockInstance === undefined) {+ if (blockInstance === undefined) {toast.error("Editable block instance not found");return;}- const index = editableBlockInstance.children.findIndex((child) => {+ const index = blockInstance.children.findIndex((child) => {if (child.type !== "id") {return false;}if (insertAtInitialPosition) {- return (- instances.get(child.value)?.component === editableBlockTemplateComponent- );+ return instances.get(child.value)?.component === blockTemplateComponent;}return child.value === anchor[0];@@ -256,10 +251,7 @@ const TemplatesMenu = ({templateSelector[0]);- const parentSelector = findEditableBlockSelector(- anchor,- instances- );+ const parentSelector = findBlockSelector(anchor, instances);if (parentSelector === undefined) {return;@@ -322,8 +314,8 @@ const TemplatesMenu = ({);};-export const EditableBlockChildHoveredInstanceOutline = () => {- const editableBlockChildOutline = useStore($editableBlockChildOutline);+export const BlockChildHoveredInstanceOutline = () => {+ const blockChildOutline = useStore($blockChildOutline);const scale = useStore($scale);const isContentMode = useStore($isContentMode);@@ -331,10 +323,10 @@ export const EditableBlockChildHoveredInstanceOutline = () => {undefined);const [buttonOutline, setButtonOutline] = useState<- undefined | EditableBlockChildOutline+ undefined | BlockChildOutline>(undefined);- const outline = editableBlockChildOutline ?? buttonOutline;+ const outline = blockChildOutline ?? buttonOutline;const [isMenuOpen, setIsMenuOpen] = useState(false);@@ -353,7 +345,7 @@ export const EditableBlockChildHoveredInstanceOutline = () => {const rect = applyScale(outline.rect, scale);return (- <EditableBlockChildAddButtonOutline rect={rect}>+ <BlockChildAddButtonOutline rect={rect}><Flexcss={{width: "min-content",@@ -399,6 +391,6 @@ export const EditableBlockChildHoveredInstanceOutline = () => {</IconButton></TemplatesMenu></Flex>- </EditableBlockChildAddButtonOutline>+ </BlockChildAddButtonOutline>);};diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsxindex 0545b6fd0d..804463a27a 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx@@ -1,6 +1,6 @@import { useStore } from "@nanostores/react";import {- $editableBlockChildOutline,+ $blockChildOutline,$hoveredInstanceOutlineAndInstance,$hoveredInstanceSelector,$instances,@@ -26,7 +26,7 @@ const isDescendantOrSelf = (export const HoveredInstanceOutline = () => {const instances = useStore($instances);const hoveredInstanceSelector = useStore($hoveredInstanceSelector);- const editableBlockChildOutline = useStore($editableBlockChildOutline);+ const blockChildOutline = useStore($blockChildOutline);const outline = useStore($hoveredInstanceOutlineAndInstance);const scale = useStore($scale);const textEditingInstanceSelector = useStore($textEditingInstanceSelector);@@ -37,9 +37,7 @@ export const HoveredInstanceOutline = () => {}if (isFeatureEnabled("contentEditableMode") && isContentMode) {- if (- shallowEqual(editableBlockChildOutline?.selector, hoveredInstanceSelector)- ) {+ if (shallowEqual(blockChildOutline?.selector, hoveredInstanceSelector)) {return;}}diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsxindex 548af4d928..37cc4e267e 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx@@ -72,7 +72,7 @@ type OutlineProps = {variant?: "default" | "collaboration" | "slot";};-export const EditableBlockChildAddButtonOutline = ({+export const BlockChildAddButtonOutline = ({rect,children,}: {diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex 145596f1b5..60179285a9 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -32,8 +32,8 @@ import {import { selectInstance } from "~/shared/awareness";import { openCommandPanel } from "../features/command-panel";import { builderApi } from "~/shared/builder-api";-import { findEditableBlockSelector } from "../features/workspace/canvas-tools/outline/editable-block-instance-outline";-import { editableBlockTemplateComponent } from "@webstudio-is/react-sdk";+import { findBlockSelector } from "../features/workspace/canvas-tools/outline/editable-block-instance-outline";+import { blockTemplateComponent } from "@webstudio-is/react-sdk";const makeBreakpointCommand = <CommandName extends string>(name: CommandName,@@ -71,7 +71,7 @@ const deleteSelectedInstance = () => {if ($isContentMode.get()) {// In content mode we are allowing to delete childen of the editable block- const editableInstanceSelector = findEditableBlockSelector(+ const editableInstanceSelector = findBlockSelector(selectedInstanceSelector,instances);@@ -80,19 +80,19 @@ const deleteSelectedInstance = () => {return;}- const isChildOfEditableBlock =+ const isChildOfBlock =selectedInstanceSelector.length - editableInstanceSelector.length === 1;const isTemplateInstance =instances.get(selectedInstanceSelector[0])?.component ===- editableBlockTemplateComponent;+ blockTemplateComponent;if (isTemplateInstance) {builderApi.toast.info("You can't delete this instance in conent mode.");return;}- if (!isChildOfEditableBlock) {+ if (!isChildOfBlock) {builderApi.toast.info("You can't delete this instance in conent mode.");return;}diff --git a/apps/builder/app/canvas/features/build-mode/editable-block-template.tsx b/apps/builder/app/canvas/features/build-mode/block-template.tsxsimilarity index 94%rename from apps/builder/app/canvas/features/build-mode/editable-block-template.tsxrename to apps/builder/app/canvas/features/build-mode/block-template.tsxindex 5d9557c17d..24c4d496d6 100644--- a/apps/builder/app/canvas/features/build-mode/editable-block-template.tsx+++ b/apps/builder/app/canvas/features/build-mode/block-template.tsx@@ -7,7 +7,7 @@ import {import * as React from "react";import { $isDesignMode, $selectedInstanceSelector } from "~/shared/nano-states";-export const EditableBlockTemplate = React.forwardRef<+export const BlockTemplate = React.forwardRef<HTMLDivElement,WebstudioComponentSystemProps & { children: React.ReactNode }>(({ ...props }, ref) => {diff --git a/apps/builder/app/canvas/features/build-mode/editable-block.tsx b/apps/builder/app/canvas/features/build-mode/block.tsxsimilarity index 93%rename from apps/builder/app/canvas/features/build-mode/editable-block.tsxrename to apps/builder/app/canvas/features/build-mode/block.tsxindex 2424ea7461..f950e778a1 100644--- a/apps/builder/app/canvas/features/build-mode/editable-block.tsx+++ b/apps/builder/app/canvas/features/build-mode/block.tsx@@ -1,6 +1,6 @@import { useStore } from "@nanostores/react";import {- editableBlockTemplateComponent,+ blockTemplateComponent,idAttribute,selectorIdAttribute,type AnyComponent,@@ -14,7 +14,7 @@ import {$selectedInstanceSelector,} from "~/shared/nano-states";-export const EditableBlock = React.forwardRef<+export const Block = React.forwardRef<HTMLDivElement,{ children: React.ReactNode } & WebstudioComponentSystemProps>(({ children, ...props }, ref) => {@@ -36,7 +36,7 @@ export const EditableBlock = React.forwardRef<const templateInstanceId = instance.children.find((child) =>child.type === "id" &&- instances.get(child.value)?.component === editableBlockTemplateComponent+ instances.get(child.value)?.component === blockTemplateComponent)?.value;if (templateInstanceId === undefined) {diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.tsxindex 07e8105433..cf2ae47e89 100644--- a/apps/builder/app/canvas/features/text-editor/text-editor.tsx+++ b/apps/builder/app/canvas/features/text-editor/text-editor.tsx@@ -58,7 +58,7 @@ import { colord } from "colord";import { useEffectEvent } from "~/shared/hook-utils/effect-event";import { findAllEditableInstanceSelector } from "~/shared/instance-utils";import {- $editableBlockChildOutline,+ $blockChildOutline,$hoveredInstanceOutline,$hoveredInstanceSelector,$registeredComponentMetas,@@ -1035,7 +1035,7 @@ export const TextEditor = ({);const handleAnyKeydown = useCallback(() => {- $editableBlockChildOutline.set(undefined);+ $blockChildOutline.set(undefined);$hoveredInstanceOutline.set(undefined);$hoveredInstanceSelector.set(undefined);}, []);diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 9759922701..6228f885e4 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -26,8 +26,8 @@ import {type AnyComponent,textContentAttribute,descendantComponent,- editableBlockComponent,- editableBlockTemplateComponent,+ blockComponent,+ blockTemplateComponent,} from "@webstudio-is/react-sdk";import { rawTheme } from "@webstudio-is/design-system";import {@@ -55,8 +55,8 @@ import {createInstanceChildrenElements,type WebstudioComponentProps,} from "~/canvas/elements";-import { EditableBlock } from "../build-mode/editable-block";-import { EditableBlockTemplate } from "../build-mode/editable-block-template";+import { Block } from "../build-mode/block";+import { BlockTemplate } from "../build-mode/block-template";const ContentEditable = ({renderComponentWithRef,@@ -435,12 +435,12 @@ export const WebstudioComponentCanvas = forwardRef<return <></>;}- if (instance.component === editableBlockComponent) {- Component = EditableBlock;+ if (instance.component === blockComponent) {+ Component = Block;}- if (instance.component === editableBlockTemplateComponent) {- Component = EditableBlockTemplate;+ if (instance.component === blockTemplateComponent) {+ Component = BlockTemplate;}const props: {@@ -571,12 +571,12 @@ export const WebstudioComponentPreview = forwardRef<let Component = components.get(instance.component);- if (instance.component === editableBlockComponent) {- Component = EditableBlock;+ if (instance.component === blockComponent) {+ Component = Block;}- if (instance.component === editableBlockTemplateComponent) {- Component = EditableBlockTemplate;+ if (instance.component === blockTemplateComponent) {+ Component = BlockTemplate;}if (Component === undefined) {diff --git a/apps/builder/app/canvas/instance-hovering.ts b/apps/builder/app/canvas/instance-hovering.tsindex 56033461ed..9fac915071 100644--- a/apps/builder/app/canvas/instance-hovering.ts+++ b/apps/builder/app/canvas/instance-hovering.ts@@ -1,11 +1,11 @@import { idAttribute } from "@webstudio-is/react-sdk";import {- $editableBlockChildOutline,+ $blockChildOutline,$hoveredInstanceSelector,$instances,$selectedInstanceSelector,$textEditingInstanceSelector,- findEditableBlockChildSelector,+ findBlockChildSelector,} from "~/shared/nano-states";import { $hoveredInstanceOutline } from "~/shared/nano-states";import {@@ -76,7 +76,7 @@ export const subscribeInstanceHovering = ({if (textSelector &&isDescendantOrSelf(instanceSelector, textSelector) && // optimisation- $editableBlockChildOutline.get() === undefined+ $blockChildOutline.get() === undefined) {updateEditableChildOutline(instanceSelector);}@@ -95,7 +95,7 @@ export const subscribeInstanceHovering = ({updateOnMouseMove = false;hoveredElement = undefined;- $editableBlockChildOutline.set(undefined);+ $blockChildOutline.set(undefined);$hoveredInstanceSelector.set(undefined);$hoveredInstanceOutline.set(undefined);}, 100);@@ -118,29 +118,25 @@ export const subscribeInstanceHovering = ({return;}- const editableBlockChildSelector =- findEditableBlockChildSelector(instanceSelector);+ const blockChildSelector = findBlockChildSelector(instanceSelector);- if (editableBlockChildSelector === undefined) {- $editableBlockChildOutline.set(undefined);+ if (blockChildSelector === undefined) {+ $blockChildOutline.set(undefined);return;}- const editableBlockChildElements = getVisibleElementsByInstanceSelector(- editableBlockChildSelector- );- const editableBlockChildRect = getAllElementsBoundingBox(- editableBlockChildElements- );+ const blockChildElements =+ getVisibleElementsByInstanceSelector(blockChildSelector);+ const blockChildRect = getAllElementsBoundingBox(blockChildElements);- if (editableBlockChildRect === undefined) {- $editableBlockChildOutline.set(undefined);+ if (blockChildRect === undefined) {+ $blockChildOutline.set(undefined);return;}- $editableBlockChildOutline.set({- selector: editableBlockChildSelector,- rect: editableBlockChildRect,+ $blockChildOutline.set({+ selector: blockChildSelector,+ rect: blockChildRect,});};@@ -178,7 +174,7 @@ export const subscribeInstanceHovering = ({onScrollStart() {isScrolling = true;$hoveredInstanceOutline.set(undefined);- $editableBlockChildOutline.set(undefined);+ $blockChildOutline.set(undefined);},onScrollEnd() {isScrolling = false;@@ -205,7 +201,7 @@ export const subscribeInstanceHovering = ({});- // selected instance selection can change hovered instance outlines (example EditableBlock/Template/Child)+ // selected instance selection can change hovered instance outlines (example Block/Template/Child)const usubscribeSelectedInstanceSelector =$selectedInstanceSelector.subscribe(() => {const instanceSelector = $hoveredInstanceSelector.get();diff --git a/apps/builder/app/shared/nano-states/canvas.ts b/apps/builder/app/shared/nano-states/canvas.tsindex 6f56e0dbcb..17ba296916 100644--- a/apps/builder/app/shared/nano-states/canvas.ts+++ b/apps/builder/app/shared/nano-states/canvas.ts@@ -3,7 +3,7 @@ import type { Instance, Instances } from "@webstudio-is/sdk";import type { FontWeight } from "@webstudio-is/fonts";import { $instances } from "./instances";import type { InstanceSelector } from "../tree-utils";-import { editableBlockComponent } from "@webstudio-is/react-sdk";+import { blockComponent } from "@webstudio-is/react-sdk";export type TextToolbarState = {selectionRect: undefined | DOMRect;@@ -22,7 +22,7 @@ type InstanceOutline = {rect: DOMRect;};-export type EditableBlockChildOutline = {+export type BlockChildOutline = {selector: InstanceSelector;rect: DOMRect;};@@ -69,28 +69,24 @@ export const $collaborativeInstanceSelector = atom<export const $collaborativeInstanceRect = atom<undefined | DOMRect>(undefined);-export const $editableBlockChildOutline = atom<- undefined | EditableBlockChildOutline->(undefined);+export const $blockChildOutline = atom<undefined | BlockChildOutline>(+ undefined+);-export const findEditableBlockChildSelector = (- instanceSelector: InstanceSelector-) => {+export const findBlockChildSelector = (instanceSelector: InstanceSelector) => {const instances = $instances.get();- let editableBlockChildSelector: InstanceSelector | undefined = undefined;+ let blockChildSelector: InstanceSelector | undefined = undefined;for (let i = 1; i < instanceSelector.length; ++i) {const instance = instances.get(instanceSelector[i]);- if (instance?.component === editableBlockComponent) {- editableBlockChildSelector = instanceSelector.slice(i - 1);+ if (instance?.component === blockComponent) {+ blockChildSelector = instanceSelector.slice(i - 1);- return editableBlockChildSelector;+ return blockChildSelector;}}- if (- instances.get(instanceSelector[0])?.component === editableBlockComponent- ) {+ if (instances.get(instanceSelector[0])?.component === blockComponent) {return instanceSelector;}};diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tsindex 8e2863d077..8012693ce4 100644--- a/apps/builder/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -41,7 +41,7 @@ import {$collaborativeInstanceSelector,$hoveredInstanceOutline,$selectedInstanceOutline,- $editableBlockChildOutline,+ $blockChildOutline,$textToolbar,$registeredComponentMetas,$registeredComponentPropsMetas,@@ -138,10 +138,7 @@ const createObjectPool = () => {$selectedInstanceOutline),new NanostoresSyncObject("hoveredInstanceOutline", $hoveredInstanceOutline),- new NanostoresSyncObject(- "editableBlockChildOutline",- $editableBlockChildOutline- ),+ new NanostoresSyncObject("blockChildOutline", $blockChildOutline),new NanostoresSyncObject("collaborativeInstanceSelector",diff --git a/packages/react-sdk/src/core-components.ts b/packages/react-sdk/src/core-components.tsindex 1446b713f5..2d4dd61a14 100644--- a/packages/react-sdk/src/core-components.ts+++ b/packages/react-sdk/src/core-components.ts@@ -126,9 +126,9 @@ const descendantPropsMeta: WsComponentPropsMeta = {initialProps: ["selector"],};-export const editableBlockTemplateComponent = "ws:editable-block-template";+export const blockTemplateComponent = "ws:block-template";-export const editableBlockTemplateMeta: WsComponentMeta = {+export const blockTemplateMeta: WsComponentMeta = {category: "hidden",detachable: false,type: "container",@@ -136,30 +136,30 @@ export const editableBlockTemplateMeta: WsComponentMeta = {stylable: false,};-const editableBlockTemplatePropsMeta: WsComponentPropsMeta = {+const blockTemplatePropsMeta: WsComponentPropsMeta = {props: {},initialProps: [],};-export const editableBlockComponent = "ws:editable-block";+export const blockComponent = "ws:block";-const editableBlockMeta: WsComponentMeta = {+const blockMeta: WsComponentMeta = {category: "data",order: 2,type: "container",- label: "Editable Block",+ label: "Content Block",icon: EditIcon,stylable: false,template: [{type: "instance",- component: editableBlockComponent,+ component: blockComponent,props: [],children: [{type: "instance",label: "Templates",- component: editableBlockTemplateComponent,+ component: blockTemplateComponent,children: [],},],@@ -167,7 +167,7 @@ const editableBlockMeta: WsComponentMeta = {],};-const editableBlockPropsMeta: WsComponentPropsMeta = {+const blockPropsMeta: WsComponentPropsMeta = {props: {},initialProps: [],};@@ -176,16 +176,16 @@ export const coreMetas = {[rootComponent]: rootMeta,[collectionComponent]: collectionMeta,[descendantComponent]: descendantMeta,- [editableBlockComponent]: editableBlockMeta,- [editableBlockTemplateComponent]: editableBlockTemplateMeta,+ [blockComponent]: blockMeta,+ [blockTemplateComponent]: blockTemplateMeta,};export const corePropsMetas = {[rootComponent]: rootPropsMeta,[collectionComponent]: collectionPropsMeta,[descendantComponent]: descendantPropsMeta,- [editableBlockComponent]: editableBlockPropsMeta,- [editableBlockTemplateComponent]: editableBlockTemplatePropsMeta,+ [blockComponent]: blockPropsMeta,+ [blockTemplateComponent]: blockTemplatePropsMeta,};// components with custom implementation@@ -194,5 +194,5 @@ export const isCoreComponent = (component: string) =>component === rootComponent ||component === collectionComponent ||component === descendantComponent ||- component === editableBlockComponent ||- component === editableBlockTemplateComponent;+ component === blockComponent ||+ component === blockTemplateComponent;