Skip to content

Commit b8c035f

Browse files
zdrawkuzdrawku
authored
Merge branch 'master' into iganchev/drop-down-scroll-brfix
2 parents b6f2096 + 080df9e commit b8c035f

File tree

2 files changed

+38
-32
lines changed

2 files changed

+38
-32
lines changed

‎projects/igniteui-angular/src/lib/core/styles/themes/_index.scss‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@
122122
$palette,
123123
$schema,
124124
$border-radius: $roundness,
125-
$shadow: if($elevation == false, 0, null),
125+
$shadow: if($elevation == false, none, null),
126126
));
127127
}
128128

129129
@if not(index($exclude, 'igx-bottom-nav')) {
130130
@include igx-bottom-nav(igx-bottom-nav-theme(
131131
$palette,
132132
$schema,
133-
$shadow: if($elevation == false, 0, null),
133+
$shadow: if($elevation == false, none, null),
134134
));
135135
}
136136

@@ -143,12 +143,12 @@
143143
$outlined-border-radius: $roundness,
144144
$fab-border-radius: $roundness,
145145
$icon-border-radius: $roundness,
146-
$raised-resting-shadow: if($elevation == false, 0, null),
147-
$raised-hover-shadow: if($elevation == false, 0, null),
148-
$raised-focus-shadow: if($elevation == false, 0, null),
149-
$fab-resting-shadow: if($elevation == false, 0, null),
150-
$fab-hover-shadow: if($elevation == false, 0, null),
151-
$fab-focus-shadow: if($elevation == false, 0, null),
146+
$raised-resting-shadow: if($elevation == false, none, null),
147+
$raised-hover-shadow: if($elevation == false, none, null),
148+
$raised-focus-shadow: if($elevation == false, none, null),
149+
$fab-resting-shadow: if($elevation == false, none, null),
150+
$fab-hover-shadow: if($elevation == false, none, null),
151+
$fab-focus-shadow: if($elevation == false, none, null),
152152
));
153153
}
154154

@@ -157,7 +157,7 @@
157157
$palette,
158158
$schema,
159159
$border-radius: $roundness,
160-
$shadow: if($elevation == false, 0, null),
160+
$shadow: if($elevation == false, 'none', null),
161161
));
162162
}
163163

@@ -183,8 +183,8 @@
183183
$palette,
184184
$schema,
185185
$border-radius: $roundness,
186-
$resting-shadow: if($elevation == false, 0, null),
187-
$hover-shadow: if($elevation == false, 0, null),
186+
$resting-shadow: if($elevation == false, none, null),
187+
$hover-shadow: if($elevation == false, none, null),
188188
));
189189
}
190190

@@ -193,7 +193,7 @@
193193
$palette,
194194
$schema,
195195
$border-radius: $roundness,
196-
$button-shadow: if($elevation == false, 0, null),
196+
$button-shadow: if($elevation == false, none, null),
197197
));
198198
}
199199

@@ -211,7 +211,7 @@
211211
$palette,
212212
$schema,
213213
$border-radius: $roundness,
214-
$ghost-shadow: if($elevation == false, 0, null),
214+
$ghost-shadow: if($elevation == false, none, null),
215215
));
216216
}
217217

@@ -236,7 +236,7 @@
236236
$palette,
237237
$schema,
238238
$border-radius: $roundness,
239-
$shadow: if($elevation == false, 0, null),
239+
$shadow: if($elevation == false, none, null),
240240
));
241241
}
242242

@@ -249,7 +249,7 @@
249249
$palette,
250250
$schema,
251251
$border-radius: $roundness,
252-
$shadow: if($elevation == false, 0, null),
252+
$shadow: if($elevation == false, none, null),
253253
));
254254
}
255255

@@ -266,8 +266,8 @@
266266
$palette,
267267
$schema,
268268
$drop-area-border-radius: $roundness,
269-
$grid-shadow: if($elevation == false, 0, null),
270-
$drag-shadow: if($elevation == false, 0, null),
269+
$grid-shadow: if($elevation == false, none, null),
270+
$drag-shadow: if($elevation == false, none, null),
271271
));
272272
}
273273

