GAUD-8866 remove button scss from bsi #7254
+144
−69
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,149 @@ | ||
| import '../colors/colors.js'; | ||
| import { css, unsafeCSS } from 'lit'; | ||
| import { _isValidCssSelector } from '../../helpers/internal/css.js'; | ||
| import { getFocusRingStyles } from '../../helpers/focus.js'; | ||
|
|
||
| function _generateButtonBaseStyles(selector) { | ||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| selector = unsafeCSS(selector.trim()); | ||
|
|
||
| return css` | ||
| ${selector} { | ||
| border-end-end-radius: var(--d2l-button-end-end-radius, 0.3rem); | ||
| border-end-start-radius: var(--d2l-button-end-start-radius, 0.3rem); | ||
| border-start-end-radius: var(--d2l-button-start-end-radius, 0.3rem); | ||
| border-start-start-radius: var(--d2l-button-start-start-radius, 0.3rem); | ||
| border-style: none; | ||
| box-sizing: border-box; | ||
| cursor: pointer; | ||
| display: inline-block; | ||
| margin: 0; | ||
| min-height: calc(2rem + 2px); | ||
| outline: none; | ||
| text-align: center; | ||
| -webkit-user-select: none; | ||
| -moz-user-select: none; | ||
| -ms-user-select: none; | ||
| user-select: none; | ||
| vertical-align: middle; | ||
| white-space: nowrap; | ||
| width: auto; | ||
| } | ||
| `; | ||
| } | ||
|
|
||
| export function _generateButtonStyles(selector) { | ||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| selector = unsafeCSS(selector.trim()); | ||
|
|
||
| return css` | ||
| ${selector} { | ||
| font-family: inherit; | ||
| padding-block-end: 0; | ||
| padding-block-start: 0; | ||
| padding-inline-end: var(--d2l-button-padding-inline-end, 1.5rem); | ||
| padding-inline-start: var(--d2l-button-padding-inline-start, 1.5rem); | ||
| } | ||
| `; | ||
| } | ||
|
|
||
| export function _generateMozillaButtonBorderStyles(selector) { | ||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| selector = unsafeCSS(selector.trim()); | ||
|
|
||
| return css` | ||
| /* Firefox includes a hidden border which messes up button dimensions */ | ||
|
Contributor
There was a problem hiding this comment. Lots of generator methods. Was hoping core would just have two - one for the base styles (defined in the mixin), and another for the d2l-button styles. Can this be combined with the template immediately above?
Contributor
Author
There was a problem hiding this comment. So I have done the following:
|
||
| ${selector}::-moz-focus-inner { | ||
| border: 0; | ||
| } | ||
| `; | ||
| } | ||
|
|
||
| export function _generateButtonDisabledStyles(selector, isForBsi = false) { | ||
|
Contributor
There was a problem hiding this comment. Same thing here - do we need to support a special generator just for the disabled styles? The BSI aspect creeping in here isn't great. If we really need to distinguish the context, I think we can make it more meaningful by naming it something like
Contributor
Author
There was a problem hiding this comment. Thanks for the feedback....it's been a while since reviewing this so I will come up if some updates trying to put all together into a single generator function (2 tops as you suggested). |
||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| selector = unsafeCSS(selector.trim()); | ||
|
|
||
| const activeDisabledSelector = isForBsi ? unsafeCSS(`${selector}[active][disabled]`) : unsafeCSS(`:host([active]) ${selector}[disabled]`); | ||
|
|
||
| return css` | ||
| ${selector}, | ||
| ${selector}[disabled]:hover, | ||
| ${selector}[disabled]:focus, | ||
| ${activeDisabledSelector} { | ||
| background-color: var(--d2l-theme-background-color-interactive-secondary-default); | ||
| color: var(--d2l-theme-text-color-static-standard); | ||
| } | ||
| `; | ||
| } | ||
|
|
||
| export function _generateButtonEnabledStyles(selector, isForBsi = false) { | ||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| selector = unsafeCSS(selector.trim()); | ||
|
|
||
| const activeSelector = isForBsi ? unsafeCSS(`${selector}[active]`) : unsafeCSS(`:host([active]) ${selector}`); | ||
| const additionalBSISelector = isForBsi ? unsafeCSS(`${selector}.d2l-button-hover, ${selector}.d2l-button-focus,`) : unsafeCSS(''); | ||
|
|
||
| return css` | ||
| ${additionalBSISelector} | ||
| ${selector}:hover, | ||
| ${selector}:focus, | ||
| ${activeSelector} { | ||
| background-color: var(--d2l-theme-background-color-interactive-secondary-hover); | ||
| } | ||
| `; | ||
| } | ||
|
|
||
| export function _generateBSIButtonFocusStyles(selector) { | ||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| const getSelector = (focusPseudoClass) => ` | ||
| ${selector}:${focusPseudoClass}, | ||
| ${selector}.d2l-button-focus, | ||
| ${selector}[primary]:${focusPseudoClass}, | ||
| ${selector}[primary].d2l-button-focus`; | ||
|
|
||
| return getFocusRingStyles(getSelector); | ||
| } | ||
|
|
||
| export function _generatePrimaryButtonDisabledStyles(selector, isForBsi = false) { | ||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| selector = unsafeCSS(selector.trim()); | ||
|
|
||
| const finalSelector = isForBsi ? `${selector}[primary], | ||
| ${selector}[primary][disabled]:hover, | ||
| ${selector}[primary][disabled]:focus, | ||
| ${selector}[primary][active][disabled]` : `:host([primary]) ${selector}, | ||
| :host([primary]) ${selector}[disabled]:hover, | ||
| :host([primary]) ${selector}[disabled]:focus, | ||
| :host([primary][active]) ${selector}[disabled]`; | ||
|
|
||
| return css` | ||
| ${unsafeCSS(finalSelector)} { | ||
| background-color: var(--d2l-theme-background-color-interactive-primary-default); | ||
| color: var(--d2l-theme-text-color-static-inverted); | ||
| } | ||
| `; | ||
| } | ||
|
|
||
| export function _generatePrimaryButtonEnabledStyles(selector, isForBsi = false) { | ||
| if (!_isValidCssSelector(selector)) return unsafeCSS(''); | ||
| selector = unsafeCSS(selector.trim()); | ||
|
|
||
| const finalSelector = isForBsi ? `${selector}[primary]:hover, | ||
| ${selector}[primary].d2l-button-hover, | ||
| ${selector}[primary]:focus, | ||
| ${selector}[primary].d2l-button-focus, | ||
| ${selector}[primary][active]` : `:host([primary]) ${selector}:hover, | ||
| :host([primary]) ${selector}:focus, | ||
| :host([primary][active]) ${selector}`; | ||
|
|
||
| return css` | ||
| ${unsafeCSS(finalSelector)} { | ||
| background-color: var(--d2l-theme-background-color-interactive-primary-hover); | ||
| } | ||
| `; | ||
| } | ||
|
|
||
| export const buttonStyles = css` | ||
| ${_generateButtonBaseStyles('button')} | ||
| ${getFocusRingStyles('button', { preferContrastMediaQueryExtraStyles: css`border: 2px solid transparent;` })} | ||
| `; | ||
|
Contributor
Author
There was a problem hiding this comment. The deletes styles from this component are now being generated using the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think would be better if you use the split view so you can see what was replaced by what