@brightspace-ui/core 3.267.3 → 3.268.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/components/inputs/input-select-styles.js +30 -25
  2. package/helpers/focus.js +5 -1
  3. package/package.json +1 -1
package/components/inputs/input-select-styles.js CHANGED
@@ -1,11 +1,9 @@
1
1
  import './input-styles.js';
2
2
  import { css, unsafeCSS } from 'lit';
3
+ import { getFocusRingStyles, getFocusVisibleStyles } from '../../helpers/focus.js';
3
4
  import { _isValidCssSelector } from '../../helpers/internal/css.js';
4
- import { getFocusPseudoClass } from '../../helpers/focus.js';
5
5
  import { registerSemanticVariableForSvgImageUrl } from '../colors/colors.js';
6
6
 
7
- const focusClass = unsafeCSS(getFocusPseudoClass());
8
-
9
7
  registerSemanticVariableForSvgImageUrl(
10
8
  '--d2l-input-select-chevron-image',
11
9
  `<svg width="11" height="7" viewBox="0 0 11 7" xmlns="http://www.w3.org/2000/svg">
@@ -13,12 +11,36 @@ registerSemanticVariableForSvgImageUrl(
13
11
  </svg>`
14
12
  );
15
13
 
14
+ function _getSelectFocusStyles(selector) {
15
+ const notDisabledSelector = (focusSelector) => `
16
+ ${selector}:not([disabled]):hover,
17
+ ${selector}:not([disabled]):${focusSelector}`;
18
+ const ariaInvalidSelector = (focusSelector) => `
19
+ ${selector}[aria-invalid="true"],
20
+ ${selector}[aria-invalid="true"]:${focusSelector},
21
+ ${selector}[aria-invalid="true"]:hover`;
22
+
23
+ return {
24
+ notDisabled: getFocusRingStyles(notDisabledSelector, {
25
+ extraStyles: css`
26
+ box-shadow: inset var(--d2l-theme-shadow-inset-offset-x) var(--d2l-theme-shadow-inset-offset-y) var(--d2l-theme-shadow-inset-blur-radius) 2px var(--d2l-theme-shadow-inset-color);
27
+
28
+ --d2l-focus-ring-offset: -2px;`,
29
+ preferContrastMediaQueryExtraStyles: css`box-shadow: none;`
30
+ }),
31
+ ariaInvalid: getFocusVisibleStyles(ariaInvalidSelector, (selector) => css`${selector} {
32
+ outline-color: var(--d2l-theme-status-color-error);
33
+ }`)
34
+ };
35
+ }
36
+
16
37
  /**
17
38
  * A private helper method that should not be used by general consumers
18
39
  */
19
40
  export function _generateSelectStyles(selector) {
20
41
  if (!_isValidCssSelector(selector)) return '';
21
42
  const finalSelector = unsafeCSS(selector);
43
+ const selectFocusStyles = _getSelectFocusStyles(finalSelector);
22
44
 
23
45
  return css`
24
46
  ${finalSelector} {
@@ -51,23 +73,16 @@ export function _generateSelectStyles(selector) {
51
73
  vertical-align: middle;
52
74
  }
53
75
 
54
- ${finalSelector}:not([disabled]):hover,
55
- ${finalSelector}:not([disabled]):${focusClass} {
56
- box-shadow: inset var(--d2l-theme-shadow-inset-offset-x) var(--d2l-theme-shadow-inset-offset-y) var(--d2l-theme-shadow-inset-blur-radius) 2px var(--d2l-theme-shadow-inset-color);
57
- outline: 2px solid var(--d2l-theme-border-color-focus);
58
- outline-offset: -2px;
59
- }
76
+ ${selectFocusStyles.notDisabled}
77
+
60
78
  ${finalSelector}[aria-invalid="true"] {
61
79
  background-image: var(--d2l-input-select-chevron-image), var(--d2l-input-invalid-image);
62
80
  background-position: center var(--d2l-inline-end, right) 17px, center var(--d2l-inline-end, right) calc(1px + 11px + 17px);
63
81
  background-repeat: no-repeat, no-repeat;
64
82
  background-size: 11px 7px, 0.8rem 0.8rem;
65
83
  }
66
- ${finalSelector}[aria-invalid="true"],
67
- ${finalSelector}[aria-invalid="true"]:${focusClass},
68
- ${finalSelector}[aria-invalid="true"]:hover {
69
- outline-color: var(--d2l-theme-status-color-error);
70
- }
84
+ ${selectFocusStyles.ariaInvalid}
85
+
71
86
  ${finalSelector}:disabled {
72
87
  opacity: var(--d2l-theme-opacity-disabled-control);
73
88
  }
@@ -87,12 +102,6 @@ export function _generateSelectStyles(selector) {
87
102
  padding-inline: 0.6rem 16px;
88
103
  }
89
104
 
90
- ${finalSelector}:not([disabled]):${focusClass},
91
- ${finalSelector}:not([disabled]):hover {
92
- box-shadow: none;
93
- outline: 2px solid Highlight;
94
- }
95
-
96
105
  ${finalSelector}:disabled {
97
106
  outline: 1px solid GrayText;
98
107
  }
@@ -104,11 +113,7 @@ export function _generateSelectStyles(selector) {
104
113
  background-size: 0.8rem 0.8rem;
105
114
  }
106
115
 
107
- ${finalSelector}[aria-invalid="true"],
108
- ${finalSelector}[aria-invalid="true"]:${focusClass},
109
- ${finalSelector}[aria-invalid="true"]:hover {
110
- outline-color: var(--d2l-theme-status-color-error);
111
- }
116
+ ${selectFocusStyles.ariaInvalid}
112
117
  }
113
118
  `;
114
119
  };
package/helpers/focus.js CHANGED
@@ -72,10 +72,13 @@ export function getFocusableDescendants(node, options) {
72
72
  return focusables;
73
73
  }
74
74
 
75
+ /**
76
+ * @deprecated Use getFocusVisibleStyles instead.
77
+ */
75
78
  export function getFocusPseudoClass() {
76
79
  return isFocusVisibleSupported() ? 'focus-visible' : 'focus';
77
80
  }
78
- export function getFocusRingStyles(selector, { extraStyles = null } = {}) {
81
+ export function getFocusRingStyles(selector, { extraStyles = null, preferContrastMediaQueryExtraStyles = null } = {}) {
79
82
  const stylesDelegate = selector => css`
80
83
  ${selector} {
81
84
  ${extraStyles ?? css``}
@@ -84,6 +87,7 @@ export function getFocusRingStyles(selector, { extraStyles = null } = {}) {
84
87
  }
85
88
  @media (prefers-contrast: more) {
86
89
  ${selector} {
90
+ ${preferContrastMediaQueryExtraStyles ?? css``}
87
91
  outline-color: Highlight;
88
92
  }
89
93
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@brightspace-ui/core",
3
- "version": "3.267.3",
3
+ "version": "3.268.0",
4
4
  "description": "A collection of accessible, free, open-source web components for building Brightspace applications",
5
5
  "type": "module",
6
6
  "repository": "https://github.com/BrightspaceUI/core.git",