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

Update LinkContainer props to follow more closely to v6 standards #300

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update LinkContainer props to follow more closely to v6 standards #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 17 additions & 26 deletions src/LinkContainer.js
View file
Open in desktop
Expand Up @@ -11,21 +11,19 @@ const isModifiedEvent = (event) =>
!!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey);

const LinkContainer = ({
children,
onClick,
replace, // eslint-disable-line no-unused-vars
to,
activeClassName,
className,
activeStyle,
style,
isActive: getIsActive,
// eslint-disable-next-line comma-dangle
...props
}) => {
children,
onClick,
replace, // eslint-disable-line no-unused-vars
to,
className,
style,
isActive: getIsActive,
// eslint-disable-next-line comma-dangle
...props
}) => {
const path = typeof to === 'object' ? to.pathname : to;
const navigate = useNavigate();
const href = useHref(typeof to === 'string' ? { pathname: to } : to);
const href = useHref(typeof to === 'string' ? {pathname: to} : to);
const match = useMatch(path);
const location = useLocation();
const child = React.Children.only(children);
Expand Down Expand Up @@ -61,13 +59,12 @@ const LinkContainer = ({
return React.cloneElement(child, {
...props,
className: [
className,
typeof className === 'function' ? className({isActive}) : className,
child.props.className,
isActive ? activeClassName : null,
]
.join(' ')
.trim(),
style: isActive ? { ...style, ...activeStyle } : style,
style: typeof style === 'function' ? style({isActive}) : style,
href,
onClick: handleClick,
});
Expand All @@ -78,24 +75,18 @@ LinkContainer.propTypes = {
onClick: PropTypes.func,
replace: PropTypes.bool,
to: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,
className: PropTypes.string,
activeClassName: PropTypes.string,
style: PropTypes.objectOf(
className: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
style: PropTypes.oneOfType([PropTypes.objectOf(
PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
),
activeStyle: PropTypes.objectOf(
PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
),
), PropTypes.func]),
isActive: PropTypes.oneOfType([PropTypes.func, PropTypes.bool]),
};

LinkContainer.defaultProps = {
replace: false,
activeClassName: 'active',
onClick: null,
className: null,
className: ({isActive}) => isActive ? 'active' : null,
style: null,
activeStyle: null,
isActive: null,
};

Expand Down