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

fix(tooltip): fix trigger disabled bug #465

Merged
merged 1 commit into from
Nov 13, 2020
Merged

fix(tooltip): fix trigger disabled bug #465

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
3 changes: 3 additions & 0 deletions packages/components/src/components/tooltip/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ const Tooltip = (props: TooltipProps): JSX.Element => {
builtinPlacements={getPlacements({ arrowPointAtCenter })}
visible={controlledVisible && !disabled && !isNoContent}
onVisibleChange={(_visible) => {
if (disabled) {
return;
}
setControlledVisible(_visible);
if (!isNoContent) {
onVisibleChange?.(_visible);
Expand Down
47 changes: 24 additions & 23 deletions packages/components/src/components/tooltip/__tests__/Tooltip.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import React from 'react';
import { mount, render } from 'enzyme';
import { isEqual } from 'lodash';
import Tooltip from '../index';
import '../../../../es/components/tabs/style/index.css';
import getPlacements, { getOverflowOptions } from '../placements';
import { waitForComponentToPaint } from '../../../utils/test';


describe('Testing Tooltip', () => {
const getTooltip = () => (
<Tooltip title="This is a test" tooltipLink={{ name: '点击这里', link: 'https://www.growingio.com' }}>
Expand Down Expand Up @@ -48,26 +46,31 @@ describe('Testing Tooltip', () => {
).toHaveLength(1);
});

test('props disabled', () => {
test('props disabled', async () => {
const wrapper = mount(getTooltip());
wrapper.setProps({ disabled: true, title: '测试disabled' });
wrapper.find('span').at(0).simulate('mouseenter');
await waitForComponentToPaint(wrapper);
expect(wrapper.exists('.gio-tooltip')).toBe(false);
// 重新触发才应该显示
wrapper.setProps({ disabled: false });
await waitForComponentToPaint(wrapper);
expect(wrapper.exists('.gio-tooltip')).toBe(false);
// 重新触发
wrapper.find('span').at(0).simulate('mouseenter');
await waitForComponentToPaint(wrapper);
expect(wrapper.exists('.gio-tooltip')).toBe(true);
});

test('title content should be render', (done) => {
test('title content should be render', async () => {
const wrapper = mount(getTooltip());
wrapper.setProps({ visible: true });
wrapper.setProps({ title: '' });
waitForComponentToPaint(wrapper).then(() => {
expect(wrapper.exists('.gio-tooltip')).toBe(false);
done();
});
await waitForComponentToPaint(wrapper);
expect(wrapper.exists('.gio-tooltip')).toBe(false);
wrapper.setProps({ title: null });
waitForComponentToPaint(wrapper).then(() => {
expect(wrapper.exists('.gio-tooltip')).toBe(false);
done();
});
await waitForComponentToPaint(wrapper);
expect(wrapper.exists('.gio-tooltip')).toBe(false);
});

test('props trigger', () => {
Expand All @@ -77,13 +80,11 @@ describe('Testing Tooltip', () => {
expect(wrapper.exists('.gio-tooltip-inner')).toBe(true);
});

test('props placement', (done) => {
test('props placement', async () => {
const wrapper = mount(getTooltip());
wrapper.setProps({ visible: true, placement: 'topLeft' });
waitForComponentToPaint(wrapper, 2000).then(() => {
expect(wrapper.exists('.gio-tooltip-placement-topLeft')).toBe(true);
done();
});
await waitForComponentToPaint(wrapper, 2000);
expect(wrapper.exists('.gio-tooltip-placement-topLeft')).toBe(true);
});

test('props overlayClassName', () => {
Expand All @@ -97,14 +98,16 @@ describe('Testing Tooltip', () => {
let called = false;
const wrapper = mount(getTooltip());
wrapper.setProps({
onVisibleChange: () => {called = true},
onVisibleChange: () => {
called = true;
},
});
wrapper.setProps({ trigger: 'click' });
wrapper.find('span').at(0).simulate('click');
expect(called).toBe(true);
});

it('should be render rightly', (done) => {
it('should be render rightly', async () => {
const wrapper = mount(getTooltip());
wrapper.setProps({ trigger: 'click' });
wrapper.setProps({ placement: 'topLeft' });
Expand All @@ -119,10 +122,8 @@ describe('Testing Tooltip', () => {
.filterWhere((item) => item.prop('href') === 'https://www.growingio.com')
).toHaveLength(1);
expect(wrapper.exists('.overlayClassName')).toBe(true);
waitForComponentToPaint(wrapper).then(() => {
expect(wrapper.exists('.gio-tooltip-placement-topLeft')).toBe(true);
done();
});
await waitForComponentToPaint(wrapper);
expect(wrapper.exists('.gio-tooltip-placement-topLeft')).toBe(true);
});

test('getOverflowOptions function', () => {
Expand Down