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

Join className from container with the one from child element #228

Merged
merged 1 commit into from
Sep 8, 2017
Merged

Join className from container with the one from child element #228

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/LinkContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ export default class LinkContainer extends Component {
typeof to === 'string' ? { pathname: to } : to
);

const child = React.Children.only(children);

return (
<Route
path={typeof to === 'object' ? to.pathname : to}
Expand All @@ -97,10 +99,10 @@ export default class LinkContainer extends Component {
const isActive = !!(getIsActive ? getIsActive(match, location) : match);

return React.cloneElement(
React.Children.only(children),
child,
{
...props,
className: isActive ? [className, activeClassName].join(' ') : className,
className: [className, child.props.className, isActive && activeClassName].join(' '),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't right:

> ['asdf', false].join(' ')
'asdf false'

Maybe just pull in classnames?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, it was supposed to be null - missed that, thanks.
Do you reckon it's worth to have another dependency just to join three different classes? 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, I thought it was a dep in the previous version. I guess it never came up?

I mean, React-Bootstrap pulls in classnames anyway, so it's not an extra dependency net for anyone already using React-Bootstrap. Or really classnames is just so darn common, no?

Copy link
Member Author

@v12 v12 Sep 8, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

classnames is quite common for many React project, although, react-router-bootstrap module isn't restricted to be used with react-bootstrap only (i.e., I started to use it with Blueprint recently and it works like a charm). 😃

I'd keep it as tiny as possible as I don't see an advantage of bringing an additional dependency for such a simple use case 😉

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blueprint uses classnames too:

https://github.com/palantir/blueprint/search?utf8=%E2%9C%93&q=classnames&type=

Hand-rolling the class joining would be the worst thing. I'd personally use classnames but it's your call – either way is fine.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GAH sorry typed too quickly, I meant wouldn't be the worst thing. sorry ):

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does, you're right. 👍

I mentioned Blueprint just as one of the examples that react-router-bootstrap can be used with other libraries (not even libraries but, potentially, custom components).

Anyway, if this comes up at any point later, I'll pull classnames in 😉

Thanks for an instant response and valuable comments!

style: isActive ? { ...style, ...activeStyle } : style,
href,
onClick: this.handleClick,
Expand Down
26 changes: 26 additions & 0 deletions test/LinkContainer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,32 @@ describe('LinkContainer', () => {
.to.equal(findDOMNode(component));
});

it('should join child element className with the one from container', () => {
function renderComponent(location) {
const router = ReactTestUtils.renderIntoDocument(
<Router initialEntries={[location]}>
<Route
path="/"
render={() => (
<LinkContainer to="/" className="container-css">
<Component className="foo-css">Foo</Component>
</LinkContainer>
)}
/>
</Router>
);

const component = ReactTestUtils.findRenderedComponentWithType(
router, Component
);
return findDOMNode(component);
}

const { className } = renderComponent('/test');

expect(className.trim()).to.match(/\bcontainer-css foo-css\b/);
});

describe('when clicked', () => {
it('should transition to the correct route', () => {
const router = ReactTestUtils.renderIntoDocument(
Expand Down