From 188eaede43fcf79504f76537164ab3931fe3b6c5 Mon Sep 17 00:00:00 2001 From: Keith Grant Date: Tue, 12 Mar 2019 15:24:36 -0400 Subject: [PATCH] switch to PatternFly Tooltip everywhere --- __tests__/components/Tooltip.test.jsx | 69 ------------- src/app.scss | 4 + .../DataListToolbar/DataListToolbar.jsx | 4 +- src/components/Tabs/Tabs.jsx | 5 +- src/components/Tooltip/Tooltip.jsx | 96 ------------------- src/components/Tooltip/index.js | 3 - 6 files changed, 8 insertions(+), 173 deletions(-) delete mode 100644 __tests__/components/Tooltip.test.jsx delete mode 100644 src/components/Tooltip/Tooltip.jsx delete mode 100644 src/components/Tooltip/index.js diff --git a/__tests__/components/Tooltip.test.jsx b/__tests__/components/Tooltip.test.jsx deleted file mode 100644 index 9a78ae5fa0..0000000000 --- a/__tests__/components/Tooltip.test.jsx +++ /dev/null @@ -1,69 +0,0 @@ -import React from 'react'; -import { mount } from 'enzyme'; -import Tooltip from '../../src/components/Tooltip'; - -describe('', () => { - let elem; - let content; - let mouseOverHandler; - let mouseOutHandler; - const child = (foo); - const message = 'hi'; - - test('initially renders without crashing', () => { - elem = mount( - - {child} - - ); - expect(elem.length).toBe(1); - }); - - test('shows/hides with mouse over and leave', () => { - elem = mount( - - {child} - - ); - mouseOverHandler = elem.find('.mouseOverHandler'); - mouseOutHandler = elem.find('.mouseOutHandler'); - expect(elem.state().isDisplayed).toBe(false); - elem.update(); - content = elem.find('.pf-c-tooltip__content'); - expect(content.length).toBe(0); - mouseOverHandler.props().onMouseOver(); - expect(elem.state().isDisplayed).toBe(true); - elem.update(); - content = elem.find('.pf-c-tooltip__content'); - expect(content.length).toBe(1); - mouseOutHandler.props().onMouseLeave(); - expect(elem.state().isDisplayed).toBe(false); - elem.update(); - content = elem.find('.pf-c-tooltip__content'); - expect(content.length).toBe(0); - }); - - test('shows/hides with focus and blur', () => { - elem = mount( - - {child} - - ); - mouseOverHandler = elem.find('.mouseOverHandler'); - mouseOutHandler = elem.find('.mouseOutHandler'); - expect(elem.state().isDisplayed).toBe(false); - elem.update(); - content = elem.find('.pf-c-tooltip__content'); - expect(content.length).toBe(0); - mouseOverHandler.props().onFocus(); - expect(elem.state().isDisplayed).toBe(true); - elem.update(); - content = elem.find('.pf-c-tooltip__content'); - expect(content.length).toBe(1); - mouseOutHandler.props().onBlur(); - expect(elem.state().isDisplayed).toBe(false); - elem.update(); - content = elem.find('.pf-c-tooltip__content'); - expect(content.length).toBe(0); - }); -}); diff --git a/src/app.scss b/src/app.scss index 5d984dcbd5..1f0d7ee0c2 100644 --- a/src/app.scss +++ b/src/app.scss @@ -216,6 +216,10 @@ --pf-c-tooltip__content--PaddingBottom: 0.71rem; --pf-c-tooltip__content--PaddingLeft: 0.71rem; } +// higher specificity needed to override PF styles added dynamically to page +.pf-c-tooltip .pf-c-tooltip__content { + text-align: left; +} // // pf empty state overrides diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx index 2810a52435..efa66c1a70 100644 --- a/src/components/DataListToolbar/DataListToolbar.jsx +++ b/src/components/DataListToolbar/DataListToolbar.jsx @@ -15,6 +15,7 @@ import { Toolbar, ToolbarGroup, ToolbarItem, + Tooltip, } from '@patternfly/react-core'; import { BarsIcon, @@ -30,7 +31,6 @@ import { Link } from 'react-router-dom'; -import Tooltip from '../Tooltip'; import VerticalSeparator from '../VerticalSeparator'; const flexGrowStyling = { @@ -291,7 +291,7 @@ class DataListToolbar extends React.Component { { showDelete && (