Skip to content

Fix invalid state styling on vscode-textfield #618

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

Open
MarshalX wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix invalid state styling on vscode-textfield #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dev/vscode-textfield/validation-min-validation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<body class="vscode-light">
<main>
<h1>Textfield</h1>
<h2>File input</h2>
<h2>Validation min validation</h2>
<vscode-demo>
<style>
input[type='number']:invalid {
Expand Down
2 changes: 1 addition & 1 deletion dev/vscode-textfield/validation-on-value-change.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<body class="vscode-light">
<main>
<h1>Textfield</h1>
<h2>File input</h2>
<h2>Validation on value change</h2>
<vscode-demo>
<style>
input[type='text']:invalid {
Expand Down
19 changes: 10 additions & 9 deletions src/vscode-textfield/vscode-textfield.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const styles: CSSResultGroup = [
background-color: var(--vscode-settings-textInputBackground, #313131);
border-color: var(
--vscode-settings-textInputBorder,
var(--vscode-settings-textInputBackground, #3c3c3c)
var(--vscode-settings-textInputBackground, #313131)
);
border-radius: 4px;
border-style: solid;
Expand All @@ -34,14 +34,15 @@ const styles: CSSResultGroup = [
border-color: var(--vscode-focusBorder, #0078d4);
}

:host([invalid]),
:host(:invalid) {
:host([invalid]) .root,
:host(:invalid) .root {
background-color: var(--vscode-inputValidation-errorBackground, #5a1d1d);
border-color: var(--vscode-inputValidation-errorBorder, #be1100);
}

:host([invalid]) input,
:host(:invalid) input {
background-color: var(--vscode-inputValidation-errorBackground, #5a1d1d);
:host([invalid][focused]) .root,
:host(:invalid[focused]) .root {
border-color: var(--vscode-inputValidation-errorBorder, #be1100);
}

::slotted([slot='content-before']) {
Expand All @@ -61,14 +62,14 @@ const styles: CSSResultGroup = [
}

input {
background-color: var(--vscode-settings-textInputBackground, #313131);
background-color: transparent;
border: 0;
box-sizing: border-box;
color: var(--vscode-settings-textInputForeground, #cccccc);
display: block;
font-family: var(--vscode-font-family, ${defaultFontStack});
font-size: var(--vscode-font-size, 13px);
font-weight: var(--vscode-font-weight, 'normal');
font-weight: var(--vscode-font-weight, normal);
line-height: 18px;
outline: none;
padding-bottom: 3px;
Expand Down Expand Up @@ -102,7 +103,7 @@ const styles: CSSResultGroup = [
cursor: pointer;
font-family: var(--vscode-font-family, ${defaultFontStack});
font-size: var(--vscode-font-size, 13px);
font-weight: var(--vscode-font-weight, 'normal');
font-weight: var(--vscode-font-weight, normal);
line-height: 20px;
padding: 0 14px;
}
Expand Down
18 changes: 18 additions & 0 deletions src/vscode-textfield/vscode-textfield.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,4 +277,22 @@ describe('vscode-textfield', () => {

expect(el.checkValidity()).to.eq(false);
});

it('should reflect invalid property to the invalid attribute', async () => {
const el = await fixture<VscodeTextfield>(
'<vscode-textfield></vscode-textfield>'
);

expect(el.hasAttribute('invalid')).to.be.false;

el.invalid = true;
await el.updateComplete;

expect(el.hasAttribute('invalid')).to.be.true;

el.invalid = false;
await el.updateComplete;

expect(el.hasAttribute('invalid')).to.be.false;
});
});
3 changes: 1 addition & 2 deletions src/vscode-textfield/vscode-textfield.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ type InputType =
* @fires {Event} change
*
* @cssprop [--vscode-settings-textInputBackground=#313131]
* @cssprop [--vscode-settings-textInputBorder=var(--vscode-settings-textInputBackground, #3c3c3c)]
* @cssprop [--vscode-settings-textInputBorder=var(--vscode-settings-textInputBackground, #313131)]
* @cssprop [--vscode-settings-textInputForeground=#cccccc]
* @cssprop [--vscode-settings-textInputBackground=#313131]
* @cssprop [--vscode-focusBorder=#0078d4]
* @cssprop [--vscode-font-family=sans-serif] - A sans-serif font type depends on the host OS.
* @cssprop [--vscode-font-size=13px]
Expand Down