Skip to content

fix: 🐛 ensure viewport height cannot be negative #7164

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
merged 1 commit into from
Aug 7, 2021
Merged

fix: 🐛 ensure viewport height cannot be negative #7164

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cellnav/test/uiGridCellNavService.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ describe('ui.grid.edit uiGridCellNavService', function() {
$timeout.flush();

expect(args.grid).toEqual(grid);
expect(Math.round(args.y.percentage * 10) / 10).toBe(0.4);
expect(Math.round(args.y.percentage * 10) / 10).toBe(0.5);
expect(isNaN(args.x.percentage)).toEqual(true);
});

Expand Down Expand Up @@ -233,7 +233,7 @@ describe('ui.grid.edit uiGridCellNavService', function() {
});
$timeout.flush();

expect(Math.round(args.y.percentage * 10) / 10).toEqual(0.5);
expect(Math.round(args.y.percentage * 10) / 10).toEqual(0.6);
expect(args.x).toBe(null);
});

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/js/factories/Grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,7 @@ angular.module('ui.grid')

// gridUtil.logDebug('viewPortHeight', viewPortHeight);

return viewPortHeight;
return viewPortHeight > 0 ? viewPortHeight : 0;
};

Grid.prototype.getViewportWidth = function getViewportWidth() {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/js/factories/GridRenderContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ angular.module('ui.grid')

viewPortHeight = viewPortHeight + adjustment.height;

return viewPortHeight;
return viewPortHeight > 0 ? viewPortHeight : 0;
};

GridRenderContainer.prototype.getViewportWidth = function getViewportWidth() {
Expand Down