Skip to content

Commit f48c98c

Browse files
committed
fix(CToast): add missing color prop
1 parent cdb9aa7 commit f48c98c

File tree

7 files changed

+28
-6
lines changed

7 files changed

+28
-6
lines changed

Diff for: src/index.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,7 @@ interface CToast extends HTMLPropsNoClassName {
951951
show?: boolean;
952952
autohide?: number | boolean;
953953
fade?: boolean;
954+
color?: string;
954955
onStateChange?: Function;
955956
}
956957

Diff for: src/toast/CToast.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const CToast = props => {
1919
show,
2020
autohide,
2121
fade,
22+
color,
2223
onStateChange,
2324
...attributes
2425
} = props
@@ -83,7 +84,13 @@ const CToast = props => {
8384
}
8485

8586
// render
86-
const classes = classNames('toast', className)
87+
const classes = classNames(
88+
{
89+
toast: true,
90+
[`toast-${color}`]: !!color
91+
},
92+
className
93+
)
8794

8895
const fadeClasses = classNames(
8996
fade && (state === 'hiding' ? 'toast-fade-slow' : 'toast-fade')
@@ -120,6 +127,7 @@ CToast.propTypes = {
120127
show: PropTypes.bool,
121128
autohide: PropTypes.oneOfType([PropTypes.number, PropTypes.bool]),
122129
fade: PropTypes.bool,
130+
color: PropTypes.string,
123131
onStateChange: PropTypes.func
124132
};
125133

Diff for: src/toast/CToastHeader.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const CToastHeader = props => {
2828
<div className={classes} {...attributes} ref={innerRef}>
2929
{ children }
3030
{ closeButton &&
31-
<CButtonClose className="ml-auto" onClick={close}/>}
31+
<CButtonClose className="mfs-auto" onClick={close}/>}
3232
</div>
3333
)
3434
}

Diff for: src/toast/tests/CToast.test.js

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ describe('CToast', () => {
2323
show
2424
autohide
2525
fade
26+
color={'danger'}
2627
>
2728
CToast
2829
</CToast>

Diff for: src/toast/tests/__snapshots__/CToast.test.js.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports[`CToast renders customized wrapper correctly 1`] = `
66
<div
77
aria-atomic="true"
88
aria-live="assertive"
9-
className="toast class-name toast-fade"
9+
className="toast toast-danger class-name toast-fade"
1010
onMouseOut={[Function]}
1111
onMouseOver={[Function]}
1212
role="alert"

Diff for: src/toast/tests/__snapshots__/CToastHeader.test.js.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports[`CToastHeader renders basic wrapper correctly 1`] = `
66
>
77
<button
88
aria-label="Close"
9-
className="close ml-auto"
9+
className="close mfs-auto"
1010
>
1111
×
1212
</button>
@@ -20,7 +20,7 @@ exports[`CToastHeader renders customized wrapper correctly 1`] = `
2020
CToastHeader
2121
<button
2222
aria-label="Close"
23-
className="close ml-auto"
23+
className="close mfs-auto"
2424
>
2525
×
2626
</button>

Diff for: stories/CToast.stories.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,18 @@ export const basic = () => {
2424
const autohide = boolean('Autohide', false, 'Other')
2525
const fade = boolean('Fade', true, 'Other')
2626
const closeButton = boolean('Close button', true, 'Other')
27-
27+
const colorOptions = [
28+
'primary',
29+
'secondary',
30+
'success',
31+
'warning',
32+
'danger',
33+
'info',
34+
'light',
35+
'dark',
36+
''
37+
]
38+
const color = select('Color', colorOptions, '', 'Other')
2839

2940
return <>
3041
<CCol lg="6" md="8" xs="12">
@@ -37,6 +48,7 @@ export const basic = () => {
3748
show={show}
3849
autohide={autohide}
3950
fade={fade}
51+
color={color}
4052
>
4153
<CToastHeader closeButton={closeButton}>
4254
Toast title

0 commit comments

Comments
 (0)