Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve defaultProps deprecation warning for React v18+ #5689

Merged
merged 4 commits into from
Jul 13, 2023
Merged

Resolve defaultProps deprecation warning for React v18+ #5689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9791138
Remove `defaultProps` reference from functional components
Rall3n Jul 3, 2023
be3da3e
Prettier
Rall3n Jul 3, 2023
636d829
Add changeset
Rall3n Jul 3, 2023
44fe2af
Change changeset message
Rall3n Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/metal-pens-boil.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'react-select': patch
---

Resolve `defaultProps` deprecation warning for React v18+.
48 changes: 26 additions & 22 deletions packages/react-select/src/components/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,49 +498,53 @@ export const NoOptionsMessage = <
Option,
IsMulti extends boolean,
Group extends GroupBase<Option>
>(
props: NoticeProps<Option, IsMulti, Group>
) => {
const { children, innerProps } = props;
>({
children = 'No options',
innerProps,
...restProps
}: NoticeProps<Option, IsMulti, Group>) => {
return (
<div
{...getStyleProps(props, 'noOptionsMessage', {
'menu-notice': true,
'menu-notice--no-options': true,
})}
{...getStyleProps(
{ ...restProps, children, innerProps },
'noOptionsMessage',
{
'menu-notice': true,
'menu-notice--no-options': true,
}
)}
{...innerProps}
>
{children}
</div>
);
};
NoOptionsMessage.defaultProps = {
children: 'No options',
};

export const LoadingMessage = <
Option,
IsMulti extends boolean,
Group extends GroupBase<Option>
>(
props: NoticeProps<Option, IsMulti, Group>
) => {
const { children, innerProps } = props;
>({
children = 'Loading...',
innerProps,
...restProps
}: NoticeProps<Option, IsMulti, Group>) => {
return (
<div
{...getStyleProps(props, 'loadingMessage', {
'menu-notice': true,
'menu-notice--loading': true,
})}
{...getStyleProps(
{ ...restProps, children, innerProps },
'loadingMessage',
{
'menu-notice': true,
'menu-notice--loading': true,
}
)}
{...innerProps}
>
{children}
</div>
);
};
LoadingMessage.defaultProps = {
children: 'Loading...',
};

// ==============================
// Menu Portal
Expand Down
24 changes: 14 additions & 10 deletions packages/react-select/src/components/indicators.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,22 @@ export const LoadingIndicator = <
Option,
IsMulti extends boolean,
Group extends GroupBase<Option>
>(
props: LoadingIndicatorProps<Option, IsMulti, Group>
) => {
const { innerProps, isRtl } = props;

>({
innerProps,
isRtl,
size = 4,
...restProps
}: LoadingIndicatorProps<Option, IsMulti, Group>) => {
return (
<div
{...getStyleProps(props, 'loadingIndicator', {
indicator: true,
'loading-indicator': true,
})}
{...getStyleProps(
{ ...restProps, innerProps, isRtl, size },
'loadingIndicator',
{
indicator: true,
'loading-indicator': true,
}
)}
{...innerProps}
>
<LoadingDot delay={0} offset={isRtl} />
Expand All @@ -306,4 +311,3 @@ export const LoadingIndicator = <
</div>
);
};
LoadingIndicator.defaultProps = { size: 4 };