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

TagBox - selectAll checkBox should be aligned correctly in fluent (T1252002) #28809

Merged
merged 11 commits into from
Jan 22, 2025
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
20 changes: 20 additions & 0 deletions e2e/testcafe-devextreme/tests/editors/tagBox/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TagBox from 'devextreme-testcafe-models/tagBox';
import { testScreenshot } from '../../../helpers/themeUtils';
import url from '../../../helpers/getPageUrl';
import { createWidget } from '../../../helpers/createWidget';
import { safeSizeTest } from '../../../helpers/safeSizeTest';

fixture.disablePageReloads`TagBox`
.page(url(__dirname, '../../container.html'));
Expand Down Expand Up @@ -123,6 +124,25 @@ test('Select all checkbox should be focused by tab and closed by escape (T389453
applyValueMode: 'useButtons',
}));

safeSizeTest('TagBox with selection controls', async (t) => {
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
const tagBox = new TagBox('#container');

await t.click(tagBox.element);

await testScreenshot(t, takeScreenshot, 'TagBox with selection controls.png', {
shouldTestInCompact: true,
});

await t
.expect(compareResults.isValid())
.ok(compareResults.errorMessages());
}, [300, 300]).before(async () => createWidget('dxTagBox', {
items: [1, 2, 3, 4, 5, 6, 7],
showSelectionControls: true,
width: 300,
}));

test('Placeholder is visible after items option change when value is not chosen (T1099804)', async (t) => {
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
const tagBox = new TagBox('#container');
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.
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.
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,16 @@ $badge-invalid-bg: $base-invalid-color;
}

.dx-list-select-all {
margin-inline: $fluent-list-item-margin-inline;
padding: $fluent-list-item-vertical-padding + 2px 0 $fluent-list-item-vertical-padding - 2px;
}

.dx-list-items {
margin-left: $fluent-list-vertical-padding;
margin-right: $fluent-list-vertical-padding;
margin-inline: $fluent-list-item-margin-inline;

.dx-list-select-checkbox {
margin-inline: $fluent-list-item-checkbox-margin-inline;
}
}

.dx-list-item,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ $fluent-dropdowneditor-invalid-badge-size: $fluent-invalid-badge-size + $fluent-
}

.dx-list-group-header,
.dx-list-item-content {
.dx-list-item-content,
.dx-list-select-all-label {
font-size: $fluent-dropdowneditor-list-font-size;
line-height: $fluent-dropdowneditor-list-line-height;
}
Expand Down
4 changes: 4 additions & 0 deletions packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// adduse

$fluent-list-vertical-padding: 4px !default;
$fluent-list-item-margin-inline: 4px !default;
$fluent-list-item-checkbox-margin-inline: null !default;
$fluent-list-bottom-padding: 4px !default;
$fluent-list-searchbox-margin-bottom: 4px !default;
$fluent-list-item-height: null !default;
Expand All @@ -13,6 +15,7 @@ $fluent-list-group-header-vertical-padding: null !default;
$fluent-list-next-button-horizontal-padding: null !default;

@if $size == "default" {
$fluent-list-item-checkbox-margin-inline: 8px !default;
$fluent-list-item-height: 32px !default;
$fluent-list-item-vertical-padding: 6px !default;
$fluent-list-item-horizontal-padding: 12px !default;
Expand All @@ -21,6 +24,7 @@ $fluent-list-next-button-horizontal-padding: null !default;
}

@else if $size == "compact" {
$fluent-list-item-checkbox-margin-inline: 4px !default;
$fluent-list-item-height: 24px !default;
$fluent-list-item-vertical-padding: 4px !default;
$fluent-list-item-horizontal-padding: 8px !default;
Expand Down
Loading