Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/CSSTransition.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class CSSTransition extends React.Component {
const { doneClassName } = this.getClassNames('enter');

if (type === 'appear' && phase === 'done' && doneClassName) {
className += ` ${doneClassName}`;
className = className ? `${className} ${doneClassName}` : doneClassName;
}

// This is to force a repaint,
Expand Down
59 changes: 31 additions & 28 deletions test/CSSTransition-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,34 +203,37 @@ describe('CSSTransition', () => {
expect(nodeRef.current.className).toBe('appear-test-enter-done');
});

it('should not add undefined when appearDone is not defined', async () => {
const nodeRef = React.createRef();
let done = false;
render(
<CSSTransition
timeout={10}
nodeRef={nodeRef}
classNames={{ appear: 'appear-test' }}
in={true}
appear={true}
onEnter={(isAppearing) => {
expect(isAppearing).toEqual(true);
expect(nodeRef.current.className).toEqual('appear-test');
}}
onEntered={(isAppearing) => {
expect(isAppearing).toEqual(true);
expect(nodeRef.current.className).toEqual('');
done = true;
}}
>
<div ref={nodeRef} />
</CSSTransition>
);

await waitFor(() => {
expect(done).toEqual(true);
});
});
it.each(['', 'enter-done'])(
'should not add undefined when appearDone is omitted and enterDone is %s',
async (enterDone) => {
const nodeRef = React.createRef();
let done = false;
render(
<CSSTransition
timeout={10}
nodeRef={nodeRef}
classNames={{ appear: 'appear-test', enterDone }}
in={true}
appear={true}
onEnter={(isAppearing) => {
expect(isAppearing).toEqual(true);
expect(nodeRef.current.className).toEqual('appear-test');
}}
onEntered={(isAppearing) => {
expect(isAppearing).toEqual(true);
expect(nodeRef.current.className).toEqual(enterDone);
done = true;
}}
>
<div ref={nodeRef} />
</CSSTransition>
);

await waitFor(() => {
expect(done).toEqual(true);
});
}
);

it('should not be appearing in normal enter mode', async () => {
let count = 0;
Expand Down