sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: allow pointer events when editing a linear element (#7238)

Browse Source
This commit is contained in:
zsviczian 2023-11-10 15:21:59 +01:00 committed by GitHub
parent f66c93633c
commit 798e1fd858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/App.tsx
View File

@ -1173,6 +1173,19 @@ class App extends React.Component<AppProps, AppState> {
pendingImageElementId: this.state.pendingImageElementId, pendingImageElementId: this.state.pendingImageElementId,
}); });
const shouldBlockPointerEvents =
!(
this.state.editingElement && isLinearElement(this.state.editingElement)
) &&
(this.state.selectionElement ||
this.state.draggingElement ||
this.state.resizingElement ||
(this.state.activeTool.type === "laser" &&
// technically we can just test on this once we make it more safe
this.state.cursorButton === "down") ||
(this.state.editingElement &&
!isTextElement(this.state.editingElement)));
return ( return (
<div <div
className={clsx("excalidraw excalidraw-container", { className={clsx("excalidraw excalidraw-container", {
@ -1180,17 +1193,9 @@ class App extends React.Component<AppProps, AppState> {
"excalidraw--mobile": this.device.editor.isMobile, "excalidraw--mobile": this.device.editor.isMobile,
})} })}
style={{ style={{
["--ui-pointerEvents" as any]: ["--ui-pointerEvents" as any]: shouldBlockPointerEvents
this.state.selectionElement || ? POINTER_EVENTS.disabled
this.state.draggingElement || : POINTER_EVENTS.enabled,
this.state.resizingElement ||
(this.state.activeTool.type === "laser" &&
// technically we can just test on this once we make it more safe
this.state.cursorButton === "down") ||
(this.state.editingElement &&
!isTextElement(this.state.editingElement))
? POINTER_EVENTS.disabled
: POINTER_EVENTS.enabled,
}} }}
ref={this.excalidrawContainerRef} ref={this.excalidrawContainerRef}
onDrop={this.handleAppOnDrop} onDrop={this.handleAppOnDrop}