Skip to content

Commit

Permalink
Merge branch 'cal_delete_values__23_2' of https://github.com/Zedwag/D…
Browse files Browse the repository at this point in the history 
…evExtreme into cal_delete_values__23_2
  • Loading branch information
@Zedwag
Zedwag committed Sep 6, 2023
2 parents 5693186 + e37b3cf commit 83e1722
Show file tree
Hide file tree
Showing 192 changed files with 795 additions and 109 deletions.
820 changes: 754 additions & 66 deletions package-lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/devextreme/artifacts/npm/devextreme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"license": "SEE LICENSE IN README.md",
"dependencies": {
"@babel/runtime": "^7.12.1",
"@devextreme/runtime": "3.0.11",
"@devextreme/runtime": "3.0.12",
"devexpress-diagram": "2.2.1",
"devexpress-gantt": "4.1.48",
"devextreme-quill": "1.6.2",
Expand Down
5 changes: 2 additions & 3 deletions packages/devextreme/js/renovation/test_utils/transformers/declaration.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ module.exports = {
const result = compileCode(generator, src, {
path: filename,
dirname: path.dirname(filename),
},
true);
}, { includeExtraComponents: true });

if(result && result[1]) {
const componentName = (result[1].code.match(/export default class (\w+) extends/) || [])[1];
Expand All @@ -35,7 +34,7 @@ module.exports = {
ts.transpileModule(
// Vitik: jest.tsconfig set jsxFactory to h. Add import for support it.
// In propduction jsx transpaled by babel-plugin-inferno
`import { createElement as h } from "inferno-create-element";
`import { createElement as h } from "inferno-create-element";
${result[0].code}
${result[1].code
.replace('export default', 'export ')
Expand Down
16 changes: 8 additions & 8 deletions packages/devextreme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"license": "SEE LICENSE IN README.md",
"dependencies": {
"@babel/runtime": "^7.12.1",
"@devextreme/runtime": "3.0.11",
"@devextreme/runtime": "3.0.12",
"devexpress-diagram": "2.2.1",
"devexpress-gantt": "4.1.48",
"devextreme-quill": "1.6.2",
Expand All @@ -51,13 +51,13 @@
"@babel/plugin-transform-property-mutators": "7.20.7",
"@babel/plugin-transform-runtime": "7.19.6",
"@babel/preset-env": "7.20.2",
"@devextreme-generator/angular": "3.0.11",
"@devextreme-generator/build-helpers": "3.0.11",
"@devextreme-generator/core": "3.0.11",
"@devextreme-generator/declarations": "3.0.11",
"@devextreme-generator/inferno": "3.0.11",
"@devextreme-generator/react": "3.0.11",
"@devextreme-generator/vue": "3.0.11",
"@devextreme-generator/angular": "3.0.12",
"@devextreme-generator/build-helpers": "3.0.12",
"@devextreme-generator/core": "3.0.12",
"@devextreme-generator/declarations": "3.0.12",
"@devextreme-generator/inferno": "3.0.12",
"@devextreme-generator/react": "3.0.12",
"@devextreme-generator/vue": "3.0.12",
"@testcafe-community/axe": "3.5.0",
"@types/enzyme": "3.10.12",
"@types/jest": "24.9.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/scss/widgets/generic/dataGrid/_index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}

.dx-sort {
color: $datagrid-menu-icon-color;
color: $datagrid-columnchooser-item-color;
}
}

Expand Down
24 changes: 12 additions & 12 deletions packages/devextreme/scss/widgets/generic/gridBase/_colors.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,14 @@ $datagrid-text-stub-background-image-path: null !default;
$datagrid-selection-bg: #444 !default;
$datagrid-row-selected-border-color: $datagrid-border-color !default;
$datagrid-row-selected-color: $datagrid-base-color !default;
$datagrid-row-focused-color: $base-inverted-text-color !default;
$datagrid-row-focused-bg: mix($base-bg, $base-accent, 20%) !default;
$datagrid-row-focused-color: $base-text-color !default;
$datagrid-row-focused-bg: color.change($base-accent, $alpha: 0.2) !default;
$datagrid-hover-bg: $base-hover-bg !default;
$datagrid-row-hovered-color: $base-hover-color !default;
$datagrid-menu-icon-color: darken($base-icon-color, 33.7%) !default;
$datagrid-cell-modified-border-color: color.change($base-success, $alpha: 0.5) !default;
$datagrid-nodata-color: darken($datagrid-base-color, 40%) !default;
$datagrid-group-row-color: darken($datagrid-base-color, 38.5%) !default;
$datagrid-nodata-color: $datagrid-base-color !default;
$datagrid-group-row-color: lighten($datagrid-base-color, 6.7%) !default;
$datagrid-group-row-bg: lighten($datagrid-base-background-color, 3%) !default;
$datagrid-master-detail-cell-bg: lighten($datagrid-base-background-color, 2%) !default;
$datagrid-spin-icon-color: darken($base-icon-color, 38.5%) !default;
Expand All @@ -330,8 +330,8 @@ $datagrid-text-stub-background-image-path: null !default;
$datagrid-column-separator-bg: color.change($base-accent, $alpha: 0.5) !default;
$datagrid-text-stub-background-image-path: data-uri('images/widgets/generic/color-schemes/dark/grid/text-stub.png') !default;
$datagrid-cell-removed-border-color: $datagrid-border-color !default;
$datagrid-row-removed-bg: $datagrid-border-color !default;
$datagrid-cell-removed-text-color: $datagrid-columnchooser-item-color !default;
$datagrid-row-removed-bg: darken($datagrid-border-color, 6.67) !default;
$datagrid-cell-removed-text-color: color.change($base-text-color, $alpha: 0.7) !default;
}

@if $color == "darkmoon" {
Expand Down Expand Up @@ -475,14 +475,14 @@ $datagrid-text-stub-background-image-path: null !default;
$datagrid-selection-bg: #e6e6e6 !default;
$datagrid-row-selected-border-color: $datagrid-border-color !default;
$datagrid-row-selected-color: $datagrid-base-color !default;
$datagrid-row-focused-color: $base-inverted-text-color !default;
$datagrid-row-focused-bg: mix($base-bg, $base-accent, 20%) !default;
$datagrid-row-focused-color: $base-text-color !default;
$datagrid-row-focused-bg: color.change($base-accent, $alpha: 0.2) !default;
$datagrid-hover-bg: $base-hover-bg !default;
$datagrid-row-hovered-color: $base-hover-color !default;
$datagrid-menu-icon-color: lighten($base-icon-color, 33.7%) !default;
$datagrid-cell-modified-border-color: color.change($base-success, $alpha: 0.5) !default;
$datagrid-nodata-color: lighten($datagrid-base-color, 40%) !default;
$datagrid-group-row-color: lighten($datagrid-base-color, 38.5%) !default;
$datagrid-nodata-color: $datagrid-base-color !default;
$datagrid-group-row-color: darken($datagrid-base-color, 6.7%) !default;
$datagrid-group-row-bg: darken($datagrid-base-background-color, 3%) !default;
$datagrid-master-detail-cell-bg: darken($datagrid-base-background-color, 2%) !default;
$datagrid-spin-icon-color: lighten($base-icon-color, 38.5%) !default;
Expand All @@ -502,8 +502,8 @@ $datagrid-text-stub-background-image-path: null !default;
$datagrid-column-separator-bg: color.change($base-accent, $alpha: 0.5) !default;
$datagrid-text-stub-background-image-path: data-uri('images/widgets/generic/color-schemes/light/grid/text-stub.png') !default;
$datagrid-cell-removed-border-color: $datagrid-border-color !default;
$datagrid-row-removed-bg: $datagrid-border-color !default;
$datagrid-cell-removed-text-color: $datagrid-columnchooser-item-color !default;
$datagrid-row-removed-bg: lighten($datagrid-border-color, 6.67) !default;
$datagrid-cell-removed-text-color: color.change($base-text-color, $alpha: 0.7) !default;
}

@if $color == "softblue" {
Expand Down
5 changes: 3 additions & 2 deletions packages/devextreme/scss/widgets/generic/gridBase/_index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,8 +793,8 @@ $grid-masterdetail-padding: 20px;
&:not(.dx-row-lines) {
& > td,
& > tr:first-child > td {
border-top: 1px solid $datagrid-focused-border-color;
border-bottom: 1px solid $datagrid-focused-border-color;
border-top: 1px solid $datagrid-row-focused-bg;
border-bottom: 1px solid $datagrid-row-focused-bg;
}
}
}
Expand Down Expand Up @@ -924,6 +924,7 @@ $grid-masterdetail-padding: 20px;
.dx-#{$widget-name}-nodata {
color: $datagrid-nodata-color;
font-size: $generic-grid-base-nodata-font-size;
opacity: 0.7;
}

.dx-#{$widget-name}-bottom-load-panel {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/scss/widgets/material/dataGrid/_index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}

.dx-sort {
color: $datagrid-menu-icon-color;
color: $datagrid-columnchooser-item-color;
}
}

Expand Down
10 changes: 5 additions & 5 deletions packages/devextreme/scss/widgets/material/gridBase/_colors.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ $datagrid-row-selected-color: $datagrid-base-color !default;
* $name 65. Focused row text color
* $type color
*/
$datagrid-row-focused-color: $base-inverted-text-color !default;
$datagrid-row-focused-color: $base-text-color !default;

/**
* $name 70. Focused row background color
* $type color
*/
$datagrid-row-focused-bg: mix($base-bg, $base-accent, 20%) !default;
$datagrid-row-focused-bg: color.change($base-accent, $alpha: 0.2) !default;
$datagrid-hover-bg: $base-hover-bg !default;
$datagrid-row-hovered-color: $base-hover-color !default;

Expand All @@ -93,7 +93,7 @@ $datagrid-cell-removed-text-color: null !default;
* $type color
*/
$datagrid-row-invalid-faded-border-color: color.change($base-invalid-faded-border-color, $alpha: 0.32) !default;
$datagrid-nodata-color: lighten($datagrid-base-color, 40%) !default;
$datagrid-nodata-color: color.change($datagrid-base-color, $alpha: 0.54) !default;

/**
* $name 90. Group row text color
Expand Down Expand Up @@ -173,7 +173,7 @@ $datagrid-text-link-disabled-opacity: $base-disabled-opacity;
$datagrid-icon-link-disabled-opacity: $button-disabled-icon-opacity;

@if $mode == "light" {
$datagrid-columnchooser-item-color: color.change($datagrid-base-color, $alpha: 0.54) !default;
$datagrid-columnchooser-item-color: color.change($datagrid-base-color, $alpha: 0.6) !default;
$datagrid-block-separator-bg: darken($datagrid-base-background-color, 12%) !default;
$datagrid-drag-header-shadow-color: color.change($base-shadow-color, $alpha: 0.1) !default;
$datagrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.2) !default;
Expand All @@ -188,7 +188,7 @@ $datagrid-icon-link-disabled-opacity: $button-disabled-icon-opacity;
}

@if $mode == "dark" {
$datagrid-columnchooser-item-color: color.change($datagrid-base-color, $alpha: 0.6) !default;
$datagrid-columnchooser-item-color: color.change($datagrid-base-color, $alpha: 0.72) !default;
$datagrid-block-separator-bg: lighten($datagrid-base-background-color, 12%) !default;
$datagrid-drag-header-shadow-color: color.change($base-shadow-color, $alpha: 0.3) !default;
$datagrid-drag-header-second-shadow-color: color.change($base-shadow-color, $alpha: 0.4) !default;
Expand Down
5 changes: 0 additions & 5 deletions packages/devextreme/scss/widgets/material/gridBase/_index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,11 +968,6 @@ $grid-masterdetail-padding: 16px;
color: $datagrid-link-color;
}

& > td,
& > tr:last-child > td {
border-bottom: 2px solid $datagrid-focused-border-color;
}

&:not(.dx-row-lines) {
& > td,
& > tr:first-child > td {
Expand Down
9 changes: 6 additions & 3 deletions packages/devextreme/testing/testcafe/tests/dataGrid/accessibility/common.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ const DATA_GRID_SELECTOR = '#container';
};

test(`Grid without data in ${theme}`, async (t) => {
if (theme === Themes.fluentBlue) { return; }
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);

await t
.expect(dataGrid.isReady())
.ok();

await a11yCheck(t);
await a11yCheck(t, a11yCheckConfig, DATA_GRID_SELECTOR);
}).before(async () => {
await changeTheme(theme);

Expand Down Expand Up @@ -158,13 +159,14 @@ const DATA_GRID_SELECTOR = '#container';
});

test(`Grouping and Summary in ${theme}`, async (t) => {
if (theme === Themes.fluentBlue || theme === Themes.fluentBlueDark) { return; }
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);

await t
.expect(dataGrid.isReady())
.ok();

await a11yCheck(t);
await a11yCheck(t, a11yCheckConfig, DATA_GRID_SELECTOR);
}).before(async () => {
await changeTheme(theme);

Expand Down Expand Up @@ -502,6 +504,7 @@ const DATA_GRID_SELECTOR = '#container';
});

test(`Focused row in ${theme}`, async (t) => {
if (theme === Themes.fluentBlue || theme === Themes.fluentBlueDark) { return; }
const dataGrid = new DataGrid(DATA_GRID_SELECTOR);

// assert
Expand All @@ -511,7 +514,7 @@ const DATA_GRID_SELECTOR = '#container';
.expect(dataGrid.getDataRow(1).isFocusedRow)
.ok();

await a11yCheck(t);
await a11yCheck(t, a11yCheckConfig, DATA_GRID_SELECTOR);
}).before(async () => {
await changeTheme(theme);

Expand Down
Binary file modified ...evextreme/testing/testcafe/tests/dataGrid/etalons/T1113525.page-size-select.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../testcafe/tests/dataGrid/etalons/T1136896-virtual-scrolling_editing-buttons.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/T1179114-grid-edit-custom-button-in-material-theme-when-useicons-is-false.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ns/T1179114-grid-edit-custom-button-in-material-theme-when-useicons-is-true.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...esting/testcafe/tests/dataGrid/etalons/column-separator-with-expand-columns.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ing/testcafe/tests/dataGrid/etalons/disabled-export_when-no-columns-visible.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/devextreme/testing/testcafe/tests/dataGrid/etalons/grid-adaptive-checkbox.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../devextreme/testing/testcafe/tests/dataGrid/etalons/grid-adaptive-item-text.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...sts/dataGrid/etalons/grid-new-row_position-first_scroll-mode-standard_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ests/dataGrid/etalons/grid-new-row_position-last_scroll-mode-standard_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ataGrid/etalons/grid-new-row_position-pageBottom_scroll-mode-standard_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...dataGrid/etalons/grid-new-row_position-pageBottom_scroll-mode-virtual_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/dataGrid/etalons/grid-new-row_position-pageTop_scroll-mode-standard_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ts/dataGrid/etalons/grid-new-row_position-pageTop_scroll-mode-virtual_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...rid/etalons/grid-new-row_position-viewportBottom_scroll-mode-standard_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...d/etalons/grid-new-row_position-viewportBottom_scroll-mode-standard_top-162.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...Grid/etalons/grid-new-row_position-viewportBottom_scroll-mode-virtual_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...id/etalons/grid-new-row_position-viewportBottom_scroll-mode-virtual_top-162.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...taGrid/etalons/grid-new-row_position-viewportTop_scroll-mode-standard_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...Grid/etalons/grid-new-row_position-viewportTop_scroll-mode-standard_top-162.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ataGrid/etalons/grid-new-row_position-viewportTop_scroll-mode-virtual_top-0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...aGrid/etalons/grid-new-row_position-viewportTop_scroll-mode-virtual_top-162.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../devextreme/testing/testcafe/tests/dataGrid/etalons/grid-popup-editing-grid.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...vextreme/testing/testcafe/tests/dataGrid/etalons/grid-toolbar-dropdown-menu.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...es/devextreme/testing/testcafe/tests/dataGrid/etalons/group-summary-focused.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...d/filterRow/etalons/T1163100_change-icon_columns-fixed-band_scrolling-usual.png
View file
Binary file modified .../filterRow/etalons/T1163100_change-icon_columns-fixed-usual_scrolling-usual.png
View file
Binary file modified ...ilterRow/etalons/T1163100_change-icon_columns-fixed-usual_scrolling-virtual.png
View file
Binary file modified ...d/filterRow/etalons/T1163100_change-icon_columns-usual-band_scrolling-usual.png
View file
Binary file modified .../filterRow/etalons/T1163100_change-icon_columns-usual-usual_scrolling-usual.png
View file
Binary file modified ...ilterRow/etalons/T1163100_change-icon_columns-usual-usual_scrolling-virtual.png
View file
Binary file modified ...xtreme/testing/testcafe/tests/dataGrid/filterRow/etalons/filter-row-overlay.png
View file
Binary file modified .../tests/dataGrid/focus/focusedRow/etalons/focused-row_markup (generic.light).png
View file
Binary file modified .../dataGrid/focus/focusedRow/etalons/focused-row_markup (material.blue.light).png
View file
Binary file modified ...ests/dataGrid/grouping/etalons/T1155453-collapsed-groups-with-fixed-content.png
View file
Binary file modified .../testing/testcafe/tests/dataGrid/grouping/etalons/T1155453-collapsed-groups.png
View file
Binary file modified ...tests/dataGrid/grouping/etalons/T1155453-expanded-groups-with-fixed-content.png
View file
Binary file modified ...e/testing/testcafe/tests/dataGrid/grouping/etalons/T1155453-expanded-groups.png
View file
Binary file modified ...tests/dataGrid/grouping/etalons/empty-header-message-with-selection-enabled.png
View file
Binary file modified ...me/testing/testcafe/tests/dataGrid/grouping/etalons/expanded-groups-content.png
View file
Binary file modified ...esting/testcafe/tests/dataGrid/grouping/etalons/group-panel_loaded_page-end.png
View file
Binary file modified ...ting/testcafe/tests/dataGrid/grouping/etalons/group-panel_restored_page-end.png
View file
Binary file modified ...e/testing/testcafe/tests/dataGrid/markup/etalons/grid-no-data-text-position.png
View file
Binary file modified .../testing/testcafe/tests/dataGrid/markup/group-panel/etalons/borders-repaint.png
View file
Binary file modified .../testcafe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_borders.png
View file
Binary file modified ...tests/dataGrid/markup/group-panel/etalons/borders-repaint_borders_f-columns.png
View file
Binary file modified ...aGrid/markup/group-panel/etalons/borders-repaint_borders_f-columns_m-detail.png
View file
Binary file modified .../tests/dataGrid/markup/group-panel/etalons/borders-repaint_borders_m-detail.png
View file
Binary file modified ...estcafe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_f-columns.png
View file
Binary file modified ...ests/dataGrid/markup/group-panel/etalons/borders-repaint_f-columns_m-detail.png
View file
Binary file modified .../testcafe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-c.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-c_borders.png
View file
Binary file modified ...taGrid/markup/group-panel/etalons/borders-repaint_lines-c_borders_f-columns.png
View file
Binary file modified ...rkup/group-panel/etalons/borders-repaint_lines-c_borders_f-columns_m-detail.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders-repaint_lines-c_borders_m-detail.png
View file
Binary file modified ...tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-c_f-columns.png
View file
Binary file modified ...aGrid/markup/group-panel/etalons/borders-repaint_lines-c_f-columns_m-detail.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-c_lines-r.png
View file
Binary file modified ...dataGrid/markup/group-panel/etalons/borders-repaint_lines-c_lines-r_borders.png
View file
Binary file modified ...arkup/group-panel/etalons/borders-repaint_lines-c_lines-r_borders_f-columns.png
View file
Binary file modified ...up-panel/etalons/borders-repaint_lines-c_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified ...markup/group-panel/etalons/borders-repaint_lines-c_lines-r_borders_m-detail.png
View file
Binary file modified ...taGrid/markup/group-panel/etalons/borders-repaint_lines-c_lines-r_f-columns.png
View file
Binary file modified ...rkup/group-panel/etalons/borders-repaint_lines-c_lines-r_f-columns_m-detail.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders-repaint_lines-c_lines-r_m-detail.png
View file
Binary file modified .../tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-c_m-detail.png
View file
Binary file modified .../testcafe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-r.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-r_borders.png
View file
Binary file modified ...taGrid/markup/group-panel/etalons/borders-repaint_lines-r_borders_f-columns.png
View file
Binary file modified ...rkup/group-panel/etalons/borders-repaint_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders-repaint_lines-r_borders_m-detail.png
View file
Binary file modified ...tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-r_f-columns.png
View file
Binary file modified ...aGrid/markup/group-panel/etalons/borders-repaint_lines-r_f-columns_m-detail.png
View file
Binary file modified .../tests/dataGrid/markup/group-panel/etalons/borders-repaint_lines-r_m-detail.png
View file
Binary file modified ...testcafe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_m-detail.png
View file
Binary file modified ...ng/testcafe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt.png
View file
Binary file modified ...afe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_borders.png
View file
Binary file modified ...dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_borders_f-columns.png
View file
Binary file modified ...markup/group-panel/etalons/borders-repaint_r-alt_borders_f-columns_m-detail.png
View file
Binary file modified .../dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_borders_m-detail.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_f-columns.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders-repaint_r-alt_f-columns_m-detail.png
View file
Binary file modified ...afe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-c.png
View file
Binary file modified ...s/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-c_borders.png
View file
Binary file modified .../markup/group-panel/etalons/borders-repaint_r-alt_lines-c_borders_f-columns.png
View file
Binary file modified ...roup-panel/etalons/borders-repaint_r-alt_lines-c_borders_f-columns_m-detail.png
View file
Binary file modified ...d/markup/group-panel/etalons/borders-repaint_r-alt_lines-c_borders_m-detail.png
View file
Binary file modified ...dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-c_f-columns.png
View file
Binary file modified ...markup/group-panel/etalons/borders-repaint_r-alt_lines-c_f-columns_m-detail.png
View file
Binary file modified ...s/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-c_lines-r.png
View file
Binary file modified ...id/markup/group-panel/etalons/borders-repaint_r-alt_lines-c_lines-r_borders.png
View file
Binary file modified ...group-panel/etalons/borders-repaint_r-alt_lines-c_lines-r_borders_f-columns.png
View file
Binary file modified ...el/etalons/borders-repaint_r-alt_lines-c_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified .../group-panel/etalons/borders-repaint_r-alt_lines-c_lines-r_borders_m-detail.png
View file
Binary file modified .../markup/group-panel/etalons/borders-repaint_r-alt_lines-c_lines-r_f-columns.png
View file
Binary file modified ...roup-panel/etalons/borders-repaint_r-alt_lines-c_lines-r_f-columns_m-detail.png
View file
Binary file modified ...d/markup/group-panel/etalons/borders-repaint_r-alt_lines-c_lines-r_m-detail.png
View file
Binary file modified .../dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-c_m-detail.png
View file
Binary file modified ...afe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-r.png
View file
Binary file modified ...s/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-r_borders.png
View file
Binary file modified .../markup/group-panel/etalons/borders-repaint_r-alt_lines-r_borders_f-columns.png
View file
Binary file modified ...roup-panel/etalons/borders-repaint_r-alt_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified ...d/markup/group-panel/etalons/borders-repaint_r-alt_lines-r_borders_m-detail.png
View file
Binary file modified ...dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-r_f-columns.png
View file
Binary file modified ...markup/group-panel/etalons/borders-repaint_r-alt_lines-r_f-columns_m-detail.png
View file
Binary file modified .../dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_lines-r_m-detail.png
View file
Binary file modified ...fe/tests/dataGrid/markup/group-panel/etalons/borders-repaint_r-alt_m-detail.png
View file
Binary file modified ...vextreme/testing/testcafe/tests/dataGrid/markup/group-panel/etalons/borders.png
View file
Binary file modified .../testing/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_borders.png
View file
Binary file modified ...estcafe/tests/dataGrid/markup/group-panel/etalons/borders_borders_f-columns.png
View file
Binary file modified ...ests/dataGrid/markup/group-panel/etalons/borders_borders_f-columns_m-detail.png
View file
Binary file modified ...testcafe/tests/dataGrid/markup/group-panel/etalons/borders_borders_m-detail.png
View file
Binary file modified ...esting/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_f-columns.png
View file
Binary file modified ...stcafe/tests/dataGrid/markup/group-panel/etalons/borders_f-columns_m-detail.png
View file
Binary file modified .../testing/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-c.png
View file
Binary file modified .../testcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-c_borders.png
View file
Binary file modified ...tests/dataGrid/markup/group-panel/etalons/borders_lines-c_borders_f-columns.png
View file
Binary file modified ...aGrid/markup/group-panel/etalons/borders_lines-c_borders_f-columns_m-detail.png
View file
Binary file modified .../tests/dataGrid/markup/group-panel/etalons/borders_lines-c_borders_m-detail.png
View file
Binary file modified ...estcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-c_f-columns.png
View file
Binary file modified ...ests/dataGrid/markup/group-panel/etalons/borders_lines-c_f-columns_m-detail.png
View file
Binary file modified .../testcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-c_lines-r.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders_lines-c_lines-r_borders.png
View file
Binary file modified ...taGrid/markup/group-panel/etalons/borders_lines-c_lines-r_borders_f-columns.png
View file
Binary file modified ...rkup/group-panel/etalons/borders_lines-c_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders_lines-c_lines-r_borders_m-detail.png
View file
Binary file modified ...tests/dataGrid/markup/group-panel/etalons/borders_lines-c_lines-r_f-columns.png
View file
Binary file modified ...aGrid/markup/group-panel/etalons/borders_lines-c_lines-r_f-columns_m-detail.png
View file
Binary file modified .../tests/dataGrid/markup/group-panel/etalons/borders_lines-c_lines-r_m-detail.png
View file
Binary file modified ...testcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-c_m-detail.png
View file
Binary file modified .../testing/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-r.png
View file
Binary file modified .../testcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-r_borders.png
View file
Binary file modified ...tests/dataGrid/markup/group-panel/etalons/borders_lines-r_borders_f-columns.png
View file
Binary file modified ...aGrid/markup/group-panel/etalons/borders_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified .../tests/dataGrid/markup/group-panel/etalons/borders_lines-r_borders_m-detail.png
View file
Binary file modified ...estcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-r_f-columns.png
View file
Binary file modified ...ests/dataGrid/markup/group-panel/etalons/borders_lines-r_f-columns_m-detail.png
View file
Binary file modified ...testcafe/tests/dataGrid/markup/group-panel/etalons/borders_lines-r_m-detail.png
View file
Binary file modified ...testing/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_m-detail.png
View file
Binary file modified ...me/testing/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt.png
View file
Binary file modified ...ng/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_borders.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_borders_f-columns.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders_r-alt_borders_f-columns_m-detail.png
View file
Binary file modified ...fe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_borders_m-detail.png
View file
Binary file modified .../testcafe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_f-columns.png
View file
Binary file modified .../tests/dataGrid/markup/group-panel/etalons/borders_r-alt_f-columns_m-detail.png
View file
Binary file modified ...ng/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c.png
View file
Binary file modified ...afe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_borders.png
View file
Binary file modified ...dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_borders_f-columns.png
View file
Binary file modified ...markup/group-panel/etalons/borders_r-alt_lines-c_borders_f-columns_m-detail.png
View file
Binary file modified .../dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_borders_m-detail.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_f-columns.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_f-columns_m-detail.png
View file
Binary file modified ...afe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_lines-r.png
View file
Binary file modified ...s/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_lines-r_borders.png
View file
Binary file modified .../markup/group-panel/etalons/borders_r-alt_lines-c_lines-r_borders_f-columns.png
View file
Binary file modified ...roup-panel/etalons/borders_r-alt_lines-c_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified ...d/markup/group-panel/etalons/borders_r-alt_lines-c_lines-r_borders_m-detail.png
View file
Binary file modified ...dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_lines-r_f-columns.png
View file
Binary file modified ...markup/group-panel/etalons/borders_r-alt_lines-c_lines-r_f-columns_m-detail.png
View file
Binary file modified .../dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_lines-r_m-detail.png
View file
Binary file modified ...fe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-c_m-detail.png
View file
Binary file modified ...ng/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-r.png
View file
Binary file modified ...afe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-r_borders.png
View file
Binary file modified ...dataGrid/markup/group-panel/etalons/borders_r-alt_lines-r_borders_f-columns.png
View file
Binary file modified ...markup/group-panel/etalons/borders_r-alt_lines-r_borders_f-columns_m-detail.png
View file
Binary file modified .../dataGrid/markup/group-panel/etalons/borders_r-alt_lines-r_borders_m-detail.png
View file
Binary file modified ...e/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-r_f-columns.png
View file
Binary file modified ...ataGrid/markup/group-panel/etalons/borders_r-alt_lines-r_f-columns_m-detail.png
View file
Binary file modified ...fe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_lines-r_m-detail.png
View file
Binary file modified ...g/testcafe/tests/dataGrid/markup/group-panel/etalons/borders_r-alt_m-detail.png
View file
Binary file removed ...rid with scrollable wrapped in td el, useNative=false (material-blue-light).png
View file
Diff not rendered.
Binary file removed ...Grid with scrollable wrapped in td el, useNative=true (material-blue-light).png
View file
Diff not rendered.
0 ...d el, useNative=false (generic-light).png → ...in td,useNative=false (generic-light).png
View file
File renamed without changes
Binary file added ...ns/Grid with scrollable wrapped in td,useNative=false (material-blue-light).png
View file
0 ...td el, useNative=true (generic-light).png → ... in td,useNative=true (generic-light).png
View file
File renamed without changes
Binary file added ...ons/Grid with scrollable wrapped in td,useNative=true (material-blue-light).png
View file
2 changes: 1 addition & 1 deletion packages/devextreme/testing/testcafe/tests/navigation/scrollable/integration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fixture.disablePageReloads`Integration_DataGrid`
test(`The rows in the fixed column are not aligned when the grid is encapsulated inside a <td> element, useNative: ${useNative} (T1071725)`, async (t) => {
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

await testScreenshot(t, takeScreenshot, `Grid with scrollable wrapped in td el, useNative=${useNative}.png`, { element: '#container' });
await testScreenshot(t, takeScreenshot, `Grid with scrollable wrapped in td,useNative=${useNative}.png`, { element: '#container' });

await t
.expect(compareResults.isValid())
Expand Down
Binary file modified ...xtreme/testing/testcafe/tests/treeList/etalons/T1053931-material.blue.light.png
View file
Binary file modified ...xtreme/testing/testcafe/tests/treeList/etalons/T1054312-material.blue.light.png
View file
2 changes: 1 addition & 1 deletion packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ QUnit.module('Initialization', baseModuleConfig, () => {

const cellBackgroundColor = 'rgba(0, 0, 0, 0)';
const $groupedRow = $(dataGrid.getRowElement(0)[0]);
assert.equal(window.getComputedStyle($groupedRow[0]).backgroundColor, 'rgb(92, 149, 197)', 'focused grouped row has correct background color in rtl mode');
assert.equal(window.getComputedStyle($groupedRow[0]).backgroundColor, 'rgba(51, 122, 183, 0.2)', 'focused grouped row has correct background color in rtl mode');
assert.equal(window.getComputedStyle($groupedRow.find('td')[0]).backgroundColor, cellBackgroundColor, 'cell in focused row has no background color');
assert.equal(window.getComputedStyle($groupedRow.find('td')[1]).backgroundColor, cellBackgroundColor, 'cell in focused row has no background color');
});
Expand Down

0 comments on commit 83e1722

Please sign in to comment.