smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some element types reset to selection when the lock is active (#746)

Browse source 
* keep arrows and lines selected if locked

* keep element type selected if locked after inserting text

* ensure clicking outside doesn't create new text

* esc should switch to selection even if locked

* reset cursor when creating text via doubleClick

Co-authored-by: David Luzar <luzar.david@gmail.com>
This commit is contained in:
lissitz 2020-02-10 15:09:50 +01:00 • committed by GitHub
parent 1ec3946ed6
commit fa12125db0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/index.tsx
View file

@ -48,6 +48,7 @@ import {
capitalizeString,
distance,
distance2d,
resetCursor,
} from "./utils";
import { KEYS, isArrowKey } from "./keys";
@ -102,10 +103,6 @@ import { copyToAppClipboard, getClipboardContent } from "./clipboard";
let { elements } = createScene();
const { history } = createHistory();
function resetCursor() {
document.documentElement.style.cursor = "";
}
function setCursorForShape(shape: string) {
if (shape === "selection") {
resetCursor();
@ -1014,6 +1011,12 @@ export class App extends React.Component<any, AppState> {
}
if (isTextElement(element)) {
// if we're currently still editing text, clicking outside
// should only finalize it, not create another (irrespective
// of state.elementLocked)
if (this.state.editingElement?.type === "text") {
return;
}
let textX = e.clientX;
let textY = e.clientY;
if (!e.altKey) {
@ -1033,7 +1036,6 @@ export class App extends React.Component<any, AppState> {
this.setState({
draggingElement: null,
editingElement: null,
elementType: "selection",
});
};
@ -1058,6 +1060,9 @@ export class App extends React.Component<any, AppState> {
},
];
}
if (this.state.elementLocked) {
setCursorForShape(this.state.elementType);
}
history.resumeRecording();
resetSelection();
},
@ -1065,10 +1070,17 @@ export class App extends React.Component<any, AppState> {
resetSelection();
},
});
this.setState({
elementType: "selection",
editingElement: element,
});
resetCursor();
if (!this.state.elementLocked) {
this.setState({
editingElement: element,
elementType: "selection",
});
} else {
this.setState({
editingElement: element,
});
}
return;
} else if (
this.state.elementType === "arrow" ||
@ -1563,10 +1575,17 @@ export class App extends React.Component<any, AppState> {
this.setState({ multiElement: this.state.draggingElement });
} else if (draggingOccurred && !multiElement) {
this.state.draggingElement!.isSelected = true;
this.setState({
draggingElement: null,
elementType: "selection",
});
if (!elementLocked) {
resetCursor();
this.setState({
draggingElement: null,
elementType: "selection",
});
} else {
this.setState({
draggingElement: null,
});
}
}
return;
}
@ -1660,6 +1679,8 @@ export class App extends React.Component<any, AppState> {
window.addEventListener("mouseup", onMouseUp);
}}
onDoubleClick={e => {
resetCursor();
const { x, y } = viewportCoordsToSceneCoords(e, this.state);
const elementAtPosition = getElementAtPosition(elements, x, y);
@ -1724,7 +1745,6 @@ export class App extends React.Component<any, AppState> {
this.setState({
draggingElement: null,
editingElement: null,
elementType: "selection",
});
};