carbon-react 153.0.0 → 153.0.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 (4) hide show
  1. package/README.md +1 -1
  2. package/esm/components/button-bar/button-bar.style.js +25 -53
  3. package/lib/components/button-bar/button-bar.style.js +25 -53
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -51,4 +51,4 @@ Thanks to [Chromatic](https://www.chromatic.com/) for providing the visual testi
51
51
 
52
52
  Carbon is licensed under the [Apache-2.0 licence](LICENSE).
53
53
 
54
- Copyright (c) 2018-2024 Sage Group Plc. All rights reserved.
54
+ Copyright (c) 2018-2025 Sage Group Plc. All rights reserved.
package/esm/components/button-bar/button-bar.style.js CHANGED
@@ -1,13 +1,8 @@
1
1
  import styled, { css } from "styled-components";
2
2
  import { space } from "styled-system";
3
3
  import BaseTheme from "../../style/themes/base";
4
- import StyledButton from "../button/button.style";
5
4
  import StyledIcon from "../icon/icon.style";
6
5
  import StyledIconButton from "../icon-button/icon-button.style";
7
- const commonHoverStyles = `
8
- background-color: var(--colorsActionMajor600);
9
- border-color: var(--colorsActionMajor600);
10
- `;
11
6
  const StyledButtonBar = styled.div`
12
7
  ${space}
13
8
  ${({
@@ -29,84 +24,61 @@ const StyledButtonBar = styled.div`
29
24
 
30
25
  button {
31
26
  margin: 0;
27
+ position: relative;
32
28
 
33
- :not(:first-child):not(:last-child) {
29
+ &:not(:first-child):not(:last-child) {
34
30
  border-radius: var(--borderRadius000);
35
31
  }
36
- :first-child:not(:last-child) {
32
+ &:first-child:not(:last-child) {
37
33
  border-top-right-radius: var(--borderRadius000);
38
34
  border-bottom-right-radius: var(--borderRadius000);
39
35
  }
40
- :last-child:not(:first-child) {
36
+ &:last-child:not(:first-child) {
41
37
  border-top-left-radius: var(--borderRadius000);
42
38
  border-bottom-left-radius: var(--borderRadius000);
43
39
  }
44
40
 
45
- &:not(:last-of-type) {
46
- border-right-color: transparent;
47
- }
48
-
49
41
  &:not(:first-of-type) {
50
42
  margin-left: -2px;
51
43
  }
52
44
 
53
- &:focus {
54
- position: relative;
55
- z-index: 2;
45
+ &:not(:disabled) {
46
+ z-index: 1;
56
47
  }
57
48
 
58
- &:hover {
59
- background-color: var(--colorsActionMajor600);
60
- border-color: var(--colorsActionMajor600);
61
-
62
- & + button {
63
- border-left-color: var(--colorsActionMajor600);
64
- }
65
-
66
- & ${StyledIcon} {
67
- ${commonHoverStyles}
68
- color: white;
69
- }
49
+ &:hover:not(:disabled) {
50
+ z-index: 2;
70
51
  }
71
52
 
72
- & ${StyledIcon} {
73
- color: var(--colorsActionMajor500);
53
+ &:focus {
54
+ z-index: 3;
74
55
  }
75
56
  }
76
57
 
77
- [data-component="button"] {
78
- :hover {
79
- ${commonHoverStyles}
80
- & + ${StyledButton} {
81
- border-left-color: var(--colorsActionMajor600);
82
- }
58
+ ${StyledIconButton}:not(:disabled) {
59
+ border: 2px solid var(--colorsActionMajor500);
60
+
61
+ &:focus {
62
+ border-right-color: var(--colorsActionMajor500);
83
63
  }
84
- }
85
64
 
86
- [data-component="button-minor"] {
87
- & ${StyledIcon} {
88
- color: var(--colorsActionMinor500);
65
+ &:hover {
66
+ background-color: var(--colorsActionMajor600);
67
+ border-color: var(--colorsActionMajor600);
68
+ color: var(--colorsActionMajorYang100);
89
69
  }
90
- }
91
70
 
92
- [data-component="button-minor"] {
93
- :hover {
94
- color: var(--colorsActionMinorYang100);
95
- background-color: var(--colorsActionMinor500);
96
- border-color: var(--colorsActionMinor500);
71
+ ${StyledIcon} {
72
+ color: var(--colorsActionMajor500);
97
73
 
98
- & + ${StyledButton} {
99
- border-left-color: var(--colorsActionMinor500);
74
+ &:hover {
75
+ color: var(--colorsActionMajorYang100);
100
76
  }
101
77
  }
102
78
  }
103
79
 
104
- ${StyledIconButton} {
105
- border: 2px solid var(--colorsActionMajor500);
106
-
107
- :focus {
108
- border-right-color: var(--colorsActionMajor500);
109
- }
80
+ ${StyledIconButton}:disabled {
81
+ border: 2px solid var(--colorsActionDisabled500);
110
82
  }
111
83
  `}
112
84
  `;
package/lib/components/button-bar/button-bar.style.js CHANGED
@@ -7,16 +7,11 @@ exports.default = void 0;
7
7
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
8
8
  var _styledSystem = require("styled-system");
9
9
  var _base = _interopRequireDefault(require("../../style/themes/base"));
10
- var _button = _interopRequireDefault(require("../button/button.style"));
11
10
  var _icon = _interopRequireDefault(require("../icon/icon.style"));
12
11
  var _iconButton = _interopRequireDefault(require("../icon-button/icon-button.style"));
13
12
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
14
13
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
15
14
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
16
- const commonHoverStyles = `
17
- background-color: var(--colorsActionMajor600);
18
- border-color: var(--colorsActionMajor600);
19
- `;
20
15
  const StyledButtonBar = _styledComponents.default.div`
21
16
  ${_styledSystem.space}
22
17
  ${({
@@ -38,84 +33,61 @@ const StyledButtonBar = _styledComponents.default.div`
38
33
 
39
34
  button {
40
35
  margin: 0;
36
+ position: relative;
41
37
 
42
- :not(:first-child):not(:last-child) {
38
+ &:not(:first-child):not(:last-child) {
43
39
  border-radius: var(--borderRadius000);
44
40
  }
45
- :first-child:not(:last-child) {
41
+ &:first-child:not(:last-child) {
46
42
  border-top-right-radius: var(--borderRadius000);
47
43
  border-bottom-right-radius: var(--borderRadius000);
48
44
  }
49
- :last-child:not(:first-child) {
45
+ &:last-child:not(:first-child) {
50
46
  border-top-left-radius: var(--borderRadius000);
51
47
  border-bottom-left-radius: var(--borderRadius000);
52
48
  }
53
49
 
54
- &:not(:last-of-type) {
55
- border-right-color: transparent;
56
- }
57
-
58
50
  &:not(:first-of-type) {
59
51
  margin-left: -2px;
60
52
  }
61
53
 
62
- &:focus {
63
- position: relative;
64
- z-index: 2;
54
+ &:not(:disabled) {
55
+ z-index: 1;
65
56
  }
66
57
 
67
- &:hover {
68
- background-color: var(--colorsActionMajor600);
69
- border-color: var(--colorsActionMajor600);
70
-
71
- & + button {
72
- border-left-color: var(--colorsActionMajor600);
73
- }
74
-
75
- & ${_icon.default} {
76
- ${commonHoverStyles}
77
- color: white;
78
- }
58
+ &:hover:not(:disabled) {
59
+ z-index: 2;
79
60
  }
80
61
 
81
- & ${_icon.default} {
82
- color: var(--colorsActionMajor500);
62
+ &:focus {
63
+ z-index: 3;
83
64
  }
84
65
  }
85
66
 
86
- [data-component="button"] {
87
- :hover {
88
- ${commonHoverStyles}
89
- & + ${_button.default} {
90
- border-left-color: var(--colorsActionMajor600);
91
- }
67
+ ${_iconButton.default}:not(:disabled) {
68
+ border: 2px solid var(--colorsActionMajor500);
69
+
70
+ &:focus {
71
+ border-right-color: var(--colorsActionMajor500);
92
72
  }
93
- }
94
73
 
95
- [data-component="button-minor"] {
96
- & ${_icon.default} {
97
- color: var(--colorsActionMinor500);
74
+ &:hover {
75
+ background-color: var(--colorsActionMajor600);
76
+ border-color: var(--colorsActionMajor600);
77
+ color: var(--colorsActionMajorYang100);
98
78
  }
99
- }
100
79
 
101
- [data-component="button-minor"] {
102
- :hover {
103
- color: var(--colorsActionMinorYang100);
104
- background-color: var(--colorsActionMinor500);
105
- border-color: var(--colorsActionMinor500);
80
+ ${_icon.default} {
81
+ color: var(--colorsActionMajor500);
106
82
 
107
- & + ${_button.default} {
108
- border-left-color: var(--colorsActionMinor500);
83
+ &:hover {
84
+ color: var(--colorsActionMajorYang100);
109
85
  }
110
86
  }
111
87
  }
112
88
 
113
- ${_iconButton.default} {
114
- border: 2px solid var(--colorsActionMajor500);
115
-
116
- :focus {
117
- border-right-color: var(--colorsActionMajor500);
118
- }
89
+ ${_iconButton.default}:disabled {
90
+ border: 2px solid var(--colorsActionDisabled500);
119
91
  }
120
92
  `}
121
93
  `;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "carbon-react",
3
- "version": "153.0.0",
3
+ "version": "153.0.1",
4
4
  "description": "A library of reusable React components for easily building user interfaces.",
5
5
  "files": [
6
6
  "lib",