Skip to content

update x-pack to eui 5.1.0, clean up some ts defs #3

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

Merged
jasonrhodes merged 1 commit into from
Nov 25, 2018
Merged

update x-pack to eui 5.1.0, clean up some ts defs #3

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
4 changes: 0 additions & 4 deletions src/ui/public/query_bar/components/language_switcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
* under the License.
*/

declare module '@elastic/eui' {
export const EuiPopoverTitle: React.SFC<any>;
}

import {
EuiButtonEmpty,
EuiForm,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
},
"dependencies": {
"@elastic/datemath": "^4.0.2",
"@elastic/eui": "5.0.0",
"@elastic/eui": "^5.1.0",
"@elastic/node-crypto": "0.1.2",
"@elastic/node-phantom-simple": "2.2.4",
"@elastic/numeral": "2.3.2",
Expand Down
9 changes: 7 additions & 2 deletions x-pack/plugins/apm/public/components/shared/HistoryTabs/__test__/HistoryTabs.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ import {
IHistoryTab
} from '..';

type PropsOf<Component> = Component extends React.SFC<infer Props>
? Props
: never;
type EuiTabProps = PropsOf<typeof EuiTab>;

describe('HistoryTabs', () => {
let mockLocation: any;
let mockHistory: any;
Expand Down Expand Up @@ -61,7 +66,7 @@ describe('HistoryTabs', () => {
const wrapper = shallow(<HistoryTabsWithoutRouter {...testProps} />);
expect(wrapper).toMatchSnapshot();

const tabs: ShallowWrapper<EuiTab> = wrapper.find(EuiTab);
const tabs: ShallowWrapper<EuiTabProps> = wrapper.find(EuiTab);
expect(tabs.at(0).props().isSelected).toEqual(false);
expect(tabs.at(1).props().isSelected).toEqual(true);
expect(tabs.at(2).props().isSelected).toEqual(false);
Expand All @@ -81,7 +86,7 @@ describe('HistoryTabs', () => {
.at(2)
.simulate('click');

const tabs: ReactWrapper<EuiTab> = wrapper.find(EuiTab);
const tabs: ReactWrapper<EuiTabProps> = wrapper.find(EuiTab);
expect(tabs.at(0).props().isSelected).toEqual(false);
expect(tabs.at(1).props().isSelected).toEqual(false);
expect(tabs.at(2).props().isSelected).toEqual(true);
Expand Down
11 changes: 0 additions & 11 deletions x-pack/plugins/infra/types/eui.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ declare module '@elastic/eui' {
children: React.ReactNode;
};

export const EuiErrorBoundary: React.SFC<EuiErrorBoundaryProps>;

type EuiSizesResponsive = 'xs' | 's' | 'm' | 'l' | 'xl';
type EuiResponsiveProps = CommonProps & {
children: React.ReactNode;
Expand All @@ -164,13 +162,4 @@ declare module '@elastic/eui' {
};

export const EuiDatePickerRange: React.SFC<EuiDatePickerRangeProps>;

export type EuiBetaBadgeProps = CommonProps & {
iconType?: IconType;
label: React.ReactNode;
title?: string;
tooltipContent?: React.ReactNode;
tooltipPosition?: EuiToolTipPosition;
};
export const EuiBetaBadge: React.SFC<EuiBetaBadgeProps>;
}
26 changes: 1 addition & 25 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,31 +746,7 @@
tabbable "^1.1.0"
uuid "^3.1.0"

"@elastic/eui@5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-5.0.0.tgz#e6fe9e1aa8b00c93045178f78a6dd0d457d56fa8"
integrity sha512-WL6sp6u2Rt1O7a2exLU/RuDcRnpluPN6aQ2JexBl+G6mVyF8F5I3RGJKTJp3jOozOaODRY2ev+Nq57EydkjrKg==
dependencies:
classnames "^2.2.5"
core-js "^2.5.1"
focus-trap-react "^3.0.4"
highlight.js "^9.12.0"
html "^1.0.0"
keymirror "^0.1.1"
lodash "npm:@elastic/lodash@3.10.1-kibana1"
numeral "^2.0.6"
prop-types "^15.6.0"
react-ace "^5.5.0"
react-color "^2.13.8"
react-datepicker v1.5.0
react-input-autosize "^2.2.1"
react-virtualized "^9.18.5"
react-vis "1.10.2"
resize-observer-polyfill "^1.5.0"
tabbable "^1.1.0"
uuid "^3.1.0"

"@elastic/eui@^5.1.0":
"@elastic/eui@5.1.0":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-5.1.0.tgz#fdc17af319567e500002f79404a2e33748501f6c"
integrity sha512-ZVUQYO7uP1M1NyPmzal16SKbjA3PwxR393YpcKJ/Wytqi4kHEeJNLVGQoRGBSJ3Qw0ivU91i5+RuefkyPj67tw==
Expand Down