Skip to content

Commit

Permalink
fix onVisibleChange arguments error (ant-design#4589)
Browse files Browse the repository at this point in the history
* fix onVisibleChange arguments error

* add test

* trigger travis
  • Loading branch information
ystarlongzi authored and afc163 committed Jan 14, 2017
1 parent c09cf95 commit 6e33285
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 6 deletions.
53 changes: 53 additions & 0 deletions components/tooltip/__tests__/tooltip.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import React from 'react';
import { mount } from 'enzyme';
import Tooltip from '..';

describe('Tooltip', () => {
it('check `onVisibleChange` arguments', () => {
const onVisibleChange = jest.fn();

const wrapper = mount(
<Tooltip
title=""
mouseEnterDelay={0}
mouseLeaveDelay={0}
onVisibleChange={onVisibleChange}
>
<div>Hello world!</div>
</Tooltip>
);

// `title` is empty.
const div = wrapper.find('div').at(0);
div.simulate('mouseenter');
expect(onVisibleChange).not.toHaveBeenCalled();
expect(wrapper.ref('tooltip').prop('visible')).toBe(false);

div.simulate('mouseleave');
expect(onVisibleChange).not.toHaveBeenCalled();
expect(wrapper.ref('tooltip').prop('visible')).toBe(false);


// update `title` value.
wrapper.setProps({ title: 'Have a nice day!' });
wrapper.simulate('mouseenter');
expect(onVisibleChange).toBeCalledWith(true); // mock.calls.length++
expect(wrapper.ref('tooltip').prop('visible')).toBe(true);

wrapper.simulate('mouseleave');
expect(onVisibleChange).toBeCalledWith(false); // mock.calls.length++
expect(wrapper.ref('tooltip').prop('visible')).toBe(false);


// add `visible` props.
wrapper.setProps({ visible: false });
wrapper.simulate('mouseenter');
expect(onVisibleChange.mock.calls.length).toBe(2);
expect(wrapper.ref('tooltip').prop('visible')).toBe(false);

wrapper.simulate('mouseleave');
expect(onVisibleChange.mock.calls.length).toBe(2);
expect(wrapper.ref('tooltip').prop('visible')).toBe(false);
});
});

17 changes: 11 additions & 6 deletions components/tooltip/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default class Tooltip extends React.Component<TooltipProps, any> {
super(props);

this.state = {
visible: props.visible,
visible: !!props.visible,
};
}

Expand All @@ -62,14 +62,19 @@ export default class Tooltip extends React.Component<TooltipProps, any> {
}

onVisibleChange = (visible) => {
const props = this.props;
const { props, state } = this;
const { title, overlay, onVisibleChange } = props;

if (!('visible' in props)) {
if (!title && !overlay) {
visible = false;
}

this.setState({ visible });
}

const onVisibleChange = props.onVisibleChange;
if (onVisibleChange) {
onVisibleChange(visible);
if (onVisibleChange && (visible !== state.visible)) {
onVisibleChange(visible);
}
}
}

Expand Down

0 comments on commit 6e33285

Please sign in to comment.