|
@@ -170,12 +170,11 @@ export const isSnappingEnabled = ({
|
|
}) => {
|
|
}) => {
|
|
if (event) {
|
|
if (event) {
|
|
return (
|
|
return (
|
|
- (app.state.objectsSnapModeEnabled && !event[KEYS.CTRL_OR_CMD]) ||
|
|
|
|
- (!app.state.objectsSnapModeEnabled &&
|
|
|
|
- event[KEYS.CTRL_OR_CMD] &&
|
|
|
|
- // ctrl + alt means we're lasso selecting
|
|
|
|
- !event.altKey &&
|
|
|
|
- !isGridModeEnabled(app))
|
|
|
|
|
|
+ app.state.activeTool.type !== "lasso" &&
|
|
|
|
+ ((app.state.objectsSnapModeEnabled && !event[KEYS.CTRL_OR_CMD]) ||
|
|
|
|
+ (!app.state.objectsSnapModeEnabled &&
|
|
|
|
+ event[KEYS.CTRL_OR_CMD] &&
|
|
|
|
+ !isGridModeEnabled(app)))
|
|
);
|
|
);
|
|
}
|
|
}
|
|
|
|
|