Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/selection/useSelection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import React, {
useMemo,
useState
} from 'react';
import { isNotEditableElement } from '../utils/dom';
import { GraphCanvasRef } from '../GraphCanvas';
import { GraphEdge, GraphNode } from '../types';
import { findPath } from '../utils/paths';
Expand Down Expand Up @@ -304,30 +305,37 @@ export const useSelection = ({

const onKeyDown = useCallback((event: KeyboardEvent) => {
const element = event.target as HTMLElement;
const isSafe =
element.tagName !== 'INPUT' &&
element.tagName !== 'SELECT' &&
element.tagName !== 'TEXTAREA' &&
!element.isContentEditable;

const isSafe = isNotEditableElement(element);
const isMeta = event.metaKey || event.ctrlKey;

if (isSafe && isMeta) {
setMetaKeyDown(true);
}
}, []);

const onKeyUp = useCallback((event: KeyboardEvent) => {
const element = event.target as HTMLElement;
const isSafe = isNotEditableElement(element);
const isMeta = ['Meta', 'Control'].includes(event.key);

if (isSafe && isMeta) {
setMetaKeyDown(false);
}
}, []);

useEffect(() => {
if (typeof window !== 'undefined') {
window.addEventListener('keydown', onKeyDown);
window.addEventListener('keyup', onKeyUp);
}

return () => {
if (typeof window !== 'undefined') {
window.removeEventListener('keydown', onKeyDown);
window.removeEventListener('keyup', onKeyUp);
}
};
}, [onKeyDown]);
}, [onKeyDown, onKeyUp]);

const onCanvasClick = useCallback(
(event: MouseEvent) => {
Expand Down
13 changes: 13 additions & 0 deletions src/utils/dom.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Check if an element is not editable (input, select, textarea, contentEditable).
* @param element - The element to check
* @returns True if the element is not editable, false otherwise
*/
export const isNotEditableElement = (element: HTMLElement) => {
return (
element.tagName !== 'INPUT' &&
element.tagName !== 'SELECT' &&
element.tagName !== 'TEXTAREA' &&
!element.isContentEditable
);
};
1 change: 1 addition & 0 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ export * from './cluster';
export * from './useHoverIntent';
export * from './useDrag';
export * from './paths';
export * from './dom';