Skip to content

Commit 31c7b18

Browse files
committed
fix(alert): remove broken close button on Bootstrap 5 sites
1 parent f9fd74c commit 31c7b18

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

src/edit-resource/EditResource.jsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default function EditResource({
102102
return (
103103
<div>
104104
{errors.map((error, index) => (
105-
<Alert key={index} color="danger">
105+
<Alert key={index} color="danger" dismissable={true}>
106106
{error}
107107
</Alert>
108108
))}
@@ -114,7 +114,9 @@ export default function EditResource({
114114
return (
115115
<div className="edit-resource">
116116
{successMessage.message && (
117-
<Alert color={successMessage.color}>{successMessage.message}</Alert>
117+
<Alert color={successMessage.color} dismissable={true}>
118+
{successMessage.message}
119+
</Alert>
118120
)}
119121
<div>
120122
<h2>Resource Propeties</h2>

src/shared/Alert.jsx

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1-
const Alert = ({ children, color }) => {
1+
// TODO: Make alerts dismissable on Bootstrap 5. Currently the dismiss feature
2+
// only works on Bootstrap 2 sites (e.g., Admin).
3+
const Alert = ({ children, color, dismissable = false }) => {
24
return (
35
<div
46
className={`alert alert-${color} mt-3 alert-dismissible show`}
57
role="alert"
68
>
79
{children}
8-
<button
9-
type="button"
10-
className="close"
11-
data-dismiss="alert"
12-
aria-label="Close"
13-
>
14-
<span aria-hidden="true">&times;</span>
15-
</button>
10+
{dismissable && (
11+
<button
12+
type="button"
13+
className="close"
14+
data-dismiss="alert"
15+
aria-label="Close"
16+
>
17+
<span aria-hidden="true">&times;</span>
18+
</button>
19+
)}
1620
</div>
1721
);
1822
};

0 commit comments

Comments
 (0)