mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-09 00:00:01 +01:00
corrected grid snapping, solves #232
notes: -was already snapping to grid but didn't look like it because toolbox border was shifting everything by 3px -drag function wasn't updating the position, this.rnd.updatePosition doesn't work inside onDrag -snapping while dragging is done by dragGrid property
This commit is contained in:
parent
c9d5cf5aa4
commit
564906cf25
2 changed files with 6 additions and 14 deletions
|
@ -305,7 +305,7 @@ body {
|
|||
}
|
||||
|
||||
.toolbox-dropzone-editing {
|
||||
border: 3px dashed #e1e1e1;
|
||||
outline: 3px dashed #e1e1e1;
|
||||
}
|
||||
|
||||
.toolbox-dropzone-active {
|
||||
|
|
|
@ -31,7 +31,6 @@ class EditableWidgetContainer extends React.Component {
|
|||
if (this.props.grid === 1) {
|
||||
return value;
|
||||
}
|
||||
|
||||
return Math.round(value / this.props.grid) * this.props.grid;
|
||||
}
|
||||
|
||||
|
@ -41,28 +40,22 @@ class EditableWidgetContainer extends React.Component {
|
|||
}
|
||||
};
|
||||
|
||||
drag = (event, data) => {
|
||||
const x = this.snapToGrid(data.x);
|
||||
const y = this.snapToGrid(data.y);
|
||||
|
||||
if (x !== data.x || y !== data.y) {
|
||||
this.rnd.updatePosition({ x, y });
|
||||
}
|
||||
};
|
||||
|
||||
dragStop = (event, data) => {
|
||||
const widget = this.props.widget;
|
||||
|
||||
widget.x = this.snapToGrid(data.x);
|
||||
widget.y = this.snapToGrid(data.y);
|
||||
|
||||
|
||||
if (widget.x !== data.x || widget.y !== data.y) {
|
||||
this.rnd.updatePosition({ x: widget.x, y: widget.y});
|
||||
}
|
||||
|
||||
if (this.props.onWidgetChange != null) {
|
||||
this.props.onWidgetChange(widget, this.props.index);
|
||||
}
|
||||
};
|
||||
|
||||
resizeStop = (event, direction, ref,delta, position) => {
|
||||
|
||||
const widget = this.props.widget;
|
||||
|
||||
// resize depends on direction
|
||||
|
@ -119,7 +112,6 @@ class EditableWidgetContainer extends React.Component {
|
|||
className={widgetClasses}
|
||||
onResizeStart={this.borderWasClicked}
|
||||
onResizeStop={this.resizeStop}
|
||||
onDrag={this.drag}
|
||||
onDragStop={this.dragStop}
|
||||
dragGrid={gridArray}
|
||||
resizeGrid={gridArray}
|
||||
|
|
Loading…
Add table
Reference in a new issue