Skip to content

Commit f815ef6

Browse files
committed
fix(core): prevent esc keypress when a11y is disabled
1 parent e5a8465 commit f815ef6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

packages/core/src/components/Edges/EdgeWrapper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const EdgeWrapper = defineComponent({
4444
findNode,
4545
isValidConnection,
4646
multiSelectionActive,
47+
disableKeyboardA11y,
4748
} = useVueFlow()
4849

4950
const hooks = useEdgeHooks(props.edge, emits)
@@ -334,7 +335,7 @@ const EdgeWrapper = defineComponent({
334335
}
335336

336337
function onKeyDown(event: KeyboardEvent) {
337-
if (elementSelectionKeys.includes(event.key) && props.selectable) {
338+
if (!disableKeyboardA11y.value && elementSelectionKeys.includes(event.key) && props.selectable) {
338339
const unselect = event.key === 'Escape'
339340

340341
if (unselect) {

packages/core/src/components/Nodes/NodeWrapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ const NodeWrapper = defineComponent({
319319
}
320320

321321
function onKeyDown(event: KeyboardEvent) {
322-
if (isInputDOMNode(event)) {
322+
if (isInputDOMNode(event) || disableKeyboardA11y.value) {
323323
return
324324
}
325325

@@ -335,7 +335,7 @@ const NodeWrapper = defineComponent({
335335
unselect,
336336
nodeElement.value!,
337337
)
338-
} else if (!disableKeyboardA11y.value && props.draggable && node.value.selected && arrowKeyDiffs[event.key]) {
338+
} else if (props.draggable && node.value.selected && arrowKeyDiffs[event.key]) {
339339
ariaLiveMessage.value = `Moved selected node ${event.key.replace('Arrow', '').toLowerCase()}. New position, x: ${~~node
340340
.value.position.x}, y: ${~~node.value.position.y}`
341341

0 commit comments

Comments
 (0)