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

Merge pull request #37 from vjeux/select-on-click

Browse Source 
Fixes selecting an element
This commit is contained in:
Giovanni Giordano 2020-01-02 18:01:54 +01:00 committed by GitHub
commit e260904244
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/index.js
View File

@ -331,10 +331,18 @@ class App extends React.Component {
let isDraggingElements = false; let isDraggingElements = false;
const cursorStyle = document.documentElement.style.cursor; const cursorStyle = document.documentElement.style.cursor;
if (this.state.elementType === "selection") { if (this.state.elementType === "selection") {
const selectedElement = elements.find(isInsideAnElement(x, y)) const selectedElement = elements.find(element => {
const isSelected = isInsideAnElement(x, y)(element)
if (isSelected) {
element.isSelected = true
}
return isSelected
})
if (selectedElement) { if (selectedElement) {
this.setState({ draggingElement: selectedElement }); this.setState({ draggingElement: selectedElement });
} else {
clearSelection()
} }
isDraggingElements = elements.some(element => element.isSelected); isDraggingElements = elements.some(element => element.isSelected);
@ -424,7 +432,7 @@ class App extends React.Component {
document.documentElement.style.cursor = cursorStyle; document.documentElement.style.cursor = cursorStyle;
// if no element is clicked, clear the selection and redraw // if no element is clicked, clear the selection and redraw
if (draggingElement === null) { if (draggingElement === null ) {
clearSelection() clearSelection()
drawScene(); drawScene();
return return
@ -435,7 +443,6 @@ class App extends React.Component {
isDraggingElements = false; isDraggingElements = false;
} }
elements.pop() elements.pop()
setSelection(draggingElement);
} else { } else {
draggingElement.isSelected = true; draggingElement.isSelected = true;
} }