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
feat: Allow delete/reorder Content Block children in Content mode (#4483)
Ivan Starkovd22dbd0718d3
diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsxindex cde10d1212..3be4e5c6cc 100644--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx@@ -21,6 +21,7 @@ import {} from "@webstudio-is/design-system";import {collectionComponent,+ editableBlockComponent,rootComponent,showAttribute,WsComponentMeta,@@ -409,9 +410,23 @@ const getBuilderDropTarget = (};};-const canDrag = (instance: Instance) => {+const canDrag = (instance: Instance, instanceSelector: InstanceSelector) => {if ($isContentMode.get()) {- return false;+ const parentId = instanceSelector[1];++ if (parentId === undefined) {+ return false;+ }++ const parentInstance = $instances.get().get(parentId);++ if (parentInstance === undefined) {+ return false;+ }++ if (parentInstance.component !== editableBlockComponent) {+ return false;+ }}const meta = $registeredComponentMetas.get().get(instance.component);@@ -430,10 +445,28 @@ const canDrag = (instance: Instance) => {const canDrop = (dragSelector: InstanceSelector,- dropSelector: InstanceSelector+ dropTarget: ItemDropTarget) => {- const metas = $registeredComponentMetas.get();const instances = $instances.get();+ const dropSelector = dropTarget.itemSelector;++ // Allow dropping into the parent only+ const isSameParent = dragSelector[1] === dropSelector[0];++ const isDropTargetEditableBlock =+ isSameParent &&+ instances.get(dropSelector[0])?.component === editableBlockComponent;++ if ($isContentMode.get()) {+ return isDropTargetEditableBlock && dropTarget.indexWithinChildren > 0;+ }++ if (isDropTargetEditableBlock && dropTarget.indexWithinChildren === 0) {+ // We want Templates to be the first child of the editable block+ return false;+ }++ const metas = $registeredComponentMetas.get();const insertConstraints = computeInstancesConstraints(metas, instances, [dragSelector[0],]);@@ -537,16 +570,17 @@ export const NavigatorTree = () => {isExpanded={item.isExpanded}isLastChild={item.isLastChild}data={item}- canDrag={() => canDrag(item.instance)}+ canDrag={() => canDrag(item.instance, item.selector)}dropTarget={item.dropTarget}onDropTargetChange={(dropTarget, draggingItem) => {const builderDropTarget = getBuilderDropTarget(item.selector,dropTarget);+if (builderDropTarget &&- canDrop(draggingItem.selector, builderDropTarget.itemSelector)+ canDrop(draggingItem.selector, builderDropTarget)) {$dragAndDropState.set({...$dragAndDropState.get(),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 db0ce2b099..40bcf712e2 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@@ -43,7 +43,7 @@ import {} from "~/shared/instance-utils";import { shallowEqual } from "shallow-equal";-const findEditableBlockSelector = (+export const findEditableBlockSelector = (anchor: InstanceSelector,instances: Instances) => {diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex ebefb4f156..145596f1b5 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -6,6 +6,8 @@ import {$textEditingInstanceSelector,$isDesignMode,toggleBuilderMode,+ $isPreviewMode,+ $isContentMode,} from "~/shared/nano-states";import {$breakpointsMenuView,@@ -30,6 +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";const makeBreakpointCommand = <CommandName extends string>(name: CommandName,@@ -46,11 +50,10 @@ const makeBreakpointCommand = <CommandName extends string>(});const deleteSelectedInstance = () => {- if ($isDesignMode.get() === false) {- builderApi.toast.info("Deleting is only allowed in design mode.");+ if ($isPreviewMode.get()) {+ builderApi.toast.info("Deleting is not allowed in preview mode.");return;}-const textEditingInstanceSelector = $textEditingInstanceSelector.get();const selectedInstanceSelector = $selectedInstanceSelector.get();// cannot delete instance while editing@@ -63,8 +66,39 @@ const deleteSelectedInstance = () => {if (selectedInstanceSelector.length === 1) {return;}- let newSelectedInstanceSelector: undefined | InstanceSelector;+const instances = $instances.get();++ if ($isContentMode.get()) {+ // In content mode we are allowing to delete childen of the editable block+ const editableInstanceSelector = findEditableBlockSelector(+ selectedInstanceSelector,+ instances+ );+ if (editableInstanceSelector === undefined) {+ builderApi.toast.info("You can't delete this instance in conent mode.");+ return;+ }++ const isChildOfEditableBlock =+ selectedInstanceSelector.length - editableInstanceSelector.length === 1;++ const isTemplateInstance =+ instances.get(selectedInstanceSelector[0])?.component ===+ editableBlockTemplateComponent;++ if (isTemplateInstance) {+ builderApi.toast.info("You can't delete this instance in conent mode.");+ return;+ }++ if (!isChildOfEditableBlock) {+ builderApi.toast.info("You can't delete this instance in conent mode.");+ return;+ }+ }++ let newSelectedInstanceSelector: undefined | InstanceSelector;const [selectedInstanceId, parentInstanceId] = selectedInstanceSelector;const parentInstance = instances.get(parentInstanceId);if (parentInstance) {