Skip to content

Commit 0009115

Browse files
committed
components: remove defaultProps
* React 18 deprecates defaultProps on function components, spamming the console with deprecation notices. * Replace `defaultProps` with ES6 default param syntax across affected components.
1 parent 9d18249 commit 0009115

22 files changed

Lines changed: 98 additions & 234 deletions

File tree

src/lib/components/ActiveFilters/ActiveFilters.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ ActiveFilters.defaultProps = {
6060
overridableId: "",
6161
};
6262

63-
const Element = ({ overridableId, filters, removeActiveFilter, getLabel }) => {
63+
const Element = ({
64+
overridableId = "",
65+
filters,
66+
removeActiveFilter,
67+
getLabel,
68+
}) => {
6469
const { buildUID } = useContext(AppContext);
6570

6671
return (
@@ -93,8 +98,4 @@ Element.propTypes = {
9398
overridableId: PropTypes.string,
9499
};
95100

96-
Element.defaultProps = {
97-
overridableId: "",
98-
};
99-
100101
export default Overridable.component("ActiveFilters", ActiveFilters);

src/lib/components/BucketAggregation/BucketAggregation.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,13 @@ BucketAggregation.defaultProps = {
9999
overridableId: "",
100100
};
101101

102-
const Element = ({ overridableId, agg, title, containerCmp, updateQueryFilters }) => {
102+
const Element = ({
103+
overridableId = "",
104+
agg,
105+
title,
106+
containerCmp = null,
107+
updateQueryFilters,
108+
}) => {
103109
const { buildUID } = useContext(AppContext);
104110

105111
return (
@@ -130,9 +136,4 @@ Element.propTypes = {
130136
updateQueryFilters: PropTypes.func.isRequired,
131137
};
132138

133-
Element.defaultProps = {
134-
containerCmp: null,
135-
overridableId: "",
136-
};
137-
138139
export default Overridable.component("BucketAggregation", BucketAggregation);

src/lib/components/BucketAggregation/BucketAggregationValues.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ BucketAggregationValues.defaultProps = {
104104
overridableId: "",
105105
};
106106

107-
const ContainerElement = ({ valuesCmp, overridableId }) => {
107+
const ContainerElement = ({ valuesCmp, overridableId = "" }) => {
108108
const { buildUID } = useContext(AppContext);
109109

110110
return (
@@ -122,16 +122,12 @@ ContainerElement.propTypes = {
122122
overridableId: PropTypes.string,
123123
};
124124

125-
ContainerElement.defaultProps = {
126-
overridableId: "",
127-
};
128-
129125
const ValueElement = ({
130126
bucket,
131127
isSelected,
132128
onFilterClicked,
133129
getChildAggCmps,
134-
overridableId,
130+
overridableId = "",
135131
keyField,
136132
}) => {
137133
const { buildUID, nextComponentIndex } = useContext(AppContext);
@@ -174,10 +170,6 @@ ValueElement.propTypes = {
174170
overridableId: PropTypes.string,
175171
};
176172

177-
ValueElement.defaultProps = {
178-
overridableId: "",
179-
};
180-
181173
export default Overridable.component(
182174
"BucketAggregationValues",
183175
BucketAggregationValues

src/lib/components/Count/Count.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { ShouldRender } from "../ShouldRender";
1515

1616
class Count extends Component {
1717
render() {
18-
const { loading, totalResults, label, overridableId } = this.props;
18+
const { loading, totalResults, label = (cmp) => cmp, overridableId = "" } = this.props;
1919
return (
2020
<ShouldRender condition={!loading && totalResults > 0}>
2121
{label(<Element totalResults={totalResults} overridableId={overridableId} />)}
@@ -32,12 +32,7 @@ Count.propTypes = {
3232
totalResults: PropTypes.number.isRequired,
3333
};
3434

35-
Count.defaultProps = {
36-
label: (cmp) => cmp,
37-
overridableId: "",
38-
};
39-
40-
const Element = ({ totalResults, overridableId }) => {
35+
const Element = ({ totalResults, overridableId = "" }) => {
4136
const { buildUID } = useContext(AppContext);
4237
const _overridableId = buildUID("Count.element", overridableId);
4338

@@ -53,8 +48,4 @@ Element.propTypes = {
5348
overridableId: PropTypes.string,
5449
};
5550

56-
Element.defaultProps = {
57-
overridableId: "",
58-
};
59-
6051
export default Overridable.component("Count", Count);

src/lib/components/EmptyResults/EmptyResults.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ EmptyResults.defaultProps = {
6565
};
6666

6767
const Element = ({
68-
overridableId,
69-
queryString,
68+
overridableId = "",
69+
queryString = "",
7070
resetQuery,
71-
extraContent,
71+
extraContent = null,
7272
userSelectionFilters,
7373
}) => {
7474
const { buildUID } = useContext(AppContext);
@@ -105,10 +105,4 @@ Element.propTypes = {
105105
userSelectionFilters: PropTypes.array.isRequired,
106106
};
107107

108-
Element.defaultProps = {
109-
queryString: "",
110-
extraContent: null,
111-
overridableId: "",
112-
};
113-
114108
export default Overridable.component("EmptyResults", EmptyResults);

src/lib/components/Error/Error.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Overridable from "react-overridable";
1313
import { AppContext } from "../ReactSearchKit";
1414
import { ShouldRender } from "../ShouldRender";
1515

16-
function Error({ loading, error, overridableId }) {
16+
function Error({ loading, error, overridableId = "" }) {
1717
return (
1818
<ShouldRender condition={!loading && !_isEmpty(error)}>
1919
<Element error={error} overridableId={overridableId} />
@@ -28,11 +28,7 @@ Error.propTypes = {
2828
error: PropTypes.object.isRequired,
2929
};
3030

31-
Error.defaultProps = {
32-
overridableId: "",
33-
};
34-
35-
const Element = ({ error, overridableId }) => {
31+
const Element = ({ error, overridableId = "" }) => {
3632
const { buildUID } = useContext(AppContext);
3733

3834
return (
@@ -48,8 +44,4 @@ Element.propTypes = {
4844
error: PropTypes.object.isRequired,
4945
};
5046

51-
Element.defaultProps = {
52-
overridableId: "",
53-
};
54-
5547
export default Overridable.component("Error", Error);

src/lib/components/LayoutSwitcher/LayoutSwitcher.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ class LayoutSwitcher extends Component {
2424
};
2525

2626
render() {
27-
const { currentLayout, loading, totalResults, overridableId } = this.props;
27+
const {
28+
currentLayout = null,
29+
loading,
30+
totalResults,
31+
overridableId = "",
32+
} = this.props;
2833
return (
2934
<ShouldRender condition={currentLayout !== null && !loading && totalResults > 0}>
3035
<Element
@@ -46,12 +51,11 @@ LayoutSwitcher.propTypes = {
4651
totalResults: PropTypes.number.isRequired,
4752
};
4853

49-
LayoutSwitcher.defaultProps = {
50-
currentLayout: null,
51-
overridableId: "",
52-
};
53-
54-
const Element = ({ overridableId, currentLayout, onLayoutChange }) => {
54+
const Element = ({
55+
overridableId = "",
56+
currentLayout = null,
57+
onLayoutChange,
58+
}) => {
5559
const { buildUID } = useContext(AppContext);
5660
return (
5761
<Overridable
@@ -85,9 +89,4 @@ Element.propTypes = {
8589
overridableId: PropTypes.string,
8690
};
8791

88-
Element.defaultProps = {
89-
currentLayout: null,
90-
overridableId: "",
91-
};
92-
9392
export default Overridable.component("LayoutSwitcher", LayoutSwitcher);

src/lib/components/Pagination/Pagination.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ Pagination.defaultProps = {
9999
};
100100

101101
const Element = ({
102-
overridableId,
102+
overridableId = "",
103103
currentPage,
104104
currentSize,
105105
totalResults,
106106
onPageChange,
107-
options,
108-
maxTotalResults,
107+
options = {},
108+
maxTotalResults = 10000,
109109
...props
110110
}) => {
111111
const boundaryRangeCount = options.boundaryRangeCount;
@@ -161,10 +161,4 @@ Element.propTypes = {
161161
maxTotalResults: PropTypes.number,
162162
};
163163

164-
Element.defaultProps = {
165-
options: {},
166-
overridableId: "",
167-
maxTotalResults: 10000,
168-
};
169-
170164
export default Overridable.component("Pagination", Pagination);

src/lib/components/RangeFacet/RangeDefaultFilters.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ RangeDefaultFilters.defaultProps = {
111111

112112
const RangeDefaultFiltersElement = ({
113113
ranges,
114-
activeLabel,
114+
activeLabel = null,
115115
onToggle,
116-
overridableId,
116+
overridableId = "",
117117
}) => {
118118
const { buildUID } = useContext(AppContext);
119119

@@ -150,9 +150,7 @@ RangeDefaultFiltersElement.propTypes = {
150150
overridableId: PropTypes.string,
151151
};
152152

153-
RangeDefaultFiltersElement.defaultProps = {
154-
activeLabel: null,
155-
overridableId: "",
156-
};
157-
158-
export default Overridable.component("RangeFacet.DefaultFilters", RangeDefaultFilters);
153+
export default Overridable.component(
154+
"RangeFacet.DefaultFilters",
155+
RangeDefaultFilters
156+
);

src/lib/components/RangeFacet/RangeFacet.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,10 @@ export default Overridable.component("RangeFacet", withState(RangeFacet));
355355

356356
const RangeFacetElement = ({
357357
title,
358-
containerCmp,
358+
containerCmp = null,
359359
hasActiveFilter,
360360
onClear,
361-
overridableId,
361+
overridableId = "",
362362
}) => {
363363
const { buildUID } = React.useContext(AppContext);
364364

@@ -389,8 +389,3 @@ RangeFacetElement.propTypes = {
389389
onClear: PropTypes.func.isRequired,
390390
overridableId: PropTypes.string,
391391
};
392-
393-
RangeFacetElement.defaultProps = {
394-
containerCmp: null,
395-
overridableId: "",
396-
};

0 commit comments

Comments
 (0)