Merge branch 'main' into inputs-ds

webstudio-is · Dec 21, 2024 · dad98c4 · dad98c4
2 parents b6166c7 + 21a97fb
commit dad98c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsx
@@ -367,7 +367,7 @@ export const BindingPopover = ({
   const valueError = validate?.(evaluateExpressionWithinScope(value, scope));
   return (
     <FloatingPanel
-      placement="right-start"
+      placement="left-start"
       open={isOpen}
       onOpenChange={(newOpen) => {
         // handle special case for popover close

diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.ts
@@ -299,13 +299,17 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({
       handler: () => {
         $publishDialog.set("publish");
       },
+      disableHotkeyOnFormTags: true,
+      disableHotkeyOnContentEditable: true,
     },
     {
       name: "openExportDialog",
       defaultHotkeys: ["shift+E"],
       handler: () => {
         $publishDialog.set("export");
       },
+      disableHotkeyOnFormTags: true,
+      disableHotkeyOnContentEditable: true,
     },
     {
       name: "toggleComponentsPanel",