Skip to content

H5: resize from left side can move item right #1607

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 3, 2021
Merged

H5: resize from left side can move item right #1607

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
1 change: 1 addition & 0 deletions doc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Change log
- fix [1600](https://github.com/gridstack/gridstack.js/issues/1600) height too small with `cellHeight:auto` loading in 1 column. Now detect we load at 1 column and size accordingly (default 'auto' could make big 700x700 cells, so explicit px might still be wanted)
- fix [1538](https://github.com/gridstack/gridstack.js/issues/1538) loading nested into small size and sizing back up
- fix [1604](https://github.com/gridstack/gridstack.js/issues/1604) nested grid resizing fix
- fix [1599](https://github.com/gridstack/gridstack.js/issues/1599) resize from left side can move item right

## 3.2.0 (2021-1-25)

Expand Down
6 changes: 5 additions & 1 deletion spec/e2e/html/1330-maxw-left-resize.html → ...330-1559-left-resize-maxW-and-others.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
<script type="text/javascript">
let grid = GridStack.init({resizable: { handles: 'sw, se, w, e, s' }});
addEvents(grid);
grid.load([{x: 2, y: 0, maxW: 1, content: 'max 1'}, {x: 5, y: 0, maxW: 2, content: 'max 2'}]);
grid.load([
{x: 2, y: 0, maxW: 1, content: 'max 1'},
{x: 5, y: 0, maxW: 2, content: 'max 2'},
{x: 7, y: 0, content: 'normal'},
]);
</script>
</body>
</html>
16 changes: 8 additions & 8 deletions src/h5/dd-resizable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ export class DDResizable extends DDBaseImplement implements HTMLElementExtendOpt
top: this.originalRect.top - this.scrolled
};

const offsetH = event.clientX - oEvent.clientX;
const offsetV = event.clientY - oEvent.clientY;
const offsetX = event.clientX - oEvent.clientX;
const offsetY = event.clientY - oEvent.clientY;

if (dir.indexOf('e') > -1) {
newRect.width += event.clientX - oEvent.clientX;
Expand All @@ -242,12 +242,12 @@ export class DDResizable extends DDBaseImplement implements HTMLElementExtendOpt
newRect.height += event.clientY - oEvent.clientY;
}
if (dir.indexOf('w') > -1) {
newRect.width -= offsetH;
newRect.left += offsetH;
newRect.width -= offsetX;
newRect.left += offsetX;
}
if (dir.indexOf('n') > -1) {
newRect.height -= offsetV;
newRect.top += offsetV
newRect.height -= offsetY;
newRect.top += offsetY
}
const reshape = this._getReShapeSize(newRect.width, newRect.height);
if (newRect.width !== reshape.width) {
Expand All @@ -267,9 +267,9 @@ export class DDResizable extends DDBaseImplement implements HTMLElementExtendOpt

/** @internal */
private _getReShapeSize(oWidth: number, oHeight: number): Size {
const maxWidth = this.option.maxWidth || oWidth;
const maxWidth = this.option.maxWidth || Number.MAX_SAFE_INTEGER;
const minWidth = this.option.minWidth || oWidth;
const maxHeight = this.option.maxHeight || oHeight;
const maxHeight = this.option.maxHeight || Number.MAX_SAFE_INTEGER;
const minHeight = this.option.minHeight || oHeight;
const width = Math.min(maxWidth, Math.max(minWidth, oWidth));
const height = Math.min(maxHeight, Math.max(minHeight, oHeight));
Expand Down