Skip to content

fix Resizing does not work as expected #1170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adumesny merged 1 commit into from
Feb 27, 2020
Merged

fix Resizing does not work as expected #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Change log

## 1.0.0-dev (upcoming)

-- TBD
-- fix [(1166)](https://github.com/gridstack/gridstack.js/issues/1166) resize not taking margin height into account

## v1.0.0 (2020-02-23)

Expand Down
23 changes: 8 additions & 15 deletions src/gridstack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,19 +1209,14 @@
var self = this;

var cellWidth;
var cellHeight;
var cellFullHeight; // internal cellHeight + v-margin

var dragOrResize = function(event, ui) {
var x = Math.round(ui.position.left / cellWidth);
var y = Math.floor((ui.position.top + cellHeight / 2) / cellHeight);
var y = Math.floor((ui.position.top + cellFullHeight / 2) / cellFullHeight);
var width;
var height;

if (event.type !== 'drag') {
width = Math.round(ui.size.width / cellWidth);
height = Math.round(ui.size.height / cellHeight);
}

if (event.type === 'drag') {
var distance = ui.position.top - node._prevYPix;
node._prevYPix = ui.position.top;
Expand Down Expand Up @@ -1262,9 +1257,9 @@
}
}
} else if (event.type === 'resize') {
if (x < 0) {
return;
}
if (x < 0) return;
width = Math.round(ui.size.width / cellWidth);
height = Math.round((ui.size.height + self.verticalMargin()) / cellFullHeight);
}
// width and height are undefined if not resizing
var lastTriedWidth = width !== undefined ? width : node.lastTriedWidth;
Expand Down Expand Up @@ -1292,11 +1287,9 @@
self.engine.cleanNodes();
self.engine.beginUpdate(node);
cellWidth = self.cellWidth();
var strictCellHeight = self.cellHeight();
// TODO: cellHeight = cellHeight() causes issue (i.e. remove strictCellHeight above) otherwise
// when sizing up we jump almost right away to next size instead of half way there. Not sure
// why as we don't use ceil() in many places but round() instead.
cellHeight = (self.$el.height() + grid.verticalMargin()) / parseInt(self.$el.attr('data-gs-current-row'));
var strictCellHeight = self.cellHeight(); // heigh without v-margin
// compute height with v-margin (Note: we add 1 margin as last row is missing it)
cellFullHeight = (self.$el.height() + self.verticalMargin()) / parseInt(self.$el.attr('data-gs-current-row'));
self.placeholder
.attr('data-gs-x', o.attr('data-gs-x'))
.attr('data-gs-y', o.attr('data-gs-y'))
Expand Down