@@ -294,9 +294,9 @@
294294
$box-border-radius: $roundness,
295295
$border-border-radius: $roundness,
296296
$search-border-radius: $roundness,
297-
$search-resting-shadow: if($elevation == false, 0, null),
298-
$search-hover-shadow: if($elevation == false, 0, null),
299-
$search-disabled-shadow: if($elevation == false, 0, null),
297+
$search-resting-shadow: if($elevation == false, none, null),
298+
$search-hover-shadow: if($elevation == false, none, null),
299+
$search-disabled-shadow: if($elevation == false, none, null),
300300
));
301301
}
302302

@@ -313,7 +313,7 @@
313313
@include igx-navbar(igx-navbar-theme(
314314
$palette,
315315
$schema,
316-
$shadow: if($elevation == false, 0, null),
316+
$shadow: if($elevation == false, none, null),
317317
));
318318
}
319319

@@ -323,7 +323,7 @@
323323
$schema,
324324
$border-radius: $roundness,
325325
$item-border-radius: $roundness,
326-
$shadow: if($elevation == false, 0, null),
326+
$shadow: if($elevation == false, none, null),
327327
));
328328
}
329329

@@ -356,7 +356,7 @@
356356
$palette,
357357
$schema,
358358
$border-radius: $roundness,
359-
$shadow: if($elevation == false, 0, null),
359+
$shadow: if($elevation == false, none, null),
360360
));
361361
}
362362

@@ -367,9 +367,9 @@
367367
$border-radius-track: $roundness,
368368
$border-radius-thumb: $roundness,
369369
$border-radius-ripple: $roundness,
370-
$resting-shadow: if($elevation == false, 0, null),
371-
$hover-shadow: if($elevation == false, 0, null),
372-
$disabled-shadow: if($elevation == false, 0, null),
370+
$resting-shadow: if($elevation == false, none, null),
371+
$hover-shadow: if($elevation == false, none, null),
372+
$disabled-shadow: if($elevation == false, none, null),
373373
));
374374
}
375375

@@ -403,8 +403,8 @@
403403
$schema,
404404
$border-radius: $roundness,
405405
$active-item-border-radius: $roundness,
406-
$modal-shadow: if($elevation == false, 0, null),
407-
$dropdown-shadow: if($elevation == false, 0, null),
406+
$modal-shadow: if($elevation == false, none, null),
407+
$dropdown-shadow: if($elevation == false, none, null),
408408
));
409409
}
410410
}

‎projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,17 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
687687
cell.focus({ preventScroll: true });
688688
}
689689
} else {
690-
const cellElem = elem.querySelector(`${cellSelector}`);
691-
const rowIndex = parseInt(cellElem.getAttribute('data-rowindex'), 10);
692-
grid.navigation.performHorizontalScrollToCell(rowIndex, visibleColumnIndex);
690+
this.horizontalScrollGridToIndex(grid, visibleColumnIndex, () => {
691+
this.focusNextRow(elem, visibleColumnIndex, grid, isSummary);
692+
});
693693
}
694694
}
695+
public getColumnUnpinnedIndex(visibleColumnIndex: number, grid?: IgxHierarchicalGridComponent) {
696+
const currGrid = grid || this.grid;
697+
const column = currGrid.unpinnedColumns.find((col) => !col.columnGroup && col.visibleIndex === visibleColumnIndex);
698+
return currGrid.pinnedColumns.length ? currGrid.unpinnedColumns.filter((c) => !c.columnGroup).indexOf(column) :
699+
visibleColumnIndex;
700+
}
695701

696702
private focusPrevRow(elem, visibleColumnIndex, grid, inChild?, isSummary?) {
697703
if (grid.navigation.isColumnFullyVisible(visibleColumnIndex)) {
@@ -728,7 +734,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
728734
}
729735

730736
private horizontalScrollGridToIndex(grid, visibleColumnIndex, callBackFunc) {
731-
const unpinnedIndex = this.getColumnUnpinnedIndex(visibleColumnIndex);
737+
const unpinnedIndex = this.getColumnUnpinnedIndex(visibleColumnIndex, grid);
732738
grid.parentVirtDir.onChunkLoad
733739
.pipe(first())
734740
.subscribe(callBackFunc);

0 commit comments

Comments
 (0)