Skip to content

Commit 7580ecc

Browse files
remove defautProps warning
1 parent 5ee8a42 commit 7580ecc

File tree

7 files changed

+62
-173
lines changed

7 files changed

+62
-173
lines changed

packages/unity-react-core/src/components/Article/Article.jsx

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { Wrapper, EventInfoWrapper } from "./Article.styles";
2727
* @returns {JSX.Element}
2828
*/
2929
export const Article = ({
30-
type,
30+
type = "news",
3131
articleUrl,
3232
publicationDate,
3333
title,
@@ -192,7 +192,11 @@ export const Article = ({
192192
data-testid="uds-hero"
193193
className="uds-hero uds-hero-md"
194194
style={{
195-
backgroundImage: `linear-gradient(180deg, #19191900 0%, #191919c9 100%), url(${headerImageUrl})`,
195+
// @ts-ignore
196+
"--color1": "#19191900",
197+
"--color2": "#191919c9",
198+
// moved colors to variable because hex color in linear-gradient breaks react
199+
"backgroundImage": `linear-gradient(180deg, var(--color1) 0%, var(--color2) 100%), url(${headerImageUrl})`,
196200
}}
197201
/>
198202
)}
@@ -369,17 +373,3 @@ Article.propTypes = {
369373
*/
370374
zoomUrl: PropTypes.string,
371375
};
372-
373-
Article.defaultProps = {
374-
type: "news",
375-
authorEmail: undefined,
376-
authorPhone: undefined,
377-
authorTitle: undefined,
378-
breadcrumbs: undefined,
379-
calendarUrl: undefined,
380-
headerImageUrl: undefined,
381-
eventLocation: undefined,
382-
eventTime: undefined,
383-
registrationUrl: undefined,
384-
zoomUrl: undefined,
385-
};

packages/unity-react-core/src/components/Button/Button.jsx

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ const gaDefaultObject = {
2424
* @returns {JSX.Element}
2525
*/
2626
export const Button = ({
27-
label,
28-
cardTitle,
27+
label = "",
28+
cardTitle = "",
2929
gaData,
3030
ariaLabel,
3131
block,
32-
color,
32+
color = "gray",
3333
disabled,
34-
element,
34+
element = "button",
3535
href,
3636
icon,
3737
innerRef,
3838
onClick,
39-
size,
39+
size = "default",
4040
classes,
41-
target,
41+
target = "_self",
4242
...props
4343
}) => {
4444
const btnClasses = classNames("btn", {
@@ -164,20 +164,3 @@ Button.propTypes = {
164164
*/
165165
target: PropTypes.oneOf(["_blank", "_self", "_top", "_parent"]),
166166
};
167-
168-
Button.defaultProps = {
169-
label: "",
170-
cardTitle: "",
171-
ariaLabel: undefined,
172-
block: undefined,
173-
color: "gray",
174-
disabled: undefined,
175-
element: "button",
176-
href: undefined,
177-
icon: undefined,
178-
innerRef: undefined,
179-
onClick: undefined,
180-
size: "default",
181-
classes: undefined,
182-
target: "_self",
183-
};

packages/unity-react-core/src/components/ButtonIconOnly/ButtonIconOnly.jsx

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ const gaDefaultObject = {
2222
* @returns {JSX.Element}
2323
*/
2424
export const ButtonIconOnly = ({
25-
color,
26-
icon,
27-
innerRef,
28-
onClick,
29-
size,
30-
cardTitle,
25+
color = "gray",
26+
icon = undefined,
27+
innerRef = undefined,
28+
onClick = undefined,
29+
size = "small",
30+
cardTitle = "",
3131
className,
3232
gaData,
3333
...rest
@@ -99,12 +99,3 @@ ButtonIconOnly.propTypes = {
9999
size: PropTypes.oneOf(["large", "small"]),
100100
className: PropTypes.string,
101101
};
102-
103-
ButtonIconOnly.defaultProps = {
104-
color: "gray",
105-
icon: undefined,
106-
innerRef: undefined,
107-
onClick: undefined,
108-
size: "small",
109-
cardTitle: "",
110-
};

packages/unity-react-core/src/components/ButtonTag/ButtonTag.jsx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ const gaDefaultObject = {
2424
* @returns {JSX.Element}
2525
*/
2626
export const ButtonTag = ({
27-
label,
28-
cardTitle,
27+
label = "",
28+
cardTitle = "",
2929
gaData,
3030
ariaLabel,
31-
color,
31+
color = "gray",
3232
disabled,
3333
element = "button",
3434
innerRef,
@@ -137,15 +137,3 @@ ButtonTag.propTypes = {
137137
*/
138138
onClick: PropTypes.func,
139139
};
140-
141-
ButtonTag.defaultProps = {
142-
label: "",
143-
cardTitle: "",
144-
ariaLabel: undefined,
145-
color: "gray",
146-
disabled: undefined,
147-
element: "button",
148-
href: undefined,
149-
innerRef: undefined,
150-
onClick: undefined,
151-
};

packages/unity-react-core/src/components/Card/Card.jsx

Lines changed: 34 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ const gaDefaultObject = {
2929
* @returns {JSX.Element}
3030
*/
3131
export const Card = ({
32-
type,
33-
width,
34-
horizontal,
32+
type = "default",
33+
width = "100%",
34+
horizontal = false,
3535
image,
3636
imageAltText,
3737
title,
3838
icon,
3939
body,
40-
eventFormat,
40+
eventFormat = "stack",
4141
eventLocation,
4242
eventTime,
4343
buttons,
4444
linkLabel,
4545
linkUrl,
4646
tags,
47-
showBorders,
47+
showBorders = true,
4848
cardLink,
4949
}) => {
5050
return (
@@ -154,44 +154,26 @@ Card.propTypes = {
154154
cardLink: PropTypes.string,
155155
};
156156

157-
Card.defaultProps = {
158-
type: "default",
159-
width: "100%",
160-
horizontal: false,
161-
body: undefined,
162-
eventFormat: "stack",
163-
eventTime: undefined,
164-
eventLocation: undefined,
165-
icon: undefined,
166-
image: undefined,
167-
imageAltText: undefined,
168-
buttons: undefined,
169-
linkLabel: undefined,
170-
linkUrl: undefined,
171-
tags: undefined,
172-
showBorders: true,
173-
};
174-
175157
/*
176158
* Sub-components defined after this
177159
*/
178160
const BaseCard = ({
179-
type,
180-
width,
181-
horizontal,
182-
image,
183-
imageAltText,
161+
type = "default",
162+
width = "100%",
163+
horizontal = false,
164+
image = "",
165+
imageAltText = "",
184166
title,
185-
icon,
186-
body,
187-
eventFormat,
188-
eventLocation,
189-
eventTime,
190-
buttons,
191-
linkLabel,
192-
linkUrl,
193-
tags,
194-
showBorders,
167+
icon = undefined,
168+
body = "",
169+
eventFormat = "stack",
170+
eventLocation = "",
171+
eventTime = "",
172+
buttons = undefined,
173+
linkLabel = undefined,
174+
linkUrl = undefined,
175+
tags = undefined,
176+
showBorders = true,
195177
cardLink,
196178
}) => {
197179
const cardClass = classNames("card", "cards-components", {
@@ -297,35 +279,17 @@ BaseCard.propTypes = {
297279
cardLink: PropTypes.string,
298280
};
299281

300-
BaseCard.defaultProps = {
301-
type: "default",
302-
width: "100%",
303-
horizontal: false,
304-
body: "",
305-
eventFormat: "stack",
306-
eventTime: "",
307-
eventLocation: "",
308-
icon: undefined,
309-
image: "",
310-
imageAltText: "",
311-
buttons: undefined,
312-
linkLabel: undefined,
313-
linkUrl: undefined,
314-
tags: undefined,
315-
showBorders: true,
316-
};
317-
318282
const CardContent = ({
319-
type,
320-
body,
321-
eventFormat,
322-
eventLocation,
323-
eventTime,
283+
type = "default",
284+
body = "",
285+
eventFormat = "stack",
286+
eventLocation = "",
287+
eventTime = "",
324288
title,
325-
buttons,
326-
linkLabel,
327-
linkUrl,
328-
tags,
289+
buttons = undefined,
290+
linkLabel = undefined,
291+
linkUrl = undefined,
292+
tags = undefined,
329293
cardLink,
330294
}) => (
331295
<>
@@ -438,19 +402,11 @@ CardContent.propTypes = {
438402
cardLink: PropTypes.string,
439403
};
440404

441-
CardContent.defaultProps = {
442-
type: "default",
443-
body: "",
444-
eventFormat: "stack",
445-
eventLocation: "",
446-
eventTime: "",
447-
buttons: undefined,
448-
linkLabel: undefined,
449-
linkUrl: undefined,
450-
tags: undefined,
451-
};
452-
453-
const EventInfo = ({ eventFormat, eventTime, eventLocation }) => {
405+
const EventInfo = ({
406+
eventFormat = "stack",
407+
eventLocation = "",
408+
eventTime = "",
409+
}) => {
454410
if (eventFormat === "inline") {
455411
return (
456412
<div className="card-event-details">
@@ -516,9 +472,3 @@ EventInfo.propTypes = {
516472
eventLocation: PropTypes.string,
517473
eventTime: PropTypes.string,
518474
};
519-
520-
EventInfo.defaultProps = {
521-
eventFormat: "stack",
522-
eventLocation: "",
523-
eventTime: "",
524-
};

packages/unity-react-core/src/components/Pagination/PageItem/PageItem.jsx

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import React from "react";
1414
*/
1515
export const PageItem = ({
1616
dataId,
17-
isClickeable,
18-
disabled,
19-
pageLinkIcon,
20-
selectedPage,
21-
onClick,
17+
isClickeable = false,
18+
disabled = false,
19+
pageLinkIcon = false,
20+
selectedPage = false,
21+
onClick = () => {},
2222
ellipses,
2323
ariaLabel,
2424
children,
@@ -69,11 +69,3 @@ PageItem.propTypes = {
6969
ariaLabel: PropTypes.string,
7070
ariaDisabled: PropTypes.bool,
7171
};
72-
73-
PageItem.defaultProps = {
74-
isClickeable: false,
75-
disabled: false,
76-
pageLinkIcon: false,
77-
selectedPage: false,
78-
onClick: () => {},
79-
};

packages/unity-react-core/src/components/Pagination/Pagination.jsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ const defaultGAEvent = {
3333
export const Pagination = ({
3434
type,
3535
background,
36-
currentPage,
37-
totalPages,
36+
currentPage = 1,
37+
totalPages = 10,
3838
onChange,
3939
}) => {
4040
const [selectedPage, setSelectedPage] = useState(null);
@@ -230,8 +230,3 @@ Pagination.propTypes = {
230230
*/
231231
onChange: PropTypes.func.isRequired,
232232
};
233-
234-
Pagination.defaultProps = {
235-
currentPage: 1,
236-
totalPages: 10,
237-
};

0 commit comments

Comments
 (0)