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.

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

Jump to bottom

feat: introduce style properties for disabled input #7553

Merged
merged 4 commits into from
Jul 30, 2024
Merged

feat: introduce style properties for disabled input #7553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5910fab
git experiment
FrediWa Jul 24, 2024
3f814ae
Remove style from labels, radiobuttons, checkboxes and MSCB chips
FrediWa Jul 25, 2024
717c074
revert mistakes
FrediWa Jul 25, 2024
705cec3
add global defaults
FrediWa Jul 30, 2024
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: 8 additions & 0 deletions packages/input-container/test/visual/lumo/input-container.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ describe('input-container', () => {
await visualDiff(div, `${initialState}-disabled`);
});

it('styled disabled', async () => {
div.style.setProperty('--vaadin-input-field-disabled-background', 'black');
div.style.setProperty('--vaadin-input-field-disabled-value-color', 'white');

element.disabled = true;
await visualDiff(div, `${initialState}-styled-disabled`);
});

it('readonly', async () => {
element.readonly = true;
await visualDiff(div, `${initialState}-readonly`);
Expand Down
Binary file added ...test/visual/lumo/screenshots/input-container/baseline/empty-styled-disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .../visual/lumo/screenshots/input-container/baseline/non-empty-styled-disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions packages/input-container/theme/lumo/vaadin-input-container-styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ registerStyles(
--_icon-size: var(--vaadin-input-field-icon-size, var(--lumo-icon-size-m));
--_invalid-background: var(--vaadin-input-field-invalid-background, var(--lumo-error-color-10pct));
--_invalid-hover-highlight: var(--vaadin-input-field-invalid-hover-highlight, var(--lumo-error-color-50pct));
--_disabled-background: var(--vaadin-input-field-disabled-background, var(--lumo-contrast-5pct));
--_disabled-value-color: var(--vaadin-input-field-disabled-value-color, var(--lumo-disabled-text-color));
}

:host([dir='rtl']) {
Expand Down Expand Up @@ -82,12 +84,9 @@ registerStyles(

/* Disabled */
:host([disabled]) {
background-color: var(--lumo-contrast-5pct);
}

:host([disabled]) ::slotted(*) {
color: var(--lumo-disabled-text-color);
-webkit-text-fill-color: var(--lumo-disabled-text-color);
background: var(--_disabled-background);
-webkit-text-fill-color: var(--_disabled-value-color);
color: var(--_disabled-value-color);
}

/* Invalid */
Expand Down
2 changes: 2 additions & 0 deletions packages/vaadin-lumo-styles/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ const globals = css`
--vaadin-input-field-icon-size: var(--lumo-icon-size-m);
--vaadin-input-field-invalid-background: var(--lumo-error-color-10pct);
--vaadin-input-field-invalid-hover-highlight: var(--lumo-error-color-50pct);
--vaadin-input-field-disabled-background: var(--lumo-contrast-5pct);
--vaadin-input-field-disabled-value-color: var(--lumo-disabled-text-color);
--vaadin-input-field-height: var(--lumo-size-m);
--vaadin-input-field-hover-highlight: var(--lumo-contrast-50pct);
--vaadin-input-field-placeholder-color: var(--lumo-secondary-text-color);
Expand Down
Loading