Skip to content

Commit 2051d12

Browse files
authored
Merge branch '7.2.x' into dpetev/ios-grid-edit-7-2
2 parents 3b62c86 + 0213744 commit 2051d12

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

projects/igniteui-angular/src/lib/core/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export const enum KEYS {
170170
*/
171171
export function getNodeSizeViaRange(range: Range, node: any): number {
172172
let overflow = null;
173-
if (isIE() || isEdge()) {
173+
if (!isFirefox()) {
174174
overflow = node.style.overflow;
175175
// we need that hack - otherwise content won't be measured correctly in IE/Edge
176176
node.style.overflow = 'visible';
@@ -179,7 +179,7 @@ export function getNodeSizeViaRange(range: Range, node: any): number {
179179
range.selectNodeContents(node);
180180
const width = range.getBoundingClientRect().width;
181181

182-
if (isIE() || isEdge()) {
182+
if (!isFirefox()) {
183183
// we need that hack - otherwise content won't be measured correctly in IE/Edge
184184
node.style.overflow = overflow;
185185
}

projects/igniteui-angular/src/lib/grids/grid/column-resizing.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,8 @@ describe('IgxGrid - Deferred Column Resizing', () => {
597597

598598
column.autosize();
599599
fixture.detectChanges();
600-
expect(column.width).toEqual('119px');
600+
// the exact width is different between chrome and chrome headless so an exact match is erroneous
601+
expect(Math.abs(parseInt(column.width, 10) - 120)).toBeLessThan(2);
601602

602603
// height/width setter rAF
603604
await wait(16);

0 commit comments

Comments
 (0)