Skip to content

Commit

Permalink
fix(studio): fix backspace issue
Browse files Browse the repository at this point in the history
  • Loading branch information
allardy committed Oct 24, 2019
1 parent 7f136bf commit 6462b05
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/bp/ui-studio/src/web/keyboardShortcuts.ts
Expand Up @@ -7,6 +7,7 @@ export const keyMap = {
undo: `${controlKey}+z`,
find: `${controlKey}+f`,
redo: `${controlKey}+shift+z`,
delete: ['backspace', 'del'],
'emulator-focus': ['e', `${controlKey}+e`],
'docs-toggle': `${controlKey}+h`,
'lang-switcher': `${controlKey}+l`,
Expand Down
3 changes: 0 additions & 3 deletions src/bp/ui-studio/src/web/views/FlowBuilder/diagram/index.tsx
Expand Up @@ -404,9 +404,6 @@ class Diagram extends Component<Props> {
this.copySelectedElementToBuffer()
} else if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
this.pasteElementFromBuffer()
} else if (event.code === 'Backspace' || event.code === 'Delete') {
event.preventDefault()
this.deleteSelectedElements()
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/bp/ui-studio/src/web/views/FlowBuilder/index.tsx
Expand Up @@ -15,6 +15,7 @@ import { Container } from '~/components/Shared/Interface'
import { Timeout, toastFailure, toastInfo } from '~/components/Shared/Utils'
import { isOperationAllowed } from '~/components/Shared/Utils/AccessControl'
import DocumentationProvider from '~/components/Util/DocumentationProvider'
import { isInputFocused } from '~/keyboardShortcuts'
import { getDirtyFlows, RootReducer } from '~/reducers'
import { UserReducer } from '~/reducers/user'

Expand Down Expand Up @@ -197,6 +198,13 @@ class FlowBuilder extends Component<Props, State> {
e.preventDefault()
toastInfo('Pssst! Flows now save automatically, no need to save anymore.', Timeout.LONG)
},
delete: e => {
if (!isInputFocused()) {
e.preventDefault()
}

this.diagram.deleteSelectedElements()
},
cancel: e => {
e.preventDefault()
this.props.closeFlowNodeProps()
Expand Down

0 comments on commit 6462b05

Please sign in to comment.