Skip to content

Commit 767e022

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored and
mportuga
committed
fix(ui-grid.core): Address resizing issues.
- Ensure displayNames can be empty strings - Ensure scrolling is not lost on grid resize - Ensure rows are refreshed when auto-resize is triggered
1 parent 5b584f9 commit 767e022

File tree

5 files changed

+113
-31
lines changed

5 files changed

+113
-31
lines changed

‎src/features/auto-resize/js/auto-resize.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
if ($elm[0].offsetParent !== null) {
3333
uiGridCtrl.grid.gridWidth = width;
3434
uiGridCtrl.grid.gridHeight = height;
35-
uiGridCtrl.grid.queueRefresh()
35+
uiGridCtrl.grid.queueGridRefresh()
3636
.then(function() {
3737
uiGridCtrl.grid.api.core.raise.gridDimensionChanged(prevHeight, prevWidth, height, width);
3838
});

‎src/js/core/factories/Grid.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,6 +2289,9 @@ angular.module('ui.grid')
22892289
return p.promise;
22902290
};
22912291

2292+
function getPrevScrollValue(rowsAdded, prevScrollVal) {
2293+
return rowsAdded || prevScrollVal > 0 ? prevScrollVal : null;
2294+
}
22922295

22932296
/**
22942297
* @ngdoc function
@@ -2304,18 +2307,16 @@ angular.module('ui.grid')
23042307
var self = this;
23052308

23062309
for (var i in self.renderContainers) {
2307-
var container = self.renderContainers[i];
2310+
var container = self.renderContainers[i],
2311+
prevScrollTop = getPrevScrollValue(rowsAdded, container.prevScrollTop),
2312+
prevScrollLeft = getPrevScrollValue(rowsAdded, container.prevScrollLeft),
2313+
prevScrolltopPercentage = rowsAdded || prevScrollTop > 0 ? null : container.prevScrolltopPercentage,
2314+
prevScrollleftPercentage = rowsAdded || prevScrollLeft > 0 ? null : container.prevScrollleftPercentage;
23082315

23092316
// gridUtil.logDebug('redrawing container', i);
23102317

2311-
if (rowsAdded) {
2312-
container.adjustRows(container.prevScrollTop, null);
2313-
container.adjustColumns(container.prevScrollLeft, null);
2314-
}
2315-
else {
2316-
container.adjustRows(null, container.prevScrolltopPercentage);
2317-
container.adjustColumns(null, container.prevScrollleftPercentage);
2318-
}
2318+
container.adjustRows(prevScrollTop, prevScrolltopPercentage);
2319+
container.adjustColumns(prevScrollLeft, prevScrollleftPercentage);
23192320
}
23202321
};
23212322

‎src/js/core/factories/GridColumn.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,9 @@ angular.module('ui.grid')
446446

447447
// Use colDef.displayName as long as it's not undefined, otherwise default to the field name
448448
function getDisplayName(colDef) {
449-
return colDef.displayName || gridUtil.readableColumnName(colDef.name);
449+
return (colDef.displayName === undefined)
450+
? gridUtil.readableColumnName(colDef.name)
451+
: colDef.displayName;
450452
}
451453

452454
/**

‎test/unit/core/factories/Grid.spec.js‎

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ describe('Grid factory', function () {
309309
grid.createRightContainer();
310310
expect(grid.renderContainers.right).toBe(right);
311311
});
312-
313-
314312
});
315313

316314
describe('buildColumns', function() {
@@ -1147,6 +1145,75 @@ describe('Grid factory', function () {
11471145
});
11481146
});
11491147

1148+
describe('redrawInPlace', function() {
1149+
beforeEach(function() {
1150+
grid.renderContainers = {
1151+
body: {
1152+
prevScrollTop: 0,
1153+
prevScrollLeft: 0,
1154+
prevScrolltopPercentage: 0,
1155+
prevScrollleftPercentage: 0,
1156+
adjustRows: jasmine.createSpy('adjustRows'),
1157+
adjustColumns: jasmine.createSpy('adjustColumns')
1158+
}
1159+
};
1160+
});
1161+
describe('when rows have been added', function() {
1162+
beforeEach(function() {
1163+
grid.renderContainers.body.prevScrollTop = 10;
1164+
grid.renderContainers.body.prevScrollLeft = 20;
1165+
grid.redrawInPlace(true);
1166+
});
1167+
it('should call adjust rows with null for a scroll percentage and the prevScrollTop value', function() {
1168+
expect(grid.renderContainers.body.adjustRows).toHaveBeenCalledWith(
1169+
grid.renderContainers.body.prevScrollTop,
1170+
null
1171+
);
1172+
});
1173+
it('should call adjust columns with null for a scroll percentage and the prevScrollLeft value', function() {
1174+
expect(grid.renderContainers.body.adjustColumns).toHaveBeenCalledWith(
1175+
grid.renderContainers.body.prevScrollLeft,
1176+
null
1177+
);
1178+
});
1179+
});
1180+
describe('when rows have not been added', function() {
1181+
it('should call adjust rows with null for a scroll percentage and the prevScrollTop value if prevScrollTop is greater than 0', function() {
1182+
grid.renderContainers.body.prevScrollTop = 10;
1183+
grid.redrawInPlace(false);
1184+
expect(grid.renderContainers.body.adjustRows).toHaveBeenCalledWith(
1185+
grid.renderContainers.body.prevScrollTop,
1186+
null
1187+
);
1188+
});
1189+
it('should call adjust columns with null for a scroll percentage and the prevScrollLeft value if prevScrollLeft is greater than 0', function() {
1190+
grid.renderContainers.body.prevScrollLeft = 20;
1191+
grid.redrawInPlace(false);
1192+
expect(grid.renderContainers.body.adjustColumns).toHaveBeenCalledWith(
1193+
grid.renderContainers.body.prevScrollLeft,
1194+
null
1195+
);
1196+
});
1197+
it('should call adjust rows with null for a scroll top and the scroll percentage value if prevScrollTop is less or equal to 0', function() {
1198+
grid.renderContainers.body.prevScrollTop = 0;
1199+
grid.renderContainers.body.prevScrolltopPercentage = 30;
1200+
grid.redrawInPlace(false);
1201+
expect(grid.renderContainers.body.adjustRows).toHaveBeenCalledWith(
1202+
null,
1203+
grid.renderContainers.body.prevScrolltopPercentage
1204+
);
1205+
});
1206+
it('should call adjust columns with null for a scroll left and the scroll percentage value if prevScrollLeft is less or equal to 0', function() {
1207+
grid.renderContainers.body.prevScrollLeft = 0;
1208+
grid.renderContainers.body.prevScrollleftPercentage = 40;
1209+
grid.redrawInPlace(false);
1210+
expect(grid.renderContainers.body.adjustColumns).toHaveBeenCalledWith(
1211+
null,
1212+
grid.renderContainers.body.prevScrollleftPercentage
1213+
);
1214+
});
1215+
});
1216+
});
11501217

11511218
describe( 'data change callbacks', function() {
11521219
it('register then deregister data change callback', function() {

‎test/unit/core/factories/GridColumn.spec.js‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
describe('GridColumn factory', function () {
2-
var $q, $scope, cols, grid, gridCol, Grid, GridColumn, gridClassFactory, GridRenderContainer, uiGridConstants, $httpBackend;
2+
var $q, $scope, cols, grid, Grid, GridColumn, gridClassFactory, GridRenderContainer, uiGridConstants, $httpBackend;
33

44
beforeEach(module('ui.grid'));
55

@@ -65,8 +65,7 @@ describe('GridColumn factory', function () {
6565

6666
describe('should not update sort when updating a column, but visible flag does update', function () {
6767
beforeEach(function(complete){
68-
var sort = { priority: 0, direction: 'asc' };
69-
grid.options.columnDefs[0].sort = sort;
68+
grid.options.columnDefs[0].sort = { priority: 0, direction: 'asc' };
7069
grid.options.columnDefs[0].visible = false;
7170
buildCols(complete);
7271
});
@@ -79,8 +78,7 @@ describe('GridColumn factory', function () {
7978

8079
describe('should update everything but term when updating filters', function () {
8180
beforeEach(function(complete) {
82-
var filter = { term: 'x', placeholder: 'placeholder', type: uiGridConstants.filter.SELECT, selectOptions: [ { value: 1, label: "male" } ] };
83-
grid.options.columnDefs[0].filter = filter;
81+
grid.options.columnDefs[0].filter = { term: 'x', placeholder: 'placeholder', type: uiGridConstants.filter.SELECT, selectOptions: [ { value: 1, label: "male" } ] };
8482
buildCols(complete);
8583
});
8684

@@ -92,8 +90,7 @@ describe('GridColumn factory', function () {
9290

9391
describe('should update everything but term when updating filters', function () {
9492
beforeEach(function(complete) {
95-
var filters = [{ term: 'x', placeholder: 'placeholder', type: uiGridConstants.filter.SELECT, selectOptions: [ { value: 1, label: "male" } ] }];
96-
grid.options.columnDefs[0].filters = filters;
93+
grid.options.columnDefs[0].filters = [{ term: 'x', placeholder: 'placeholder', type: uiGridConstants.filter.SELECT, selectOptions: [ { value: 1, label: "male" } ] }];
9794
buildCols(complete);
9895
});
9996

@@ -103,7 +100,6 @@ describe('GridColumn factory', function () {
103100
});
104101

105102

106-
107103
it('should obey columnDef sort spec', function () {
108104
// ... TODO(c0bra)
109105
});
@@ -115,15 +111,13 @@ describe('GridColumn factory', function () {
115111
});
116112

117113
it('should add an incrementing number to column names when they have the same field and no name', function () {
118-
var cols = [
114+
grid.options.columnDefs = [
119115
{ field: 'age' },
120116
{ field: 'name' },
121117
{ field: 'name' },
122118
{ field: 'name' }
123119
];
124120

125-
grid.options.columnDefs = cols;
126-
127121
buildCols();
128122

129123
expect(grid.columns[0].name).toEqual('age');
@@ -133,34 +127,29 @@ describe('GridColumn factory', function () {
133127
});
134128

135129
it('should not change the displayNames if they are provided', function () {
136-
var cols = [
130+
grid.options.columnDefs = [
137131
{ field: 'age' },
138132
{ field: 'name', displayName:'First Name' },
139133
{ field: 'name', displayName:'First Name' },
140134
{ field: 'name', displayName:'First Name' }
141135
];
142136

143-
grid.options.columnDefs = cols;
144-
145137
buildCols();
146138

147139
expect(grid.columns[0].displayName).toEqual('Age');
148140
expect(grid.columns[1].displayName).toEqual('First Name');
149141
expect(grid.columns[2].displayName).toEqual('First Name');
150142
expect(grid.columns[3].displayName).toEqual('First Name');
151-
152143
});
153144

154145
it('should account for existing incremented names', function () {
155-
var cols = [
146+
grid.options.columnDefs = [
156147
{ field: 'age' },
157148
{ field: 'name' },
158149
{ field: 'name', name: 'name3' },
159150
{ field: 'name' }
160151
];
161152

162-
grid.options.columnDefs = cols;
163-
164153
buildCols();
165154

166155
expect(grid.columns[0].name).toEqual('age');
@@ -622,6 +611,29 @@ describe('GridColumn factory', function () {
622611
expect(updateCol(col, colDef)).toThrow();
623612
});
624613

614+
describe('displayName', function() {
615+
it('should allow the user to set the displayName to an empty string or null value', function() {
616+
colDef.displayName = '';
617+
col.updateColumnDef(colDef);
618+
expect(col.displayName).toEqual('');
619+
620+
colDef.displayName = null;
621+
col.updateColumnDef(colDef);
622+
expect(col.displayName).toBeNull();
623+
});
624+
it('should allow the user to enter whatever displayName they desire', function() {
625+
colDef.displayName = 'Test';
626+
col.updateColumnDef(colDef);
627+
expect(col.displayName).toEqual(colDef.displayName);
628+
});
629+
it('should generate a displayName based on the name attribute if the user does not define it', function() {
630+
colDef.displayName = undefined;
631+
colDef.name = 'mockName';
632+
col.updateColumnDef(colDef);
633+
expect(col.displayName).toEqual('Mock Name');
634+
});
635+
});
636+
625637
describe('cellTooltip', function() {
626638
it('should be set to false when it is undefined', function() {
627639
colDef.cellTooltip = undefined;

0 commit comments

Comments
 (0)