Skip to content

Commit

Permalink
upgrade EUI to 0.0.26 (elastic#17110)
Browse files Browse the repository at this point in the history
* upgrade EUI to 0.0.25

* remove last reference to TooltipTrigger

* upgraded to EUI 0.0.26

* fix warning, EuiKeyboardAccessible child must have onClick defined
  • Loading branch information
nreese authored Mar 13, 2018
1 parent d49d59e commit 69f6c65
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 37 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"url": "https://github.com/elastic/kibana.git"
},
"dependencies": {
"@elastic/eui": "0.0.23",
"@elastic/eui": "0.0.26",
"@elastic/filesaver": "1.1.2",
"@elastic/numeral": "2.3.1",
"@elastic/ui-ace": "0.2.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jest.mock('@elastic/eui', () => ({
EuiFlexItem: 'eui-flex-item',
EuiIcon: 'eui-icon',
EuiInMemoryTable: 'eui-in-memory-table',
TooltipTrigger: 'tooltip-trigger'
}));

jest.mock('../components/table', () => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,16 @@ exports[`Table should render conflicting type 1`] = `
component="div"
grow={true}
>
<TooltipTrigger
clickHideDelay={1000}
display={false}
isSticky={false}
onClick={[Function]}
onEntered={[Function]}
onExited={[Function]}
placement="top"
size="auto"
theme="dark"
tooltip="The type of this field changes across indices. It is unavailable for many analysis functions."
trigger="hover"
<EuiToolTip
content="The type of this field changes across indices. It is unavailable for many analysis functions."
position="top"
>
<EuiIcon
color="warning"
size="m"
type="alert"
/>
</TooltipTrigger>
</EuiToolTip>
</EuiFlexItem>
</EuiFlexGroup>
</div>
Expand Down Expand Up @@ -220,25 +211,16 @@ exports[`Table should render timestamp field name 1`] = `
component="div"
grow={true}
>
<TooltipTrigger
clickHideDelay={1000}
display={false}
isSticky={false}
onClick={[Function]}
onEntered={[Function]}
onExited={[Function]}
placement="top"
size="auto"
theme="dark"
tooltip="This field represents the time that events occurred."
trigger="hover"
<EuiToolTip
content="This field represents the time that events occurred."
position="top"
>
<EuiIcon
color="primary"
size="m"
type="clock"
/>
</TooltipTrigger>
</EuiToolTip>
</EuiFlexItem>
</EuiFlexGroup>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
EuiFlexItem,
EuiIcon,
EuiInMemoryTable,
TooltipTrigger
EuiToolTip,
} from '@elastic/eui';

export class Table extends PureComponent {
Expand All @@ -29,9 +29,9 @@ export class Table extends PureComponent {
</EuiFlexItem>
{isTimeField ? (
<EuiFlexItem>
<TooltipTrigger tooltip="This field represents the time that events occurred.">
<EuiToolTip content="This field represents the time that events occurred.">
<EuiIcon type="clock" color="primary" />
</TooltipTrigger>
</EuiToolTip>
</EuiFlexItem>
) : ''}
</EuiFlexGroup>
Expand All @@ -48,9 +48,9 @@ export class Table extends PureComponent {
</EuiFlexItem>
{isConflict ? (
<EuiFlexItem>
<TooltipTrigger tooltip="The type of this field changes across indices. It is unavailable for many analysis functions.">
<EuiToolTip content="The type of this field changes across indices. It is unavailable for many analysis functions.">
<EuiIcon type="alert" color="warning" />
</TooltipTrigger>
</EuiToolTip>
</EuiFlexItem>
) : ''}
</EuiFlexGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MetricVisValue extends Component {
<div
className={containerClassName}
style={{ backgroundColor: metric.bgColor }}
onClick={hasFilter ? this.onClick : null}
onClick={hasFilter ? this.onClick : () => {}}
tabIndex={hasFilter ? 0 : null}
role={hasFilter ? 'button' : null}
>
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/styles/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ ul.navbar-inline li {
.content {
.real-flex-parent(@flow: row nowrap);
width: 100%;
min-height: 100vh;
height: 100%;
overflow: hidden;

Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
version "0.0.0"
uid ""

"@elastic/eui@0.0.23":
version "0.0.23"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-0.0.23.tgz#01a3d88aeaff175da5d42b70d407d08a32783f3d"
"@elastic/eui@0.0.26":
version "0.0.26"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-0.0.26.tgz#368beede3bb36b60879e2d7b5035e8d56e80b6e6"
dependencies:
brace "^0.10.0"
classnames "^2.2.5"
Expand Down

0 comments on commit 69f6c65

Please sign in to comment.