Skip to content

Commit 2c41db3

Browse files
feat: Fix invalid "pId" attribute in AddButton (Bootstrap-4) (rjsf-team#2046)
* 🚑 AddButton 'pId' removal/fix * 🎨 minor style fix in DescriptionField * ☔ update tests
1 parent 59901d1 commit 2c41db3

File tree

6 files changed

+25
-31
lines changed

6 files changed

+25
-31
lines changed

packages/bootstrap-4/src/AddButton/AddButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import React from "react";
22

33
import { AddButtonProps } from "@rjsf/core";
44
import Button from "react-bootstrap/Button";
5-
import { AiOutlinePlus } from "react-icons/ai";
5+
import { BsPlus } from "react-icons/bs";
66

77
const AddButton: React.FC<AddButtonProps> = props => (
88
<Button {...props} color="primary" style={{width: "100%"}} className="ml-1">
9-
<AiOutlinePlus/>
9+
<BsPlus/>
1010
</Button>
1111
);
1212

packages/bootstrap-4/src/DescriptionField/DescriptionField.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export interface DescriptionFieldProps extends Partial<FieldProps> {
77

88
const DescriptionField = ({ description }: Partial<FieldProps>) => {
99
if (description) {
10-
return <div><div className="mb-5">{description}</div></div>;
10+
return <div><div className="mb-3">{description}</div></div>;
1111
}
1212

1313
return null;

packages/bootstrap-4/test/__snapshots__/AddButton.test.tsx.snap

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,26 @@ exports[`AddButton simple 1`] = `
1616
<svg
1717
fill="currentColor"
1818
height="1em"
19-
pId="10297"
2019
stroke="currentColor"
2120
strokeWidth="0"
2221
style={
2322
Object {
2423
"color": undefined,
2524
}
2625
}
27-
t="1551322312294"
28-
version="1.1"
29-
viewBox="0 0 1024 1024"
26+
viewBox="0 0 16 16"
3027
width="1em"
3128
xmlns="http://www.w3.org/2000/svg"
3229
>
33-
<defs />
3430
<path
35-
d="M474 152m8 0l60 0q8 0 8 8l0 704q0 8-8 8l-60 0q-8 0-8-8l0-704q0-8 8-8Z"
36-
pId="10298"
31+
clipRule="evenodd"
32+
d="M8 3.5a.5.5 0 01.5.5v4a.5.5 0 01-.5.5H4a.5.5 0 010-1h3.5V4a.5.5 0 01.5-.5z"
33+
fillRule="evenodd"
3734
/>
3835
<path
39-
d="M168 474m8 0l672 0q8 0 8 8l0 60q0 8-8 8l-672 0q-8 0-8-8l0-60q0-8 8-8Z"
40-
pId="10299"
36+
clipRule="evenodd"
37+
d="M7.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H8.5V12a.5.5 0 01-1 0V8z"
38+
fillRule="evenodd"
4139
/>
4240
</svg>
4341
</button>

packages/bootstrap-4/test/__snapshots__/Array.test.tsx.snap

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,26 @@ exports[`array fields array 1`] = `
4747
<svg
4848
fill="currentColor"
4949
height="1em"
50-
pId="10297"
5150
stroke="currentColor"
5251
strokeWidth="0"
5352
style={
5453
Object {
5554
"color": undefined,
5655
}
5756
}
58-
t="1551322312294"
59-
version="1.1"
60-
viewBox="0 0 1024 1024"
57+
viewBox="0 0 16 16"
6158
width="1em"
6259
xmlns="http://www.w3.org/2000/svg"
6360
>
64-
<defs />
6561
<path
66-
d="M474 152m8 0l60 0q8 0 8 8l0 704q0 8-8 8l-60 0q-8 0-8-8l0-704q0-8 8-8Z"
67-
pId="10298"
62+
clipRule="evenodd"
63+
d="M8 3.5a.5.5 0 01.5.5v4a.5.5 0 01-.5.5H4a.5.5 0 010-1h3.5V4a.5.5 0 01.5-.5z"
64+
fillRule="evenodd"
6865
/>
6966
<path
70-
d="M168 474m8 0l672 0q8 0 8 8l0 60q0 8-8 8l-672 0q-8 0-8-8l0-60q0-8 8-8Z"
71-
pId="10299"
67+
clipRule="evenodd"
68+
d="M7.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H8.5V12a.5.5 0 01-1 0V8z"
69+
fillRule="evenodd"
7270
/>
7371
</svg>
7472
</button>

packages/bootstrap-4/test/__snapshots__/ArrayFieldTemplate.test.tsx.snap

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,26 @@ exports[`ArrayFieldTemplate simple 1`] = `
3939
<svg
4040
fill="currentColor"
4141
height="1em"
42-
pId="10297"
4342
stroke="currentColor"
4443
strokeWidth="0"
4544
style={
4645
Object {
4746
"color": undefined,
4847
}
4948
}
50-
t="1551322312294"
51-
version="1.1"
52-
viewBox="0 0 1024 1024"
49+
viewBox="0 0 16 16"
5350
width="1em"
5451
xmlns="http://www.w3.org/2000/svg"
5552
>
56-
<defs />
5753
<path
58-
d="M474 152m8 0l60 0q8 0 8 8l0 704q0 8-8 8l-60 0q-8 0-8-8l0-704q0-8 8-8Z"
59-
pId="10298"
54+
clipRule="evenodd"
55+
d="M8 3.5a.5.5 0 01.5.5v4a.5.5 0 01-.5.5H4a.5.5 0 010-1h3.5V4a.5.5 0 01.5-.5z"
56+
fillRule="evenodd"
6057
/>
6158
<path
62-
d="M168 474m8 0l672 0q8 0 8 8l0 60q0 8-8 8l-672 0q-8 0-8-8l0-60q0-8 8-8Z"
63-
pId="10299"
59+
clipRule="evenodd"
60+
d="M7.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H8.5V12a.5.5 0 01-1 0V8z"
61+
fillRule="evenodd"
6462
/>
6563
</svg>
6664
</button>

packages/bootstrap-4/test/__snapshots__/DescriptionField.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`DescriptionField should return h2 element when description is being passed as props 1`] = `
44
<div>
55
<div
6-
className="mb-5"
6+
className="mb-3"
77
>
88
SOME THING
99
</div>

0 commit comments

Comments
 (0)