Skip to content

Commit 6c0c52f

Browse files
didimmovasimeonoff
andauthored
fix(grid): fix filering row mask applying on chips (#17139)
Co-authored-by: Simeon Simeonoff <sim.simeonoff@gmail.com>
1 parent d665827 commit 6c0c52f

File tree

1 file changed

+23
-29
lines changed

1 file changed

+23
-29
lines changed

projects/igniteui-angular/core/src/core/styles/components/grid/_grid-theme.scss

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2507,6 +2507,7 @@
25072507
display: flex;
25082508
flex: 1;
25092509
overflow: hidden;
2510+
position: relative;
25102511
max-width: calc(100% - 176px);
25112512
min-width: rem(56px);
25122513

@@ -2538,48 +2539,41 @@
25382539
}
25392540
}
25402541

2541-
%igx-grid__filtering-scroll-start {
2542-
&::after {
2543-
@include _filtering-scroll-mask($theme, right);
2544-
inset-inline-start: calc(100% + 6px);
2545-
}
2542+
%igx-grid__filtering-scroll-start,
2543+
%igx-grid__filtering-scroll-end {
2544+
width: rem(24px);
2545+
height: rem(24px);
2546+
position: relative;
2547+
margin: if($variant == 'indigo', rem(12px), rem(8px));
2548+
z-index: 1;
25462549

25472550
[dir='rtl'] & {
2548-
&::before {
2549-
@include _filtering-scroll-mask($theme, right);
2550-
inset-inline-end: calc(100% + 6px);
2551-
}
2551+
transform: scaleX(-1);
25522552
}
25532553
}
25542554

2555-
%igx-grid__filtering-scroll-end {
2555+
.igx-grid__filtering-row-scroll-start + .igx-grid__filtering-row-main {
25562556
&::before {
2557-
@include _filtering-scroll-mask($theme, left);
2558-
inset-inline-end: calc(100% + 6px);
2557+
@include _filtering-scroll-mask($theme, right);
2558+
inset-inline-start: 0;
2559+
pointer-events: none;
2560+
z-index: 1;
25592561
}
25602562

2561-
[dir='rtl'] & {
2562-
&::after {
2563-
@include _filtering-scroll-mask($theme, left);
2564-
inset-inline-start: calc(100% + 6px);
2565-
}
2563+
&::after {
2564+
@include _filtering-scroll-mask($theme, left);
2565+
inset-inline-end: 0;
2566+
pointer-events: none;
2567+
z-index: 1;
25662568
}
2567-
}
2568-
2569-
%igx-grid__filtering-scroll-start,
2570-
%igx-grid__filtering-scroll-end {
2571-
width: rem(24px);
2572-
height: rem(24px);
2573-
position: relative;
2574-
overflow: visible;
2575-
margin: if($variant == 'indigo', rem(12px), rem(8px));
2576-
z-index: 1;
25772569

25782570
[dir='rtl'] & {
2579-
transform: scaleX(-1);
2571+
&::before {
2572+
background: linear-gradient(to left, var-get($theme, 'filtering-row-background'), transparent);
2573+
}
25802574

25812575
&::after {
2582-
content: initial;
2576+
background: linear-gradient(to right, var-get($theme, 'filtering-row-background'), transparent);
25832577
}
25842578
}
25852579
}

0 commit comments

Comments
 (0)