Compare commits

..

No commits in common. "7b926ec4096f8ef660af854693d46e5362e28438" and "dc4a38f391bd30df50c9da754b7ce5e2ae55d4d5" have entirely different histories.

2 changed files with 20 additions and 51 deletions

View File

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

View File

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