carbon-react 104.22.0 → 104.24.1

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 (28) hide show
  1. package/lib/components/accordion/accordion.component.js +2 -2
  2. package/lib/components/dialog-full-screen/dialog-full-screen.component.d.ts +2 -2
  3. package/lib/components/dialog-full-screen/dialog-full-screen.component.js +3 -3
  4. package/lib/components/dialog-full-screen/dialog-full-screen.d.ts +2 -2
  5. package/lib/components/drawer/drawer.component.js +1 -2
  6. package/lib/components/flat-table/flat-table-checkbox/flat-table-checkbox.component.js +14 -3
  7. package/lib/components/menu/__internal__/submenu/submenu.style.js +31 -40
  8. package/lib/components/menu/menu-divider/menu-divider.style.js +4 -6
  9. package/lib/components/menu/menu-full-screen/menu-full-screen.style.js +9 -11
  10. package/lib/components/menu/menu-item/menu-item.style.js +110 -80
  11. package/lib/components/menu/menu-segment-title/menu-segment-title.style.js +5 -7
  12. package/lib/components/menu/menu.config.d.ts +95 -0
  13. package/lib/components/menu/menu.config.js +65 -0
  14. package/lib/components/menu/menu.style.js +8 -10
  15. package/lib/components/menu/scrollable-block/scrollable-block.style.js +4 -8
  16. package/lib/components/menu/submenu-block/submenu-block.style.js +4 -8
  17. package/lib/components/popover-container/popover-container.component.d.ts +2 -1
  18. package/lib/components/popover-container/popover-container.component.js +7 -4
  19. package/lib/components/text-editor/__internal__/editor-counter/editor-counter.style.js +2 -8
  20. package/lib/components/text-editor/__internal__/toolbar/toolbar-button/toolbar-button.style.js +3 -9
  21. package/lib/components/text-editor/__internal__/toolbar/toolbar.style.js +3 -18
  22. package/lib/components/text-editor/text-editor.style.js +5 -13
  23. package/lib/components/textbox/textbox.component.js +1 -1
  24. package/lib/style/themes/aegean/aegean-theme.config.d.ts +9 -0
  25. package/lib/style/themes/aegean/aegean-theme.config.js +9 -0
  26. package/lib/style/themes/mint/mint-theme.config.d.ts +9 -0
  27. package/lib/style/themes/mint/mint-theme.config.js +9 -0
  28. package/package.json +1 -1
