Skip to content

Commit 234849c

Browse files
committed
fix: fixed ButtonGroup styles
1 parent 09995e6 commit 234849c

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/components/ButtonGroup/ButtonGroup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { CONTEXTS, SIZES } from '../../constants';
77
const { block, elem } = bem({
88
name: 'ButtonGroup',
99
classnames: styles,
10-
propsToMods: ['size', 'isBlock']
10+
propsToMods: ['size', 'isBlock', 'context']
1111
});
1212

1313
const ButtonGroup = props => {

src/components/ButtonGroup/ButtonGroup.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
+ .ButtonGroup__button {
1919
margin-left: -1px;
2020
}
21-
}
2221

23-
.Button--context {
24-
@each $context in ($contexts) {
25-
&_#{$context} {
26-
&:not(:first-child):not(:focus) {
27-
border-left-color: var(--color-#{$context}-25);
28-
}
29-
&:not(:last-child):not(:focus) {
30-
border-right-color: var(--color-#{$context}-25);
22+
&--context {
23+
@each $context in ($contexts) {
24+
&_#{$context} {
25+
&:not(:first-child):not(:focus) {
26+
border-left-color: var(--color-#{$context}-25);
27+
}
28+
&:not(:last-child):not(:focus) {
29+
border-right-color: var(--color-#{$context}-25);
30+
}
3131
}
3232
}
3333
}

src/components/ButtonGroup/__tests__/__snapshots__/ButtonGroup.spec.js.snap

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ exports[`<ButtonGroup> that renders a button should add classes when props are c
1111
role="group"
1212
>
1313
<Button
14-
className="ButtonGroup__button ButtonGroup__button--isBlock"
14+
className="ButtonGroup__button ButtonGroup__button--isBlock ButtonGroup__button--context_neutral"
1515
context="neutral"
1616
disabled={false}
1717
href={null}
@@ -22,15 +22,15 @@ exports[`<ButtonGroup> that renders a button should add classes when props are c
2222
type="button"
2323
>
2424
<button
25-
className="Button Button--context_neutral Button--size_large ButtonGroup__button ButtonGroup__button--isBlock"
25+
className="Button Button--context_neutral Button--size_large ButtonGroup__button ButtonGroup__button--isBlock ButtonGroup__button--context_neutral"
2626
disabled={false}
2727
type="button"
2828
>
2929
A button
3030
</button>
3131
</Button>
3232
<Button
33-
className="ButtonGroup__button ButtonGroup__button--isBlock"
33+
className="ButtonGroup__button ButtonGroup__button--isBlock ButtonGroup__button--context_neutral"
3434
context="neutral"
3535
disabled={false}
3636
href={null}
@@ -41,7 +41,7 @@ exports[`<ButtonGroup> that renders a button should add classes when props are c
4141
type="button"
4242
>
4343
<button
44-
className="Button Button--context_neutral Button--size_large ButtonGroup__button ButtonGroup__button--isBlock"
44+
className="Button Button--context_neutral Button--size_large ButtonGroup__button ButtonGroup__button--isBlock ButtonGroup__button--context_neutral"
4545
disabled={false}
4646
type="button"
4747
>
@@ -63,7 +63,7 @@ exports[`<ButtonGroup> that renders a button should render default button correc
6363
role="group"
6464
>
6565
<Button
66-
className="ButtonGroup__button"
66+
className="ButtonGroup__button ButtonGroup__button--context_neutral"
6767
context="neutral"
6868
disabled={false}
6969
href={null}
@@ -74,15 +74,15 @@ exports[`<ButtonGroup> that renders a button should render default button correc
7474
type="button"
7575
>
7676
<button
77-
className="Button Button--context_neutral ButtonGroup__button"
77+
className="Button Button--context_neutral ButtonGroup__button ButtonGroup__button--context_neutral"
7878
disabled={false}
7979
type="button"
8080
>
8181
A button
8282
</button>
8383
</Button>
8484
<Button
85-
className="ButtonGroup__button"
85+
className="ButtonGroup__button ButtonGroup__button--context_neutral"
8686
context="neutral"
8787
disabled={false}
8888
href={null}
@@ -93,7 +93,7 @@ exports[`<ButtonGroup> that renders a button should render default button correc
9393
type="button"
9494
>
9595
<button
96-
className="Button Button--context_neutral ButtonGroup__button"
96+
className="Button Button--context_neutral ButtonGroup__button ButtonGroup__button--context_neutral"
9797
disabled={false}
9898
type="button"
9999
>

0 commit comments

Comments
 (0)