From 5052918462b606851f1f5152855d0aa2f0f285a1 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 4 Apr 2025 01:43:17 +0300
Subject: [PATCH] web/keybindings: add cmd to composer autofocus exclude

---
 web/src/ui/keybindings.ts  | 2 +-
 web/src/ui/util/monaco.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/ui/keybindings.ts b/web/src/ui/keybindings.ts
index f6c2b0c..27e4903 100644
--- a/web/src/ui/keybindings.ts
+++ b/web/src/ui/keybindings.ts
@@ -90,7 +90,7 @@ export default class Keybindings {
 		} else if (
 			evt.target === evt.currentTarget
 			&& this.keyUpMap[keyToString(evt)] === undefined
-			&& (!evt.ctrlKey || evt.key === "v" || evt.key === "a")
+			&& ((!evt.ctrlKey && !evt.metaKey) || evt.key === "v" || evt.key === "a")
 			&& !evt.altKey
 			&& key !== "PageUp" && key !== "PageDown"
 			&& key !== "Home" && key !== "End"
diff --git a/web/src/ui/util/monaco.tsx b/web/src/ui/util/monaco.tsx
index 784ae41..3a388fc 100644
--- a/web/src/ui/util/monaco.tsx
+++ b/web/src/ui/util/monaco.tsx
@@ -55,7 +55,7 @@ const Monaco = ({ initData, onClose, onSave, contentRef }: MonacoProps) => {
 		newEditor.onKeyDown(evt => {
 			if (evt.keyCode === monaco.KeyCode.Escape) {
 				onClose()
-			} else if (evt.ctrlKey && evt.keyCode === monaco.KeyCode.KeyS) {
+			} else if ((evt.ctrlKey || evt.metaKey) && evt.keyCode === monaco.KeyCode.KeyS) {
 				onSave()
 				evt.preventDefault()
 			}