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.

Delete instance without pubsub (#937)

Bogdan Chadkincec0e16912ea
diff --git a/apps/designer/app/canvas/canvas.tsx b/apps/designer/app/canvas/canvas.tsx
index 2aedced6cf..dc5ec66b0d 100644
--- a/apps/designer/app/canvas/canvas.tsx
+++ b/apps/designer/app/canvas/canvas.tsx
@@ -15,7 +15,6 @@ import { publish } from "~/shared/pubsub";
import { registerContainers, useCanvasStore } from "~/shared/sync";
import { useShortcuts } from "./shared/use-shortcuts";
import {
- useDeleteInstance,
useInsertInstance,
usePublishTextEditingInstanceId,
useReparentInstance,
@@ -89,7 +88,6 @@ const DesignMode = () => {
useManageDesignModeStyles();
useInsertInstance();
useReparentInstance();
- useDeleteInstance();
useTrackSelectedElement();
usePublishScrollState();
useSubscribeScrollState();
diff --git a/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts b/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts
index f1273bbdd7..3029905fc1 100644
--- a/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts
+++ b/apps/designer/app/canvas/features/wrapper-component/selected-instance-connector.ts
@@ -90,11 +90,7 @@ export const SelectedInstanceConnector = ({
if (canObserve === false) {
// recompute inline elements on tree changes
unsubscribeTreeChange = subscribeAll((type) => {
- if (
- type === "insertInstance" ||
- type === "deleteInstance" ||
- type === "reparentInstance"
- ) {
+ if (type === "insertInstance" || type === "reparentInstance") {
updateOutlineRect(element);
}
});
diff --git a/apps/designer/app/canvas/shared/instance.ts b/apps/designer/app/canvas/shared/instance.ts
index 8d820a8d48..3d7b362ee4 100644
--- a/apps/designer/app/canvas/shared/instance.ts
+++ b/apps/designer/app/canvas/shared/instance.ts
@@ -10,7 +10,6 @@ import {
useTextEditingInstanceId,
} from "~/shared/nano-states";
import { publish } from "~/shared/pubsub";
-import { deleteInstance } from "~/shared/instance-utils";
declare module "~/shared/pubsub" {
export interface PubsubMap {
@@ -94,12 +93,6 @@ export const useReparentInstance = () => {
});
};
-export const useDeleteInstance = () => {
- useSubscribe("deleteInstance", ({ id: deletedInstanceId }) => {
- deleteInstance(deletedInstanceId);
- });
-};
-
export const usePublishTextEditingInstanceId = () => {
const [editingInstanceId] = useTextEditingInstanceId();
useEffect(() => {
diff --git a/apps/designer/app/canvas/shared/use-shortcuts.ts b/apps/designer/app/canvas/shared/use-shortcuts.ts
index ca30963f6d..1e419c337c 100644
--- a/apps/designer/app/canvas/shared/use-shortcuts.ts
+++ b/apps/designer/app/canvas/shared/use-shortcuts.ts
@@ -1,6 +1,5 @@
import { useHotkeys } from "react-hotkeys-hook";
import store from "immerhin";
-import type { Instance } from "@webstudio-is/project-build";
import { getComponentMeta } from "@webstudio-is/react-sdk";
import { shortcuts, options } from "~/shared/shortcuts";
import { publish, useSubscribe } from "~/shared/pubsub";
@@ -10,13 +9,11 @@ import {
useTextEditingInstanceId,
isPreviewModeStore,
} from "~/shared/nano-states";
+import { deleteInstance } from "~/shared/instance-utils";
declare module "~/shared/pubsub" {
export interface PubsubMap {
cancelCurrentDrag: undefined;
- deleteInstance: {
- id: Instance["id"];
- };
openBreakpointsMenu: undefined;
selectBreakpointFromShortcut: number;
zoom: "zoomOut" | "zoomIn";
@@ -70,21 +67,18 @@ const publishCancelCurrentDrag = () => {
export const useShortcuts = () => {
const [editingInstanceId, setEditingInstanceId] = useTextEditingInstanceId();
- const publishDeleteInstance = () => {
+ const deleteSelectedInstance = () => {
const selectedInstanceId = selectedInstanceIdStore.get();
if (selectedInstanceId === undefined) {
return;
}
- publish({
- type: "deleteInstance",
- payload: { id: selectedInstanceId },
- });
+ deleteInstance(selectedInstanceId);
};
const shortcutHandlerMap = {
undo: store.undo.bind(store),
redo: store.redo.bind(store),
- delete: publishDeleteInstance,
+ delete: deleteSelectedInstance,
preview: togglePreviewMode,
breakpointsMenu: publishOpenBreakpointsMenu,
breakpoint: publishSelectBreakpoint,
diff --git a/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx b/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx
index bf3014241e..5fceeb4f1f 100644
--- a/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx
@@ -8,8 +8,9 @@ import {
hoveredInstanceIdStore,
useRootInstance,
} from "~/shared/nano-states";
-import { Header, CloseButton } from "../header";
import { InstanceTree } from "~/designer/shared/tree";
+import { deleteInstance } from "~/shared/instance-utils";
+import { Header, CloseButton } from "../header";
declare module "~/shared/pubsub" {
export interface PubsubMap {
@@ -17,7 +18,6 @@ declare module "~/shared/pubsub" {
instanceId: Instance["id"];
dropTarget: { instanceId: Instance["id"]; position: number | "end" };
};
- deleteInstance: { id: Instance["id"] };
}
}
@@ -54,16 +54,6 @@ export const Navigator = ({ publish, isClosable, onClose }: NavigatorProps) => {
[publish]
);
- const handleDelete = useCallback(
- (instanceId: Instance["id"]) => {
- publish({
- type: "deleteInstance",
- payload: { id: instanceId },
- });
- },
- [publish]
- );
-
const handleHover = useCallback((instance: Instance | undefined) => {
hoveredInstanceIdStore.set(instance?.id);
}, []);
@@ -84,7 +74,7 @@ export const Navigator = ({ publish, isClosable, onClose }: NavigatorProps) => {
onSelect={handleSelect}
onHover={handleHover}
onDragEnd={handleDragEnd}
- onDelete={handleDelete}
+ onDelete={deleteInstance}
/>
</Flex>
</Flex>