diff --git a/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused (fluent.blue.light).png index a315c45cd44d..11058fbd7569 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused-with-sticky (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused-with-sticky (fluent.blue.light).png index 8b1d2b6e6975..30361e8ebb1c 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused-with-sticky (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/common/etalons/total-summary-focused-with-sticky (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-begin (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-begin (fluent.blue.light).png index bc688236cc2e..3153c54fbc71 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-begin (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-begin (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-center (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-center (fluent.blue.light).png index 273d9094930f..d77d0a15135b 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-center (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-center (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-end (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-end (fluent.blue.light).png index cb9894254ff4..9415f7be57f0 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-end (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-multiple-scroll-end (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=false (fluent.blue.light).png index 62d75f8b9bab..49b6f74b9911 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=false (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=false (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=true (fluent.blue.light).png index 14626a3607b9..7256b6d0e75c 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-begin-rtl=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=false (fluent.blue.light).png index b80ab1316356..32c93a580f9a 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=false (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=false (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=true (fluent.blue.light).png index bce3cd7b04aa..51c293a41e04 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-center=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=false (fluent.blue.light).png index e41296390b83..262a925db8df 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=false (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=false (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=true (fluent.blue.light).png index 562d8530ba06..4ad8f5f8cc11 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-end=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png index 0f138e90c3dc..c4cc9a72b0b7 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=false (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png index d709ba261a17..0246114199ae 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary-rtl=true (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png index 4a95f4985c17..5829db62007c 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=false (fluent.blue.light).png differ diff --git a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png index 19e59c1ad7cb..c16ff651e79f 100644 Binary files a/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png and b/e2e/testcafe-devextreme/tests/dataGrid/sticky/common/etalons/grouping-scroll-total_summary_intersection-rtl=true (fluent.blue.light).png differ diff --git a/packages/devextreme-scss/scss/widgets/base/_gridBase.scss b/packages/devextreme-scss/scss/widgets/base/_gridBase.scss index 3f4d47a4b4d2..f41616926cd1 100644 --- a/packages/devextreme-scss/scss/widgets/base/_gridBase.scss +++ b/packages/devextreme-scss/scss/widgets/base/_gridBase.scss @@ -206,7 +206,7 @@ } .dx-#{$widget-name}-total-footer { - .dx-#{$widget-name}-sticky-column, .dx-#{$widget-name}-sticky-column-left, .dx-#{$widget-name}-sticky-column-right { + td:not(.dx-#{$widget-name}-sticky-column):not(.dx-#{$widget-name}-sticky-column-left):not(.dx-#{$widget-name}-sticky-column-right) { background-color: transparent; } } @@ -1151,6 +1151,12 @@ .dx-filter-range-content { padding: $grid-cell-padding $grid-texteditor-input-padding $grid-cell-padding $grid-cell-padding; } + + .dx-#{$widget-name}-sticky-column-right { + &.dx-command-expand { + z-index: 4; + } + } } } .dx-#{$widget-name}-headers, .dx-#{$widget-name}-total-footer { diff --git a/packages/devextreme-scss/scss/widgets/base/dataGrid/_index.scss b/packages/devextreme-scss/scss/widgets/base/dataGrid/_index.scss index f946ffba4f68..bf28016f36e7 100644 --- a/packages/devextreme-scss/scss/widgets/base/dataGrid/_index.scss +++ b/packages/devextreme-scss/scss/widgets/base/dataGrid/_index.scss @@ -452,8 +452,18 @@ $datagrid-text-stub-background-image-path: null !default; outline: none; } - &:focus-within { + &:focus-within::after { + content: ""; + display: block; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; outline: 2px solid $datagrid-focused-border-color; - outline-offset: -2px; + outline-offset: -1px; + z-index: 4; // should overlap sticky column cells + pointer-events: none; + background-color: transparent; } } diff --git a/packages/devextreme-scss/scss/widgets/fluent/dataGrid/_index.scss b/packages/devextreme-scss/scss/widgets/fluent/dataGrid/_index.scss index 54d027d83190..8dc460da4e5a 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/dataGrid/_index.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/dataGrid/_index.scss @@ -90,7 +90,7 @@ padding-right: 0; overflow: initial; overflow-x: clip; - background-color: transparent; + background-color: inherit; } } diff --git a/packages/devextreme-scss/scss/widgets/generic/dataGrid/_index.scss b/packages/devextreme-scss/scss/widgets/generic/dataGrid/_index.scss index 265d7c4d5269..cb158d5a51e2 100644 --- a/packages/devextreme-scss/scss/widgets/generic/dataGrid/_index.scss +++ b/packages/devextreme-scss/scss/widgets/generic/dataGrid/_index.scss @@ -72,7 +72,7 @@ padding-right: 0; overflow: initial; overflow-x: clip; - background-color: transparent; + background-color: inherit; } } diff --git a/packages/devextreme-scss/scss/widgets/material/dataGrid/_index.scss b/packages/devextreme-scss/scss/widgets/material/dataGrid/_index.scss index 2f3ac5640a1f..db79f0566f4c 100644 --- a/packages/devextreme-scss/scss/widgets/material/dataGrid/_index.scss +++ b/packages/devextreme-scss/scss/widgets/material/dataGrid/_index.scss @@ -87,7 +87,7 @@ padding-right: 0; overflow: initial; overflow-x: clip; - background-color: transparent; + background-color: inherit; } }