src/components/Dashboard/common/EditButtons.jsx

@@ -2,7 +2,6 @@ import { Button, Space } from 'antd'
 import CheckIcon from '../../Icons/CheckIcon.jsx'
 import XMarkIcon from '../../Icons/XMarkIcon.jsx'
 import EditIcon from '../../Icons/EditIcon.jsx'
-import KeyboardShortcut from './KeyboardShortcut.jsx'
 import PropTypes from 'prop-types'
 
 const EditButtons = ({
@@ -16,56 +15,26 @@ const EditButtons = ({
 }) => {
   return isEditing ? (
     <Space size='small'>
-      <KeyboardShortcut
+      <Button
-        shortcut='alt+s'
+        icon={<CheckIcon />}
-        hint='ALT S'
+        type='primary'
-        onTrigger={() => {
+        onClick={handleUpdate}
-          if (!disabled && !loading && formValid) {
+        loading={loading}
-            handleUpdate()
+        disabled={loading || !formValid || disabled}
-          }
+      />
-        }}
+      <Button
-      >
+        icon={<XMarkIcon />}
-        <Button
+        onClick={cancelEditing}
-          icon={<CheckIcon />}
+        disabled={loading || disabled}
-          type='primary'
+      />
-          onClick={handleUpdate}
-          loading={loading}
-          disabled={loading || !formValid || disabled}
-        />
-      </KeyboardShortcut>
-      <KeyboardShortcut
-        shortcut='alt+c'
-        hint='ALT C'
-        onTrigger={() => {
-          if (!disabled && !loading) {
-            cancelEditing()
-          }
-        }}
-      >
-        <Button
-          icon={<XMarkIcon />}
-          onClick={cancelEditing}
-          disabled={loading || disabled}
-        />
-      </KeyboardShortcut>
     </Space>
   ) : (
-    <KeyboardShortcut
+    <Button
-      shortcut='alt+e'
+      icon={<EditIcon />}
-      hint='ALT E'
+      onClick={startEditing}
-      onTrigger={() => {
+      loading={loading}
-        if (!disabled && !loading) {
+      disabled={disabled || loading}
-          startEditing()
+    />
-        }
-      }}
-    >
-      <Button
-        icon={<EditIcon />}
-        onClick={startEditing}
-        loading={loading}
-        disabled={disabled || loading}
-      />
-    </KeyboardShortcut>
   )
 }
 

src/components/Dashboard/common/ObjectTableNavigationButtons.jsx

@@ -98,7 +98,7 @@ const ObjectTableNavigationButtons = ({
       <Space size='small'>
         <KeyboardShortcut
           shortcut='alt+arrowleft'
-          hint='ALT ←'
+          hint='ALT LEFT'
           onTrigger={useCallback(() => {
             if (!disabled && !loading && neighbors.previous?._id) {
               handlePrevious()
@@ -113,7 +113,7 @@ const ObjectTableNavigationButtons = ({
         </KeyboardShortcut>
         <KeyboardShortcut
           shortcut='alt+arrowright'
-          hint='ALT →'
+          hint='ALT RIGHT'
           onTrigger={useCallback(() => {
             if (!disabled && !loading && neighbors.next?._id) {
               handleNext()