@@ -113,9 +113,9 @@ const Accordion = /*#__PURE__*/_react.default.forwardRef(({
113
113
  isExpanded: isExpanded,
114
114
  buttonHeading: buttonHeading,
115
115
  buttonWidth: buttonWidth,
116
- hasButtonProps: buttonHeading && headerSpacing
116
+ hasButtonProps: buttonHeading && headerSpacing,
117
+ role: "button"
117
118
  }, buttonHeading && {
118
- role: "button",
119
119
  p: 0
120
120
  }, headerSpacing), /*#__PURE__*/_react.default.createElement(_accordion.StyledAccordionHeadingsContainer, {
121
121
  "data-element": "accordion-headings-container",
@@ -34,7 +34,7 @@ declare namespace DialogFullScreen {
34
34
  */
35
35
  "aria-label": PropTypes.Requireable<string>;
36
36
  /**
37
- * Prop to specify the aria-labeledby property of the DialogFullscreen component
37
+ * Prop to specify the aria-labelledby property of the DialogFullscreen component
38
38
  * To be used when the title prop is a custom React Node,
39
39
  * or the component is labelled by an internal element other than the title.
40
40
  */
@@ -71,7 +71,7 @@ declare namespace DialogFullScreen {
71
71
  contentRef: PropTypes.Requireable<((...args: any[]) => any) | PropTypes.InferProps<{
72
72
  current: PropTypes.Requireable<Element>;
73
73
  }>>;
74
- /** The ARIA role to be applied to the DialogFulscreen container */
74
+ /** The ARIA role to be applied to the DialogFullscreen container */
75
75
  role: PropTypes.Requireable<string>;
76
76
  };
77
77
  }
@@ -111,7 +111,7 @@ const DialogFullScreen = ({
111
111
  focusFirstElement: focusFirstElement,
112
112
  wrapperRef: dialogRef
113
113
  }, /*#__PURE__*/_react.default.createElement(_dialogFullScreen.default, _extends({
114
- "aria-modal": true
114
+ "aria-modal": role === "dialog" ? true : undefined
115
115
  }, ariaProps, {
116
116
  ref: dialogRef,
117
117
  "data-element": "dialog-full-screen",
@@ -140,7 +140,7 @@ DialogFullScreen.propTypes = {
140
140
  "aria-label": _propTypes.default.string,
141
141
 
142
142
  /**
143
- * Prop to specify the aria-labeledby property of the DialogFullscreen component
143
+ * Prop to specify the aria-labelledby property of the DialogFullscreen component
144
144
  * To be used when the title prop is a custom React Node,
145
145
  * or the component is labelled by an internal element other than the title.
146
146
  */
@@ -192,7 +192,7 @@ DialogFullScreen.propTypes = {
192
192
  current: _propTypes.default.instanceOf(Element)
193
193
  })]),
194
194
 
195
- /** The ARIA role to be applied to the DialogFulscreen container */
195
+ /** The ARIA role to be applied to the DialogFullscreen container */
196
196
  role: _propTypes.default.string
197
197
  };
198
198
  var _default = DialogFullScreen;
@@ -10,7 +10,7 @@ export interface DialogFullScreenProps extends ModalProps {
10
10
  */
11
11
  "aria-label"?: string;
12
12
  /**
13
- * Prop to specify the aria-labeledby property of the DialogFullscreen component
13
+ * Prop to specify the aria-labelledby property of the DialogFullscreen component
14
14
  * To be used when the title prop is a custom React Node,
15
15
  * or the component is labelled by an internal element other than the title.
16
16
  */
@@ -39,7 +39,7 @@ export interface DialogFullScreenProps extends ModalProps {
39
39
  subtitle?: string;
40
40
  /** Title displayed at top of dialog */
41
41
  title?: React.ReactNode;
42
- /** The ARIA role to be applied to the DialogFulscreen container */
42
+ /** The ARIA role to be applied to the DialogFullscreen container */
43
43
  role?: string;
44
44
  }
45
45
 
@@ -147,7 +147,6 @@ const Drawer = ({
147
147
  expandedWidth: expandedWidth,
148
148
  animationDuration: animationDuration,
149
149
  className: getClassNames(),
150
- "aria-expanded": isExpanded ? "true" : "false",
151
150
  ref: drawerSidebarContentRef,
152
151
  backgroundColor: backgroundColor
153
152
  }, stickyHeader && /*#__PURE__*/_react.default.createElement(_drawer.StyledSidebarHeader, {
@@ -157,7 +156,7 @@ const Drawer = ({
157
156
  id: sidebarId,
158
157
  isExpanded: isExpanded,
159
158
  role: "navigation",
160
- overflowY: "auto",
159
+ overflowY: isExpanded ? "auto" : undefined,
161
160
  scrollVariant: "light",
162
161
  ref: scrollableContentRef
163
162
  }, /*#__PURE__*/_react.default.createElement(DrawerSidebarContext.Provider, {
@@ -37,19 +37,30 @@ const FlatTableCheckbox = ({
37
37
  }
38
38
  }, [reportCellWidth, cellIndex]);
39
39
  const dataElement = `flat-table-checkbox-${as === "td" ? "cell" : "header"}`;
40
+
41
+ const handleClick = event => {
42
+ event.stopPropagation();
43
+ if (onClick) onClick(event);
44
+ };
45
+
46
+ const handleKeyDown = event => {
47
+ event.stopPropagation();
48
+ };
49
+
40
50
  return /*#__PURE__*/_react.default.createElement(_flatTableCheckbox.default, {
41
51
  ref: ref,
42
52
  makeCellSticky: !!reportCellWidth,
43
53
  leftPosition: leftPosition || 0,
44
54
  "data-element": dataElement,
45
- as: as,
46
- onClick: onClick
55
+ as: as
47
56
  }, selectable && /*#__PURE__*/_react.default.createElement(_checkbox.Checkbox, {
48
57
  checked: checked,
49
58
  onChange: onChange,
50
59
  name: "flat-table-checkbox",
51
60
  mb: 0,
52
- ariaLabelledBy: ariaLabelledBy
61
+ ariaLabelledBy: ariaLabelledBy,
62
+ onClick: handleClick,
63
+ onKeyDown: handleKeyDown
53
64
  }));
54
65
  };
55
66
 
@@ -17,10 +17,10 @@ var _menuItem = _interopRequireDefault(require("../../menu-item/menu-item.style"
17
17
 
18
18
  var _icon = _interopRequireDefault(require("../../../icon/icon.style"));
19
19
 
20
- var _scrollableBlock = _interopRequireDefault(require("../../scrollable-block/scrollable-block.style"));
21
-
22
20
  var _search = _interopRequireDefault(require("../../../search/search.style"));
23
21
 
22
+ var _menu2 = _interopRequireDefault(require("../../menu.config"));
23
+
24
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
25
 
26
26
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -42,15 +42,14 @@ const StyledSubmenuWrapper = _styledComponents.default.div`
42
42
  ${({
43
43
  inFullscreenView,
44
44
  menuType,
45
- asPassiveItem,
46
- theme
45
+ asPassiveItem
47
46
  }) => inFullscreenView && (0, _styledComponents.css)`
48
47
  width: 100%;
49
48
 
50
49
  ${asPassiveItem && (0, _styledComponents.css)`
51
50
  ${_menuItem.default} {
52
51
  outline: none;
53
- color: ${theme.menu[menuType].title};
52
+ color: ${_menu2.default[menuType].title};
54
53
  }
55
54
  `}
56
55
  `}
@@ -59,16 +58,14 @@ exports.StyledSubmenuWrapper = StyledSubmenuWrapper;
59
58
  const StyledSubmenu = _styledComponents.default.ul`
60
59
  ${({
61
60
  menuType,
62
- theme,
63
61
  submenuDirection,
64
62
  variant,
65
63
  inFullscreenView
66
64
  }) => (0, _styledComponents.css)`
67
65
  ${!inFullscreenView && (0, _styledComponents.css)`
68
- box-shadow: 0 5px 5px 0 rgba(0, 20, 29, 0.2),
69
- 0 10px 10px 0 rgba(0, 20, 29, 0.1);
66
+ box-shadow: var(--boxShadow100);
70
67
  position: absolute;
71
- background: ${variant === "default" ? theme.menu[menuType].submenuBackground : theme.menu[menuType].background};
68
+ background-color: ${variant === "default" ? _menu2.default[menuType].submenuItemBackground : _menu2.default[menuType].background};
72
69
  a,
73
70
  button,
74
71
  ${_link.StyledLink} a,
@@ -93,17 +90,6 @@ const StyledSubmenu = _styledComponents.default.ul`
93
90
  display: none;
94
91
  }
95
92
 
96
- .carbon-menu-item--has-link:hover {
97
- background: ${theme.colors.primary};
98
- cursor: pointer;
99
- color: white;
100
- text-decoration: none;
101
-
102
- [data-component="icon"] {
103
- color: white;
104
- }
105
- }
106
-
107
93
  ${_menuItem.default} {
108
94
  display: flex;
109
95
  align-items: center;
@@ -112,13 +98,24 @@ const StyledSubmenu = _styledComponents.default.ul`
112
98
  white-space: nowrap;
113
99
  cursor: pointer;
114
100
 
115
- ${!inFullscreenView && `background-color: ${theme.menu[menuType].submenuBackground};`}
101
+ ${!inFullscreenView && (0, _styledComponents.css)`
102
+ background-color: ${_menu2.default[menuType].submenuItemBackground};
116
103
 
117
- &:hover,
118
- &:hover a,
119
- a &:hover {
120
- color: ${theme.colors.white};
121
- }
104
+ a:focus,
105
+ button:focus {
106
+ background-color: ${_menu2.default[menuType].submenuItemBackground};
107
+ }
108
+
109
+ a:hover,
110
+ button:hover {
111
+ background-color: ${_menu2.default[menuType].submenuItemBackgroundHover};
112
+ color: var(--colorsComponentsMenuYang100);
113
+
114
+ [data-component="icon"] {
115
+ color: var(--colorsComponentsMenuYang100);
116
+ }
117
+ }
118
+ `}
122
119
 
123
120
  a {
124
121
  text-decoration: none;
@@ -131,10 +128,16 @@ const StyledSubmenu = _styledComponents.default.ul`
131
128
  }
132
129
 
133
130
  ${_search.default} span > [data-component="icon"] {
134
- color: ${theme.menu[menuType].searchIcon};
131
+ color: var(--colorsUtilityMajor200);
135
132
 
136
133
  &:hover {
137
- color: ${theme.menu[menuType].searchIconHover};
134
+ color: var(--colorsUtilityMajor150);
135
+ }
136
+ }
137
+
138
+ ${_search.default} {
139
+ :hover {
140
+ border-bottom-color: var(--colorsUtilityMajor150);
138
141
  }
139
142
  }
140
143
  }
@@ -167,24 +170,12 @@ const StyledSubmenu = _styledComponents.default.ul`
167
170
  width: 100%;
168
171
  }
169
172
 
170
- > *:not(${_menu.StyledMenuItem}):not(${_scrollableBlock.default}) {
171
- padding: 8px 15px 10px;
172
- background-color: ${theme.colors.white};
173
-
174
- ${menuType === "dark" && (0, _styledComponents.css)`
175
- background-color: #1b1d21;
176
- `}
177
- }
178
-
179
173
  ${submenuDirection === "left" && (0, _styledComponents.css)`
180
174
  right: 0;
181
175
  `}
182
176
  `}
183
177
  `;
184
178
  exports.StyledSubmenu = StyledSubmenu;
185
- StyledSubmenu.defaultProps = {
186
- theme: _themes.baseTheme
187
- };
188
179
  StyledSubmenuWrapper.defaultProps = {
189
180
  theme: _themes.baseTheme
190
181
  };
@@ -7,7 +7,9 @@ exports.default = void 0;
7
7
 
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
 
10
- var _themes = require("../../../style/themes");
10
+ var _menu = _interopRequireDefault(require("../menu.config"));
11
+
12
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
13
 
12
14
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
13
15
 
@@ -17,16 +19,12 @@ const StyledDivider = _styledComponents.default.div`
17
19
  cursor: default;
18
20
  ${({
19
21
  menuType,
20
- theme,
21
22
  size
22
23
  }) => (0, _styledComponents.css)`
23
24
  margin: 0px ${size === "large" ? "" : "16px"};
24
25
  height: ${size === "large" ? "4px" : "1px"};
25
- background: ${theme.menu[menuType].divider};
26
+ background-color: ${_menu.default[menuType].divider};
26
27
  `}
27
28
  `;
28
- StyledDivider.defaultProps = {
29
- theme: _themes.baseTheme
30
- };
31
29
  var _default = StyledDivider;
32
30
  exports.default = _default;
@@ -19,6 +19,8 @@ var _icon = _interopRequireDefault(require("../../icon/icon.style"));
19
19
 
20
20
  var _button = _interopRequireDefault(require("../../button/button.style"));
21
21
 
22
+ var _menu = _interopRequireDefault(require("../menu.config"));
23
+
22
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
23
25
 
24
26
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -44,25 +46,25 @@ const StyledMenuFullscreen = _styledComponents.default.div`
44
46
  startPosition,
45
47
  theme
46
48
  }) => (0, _styledComponents.css)`
47
- background-color: ${theme.menu[menuType].background};
49
+ background-color: ${_menu.default[menuType].background};
48
50
  z-index: ${theme.zIndex.fullScreenModal};
49
51
 
50
52
  ${menuType === "dark" && (0, _styledComponents.css)`
51
53
  ${_search.default} span > [data-component="icon"] {
52
- color: ${theme.menu.dark.searchIcon};
54
+ color: var(--colorsUtilityMajor200);
53
55
 
54
56
  &:hover {
55
- color: ${theme.menu.dark.searchIconHover};
57
+ color: var(--colorsUtilityMajor150);
56
58
  }
57
59
  }
58
60
  `}
59
61
 
60
62
  ${menuType === "light" && (0, _styledComponents.css)`
61
63
  ${_search.default} span > [data-component="icon"] {
62
- color: ${theme.search.icon};
64
+ color: var(--colorsUtilityMajor200);
63
65
 
64
66
  &:hover {
65
- color: ${theme.search.iconHover};
67
+ color: var(--colorsUtilityMajor400);
66
68
  }
67
69
  }
68
70
  `}
@@ -117,16 +119,12 @@ const StyledMenuFullscreenHeader = _styledComponents.default.div`
117
119
  }
118
120
 
119
121
  ${({
120
- menuType,
121
- theme
122
+ menuType
122
123
  }) => (0, _styledComponents.css)`
123
- background-color: ${theme.menu[menuType].submenuBackground};
124
+ background-color: ${_menu.default[menuType].submenuItemBackground};
124
125
  `}
125
126
  `;
126
127
  exports.StyledMenuFullscreenHeader = StyledMenuFullscreenHeader;
127
128
  StyledMenuFullscreen.defaultProps = {
128
129
  theme: _themes.baseTheme
129
- };
130
- StyledMenuFullscreenHeader.defaultProps = {
131
- theme: _themes.baseTheme
132
130
  };
@@ -7,12 +7,12 @@ exports.default = void 0;
7
7
 
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
 
10
- var _themes = require("../../../style/themes");
11
-
12
10
  var _link = require("../../link/link.style");
13
11
 
14
12
  var _icon = _interopRequireDefault(require("../../icon/icon.style"));
15
13
 
14
+ var _menu = _interopRequireDefault(require("../menu.config"));
15
+
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
17
 
18
18
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -22,7 +22,6 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
22
22
  const StyledMenuItemWrapper = _styledComponents.default.a`
23
23
  ${({
24
24
  menuType,
25
- theme,
26
25
  selected,
27
26
  hasSubmenu,
28
27
  isOpen,
@@ -41,7 +40,7 @@ const StyledMenuItemWrapper = _styledComponents.default.a`
41
40
  height: 40px;
42
41
  position: relative;
43
42
  cursor: pointer;
44
- background-color: ${theme.menu[menuType].background};
43
+ background-color: ${_menu.default[menuType].background};
45
44
 
46
45
  ${!inFullscreenView && (0, _styledComponents.css)`
47
46
  max-width: inherit;
@@ -57,21 +56,27 @@ const StyledMenuItemWrapper = _styledComponents.default.a`
57
56
  vertical-align: bottom;
58
57
  `}
59
58
  }
60
- `}
61
59
 
62
- && a:focus,
63
- && button:focus {
64
- outline: none;
65
- box-shadow: inset 0 0 0 2px ${theme.colors.focus};
66
- background: ${theme.colors.primary};
67
- color: ${theme.colors.white};
68
- z-index: 1;
69
- position: relative;
70
-
71
- [data-component="icon"] {
72
- color: ${theme.colors.white};
60
+ a:focus,
61
+ button:focus {
62
+ box-shadow: inset 0 0 0 var(--borderWidth300)
63
+ var(--colorsSemanticFocus500);
64
+ background-color: ${_menu.default[menuType].background};
65
+ color: ${_menu.default[menuType].color};
66
+ z-index: 1;
67
+ position: relative;
73
68
  }
74
- }
69
+
70
+ a:hover,
71
+ button:hover {
72
+ background-color: var(--colorsComponentsMenuAutumnStandard600);
73
+ color: var(--colorsComponentsMenuYang100);
74
+
75
+ [data-component="icon"] {
76
+ color: var(--colorsComponentsMenuYang100);
77
+ }
78
+ }
79
+ `}
75
80
 
76
81
  a,
77
82
  ${_link.StyledLink} a,
@@ -96,86 +101,93 @@ const StyledMenuItemWrapper = _styledComponents.default.a`
96
101
  ${_link.StyledLink} [data-component="icon"] {
97
102
  font-weight: 700;
98
103
  text-decoration: none;
99
- color: ${theme.menu[menuType].text};
100
- }
101
-
102
- a:hover,
103
- a:focus,
104
- button:hover,
105
- button:focus {
106
- color: ${theme.colors.white};
107
- background: transparent;
108
- }
109
-
110
- a:focus,
111
- button:focus,
112
- ${_link.StyledLink} a:focus,
113
- ${_link.StyledLink} button:focus {
114
- color: ${theme.colors.white};
115
- box-shadow: inset 0 0 0 2px ${theme.colors.focus};
116
- background: ${theme.colors.primary};
117
- z-index: 1;
118
- position: relative;
104
+ color: ${_menu.default[menuType].color};
119
105
  }
120
106
 
121
107
  ${_icon.default} {
122
108
  bottom: 1px;
123
109
  }
124
110
 
125
- :hover {
126
- background: ${theme.colors.primary};
111
+ ${selected && (0, _styledComponents.css)`
112
+ background-color: ${_menu.default[menuType].selected};
127
113
 
128
- a,
129
- button,
130
- [data-component="icon"] {
131
- color: ${theme.colors.white};
114
+ a:focus,
115
+ button:focus {
116
+ background-color: ${_menu.default[menuType].selected};
132
117
  }
133
- }
134
118
 
135
- ${variant === "alternate" && (0, _styledComponents.css)`
136
- &&& {
137
- background-color: ${theme.menu[menuType].alternate};
119
+ a:hover,
120
+ button:hover {
121
+ background-color: var(--colorsComponentsMenuAutumnStandard600);
138
122
  }
139
123
  `}
140
124
 
141
- ${selected && (0, _styledComponents.css)`
142
- background-color: ${theme.menu[menuType].selected};
125
+ ${variant === "alternate" && !inFullscreenView && (0, _styledComponents.css)`
126
+ &&& {
127
+ background-color: ${_menu.default[menuType].alternate};
128
+ }
129
+
130
+ &&& a:focus,
131
+ &&& button:focus {
132
+ background-color: ${_menu.default[menuType].alternate};
133
+ }
134
+
135
+ &&& a:hover,
136
+ &&& button:hover {
137
+ background-color: ${_menu.default[menuType].alternateHover};
138
+ }
143
139
  `}
144
140
 
145
141
  ${isOpen && (0, _styledComponents.css)`
146
- background-color: ${theme.menu[menuType].submenuBackground};
147
- color: ${theme.colors.white};
142
+ a,
143
+ button {
144
+ background-color: ${_menu.default[menuType].submenuOpenedBackground};
145
+ color: ${_menu.default[menuType].color};
146
+ }
148
147
  `}
149
148
 
150
149
  ${hasSubmenu && (0, _styledComponents.css)`
150
+ background-color: ${_menu.default[menuType].submenuBackground};
151
+
152
+ a:focus,
153
+ button:focus {
154
+ background-color: ${_menu.default[menuType].submenuBackground};
155
+ color: ${_menu.default[menuType].color};
156
+
157
+ [data-component="icon"] {
158
+ color: ${_menu.default[menuType].color};
159
+ }
160
+
161
+ ${clickToOpen && isOpen && (0, _styledComponents.css)`
162
+ background-color: ${_menu.default[menuType].submenuOpenedBackground};
163
+ `}
164
+ }
165
+
151
166
  a:hover,
152
167
  button:hover {
153
168
  ${!(href || clickToOpen) && (0, _styledComponents.css)`
154
169
  cursor: default;
155
170
  `}
171
+ background-color: ${_menu.default[menuType].submenuOpenedBackground};
172
+ color: ${_menu.default[menuType].color};
173
+
174
+ [data-component="icon"] {
175
+ color: ${_menu.default[menuType].color};
176
+ }
156
177
  }
157
178
 
158
- ${!href && (0, _styledComponents.css)`
159
- && a:hover,
160
- && button:hover {
161
- background-color: ${theme.menu[menuType].submenuBackground};
162
- color: ${theme.menu[menuType].text};
179
+ ${selected && (0, _styledComponents.css)`
180
+ background-color: ${_menu.default[menuType].submenuSelected};
163
181
 
164
- [data-component="icon"] {
165
- color: ${theme.menu[menuType].text};
166
- }
182
+ a:focus,
183
+ button:focus {
184
+ background-color: ${_menu.default[menuType].submenuSelected};
167
185
  }
168
186
 
169
- && a:focus,
170
- && button:focus {
171
- background-color: ${theme.menu[menuType].submenuBackground};
172
- color: ${theme.menu[menuType].text};
173
-
174
- a,
175
- button,
176
- [data-component="icon"] {
177
- color: ${theme.menu[menuType].text};
178
- }
187
+ a:hover,
188
+ button:hover {
189
+ background-color: var(--colorsComponentsMenuAutumnStandard600);
190
+ color: var(--colorsComponentsMenuYang100);
179
191
  }
180
192
  `}
181
193
 
@@ -183,13 +195,6 @@ const StyledMenuItemWrapper = _styledComponents.default.a`
183
195
  > a,
184
196
  > button {
185
197
  padding-right: 32px;
186
-
187
- ${href && (0, _styledComponents.css)`
188
- &:hover::before,
189
- &:focus::before {
190
- border-top-color: ${theme.colors.white};
191
- }
192
- `}
193
198
  }
194
199
 
195
200
  a::before,
@@ -204,7 +209,7 @@ const StyledMenuItemWrapper = _styledComponents.default.a`
204
209
  content: "";
205
210
  width: 0;
206
211
  height: 0;
207
- border-top: 5px solid ${theme.menu[menuType].text};
212
+ border-top: 5px solid ${_menu.default[menuType].text};
208
213
  border-right: 4px solid transparent;
209
214
  border-bottom: 4px solid transparent;
210
215
  border-left: 4px solid transparent;
@@ -225,11 +230,36 @@ const StyledMenuItemWrapper = _styledComponents.default.a`
225
230
  background: transparent;
226
231
  }
227
232
  `}
233
+
234
+ a,
235
+ ${_link.StyledLink} a,
236
+ button,
237
+ ${_link.StyledLink} button {
238
+ width: 100vw;
239
+ box-sizing: border-box;
240
+ }
241
+
242
+ a:focus,
243
+ button:focus {
244
+ box-shadow: inset 0 0 0 var(--borderWidth300)
245
+ var(--colorsSemanticFocus500);
246
+ z-index: 1;
247
+ position: relative;
248
+ }
249
+
250
+ a:focus,
251
+ a:hover,
252
+ button:focus,
253
+ button:hover {
254
+ background-color: var(--colorsComponentsMenuAutumnStandard600);
255
+ color: var(--colorsComponentsMenuYang100);
256
+
257
+ [data-component="icon"] {
258
+ color: var(--colorsComponentsMenuYang100);
259
+ }
260
+ }
228
261
  `}
229
262
  `}
230
263
  `;
231
- StyledMenuItemWrapper.defaultProps = {
232
- theme: _themes.baseTheme
233
- };
234
264
  var _default = StyledMenuItemWrapper;
235
265
  exports.default = _default;
@@ -7,7 +7,9 @@ exports.default = void 0;
7
7
 
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
 
10
- var _themes = require("../../../style/themes");
10
+ var _menu = _interopRequireDefault(require("../menu.config"));
11
+
12
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
13
 
12
14
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
13
15
 
@@ -16,7 +18,6 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
16
18
  const StyledTitle = _styledComponents.default.div`
17
19
  ${({
18
20
  menuType,
19
- theme,
20
21
  variant
21
22
  }) => (0, _styledComponents.css)`
22
23
  padding: 16px 16px 8px;
@@ -25,12 +26,9 @@ const StyledTitle = _styledComponents.default.div`
25
26
  text-transform: uppercase;
26
27
  line-height: 12px;
27
28
  cursor: default;
28
- color: ${theme.menu[menuType].title};
29
- ${variant === "alternate" ? `background: ${theme.menu[menuType].alternate};` : ""};
29
+ color: ${_menu.default[menuType].title};
30
+ ${variant === "alternate" && `background-color: ${_menu.default[menuType].alternate};`};
30
31
  `}
31
32
  `;
32
- StyledTitle.defaultProps = {
33
- theme: _themes.baseTheme
34
- };
35
33
  var _default = StyledTitle;
36
34
  exports.default = _default;
@@ -0,0 +1,95 @@
1
+ declare namespace _default {
2
+ namespace light {
3
+ const background: string;
4
+ const color: string;
5
+ const selected: string;
6
+ const submenuOpenedBackground: string;
7
+ const submenuBackground: string;
8
+ const submenuSelected: string;
9
+ const submenuItemBackground: string;
10
+ const submenuItemBackgroundHover: string;
11
+ const title: string;
12
+ const alternate: string;
13
+ const alternateHover: string;
14
+ const divider: string;
15
+ }
16
+ namespace dark {
17
+ const background_1: string;
18
+ export { background_1 as background };
19
+ const color_1: string;
20
+ export { color_1 as color };
21
+ const selected_1: string;
22
+ export { selected_1 as selected };
23
+ const submenuOpenedBackground_1: string;
24
+ export { submenuOpenedBackground_1 as submenuOpenedBackground };
25
+ const submenuBackground_1: string;
26
+ export { submenuBackground_1 as submenuBackground };
27
+ const submenuSelected_1: string;
28
+ export { submenuSelected_1 as submenuSelected };
29
+ const submenuItemBackground_1: string;
30
+ export { submenuItemBackground_1 as submenuItemBackground };
31
+ const submenuItemBackgroundHover_1: string;
32
+ export { submenuItemBackgroundHover_1 as submenuItemBackgroundHover };
33
+ const title_1: string;
34
+ export { title_1 as title };
35
+ const alternate_1: string;
36
+ export { alternate_1 as alternate };
37
+ const alternateHover_1: string;
38
+ export { alternateHover_1 as alternateHover };
39
+ const divider_1: string;
40
+ export { divider_1 as divider };
41
+ }
42
+ namespace black {
43
+ const background_2: string;
44
+ export { background_2 as background };
45
+ const color_2: string;
46
+ export { color_2 as color };
47
+ const selected_2: string;
48
+ export { selected_2 as selected };
49
+ const submenuOpenedBackground_2: string;
50
+ export { submenuOpenedBackground_2 as submenuOpenedBackground };
51
+ const submenuBackground_2: string;
52
+ export { submenuBackground_2 as submenuBackground };
53
+ const submenuSelected_2: string;
54
+ export { submenuSelected_2 as submenuSelected };
55
+ const submenuItemBackground_2: string;
56
+ export { submenuItemBackground_2 as submenuItemBackground };
57
+ const submenuItemBackgroundHover_2: string;
58
+ export { submenuItemBackgroundHover_2 as submenuItemBackgroundHover };
59
+ const title_2: string;
60
+ export { title_2 as title };
61
+ const alternate_2: string;
62
+ export { alternate_2 as alternate };
63
+ const alternateHover_2: string;
64
+ export { alternateHover_2 as alternateHover };
65
+ const divider_2: string;
66
+ export { divider_2 as divider };
67
+ }
68
+ namespace white {
69
+ const background_3: string;
70
+ export { background_3 as background };
71
+ const color_3: string;
72
+ export { color_3 as color };
73
+ const selected_3: string;
74
+ export { selected_3 as selected };
75
+ const submenuOpenedBackground_3: string;
76
+ export { submenuOpenedBackground_3 as submenuOpenedBackground };
77
+ const submenuBackground_3: string;
78
+ export { submenuBackground_3 as submenuBackground };
79
+ const submenuSelected_3: string;
80
+ export { submenuSelected_3 as submenuSelected };
81
+ const submenuItemBackground_3: string;
82
+ export { submenuItemBackground_3 as submenuItemBackground };
83
+ const submenuItemBackgroundHover_3: string;
84
+ export { submenuItemBackgroundHover_3 as submenuItemBackgroundHover };
85
+ const title_3: string;
86
+ export { title_3 as title };
87
+ const alternate_3: string;
88
+ export { alternate_3 as alternate };
89
+ const alternateHover_3: string;
90
+ export { alternateHover_3 as alternateHover };
91
+ const divider_3: string;
92
+ export { divider_3 as divider };
93
+ }
94
+ }
95
+ export default _default;
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+ var _default = {
8
+ light: {
9
+ background: "var(--colorsComponentsMenuSpringStandard500)",
10
+ color: "var(--colorsComponentsMenuYin090)",
11
+ selected: "var(--colorsComponentsMenuSpringStandard700)",
12
+ submenuOpenedBackground: "var(--colorsComponentsMenuSpringParent600)",
13
+ submenuBackground: "var(--colorsComponentsMenuSpringParent500)",
14
+ submenuSelected: "var(--colorsComponentsMenuSpringParent700)",
15
+ submenuItemBackground: "var(--colorsComponentsMenuSpringChild500)",
16
+ submenuItemBackgroundHover: "var(--colorsComponentsMenuSpringChild600)",
17
+ title: "var(--colorsComponentsMenuYin065)",
18
+ alternate: "var(--colorsComponentsMenuSpringChildAlt500)",
19
+ alternateHover: "var(--colorsComponentsMenuSpringChildAlt600)",
20
+ divider: "var(--colorsComponentsMenuSpringChild400)"
21
+ },
22
+ dark: {
23
+ background: "var(--colorsComponentsMenuAutumnStandard500)",
24
+ color: "var(--colorsComponentsMenuYang100)",
25
+ selected: "var(--colorsComponentsMenuAutumnStandard700)",
26
+ submenuOpenedBackground: "var(--colorsComponentsMenuAutumnParent600)",
27
+ submenuBackground: "var(--colorsComponentsMenuAutumnParent500)",
28
+ submenuSelected: "var(--colorsComponentsMenuAutumnParent700)",
29
+ submenuItemBackground: "var(--colorsComponentsMenuAutumnChild500)",
30
+ submenuItemBackgroundHover: "var(--colorsComponentsMenuAutumnChild600)",
31
+ title: "var(--colorsComponentsMenuYang080)",
32
+ alternate: "var(--colorsComponentsMenuAutumnChildAlt500)",
33
+ alternateHover: "var(--colorsComponentsMenuAutumnChildAlt600)",
34
+ divider: "var(--colorsComponentsMenuAutumnChild400)"
35
+ },
36
+ black: {
37
+ background: "var(--colorsComponentsMenuWinterStandard500)",
38
+ color: "var(--colorsComponentsMenuYang100)",
39
+ selected: "var(--colorsComponentsMenuWinterStandard700)",
40
+ submenuOpenedBackground: "var(--colorsComponentsMenuWinterParent600)",
41
+ submenuBackground: "var(--colorsComponentsMenuWinterParent500)",
42
+ submenuSelected: "var(--colorsComponentsMenuWinterParent700)",
43
+ submenuItemBackground: "var(--colorsComponentsMenuWinterChild500)",
44
+ submenuItemBackgroundHover: "var(--colorsComponentsMenuWinterChild600)",
45
+ title: "var(--colorsComponentsMenuYang080)",
46
+ alternate: "var(--colorsComponentsMenuWinterChildAlt500)",
47
+ alternateHover: "var(--colorsComponentsMenuWinterChildAlt600)",
48
+ divider: "var(--colorsComponentsMenuWinterChild400)"
49
+ },
50
+ white: {
51
+ background: "var(--colorsComponentsMenuSummerStandard500)",
52
+ color: "var(--colorsComponentsMenuYin090)",
53
+ selected: "var(--colorsComponentsMenuSummerStandard700)",
54
+ submenuOpenedBackground: "var(--colorsComponentsMenuSummerParent600)",
55
+ submenuBackground: "var(--colorsComponentsMenuSummerParent500)",
56
+ submenuSelected: "var(--colorsComponentsMenuSummerParent700)",
57
+ submenuItemBackground: "var(--colorsComponentsMenuSummerChild500)",
58
+ submenuItemBackgroundHover: "var(--colorsComponentsMenuSummerChild600)",
59
+ title: "var(--colorsComponentsMenuYin065)",
60
+ alternate: "var(--colorsComponentsMenuSummerChildAlt500)",
61
+ alternateHover: "var(--colorsComponentsMenuSummerChildAlt600)",
62
+ divider: "var(--colorsComponentsMenuSummerChild400)"
63
+ }
64
+ };
65
+ exports.default = _default;
@@ -9,12 +9,14 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
 
10
10
  var _styledSystem = require("styled-system");
11
11
 
12
- var _verticalDivider = require("../vertical-divider/vertical-divider.style");
12
+ var _menu = _interopRequireDefault(require("./menu.config"));
13
13
 
14
- var _themes = require("../../style/themes");
14
+ var _verticalDivider = require("../vertical-divider/vertical-divider.style");
15
15
 
16
16
  var _link = require("../link/link.style");
17
17
 
18
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
+
18
20
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
19
21
 
20
22
  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -31,15 +33,14 @@ const StyledMenuWrapper = _styledComponents.default.ul`
31
33
 
32
34
  ${_verticalDivider.StyledVerticalWrapper} {
33
35
  ${({
34
- menuType,
35
- theme
36
+ menuType
36
37
  }) => (0, _styledComponents.css)`
37
38
  display: inline-block;
38
39
  vertical-align: bottom;
39
- background-color: ${theme.menu[menuType].background};
40
+ background-color: ${_menu.default[menuType].background};
40
41
 
41
42
  ${menuType === "dark" && (0, _styledComponents.css)`
42
- color: ${theme.colors.white};
43
+ color: ${_menu.default[menuType].color};
43
44
  `}
44
45
  `}
45
46
 
@@ -80,7 +81,4 @@ const StyledMenuItem = _styledComponents.default.li`
80
81
  }
81
82
  `}
82
83
  `;
83
- exports.StyledMenuItem = StyledMenuItem;
84
- StyledMenuWrapper.defaultProps = {
85
- theme: _themes.baseTheme
86
- };
84
+ exports.StyledMenuItem = StyledMenuItem;
@@ -7,10 +7,10 @@ exports.default = void 0;
7
7
 
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
 
10
- var _themes = require("../../../style/themes");
11
-
12
10
  var _menuItem = _interopRequireDefault(require("../menu-item/menu-item.style"));
13
11
 
12
+ var _menu = _interopRequireDefault(require("../menu.config"));
13
+
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
 
16
16
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -20,16 +20,12 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
20
20
  const StyledScrollableBlock = _styledComponents.default.div`
21
21
  ${({
22
22
  menuType,
23
- variant,
24
- theme
23
+ variant
25
24
  }) => (0, _styledComponents.css)`
26
25
  && ${_menuItem.default} {
27
- background-color: ${variant === "default" ? theme.menu[menuType].submenuBackground : theme.menu[menuType].background};
26
+ background-color: ${variant === "default" ? _menu.default[menuType].submenuItemBackground : _menu.default[menuType].background};
28
27
  }
29
28
  `}
30
29
  `;
31
- StyledScrollableBlock.defaultProps = {
32
- theme: _themes.baseTheme
33
- };
34
30
  var _default = StyledScrollableBlock;
35
31
  exports.default = _default;
@@ -7,10 +7,10 @@ exports.default = void 0;
7
7
 
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
 
10
- var _themes = require("../../../style/themes");
11
-
12
10
  var _menuItem = _interopRequireDefault(require("../menu-item/menu-item.style"));
13
11
 
12
+ var _menu = _interopRequireDefault(require("../menu.config"));
13
+
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
 
16
16
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -20,18 +20,14 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
20
20
  const StyledSubmenuBlock = _styledComponents.default.div`
21
21
  ${({
22
22
  menuType,
23
- theme,
24
23
  variant
25
24
  }) => (0, _styledComponents.css)`
26
- background-color: ${theme.menu[menuType].submenuBackground};
25
+ background-color: ${_menu.default[menuType].submenuItemBackground};
27
26
 
28
27
  ${_menuItem.default} {
29
- background-color: ${variant === "default" ? "transparent" : theme.menu[menuType].alternate};
28
+ background-color: ${variant === "default" ? "transparent" : _menu.default[menuType].alternate};
30
29
  }
31
30
  `}
32
31
  `;
33
- StyledSubmenuBlock.defaultProps = {
34
- theme: _themes.baseTheme
35
- };
36
32
  var _default = StyledSubmenuBlock;
37
33
  exports.default = _default;
@@ -36,12 +36,13 @@ declare namespace PopoverContainer {
36
36
  export { position_1 as position };
37
37
  const shouldCoverButton_1: boolean;
38
38
  export { shouldCoverButton_1 as shouldCoverButton };
39
- export function renderOpenComponent_1({ tabIndex, onClick, dataElement, ref, ariaLabel, }: {
39
+ export function renderOpenComponent_1({ tabIndex, onClick, dataElement, ref, ariaLabel, id, }: {
40
40
  tabIndex: any;
41
41
  onClick: any;
42
42
  dataElement: any;
43
43
  ref: any;
44
44
  ariaLabel: any;
45
+ id: any;
45
46
  }): JSX.Element;
46
47
  export { renderOpenComponent_1 as renderOpenComponent };
47
48
  export function renderCloseComponent_1({ dataElement, tabIndex, onClick, ref, ariaLabel, }: {
@@ -78,7 +78,8 @@ const PopoverContainer = ({
78
78
  dataElement: "popover-container-open-component",
79
79
  onClick: handleOpenButtonClick,
80
80
  ref: openButtonRef,
81
- ariaLabel: openButtonAriaLabel || title
81
+ ariaLabel: openButtonAriaLabel || title,
82
+ id: isOpen ? undefined : popoverContainerId
82
83
  };
83
84
  const renderCloseComponentProps = {
84
85
  dataElement: "popover-container-close-component",
@@ -90,7 +91,7 @@ const PopoverContainer = ({
90
91
  return /*#__PURE__*/_react.default.createElement(_popoverContainer.PopoverContainerWrapperStyle, {
91
92
  "data-component": "popover-container",
92
93
  role: "region",
93
- "aria-labelledby": isOpen ? popoverContainerId : undefined
94
+ "aria-labelledby": popoverContainerId
94
95
  }, renderOpenComponent(renderOpenComponentProps), /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.Transition, {
95
96
  in: isOpen,
96
97
  timeout: {
@@ -173,7 +174,8 @@ PopoverContainer.defaultProps = {
173
174
  onClick,
174
175
  dataElement,
175
176
  ref,
176
- ariaLabel
177
+ ariaLabel,
178
+ id
177
179
  /* eslint-enable react/prop-types */
178
180
 
179
181
  }) => /*#__PURE__*/_react.default.createElement(_popoverContainer.PopoverContainerOpenIcon, {
@@ -182,7 +184,8 @@ PopoverContainer.defaultProps = {
182
184
  "data-element": dataElement,
183
185
  ref: ref,
184
186
  "aria-label": ariaLabel,
185
- "aria-haspopup": true
187
+ "aria-haspopup": true,
188
+ id: id
186
189
  }, /*#__PURE__*/_react.default.createElement(_icon.default, {
187
190
  type: "settings"
188
191
  })),
@@ -7,15 +7,12 @@ exports.StyledCounterWrapper = exports.StyledCounter = void 0;
7
7
 
8
8
  var _styledComponents = _interopRequireDefault(require("styled-components"));
9
9
 
10
- var _base = _interopRequireDefault(require("../../../../style/themes/base"));
11
-
12
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
11
 
14
12
  const StyledCounter = _styledComponents.default.span`
15
13
  color: ${({
16
- theme,
17
14
  hasError
18
- }) => hasError ? `${theme.colors.error};` : `${theme.editor.counter};`}
15
+ }) => hasError ? "var(--colorsSemanticNegative500)" : "var(--colorsUtilityYin055)"};
19
16
  width: 100%;
20
17
  `;
21
18
  exports.StyledCounter = StyledCounter;
@@ -29,7 +26,4 @@ const StyledCounterWrapper = _styledComponents.default.div`
29
26
  text-align: right;
30
27
  align-items: center;
31
28
  `;
32
- exports.StyledCounterWrapper = StyledCounterWrapper;
33
- StyledCounter.defaultProps = {
34
- theme: _base.default
35
- };
29
+ exports.StyledCounterWrapper = StyledCounterWrapper;
@@ -7,8 +7,6 @@ exports.default = void 0;
7
7
 
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
9
 
10
- var _base = _interopRequireDefault(require("../../../../../style/themes/base"));
11
-
12
10
  var _icon = _interopRequireDefault(require("../../../../icon/icon.style"));
13
11
 
14
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -32,26 +30,22 @@ const StyledToolbarButton = _styledComponents.default.button.attrs({
32
30
  }
33
31
 
34
32
  ${({
35
- theme,
36
33
  isActive
37
34
  }) => (0, _styledComponents.css)`
38
35
  :focus,
39
36
  :active {
40
- outline: 2px solid ${theme.colors.focus};
37
+ outline: 2px solid var(--colorsSemanticFocus500);
41
38
  outline-offset: -2px;
42
39
  }
43
40
 
44
41
  :hover {
45
- background-color: ${theme.editor.button.hover};
42
+ background-color: var(--colorsActionMinor200);
46
43
  }
47
44
 
48
45
  ${isActive && (0, _styledComponents.css)`
49
- background-color: ${theme.editor.button.hover};
46
+ background-color: var(--colorsActionMinor200);
50
47
  `}
51
48
  `}
52
49
  `;
53
- StyledToolbarButton.defaultProps = {
54
- theme: _base.default
55
- };
56
50
  var _default = StyledToolbarButton;
57
51
  exports.default = _default;
@@ -9,8 +9,6 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
9
9
 
10
10
  var _button = _interopRequireDefault(require("../../../button/button.style"));
11
11
 
12
- var _base = _interopRequireDefault(require("../../../../style/themes/base"));
13
-
14
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
13
 
16
14
  const StyledToolbar = _styledComponents.default.div`
@@ -23,19 +21,12 @@ const StyledToolbar = _styledComponents.default.div`
23
21
  user-select: none;
24
22
  order: 2;
25
23
  border: none;
26
- ${({
27
- theme
28
- }) => `
29
- background-color: ${theme.editor.toolbar.background};
30
- border-top: 1px solid ${theme.editor.border};
31
- `}
24
+ border-top: 1px solid var(--colorsUtilityMajor200);
25
+ background-color: var(--colorsUtilityMajor025);
32
26
  min-width: 290px;
33
27
  z-index: 10;
34
28
  `;
35
29
  exports.StyledToolbar = StyledToolbar;
36
- StyledToolbar.defaultProps = {
37
- theme: _base.default
38
- };
39
30
  const StyledEditorStyleControls = _styledComponents.default.div`
40
31
  display: inline-block;
41
32
  text-align: left;
@@ -44,9 +35,6 @@ const StyledEditorStyleControls = _styledComponents.default.div`
44
35
  margin-left: -2px;
45
36
  `;
46
37
  exports.StyledEditorStyleControls = StyledEditorStyleControls;
47
- StyledEditorStyleControls.defaultProps = {
48
- theme: _base.default
49
- };
50
38
  const StyledEditorActionControls = _styledComponents.default.div`
51
39
  display: inline-block;
52
40
  text-align: right;
@@ -58,7 +46,4 @@ const StyledEditorActionControls = _styledComponents.default.div`
58
46
  min-height: 33px;
59
47
  }
60
48
  `;
61
- exports.StyledEditorActionControls = StyledEditorActionControls;
62
- StyledEditorActionControls.defaultProps = {
63
- theme: _base.default
64
- };
49
+ exports.StyledEditorActionControls = StyledEditorActionControls;
@@ -29,7 +29,6 @@ StyledEditorWrapper.defaultProps = {
29
29
  };
30
30
  const StyledEditorContainer = _styledComponents.default.div`
31
31
  ${({
32
- theme,
33
32
  hasError,
34
33
  rows,
35
34
  hasPreview
@@ -50,7 +49,7 @@ const StyledEditorContainer = _styledComponents.default.div`
50
49
  min-height: inherit;
51
50
  height: 100%;
52
51
  min-width: 290px;
53
- background-color: ${theme.colors.white};
52
+ background-color: var(--colorsUtilityYang100);
54
53
  line-height: ${lineHeight}px;
55
54
 
56
55
  ${!(0, _browserTypeCheck.isSafari)(navigator) && (0, _styledComponents.css)`
@@ -70,17 +69,13 @@ const StyledEditorContainer = _styledComponents.default.div`
70
69
  padding: 14px 8px;
71
70
  }
72
71
 
73
- background-color: ${theme.colors.white};
74
- outline: ${hasError ? `2px solid ${theme.colors.error};` : `1px solid ${theme.editor.border};`};
72
+ background-color: var(--colorsUtilityYang100);
73
+ outline: ${hasError ? "2px solid var(--colorsSemanticNegative500)" : "1px solid var(--colorsUtilityMajor200)"};
75
74
  `}
76
75
  `;
77
76
  exports.StyledEditorContainer = StyledEditorContainer;
78
- StyledEditorContainer.defaultProps = {
79
- theme: _base.default
80
- };
81
77
  const StyledEditorOutline = _styledComponents.default.div`
82
78
  ${({
83
- theme,
84
79
  isFocused,
85
80
  hasError
86
81
  }) => (0, _styledComponents.css)`
@@ -88,12 +83,9 @@ const StyledEditorOutline = _styledComponents.default.div`
88
83
  min-width: 320px;
89
84
 
90
85
  ${isFocused && (0, _styledComponents.css)`
91
- outline: 3px solid ${theme.colors.focus};
86
+ outline: 3px solid var(--colorsSemanticFocus500);
92
87
  outline-offset: ${hasError ? "2px;" : "1px;"};
93
88
  `}
94
89
  `}
95
90
  `;
96
- exports.StyledEditorOutline = StyledEditorOutline;
97
- StyledEditorOutline.defaultProps = {
98
- theme: _base.default
99
- };
91
+ exports.StyledEditorOutline = StyledEditorOutline;
@@ -106,7 +106,7 @@ const Textbox = ({
106
106
  labelHelp,
107
107
  fieldHelp
108
108
  });
109
- const labelId = externalLabelId || internalLabelId;
109
+ const labelId = label ? externalLabelId || internalLabelId : "";
110
110
  return /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
111
111
  helpAriaLabel: helpAriaLabel,
112
112
  tooltipPosition: tooltipPosition
@@ -18,6 +18,15 @@ declare function _default(palette: any): {
18
18
  colorsActionMajor500: any;
19
19
  colorsActionMajor600: any;
20
20
  colorsActionMajor150: any;
21
+ colorsComponentsMenuAutumnStandard600: any;
22
+ colorsComponentsMenuSpringChild600: any;
23
+ colorsComponentsMenuAutumnChild600: any;
24
+ colorsComponentsMenuSummerChild600: any;
25
+ colorsComponentsMenuWinterChild600: any;
26
+ colorsComponentsMenuSpringChildAlt600: any;
27
+ colorsComponentsMenuAutumnChildAlt600: any;
28
+ colorsComponentsMenuWinterChildAlt600: any;
29
+ colorsComponentsMenuSummerChildAlt600: any;
21
30
  colorsBaseTheme: any;
22
31
  };
23
32
  };
@@ -33,6 +33,15 @@ var _default = palette => {
33
33
  colorsActionMajor500: this.colors.primary,
34
34
  colorsActionMajor600: this.colors.secondary,
35
35
  colorsActionMajor150: this.colors.loadingBarBackground,
36
+ colorsComponentsMenuAutumnStandard600: this.colors.primary,
37
+ colorsComponentsMenuSpringChild600: this.colors.primary,
38
+ colorsComponentsMenuAutumnChild600: this.colors.primary,
39
+ colorsComponentsMenuSummerChild600: this.colors.primary,
40
+ colorsComponentsMenuWinterChild600: this.colors.primary,
41
+ colorsComponentsMenuSpringChildAlt600: this.colors.primary,
42
+ colorsComponentsMenuAutumnChildAlt600: this.colors.primary,
43
+ colorsComponentsMenuWinterChildAlt600: this.colors.primary,
44
+ colorsComponentsMenuSummerChildAlt600: this.colors.primary,
36
45
  colorsBaseTheme: this.colors.primary
37
46
  };
38
47
  }
@@ -17,6 +17,15 @@ declare function _default(palette: any): {
17
17
  colorsActionMajor500: any;
18
18
  colorsActionMajor600: any;
19
19
  colorsActionMajor150: any;
20
+ colorsComponentsMenuAutumnStandard600: any;
21
+ colorsComponentsMenuSpringChild600: any;
22
+ colorsComponentsMenuAutumnChild600: any;
23
+ colorsComponentsMenuSummerChild600: any;
24
+ colorsComponentsMenuWinterChild600: any;
25
+ colorsComponentsMenuSpringChildAlt600: any;
26
+ colorsComponentsMenuAutumnChildAlt600: any;
27
+ colorsComponentsMenuWinterChildAlt600: any;
28
+ colorsComponentsMenuSummerChildAlt600: any;
20
29
  colorsBaseTheme: any;
21
30
  };
22
31
  };
@@ -27,6 +27,15 @@ var _default = palette => {
27
27
  colorsActionMajor500: this.colors.primary,
28
28
  colorsActionMajor600: this.colors.secondary,
29
29
  colorsActionMajor150: this.colors.loadingBarBackground,
30
+ colorsComponentsMenuAutumnStandard600: this.colors.primary,
31
+ colorsComponentsMenuSpringChild600: this.colors.primary,
32
+ colorsComponentsMenuAutumnChild600: this.colors.primary,
33
+ colorsComponentsMenuSummerChild600: this.colors.primary,
34
+ colorsComponentsMenuWinterChild600: this.colors.primary,
35
+ colorsComponentsMenuSpringChildAlt600: this.colors.primary,
36
+ colorsComponentsMenuAutumnChildAlt600: this.colors.primary,
37
+ colorsComponentsMenuWinterChildAlt600: this.colors.primary,
38
+ colorsComponentsMenuSummerChildAlt600: this.colors.primary,
30
39
  colorsBaseTheme: this.colors.primary
31
40
  };
32
41
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "carbon-react",
3
- "version": "104.22.0",
3
+ "version": "104.24.1",
4
4
  "description": "A library of reusable React components for easily building user interfaces.",
5
5
  "engineStrict": true,
6
6
  "engines": {