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: can't delete a form element from canvas (#1537)

Roman Pominovee17f1416a8e
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index 0e2d6d375d..feefe5bb51 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -279,7 +279,7 @@ export const Builder = ({
authToken,
authPermit,
});
- useSharedShortcuts();
+ useSharedShortcuts({ source: "builder" });
useSetIsPreviewMode(authPermit === "view");
const [isPreviewMode] = useIsPreviewMode();
usePublishShortcuts(publish);
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index 5b1b3de5e2..1a4688ff65 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -138,7 +138,7 @@ export const Canvas = ({
// e.g. toggling preview is still needed in both modes
useCanvasShortcuts();
- useSharedShortcuts();
+ useSharedShortcuts({ source: "canvas" });
const selectedPage = useStore(selectedPageStore);
useEffect(() => {
diff --git a/apps/builder/app/shared/shortcuts/shortcuts.ts b/apps/builder/app/shared/shortcuts/shortcuts.ts
index b0d30cb3a0..6d060b12a1 100644
--- a/apps/builder/app/shared/shortcuts/shortcuts.ts
+++ b/apps/builder/app/shared/shortcuts/shortcuts.ts
@@ -17,7 +17,11 @@ export const options: Options = {
enableOnFormTags: true,
};
-export const useSharedShortcuts = () => {
+export const useSharedShortcuts = ({
+ source,
+}: {
+ source: "canvas" | "builder";
+}) => {
useHotkeys(
// safari use cmd+z to reopen closed tabs so fallback to ctrl
"meta+z, ctrl+z",
@@ -37,8 +41,13 @@ export const useSharedShortcuts = () => {
useHotkeys(
"backspace, delete",
deleteSelectedInstance,
- // prevent instance deletion while deleting text
- { enableOnFormTags: false, enableOnContentEditable: false },
+ {
+ // When in builder, we don't want to delete instances,
+ // when user edits text in a control on style panel etc.
+ // But when a form control on canvas has focus, we want the shortcut to work.
+ enableOnFormTags: source === "canvas",
+ enableOnContentEditable: false,
+ },
[]
);