fix: remove unnecessary conditions in pointerup for linear elements (#5575)

* fix: remove unnecessary conditions in pointerup for linear elements

* reset editingLinearElement when clicked inside bounding box
This commit is contained in:
Aakansha Doshi 2022-08-18 13:58:46 +05:30 committed by GitHub
parent 38e8ae46c9
commit 551c38f60b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4534,9 +4534,8 @@ class App extends React.Component<AppProps, AppState> {
if (this.state.editingLinearElement) {
if (
!pointerDownState.boxSelection.hasOccurred &&
(pointerDownState.hit?.element?.id !==
this.state.editingLinearElement.elementId ||
!pointerDownState.hit.hasHitElementInside)
pointerDownState.hit?.element?.id !==
this.state.editingLinearElement.elementId
) {
this.actionManager.executeAction(actionFinalize);
} else {
@ -4554,10 +4553,8 @@ class App extends React.Component<AppProps, AppState> {
}
} else if (this.state.selectedLinearElement) {
if (
!pointerDownState.boxSelection.hasOccurred &&
(pointerDownState.hit?.element?.id !==
this.state.selectedLinearElement.elementId ||
!pointerDownState.hit.hasHitElementInside)
pointerDownState.hit?.element?.id !==
this.state.selectedLinearElement.elementId
) {
const selectedELements = getSelectedElements(
this.scene.getNonDeletedElements(),
@ -4937,7 +4934,6 @@ class App extends React.Component<AppProps, AppState> {
}
if (
!this.state.editingLinearElement &&
!pointerDownState.drag.hasOccurred &&
!this.state.isResizing &&
((hitElement &&
@ -4950,13 +4946,16 @@ class App extends React.Component<AppProps, AppState> {
(!hitElement &&
pointerDownState.hit.hasHitCommonBoundingBoxOfSelectedElements))
) {
if (this.state.editingLinearElement) {
this.setState({ editingLinearElement: null });
} else {
// Deselect selected elements
this.setState({
selectedElementIds: {},
selectedGroupIds: {},
editingGroupId: null,
});
}
return;
}