Skip to content

feat(grid): add initial implementation #17049

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

Draft
didimmova wants to merge 7 commits into
base: master
Choose a base branch
from
+365 −120
Draft

feat(grid): add initial implementation #17049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58033e4
feat(grid): add initial implementation
didimmova Mar 16, 2026
e1b5a13
feat(grid): add tokens for components used in the grid
didimmova Mar 17, 2026
37d257a
feat(grid): implement new properties and set more inner component themes
didimmova Mar 19, 2026
9dca793
chore(grid): fix button-group tokens import
didimmova Mar 19, 2026
6fc3907
feat(grid): improve grid theming
didimmova Mar 19, 2026
c7a01a0
feat(grid-builder): update button disabled states and hardcoded values
didimmova Mar 20, 2026
645f17a
feat(grid-theme-builder): revert query-builder, fix select and checkb…
didimmova Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions projects/igniteui-angular/core/src/core/styles/components/checkbox/_checkbox-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,8 @@
}

%cbx-composite--x--disabled {
@if $variant == 'material' or $variant == 'fluent' {
background: var-get($theme, 'disabled-color');
border-color: var-get($theme, 'disabled-color');
}

@if $variant == 'indigo' or $variant == 'bootstrap' {
background: var-get($theme, 'disabled-indeterminate-color');
border-color: transparent;
}
background: var-get($theme, 'disabled-fill-color');
border-color: transparent;

@if $variant != 'indigo' {
%cbx-composite-mark {
Expand Down
80 changes: 14 additions & 66 deletions projects/igniteui-angular/core/src/core/styles/components/grid/_excel-filtering-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
flex-grow: 1;

@if $variant == 'indigo' {
box-shadow: elevation(if($theme-variant == 'light', 3, 2)), 0 0 0 rem(1px) color(null, 'gray', if($theme-variant == 'light', 400, 100));
box-shadow: elevation(if($theme-variant == 'light', 3, 2)), 0 0 0 rem(1px) var-get($theme, 'excel-filtering-border-color');

// TODO: The border-radius should not be hardcoded.
border-radius: border-radius(rem(4px));
Expand Down Expand Up @@ -102,13 +102,13 @@
opacity: 1;

igx-icon {
color: if($variant == 'indigo', color($color: 'primary', $variant: 500), color($color: 'secondary'));
color: var-get($theme, 'sorted-header-icon-color');
}

@if $variant == 'indigo' {
&:hover {
igx-icon {
color: color($color: 'primary', $variant: 400);
color: var-get($theme, 'sortable-header-icon-hover-color');
}
}
}
Expand Down Expand Up @@ -164,11 +164,7 @@
--disabled-selected-border-color: transparent;
}
} @else {
@if $theme-variant == 'light' {
background: contrast-color($color: 'gray', $variant: 900);
} @else {
background: color($color: 'gray', $variant: 50);
}
background: var-get($theme, 'filtering-row-background');

%igx-group-display {
--item-background: transparent;
Expand Down Expand Up @@ -348,11 +344,7 @@

%grid-excel-actions--selected {
igx-icon {
color: if(
$variant == 'indigo',
color($color: 'primary', $variant: 200),
color($color: 'secondary')
);
color: var-get($theme, 'excel-filtering-actions-selected-icon-color');
}
}

Expand Down Expand Up @@ -401,37 +393,18 @@
&:hover,
&:focus {
color: var-get($theme, 'excel-filtering-actions-hover-foreground');
background: var-get($theme, 'excel-filtering-actions-hover-background');

@if $variant == 'indigo' {
@if $theme-variant == 'light' {
background: color($color: 'gray', $variant: 200);
} @else {
background: contrast-color($color: 'gray', $variant: 50, $opacity: .1);
}

igx-icon {
/* stylelint-disable max-nesting-depth */
@if $theme-variant == 'light' {
color: color($color: 'gray', $variant: 700);
} @else {
color: contrast-color($color: 'gray', $variant: 50, $opacity: .8);
}
/* stylelint-enable max-nesting-depth */
}
} @else {
background: color($color: 'gray', $variant: 100);
igx-icon {
color: var-get($theme, 'excel-filtering-actions-hover-icon-color');
}
}

@if $variant == 'indigo' {
igx-icon {
--component-size: 2;

@if $theme-variant == 'light' {
color: color($color: 'gray', $variant: 600);
} @else {
color: contrast-color($color: 'gray', $variant: 50, $opacity: .6);
}
color: var-get($theme, 'excel-filtering-actions-icon-color');
}
}

Expand All @@ -449,7 +422,6 @@
}

%grid-excel-actions__action--active {
background: color($color: 'gray', $variant: 100);
color: var-get($theme, 'excel-filtering-actions-hover-foreground');
}

Expand Down Expand Up @@ -489,8 +461,6 @@
overflow: hidden;

@if $variant == 'indigo' {
--background: #{color($color: 'surface', $variant: 500)};

margin-inline: calc(sizable(rem(-16px)) * -1);

// This is the only way to take the gap from the list,
Expand All @@ -510,19 +480,8 @@
}

border: 0;

@if $bootstrap-theme {
border-top: rem(1px) dashed color($color: 'gray', $variant: 100);
border-bottom: rem(1px) dashed color($color: 'gray', $variant: 100);
} @else {
border-top: rem(1px) dashed color($color: 'gray', $variant: 300);
border-bottom: rem(1px) dashed color($color: 'gray', $variant: 300);
}

@if $variant == 'indigo' and $theme-variant == 'dark' {
border-top: rem(1px) dashed color($color: 'gray', $variant: 100);
border-bottom: rem(1px) dashed color($color: 'gray', $variant: 100);
}
border-top: rem(1px) dashed var-get($theme, 'excel-filtering-border-color');
border-bottom: rem(1px) dashed var-get($theme, 'excel-filtering-border-color');
}

%igx-excel-filter__tree {
Expand All @@ -531,19 +490,8 @@
margin-inline: calc(pad-inline(rem(-4px), rem(-8px), rem(-16px)) * -1);
margin-block: 0;
flex: 1;

@if $bootstrap-theme {
border-top: rem(1px) dashed color($color: 'gray', $variant: 100);
border-bottom: rem(1px) dashed color($color: 'gray', $variant: 100);
} @else {
border-top: rem(1px) dashed color($color: 'gray', $variant: 300);
border-bottom: rem(1px) dashed color($color: 'gray', $variant: 300);
}

@if $variant == 'indigo' and $theme-variant == 'dark' {
border-top: rem(1px) dashed color($color: 'gray', $variant: 100);
border-bottom: rem(1px) dashed color($color: 'gray', $variant: 100);
}
border-top: rem(1px) dashed var-get($theme, 'excel-filtering-border-color');
border-bottom: rem(1px) dashed var-get($theme, 'excel-filtering-border-color');

igx-icon {
width: var(--ig-icon-size, #{$tree-node-expander-size});
Expand Down Expand Up @@ -721,7 +669,7 @@

@if $bootstrap-theme {
padding-block-start: pad-block(rem(16px));
border-top: rem(1px) solid color($color: 'gray', $variant: 300);
border-top: rem(1px) solid color-mix(in srgb, var(--ig-grid-foreground, --ig-gray-300) 20%, var(--ig-grid-background, --ig-gray-300));
}

%grid-excel-filter__apply,
Expand Down
Loading
Loading