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.

Fix double delete when focused navigator tree (#946)

Bogdan Chadkin46582c8f882f
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 5fceeb4f1f..9423331922 100644
--- a/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx
@@ -9,7 +9,6 @@ import {
useRootInstance,
} from "~/shared/nano-states";
import { InstanceTree } from "~/designer/shared/tree";
-import { deleteInstance } from "~/shared/instance-utils";
import { Header, CloseButton } from "../header";
declare module "~/shared/pubsub" {
@@ -74,7 +73,6 @@ export const Navigator = ({ publish, isClosable, onClose }: NavigatorProps) => {
onSelect={handleSelect}
onHover={handleHover}
onDragEnd={handleDragEnd}
- onDelete={deleteInstance}
/>
</Flex>
</Flex>
diff --git a/packages/design-system/src/components/tree/tree.stories.tsx b/packages/design-system/src/components/tree/tree.stories.tsx
index 3e262777f3..9335d56be7 100644
--- a/packages/design-system/src/components/tree/tree.stories.tsx
+++ b/packages/design-system/src/components/tree/tree.stories.tsx
@@ -94,7 +94,6 @@ export const StressTest = ({ animate }: { animate: boolean }) => {
</TreeItemBody>
)}
onDragEnd={(payload) => setRoot((root) => reparent(root, payload))}
- onDelete={() => null}
/>
</Flex>
);
diff --git a/packages/design-system/src/components/tree/tree.tsx b/packages/design-system/src/components/tree/tree.tsx
index 040f740ab2..483e84eac4 100644
--- a/packages/design-system/src/components/tree/tree.tsx
+++ b/packages/design-system/src/components/tree/tree.tsx
@@ -36,7 +36,6 @@ export type TreeProps<Data extends { id: string }> = {
itemId: string;
dropTarget: { itemId: string; position: number | "end" };
}) => void;
- onDelete: (itemId: string) => void;
};
export const Tree = <Data extends { id: string }>({
@@ -53,7 +52,6 @@ export const Tree = <Data extends { id: string }>({
onHover,
animate,
onDragEnd,
- onDelete,
}: TreeProps<Data>) => {
const { getIsExpanded, setIsExpanded } = useExpandState({
root,
@@ -236,7 +234,6 @@ export const Tree = <Data extends { id: string }>({
selectedItemId,
getIsExpanded,
setIsExpanded,
- onDelete,
onEsc: dragHandlers.cancelCurrentDrag,
});
@@ -303,7 +300,6 @@ const useKeyboardNavigation = <Data extends { id: string }>({
selectedItemId,
getIsExpanded,
setIsExpanded,
- onDelete,
onEsc,
}: {
root: Data;
@@ -312,7 +308,6 @@ const useKeyboardNavigation = <Data extends { id: string }>({
selectedItemId: string | undefined;
getIsExpanded: (instance: Data) => boolean;
setIsExpanded: (instance: Data, isExpanded: boolean) => void;
- onDelete: (itemId: string) => void;
onEsc: () => void;
}) => {
const selectedItem = useMemo(() => {
@@ -369,9 +364,6 @@ const useKeyboardNavigation = <Data extends { id: string }>({
event.preventDefault();
}
}
- if (event.key === "Backspace" || event.key === "Delete") {
- onDelete(selectedItem.id);
- }
if (event.key === "Escape") {
onEsc();
}