Skip to content

refactor(grid): remove advanced filtering parameters and schemas #461

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

Merged
merged 3 commits into from
Sep 15, 2025
Merged

refactor(grid): remove advanced filtering parameters and schemas #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ce4234
refactor(grid): remove grid theme advanced filtering params + schemas
adrianptrv Aug 26, 2025
f84ef32
Merge branch 'master' into apetrov/remove-grid-advanced-filtering-params
simeonoff Aug 27, 2025
120cb99
Merge branch 'master' into apetrov/remove-grid-advanced-filtering-params
simeonoff Sep 15, 2025
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
12 changes: 0 additions & 12 deletions sass/themes/components/grid/_grid-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@
/// @param {Color} $drop-area-icon-color [null] - The drop area icon color.
/// @param {Color} $drop-area-background [null] - The drop area background color.
/// @param {Color} $drop-area-on-drop-background [null] - The drop area background on drop color.
/// @param {Color} $filtering-background-and [null] - The background color of advanced filtering "AND" condition.
/// @param {Color} $filtering-background-and--focus [null] - The background color on focus/selected of advanced filtering "AND" condition.
/// @param {Color} $filtering-background-or [null] - The background color of advanced filtering "OR" condition.
/// @param {Color} $filtering-background-or--focus [null] - The background color on focus/selected of advanced filtering "OR" condition.
/// @param {Color} $filtering-header-background [null] - The background color of the filtered column header.
/// @param {Color} $filtering-header-text-color [null] - The text color of the filtered column header.
/// @param {Color} $filtering-row-background [null] - The background color of the filtering row.
Expand Down Expand Up @@ -185,10 +181,6 @@
$filtering-header-text-color: null,
$filtering-row-background: null,
$filtering-row-text-color: null,
$filtering-background-and: null,
$filtering-background-or: null,
$filtering-background-and--focus: null,
$filtering-background-or--focus: null,
$tree-filtered-text-color: null,
$tree-selected-filtered-row-text-color: null,
$tree-selected-filtered-cell-text-color: null,
Expand Down Expand Up @@ -555,10 +547,6 @@
filtering-header-text-color: $filtering-header-text-color,
filtering-row-background: $filtering-row-background,
filtering-row-text-color: $filtering-row-text-color,
filtering-background-and: $filtering-background-and,
filtering-background-or: $filtering-background-or,
filtering-background-and--focus: $filtering-background-and--focus,
filtering-background-or--focus: $filtering-background-or--focus,

excel-filtering-header-foreground: $excel-filtering-header-foreground,
excel-filtering-subheader-foreground: $excel-filtering-subheader-foreground,
Expand Down
80 changes: 0 additions & 80 deletions sass/themes/schemas/components/light/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
/// @prop {Map} tree-filtered-text-color [color: ('gray', 500)] - grouping row background color on focus.
/// @prop {Map} filtering-header-background [color: ('gray', 50)] - The background color of the filtered column header.
/// @prop {Map} filtering-header-text-color [color: ('gray', 800)] - The text color of the filtered column header.
/// @prop {Map} filtering-background-and [color: ('primary', 300)] - The background color of advanced filtering "AND" condition.
/// @prop {Map} filtering-background-and--focus [color: ('primary', 700)] - The background color on focus/selected of advanced filtering "AND" condition.
/// @prop {Map} filtering-background-or [color: ('secondary', 300)] - The background color of advanced filtering "OR" condition.
/// @prop {Map} filtering-background-or--focus [color: ('secondary', 700)] - The background color on focus/selected of advanced filtering "OR" condition.
/// @prop {Map} filtering-row-background [color: 'gray', 50)] - The background color of the filtering row.
/// @prop {Map} filtering-row-text-color [color: ('gray', 800)] - The text color of the filtering row.
/// @prop {Map} excel-filtering-header-foreground [color: ('gray', 700)] - The text color of the header in the excel style filtering.
Expand Down Expand Up @@ -194,34 +190,6 @@ $light-grid: extend(
),
),

filtering-background-and: (
color: (
'primary',
300,
),
),

filtering-background-or: (
color: (
'secondary',
300,
),
),

filtering-background-and--focus: (
color: (
'primary',
700,
),
),

filtering-background-or--focus: (
color: (
'secondary',
700,
),
),

excel-filtering-header-foreground: (
color: (
'gray',
Expand Down Expand Up @@ -747,8 +715,6 @@ $material-grid: extend(
/// @prop {number} grid-elevation [0] - The elevation level, between 0-24, to be used for the grid.
/// @prop {number} drag-elevation [1] - The elevation level, between 0-24, to be used for movable elements (ex. column header).
/// @prop {List} drop-area-border-radius [(rem(2px), rem(0), rem(16px))] - The border radius used for drop-area.
/// @prop {Map} filtering-background-or [color: ('error', .5)] - The background color of advanced filtering "OR" condition.
/// @prop {Map} filtering-background-or--focus [color: ('error')] - The background color on focus/selected of advanced filtering "OR" condition.
/// @prop {Map} tree-selected-filtered-row-text-color [color: ('primary', 400)] - The selected filtered row text color of the tree.
/// @prop {Map} cell-selected-within-background [color: ('gray', 300)] - The background of the selected cell inside a selected row/column.
/// @prop {Map} cell-selected-within-text-color [contrast-color: ('gray', 300)] - The color of the selected cell inside a selected row/column.
Expand All @@ -760,20 +726,6 @@ $fluent-grid: extend(
$light-grid,
$fluent-elevation-grid,
(
filtering-background-or: (
color: (
'error',
500,
0.5,
),
),

filtering-background-or--focus: (
color: (
'error',
),
),

grid-border-color: (
color: (
'gray',
Expand Down Expand Up @@ -1073,10 +1025,6 @@ $bootstrap-grid: extend(
/// @prop {Map} header-selected-text-color [color: 'gray', 900] - The table header text color when selected (ex. column selection).
/// @prop {Map} header-border-color [color: ('gray', 400)] - The color used for header borders.
/// @prop {Map} filtering-row-background [color: ('surface', 500)] - The background color of the filtering row.
/// @prop {Map} filtering-background-and [color: ('primary', 400)] - The background color of advanced filtering "AND" condition.
/// @prop {Map} filtering-background-and--focus [color: ('primary', 300)] - The background color on focus/selected of advanced filtering "AND" condition.
/// @prop {Map} filtering-background-or [color: ('success', 500)] - The background color of advanced filtering "OR" condition.
/// @prop {Map} filtering-background-or--focus [color: ('success', 400)] - The background color on focus/selected of advanced filtering "OR" condition.
/// @prop {Map} edited-row-indicator [color: ('primary', 400)] - The indicator's color of edited row.
/// @prop {Map} cell-selected-background [color: ('primary', 50)] - The selected cell background color.
/// @prop {Map} ghost-header-text-color [color: 'gray', 700] - The dragged header text color.
Expand Down Expand Up @@ -1191,34 +1139,6 @@ $indigo-grid: extend(
),
),

filtering-background-and: (
color: (
'primary',
400,
),
),

filtering-background-and--focus: (
color: (
'primary',
300,
),
),

filtering-background-or: (
color: (
'success',
500,
),
),

filtering-background-or--focus: (
color: (
'success',
400,
),
),

edited-row-indicator: (
color: (
'primary',
Expand Down