fix(ui): blocks browser save dialog from opening when hotkey used wit…

…h no changes (#6366)
payloadcms · May 21, 2024 · 0190eb8 · 0190eb8
1 parent f482fdc
commit 0190eb8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/ui/src/elements/Save/index.tsx b/packages/ui/src/elements/Save/index.tsx
@@ -8,7 +8,6 @@ import { useHotkey } from '../../hooks/useHotkey.js'
 import { useEditDepth } from '../../providers/EditDepth/index.js'
 import { useOperation } from '../../providers/Operation/index.js'
 import { useTranslation } from '../../providers/Translation/index.js'
-
 export const DefaultSaveButton: React.FC<{ label?: string }> = ({ label: labelProp }) => {
   const { t } = useTranslation()
   const { submit } = useForm()
@@ -21,7 +20,9 @@ export const DefaultSaveButton: React.FC<{ label?: string }> = ({ label: labelPr
   const forceDisable = operation === 'update' && !modified
 
   useHotkey({ cmdCtrlKey: true, editDepth, keyCodes: ['s'] }, (e) => {
-    if (forceDisable) return
+    if (forceDisable) {
+      // absorb the event
+    }
 
     e.preventDefault()
     e.stopPropagation()

diff --git a/packages/ui/src/elements/SaveDraft/index.tsx b/packages/ui/src/elements/SaveDraft/index.tsx
@@ -57,7 +57,9 @@ const DefaultSaveDraftButton: React.FC = () => {
   }, [submit, collectionSlug, globalSlug, serverURL, api, locale, id, forceDisable])
 
   useHotkey({ cmdCtrlKey: true, editDepth, keyCodes: ['s'] }, (e) => {
-    if (forceDisable) return
+    if (forceDisable) {
+      // absorb the event
+    }
 
     e.preventDefault()
     e.stopPropagation()