Skip to content
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.

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

TreeList - Expand/collapse buttons are too close to column borders if the first column is a boolean column (T1223168) #27461

Merged
merged 3 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion packages/devextreme/scss/widgets/base/_gridBase.scss
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,14 @@

.dx-editor-cell {
max-width: 0;
padding: 0;
vertical-align: middle;
padding-top: 0;
padding-right: 0;
padding-bottom: 0;

&:not(.dx-#{$widget-name}-cell-expandable) {
padding-left: 0;
}

.dx-texteditor,
.dx-texteditor-container {
Expand Down
5 changes: 4 additions & 1 deletion packages/devextreme/scss/widgets/fluent/gridBase/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,10 @@ $fluent-grid-base-group-panel-message-line-height: $fluent-button-text-line-heig

&.dx-editor-cell:not(.dx-command-select) {
padding-right: 0;
padding-left: 0;

&:not(.dx-#{$widget-name}-cell-expandable) {
padding-left: 0;
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,10 @@ $material-grid-base-group-panel-message-line-height: $material-button-text-line-

&.dx-editor-cell:not(.dx-command-select) {
padding-right: 0;
padding-left: 0;

&:not(.dx-#{$widget-name}-cell-expandable) {
padding-left: 0;
}
}
}
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions packages/devextreme/testing/testcafe/tests/treeList/markup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';

import TreeList from '../../model/treeList';
import { changeTheme } from '../../helpers/changeTheme';
import { createWidget } from '../../helpers/createWidget';
import url from '../../helpers/getPageUrl';
import { Themes } from '../../helpers/themes';

fixture`Markup`
.page(url(__dirname, '../container.html'));

const tasksT1223168 = [{
Task_ID: 1,
Task_Subject: 'Plans 2015',
Task_Parent_ID: 0,
}, {
Task_ID: 2,
Task_Subject: 'Health Insurance',
Task_Parent_ID: 1,
}, {
Task_ID: 3,
Task_Subject: 'Training',
Task_Parent_ID: 2,
}];

[Themes.genericLight, Themes.materialBlue, Themes.fluentBlue].forEach((theme) => {
test(`TreeList - Expand/collapse buttons are too close to column borders if the first column is a boolean column (T1223168) in ${theme}`, async (t) => {
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
const treeList = new TreeList('#container');

await t
.expect(await takeScreenshot(`T1223168-expandable-${theme}`, treeList.element))
.ok()
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}).before(async () => {
await changeTheme(theme);
await createWidget('dxTreeList', {
dataSource: tasksT1223168,
keyExpr: 'Task_ID',
parentIdExpr: 'Task_Parent_ID',
autoExpandAll: true,
wordWrapEnabled: true,
showBorders: true,
columns: [{
dataField: 'test',
dataType: 'boolean',
}, 'Task_Subject'],
showColumnLines: true,
rowDragging: {
allowReordering: true,
},
});
}).after(async () => {
await changeTheme(Themes.genericLight);
});
});
Loading