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

Introduce Shapelock (#480)

Browse source 
* Introduce shape lock

* Format code with prettier

* Do not reset elementLocked on selection change

* Don't set isSelected to true if element is locked

* Don't reset the cursor

* Move reset cursor call to better spot

* Run prettier + lint
This commit is contained in:
Jilles Soeters 2020-01-20 15:52:19 -08:00 • committed by Christopher Chedeau
parent 2340dddaad
commit a72a143c84
5 changed files with 86 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/index.tsx
View file

@ -77,6 +77,7 @@ import { Island } from "./components/Island";
import Stack from "./components/Stack";
import { FixedSideContainer } from "./components/FixedSideContainer";
import { ToolIcon } from "./components/ToolIcon";
import { LockIcon } from "./components/LockIcon";
import { ExportDialog } from "./components/ExportDialog";
import { withTranslation } from "react-i18next";
import "./i18n";
@ -451,6 +452,16 @@ export class App extends React.Component<any, AppState> {
);
}
private renderShapeLock() {
const { elementLocked } = this.state;
return (
<LockIcon
checked={elementLocked}
onChange={() => this.setState({ elementLocked: !elementLocked })}
/>
);
}
private renderShapesSwitcher() {
const { t } = this.props;
@ -478,6 +489,7 @@ export class App extends React.Component<any, AppState> {
></ToolIcon>
);
})}
{this.renderShapeLock()}
</>
);
}
@ -1043,7 +1055,8 @@ export class App extends React.Component<any, AppState> {
const {
draggingElement,
resizingElement,
elementType
elementType,
elementLocked
} = this.state;
lastMouseUp = null;
@ -1068,8 +1081,6 @@ export class App extends React.Component<any, AppState> {
elements = elements.filter(el => el.id !== resizingElement.id);
}
resetCursor();
// If click occured on already selected element
// it is needed to remove selection from other elements
// or if SHIFT or META key pressed remove selection
@ -1100,14 +1111,18 @@ export class App extends React.Component<any, AppState> {
if (elementType === "selection") {
elements = elements.slice(0, -1);
} else {
} else if (!elementLocked) {
draggingElement.isSelected = true;
}
this.setState({
draggingElement: null,
elementType: "selection"
});
if (!elementLocked) {
resetCursor();
this.setState({
draggingElement: null,
elementType: "selection"
});
}
history.resumeRecording();
this.forceUpdate();