Skip to content

GAUD-8851 remove text scss #7161

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
EdwinACL831 wants to merge 11 commits into
base: main
Choose a base branch
from
Open

GAUD-8851 remove text scss #7161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
40790aa
GAUD-8851: Remove text.scss
Jul 3, 2026
62ae002
Implements function to encapsulate similar styles generated
Jul 3, 2026
b7177ee
Exposes base styles from input-styles.js needed in input-text-styles.js
Jul 3, 2026
ac4a874
Updates input-text-styles.js to import and use base styles from input…
Jul 3, 2026
0f43fa6
Exposes input base styles and selector delegates in orer to be used b…
Jul 3, 2026
b248410
Updates input-text-styles.js to use the input base style delegates
Jul 3, 2026
b285bca
Updates vdiffs to use generated input text styles
Jul 3, 2026
248ed70
Removes function implementation and usage for disabled styles since t…
Jul 6, 2026
a80c5c7
Updates selector order to avoid unexpected generated css
Jul 6, 2026
58d11b3
Removes sass vdiff tests
Jul 6, 2026
b8167e9
Updating vdiff goldens (#7162)
github-actions[bot] Jul 6, 2026
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
106 changes: 77 additions & 29 deletions components/inputs/input-styles.js
View file
Open in desktop

@EdwinACL831 EdwinACL831 Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I did here was basically expose some base-style-generator-functions that I used in the new file input-text-styles.js

@EdwinACL831 EdwinACL831 Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will revert these changes in the test file. The report results are really good and there is not significant difference

Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,28 @@ registerSemanticVariableForSvgImageUrl(
</svg>`
);

/**
* A private helper method that should not be used by general consumers
*/
export function _getInputBaseStyleDelegates(selector, focusSelector) {
return {
selector: focusClass => `
${focusSelector ? `${focusSelector},` : ''}
${selector}:${focusClass}:not(:disabled),
${selector}:hover:not(:disabled)`,
style: fullSelector => css`
${fullSelector} {
border-color: var(--d2l-theme-border-color-focus);
border-width: 2px;
outline: none;
padding: var(--d2l-input-padding-focus, calc(0.4rem - 1px) calc(0.75rem - 1px));
}`
};
}

function getStyleDelegates(selector, focusSelector, textAreaSelector) {
return {
input: {
selector: focusClass => `
${focusSelector ? `${focusSelector},` : ''}
${selector}:${focusClass}:not(:disabled),
${selector}:hover:not(:disabled)
`,
style: fullSelector => css`
${fullSelector} {
border-color: var(--d2l-theme-border-color-focus);
border-width: 2px;
outline: none;
padding: var(--d2l-input-padding-focus, calc(0.4rem - 1px) calc(0.75rem - 1px));
}
`
},
input: _getInputBaseStyleDelegates(selector, focusSelector),
textarea: {
selector: focusClass => `
${textAreaSelector}:hover:not(:disabled),
Expand Down Expand Up @@ -58,13 +63,10 @@ function getStyleDelegates(selector, focusSelector, textAreaSelector) {
};
}

export function _generateInputStyles(selector, focusSelector) {
if (!_isValidCssSelector(selector) || (focusSelector && !_isValidCssSelector(focusSelector))) return '';
const lastSpaceIndex = selector.lastIndexOf(' ');
const textareaSelector = unsafeCSS(`${selector.substring(0, lastSpaceIndex + 1)}textarea${selector.substring(lastSpaceIndex + 1)}`);
const delegates = getStyleDelegates(selector, focusSelector, textareaSelector);

selector = unsafeCSS(selector);
/**
* A private helper method that should not be used by general consumers
*/
export function _generateInputBaseStyles(selector) {
return css`
${selector} {
background-color: var(--d2l-input-background-color, var(--d2l-theme-background-color-base));
Expand All @@ -88,26 +90,72 @@ export function _generateInputStyles(selector, focusSelector) {
vertical-align: middle;
width: 100%;
}
${getFocusVisibleStyles(delegates.input.selector, delegates.input.style)}
`;
}

/**
* A private helper method that should not be used by general consumers
*/
export function _generateInputPlaceholderBaseStyles(selector) {
return css`
${selector}::placeholder {
color: var(--d2l-theme-text-color-static-faint);
font-size: 0.8rem;
font-weight: 400;
opacity: 1; /* Firefox has non-1 default */
}
${selector}::-ms-input-placeholder {
color: var(--d2l-theme-text-color-static-faint);
font-size: 0.8rem;
font-weight: 400;
}
`;
}

[aria-invalid="true"]${selector}:not(:disabled) {
/**
* A private helper method that should not be used by general consumers
*/
export function _generateInputAriaInvalidBaseStyles(selector) {
return css`
${selector}[aria-invalid="true"]:not(:disabled) {
border-color: var(--d2l-theme-status-color-error);
}
`;
}

/**
* A private helper method that should not be used by general consumers
*/
export function _generateInputDisabledBaseStyles(selector) {
return css`
${selector}:disabled {
opacity: var(--d2l-theme-opacity-disabled-control);
}
`;
}

/**
* A private helper method that should not be used by general consumers
*/
export function _generateInputStyles(selector, focusSelector) {
if (!_isValidCssSelector(selector) || (focusSelector && !_isValidCssSelector(focusSelector))) return '';
const lastSpaceIndex = selector.lastIndexOf(' ');
const textareaSelector = unsafeCSS(`${selector.substring(0, lastSpaceIndex + 1)}textarea${selector.substring(lastSpaceIndex + 1)}`);
const delegates = getStyleDelegates(selector, focusSelector, textareaSelector);

selector = unsafeCSS(selector);
return css`
${_generateInputBaseStyles(selector)}

${getFocusVisibleStyles(delegates.input.selector, delegates.input.style)}

${_generateInputPlaceholderBaseStyles(selector)}

${selector}::-ms-input-placeholder {
color: var(--d2l-theme-text-color-static-faint);
font-size: 0.8rem;
font-weight: 400;
}

${_generateInputAriaInvalidBaseStyles(selector)}

${_generateInputDisabledBaseStyles(selector)}

${selector}::-webkit-search-cancel-button,
${selector}::-webkit-search-decoration {
display: none;
Expand Down
36 changes: 36 additions & 0 deletions components/inputs/input-text-styles.js
View file
Open in desktop

@EdwinACL831 EdwinACL831 Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought that would be easier to understand and implement style in BSI, therefore I created this new file with the generator function.

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

import {
_generateInputAriaInvalidBaseStyles,

@GZolla GZolla Jul 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the plan to use this functions separately on BSI? I think it would be cleaner to merge everything that is always used together under a single function so that consumers wouldn't need to import all of them separately.

@EdwinACL831 EdwinACL831 Jul 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, The plan is to only use the exported function _generateInputTextStyles from this file. I used only these ones to build it up easier and readable

_generateInputBaseStyles,
_generateInputDisabledBaseStyles,
_generateInputPlaceholderBaseStyles,
_getInputBaseStyleDelegates,
} from './input-styles.js';
import { css, unsafeCSS } from 'lit';
import { _isValidCssSelector } from '../../helpers/internal/css.js';
import { getFocusVisibleStyles } from '../../helpers/focus.js';

function _generateInputTextFocusStyles(selector) {
const input = _getInputBaseStyleDelegates(selector);
return getFocusVisibleStyles(input.selector, input.style);
}

/**
* A private helper method that should not be used by general consumers
*/
export function _generateInputTextStyles(selector) {
if (!_isValidCssSelector(selector)) return '';
const finalSelector = unsafeCSS(selector);

return css`
${ _generateInputBaseStyles(finalSelector) }

${ _generateInputPlaceholderBaseStyles(finalSelector) }

${ _generateInputTextFocusStyles(finalSelector) }

${ _generateInputAriaInvalidBaseStyles(finalSelector) }

${_generateInputDisabledBaseStyles(finalSelector)}
`;
}
Binary file removed components/inputs/test/golden/input-text/chromium/sass-aria-invalid-disabled.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-aria-invalid-focus.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-aria-invalid.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-basic-focus.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-basic.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-disabled.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-email.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-invalid-disabled.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-invalid-focus.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-invalid.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-number.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-password.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-placeholder-disabled.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-placeholder.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-search.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-tel.png
View file
Open in desktop
Binary file not shown.
Binary file removed components/inputs/test/golden/input-text/chromium/sass-url.png
View file
Open in desktop
Binary file not shown.
38 changes: 0 additions & 38 deletions components/inputs/test/input-text.vdiff.js
View file
Open in desktop

@EdwinACL831 EdwinACL831 Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a good practice that @dlockhart suggested me last time, and I found it very useful. Here we might see how different (if there is any) the component would look with these generated styles, compared to the sass ones

@EdwinACL831 EdwinACL831 Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will revert these changes in this file. The report results are really good and there is not significant difference

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import '../../button/button-icon.js';
import '../../icons/icon.js';
import '../input-text.js';
import { expect, fixture, focusElem, hoverElem, hoverElemAt, html } from '@brightspace-ui/testing';
import { loadSass, unloadSass } from '../../../test/load-sass.js';
import { inlineHelpFixtures } from './input-shared-content.js';

const createIcon = (icon, slot) => html`<d2l-icon icon="tier1:${icon}" slot="${slot}" style="margin-left: 0.55rem; margin-right: 0.55rem"></d2l-icon>`;
Expand Down Expand Up @@ -164,41 +163,4 @@ describe('d2l-input-text', () => {

});

describe('sass', () => {

before(loadSass);
after(unloadSass);

const sassBasicFixture = html`<input class="d2l-test-input-text" type="text" value="text">`;
const sassInvalidFixture = html`<input class="d2l-test-input-text" type="email" value="invalid@">`;
const sassAriaInvalidFixture = html`<input class="d2l-test-input-text" value="aria-invalid" aria-invalid="true">`;

[
{ name: 'basic', template: sassBasicFixture },
{ name: 'basic-focus', template: sassBasicFixture, focus: true },
{ name: 'email', template: html`<input class="d2l-test-input-text" type="email" value="bill@nye.com">` },
{ name: 'number', template: html`<input class="d2l-test-input-text" type="number" value="500">` },
{ name: 'password', template: html`<input class="d2l-test-input-text" type="password" value="123456">` },
{ name: 'search', template: html`<input class="d2l-test-input-text" type="search" value="search">` },
{ name: 'tel', template: html`<input class="d2l-test-input-text" type="tel" value="123-456-7890">` },
{ name: 'url', template: html`<input class="d2l-test-input-text" type="url" value="https://www.d2l.com">` },
{ name: 'disabled', template: html`<input class="d2l-test-input-text" disabled value="text disabled">` },
{ name: 'placeholder', template: html`<input class="d2l-test-input-text" placeholder="placeholder">` },
{ name: 'placeholder-disabled', template: html`<input class="d2l-test-input-text" disabled placeholder="placeholder disabled">` },
{ name: 'invalid', template: sassInvalidFixture },
{ name: 'invalid-disabled', template: html`<input class="d2l-test-input-text" disabled type="email" value="invalid-disabled@">` },
{ name: 'invalid-focus', template: sassInvalidFixture, focus: true },
{ name: 'aria-invalid', template: sassAriaInvalidFixture },
{ name: 'aria-invalid-disabled', template: html`<input class="d2l-test-input-text" disabled value="aria-invalid-disabled" aria-invalid="true">` },
{ name: 'aria-invalid-focus', template: sassAriaInvalidFixture, focus: true },
].forEach(({ name, template, focus }) => {
it(name, async() => {
const elem = await fixture(template, { viewport });
if (focus) await focusElem(elem);
await expect(elem).to.be.golden();
});
});

});

});