Skip to content

Upgrade EUI to 12.4.0 #41577

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
thompsongl merged 9 commits into from
Jul 22, 2019
Merged

Upgrade EUI to 12.4.0 #41577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d19a5a
eui 12.4.0
thompsongl Jul 19, 2019
fab3996
styled-components ts conflict
thompsongl Jul 19, 2019
43074e6
update combobox test service to always open on open call
thompsongl Jul 19, 2019
0dcfa87
Merge branch 'master' into eui/12.4.0
thompsongl Jul 19, 2019
f83c869
Revert "update combobox test service to always open on open call"
thompsongl Jul 19, 2019
81aa6c1
Merge branch 'master' into eui/12.4.0
thompsongl Jul 19, 2019
2609148
Merge branch 'master' into eui/12.4.0
thompsongl Jul 22, 2019
5022c9b
scroll combobox into view
thompsongl Jul 22, 2019
7de113a
scroll before filter
thompsongl Jul 22, 2019
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"@babel/register": "7.4.4",
"@elastic/charts": "^7.2.1",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/numeral": "2.3.3",
Expand Down
3 changes: 3 additions & 0 deletions test/functional/services/combo_box.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
import { FtrProviderContext } from '../ftr_provider_context';
import { WebElementWrapper } from './lib/web_element_wrapper';
// @ts-ignore not supported yet
import { scrollIntoViewIfNecessary } from './lib/web_element_wrapper/scroll_into_view_if_necessary';

export function ComboBoxProvider({ getService, getPageObjects }: FtrProviderContext) {
const config = getService('config');
Expand Down Expand Up @@ -58,6 +60,7 @@ export function ComboBoxProvider({ getService, getPageObjects }: FtrProviderCont
return;
}

comboBoxElement.scrollIntoViewIfNecessary();
await this._filterOptionsList(comboBoxElement, value);
await this.openOptionsList(comboBoxElement);

Expand Down
2 changes: 1 addition & 1 deletion test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
}
Expand Down
2 changes: 1 addition & 1 deletion test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0"
}
}
2 changes: 1 addition & 1 deletion test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
}
Expand Down
22 changes: 15 additions & 7 deletions x-pack/legacy/plugins/code/public/components/diff_page/diff.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,18 @@ const TopBarContainer = styled.div`
justify-content: space-between;
`;

const Accordion = styled(EuiAccordion)`
border: ${theme.euiBorderThick};
border-radius: ${theme.euiSizeS};
margin-bottom: ${theme.euiSize};
`;
// @types/styled-components@3.0.1 does not yet support `defaultProps`, which EuiAccordion uses
// Ref: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/31903
// const Accordion = styled(EuiAccordion)`
// border: ${theme.euiBorderThick};
// border-radius: ${theme.euiSizeS};
// margin-bottom: ${theme.euiSize};
// `;
const accordionStyles = {
border: theme.euiBorderThick,
borderRadius: theme.euiSizeS,
marginBottom: theme.euiSize,
};

const Icon = styled(EuiIcon)`
margin-right: ${theme.euiSizeS};
Expand Down Expand Up @@ -103,7 +110,8 @@ const onClick = (e: MouseEvent<HTMLDivElement>) => {
};

const Difference = (props: { fileDiff: FileDiff; repoUri: string; revision: string }) => (
<Accordion
<EuiAccordion
style={accordionStyles}
initialIsOpen={true}
id={props.fileDiff.path}
buttonContent={
Expand Down Expand Up @@ -135,7 +143,7 @@ const Difference = (props: { fileDiff: FileDiff; repoUri: string; revision: stri
language={props.fileDiff.language!}
renderSideBySide={true}
/>
</Accordion>
</EuiAccordion>
);

export class DiffPage extends React.Component<Props> {
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 @@ -172,7 +172,7 @@
"@babel/runtime": "7.4.5",
"@elastic/ctags-langserver": "^0.1.2",
"@elastic/datemath": "5.0.2",
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"@elastic/javascript-typescript-langserver": "^0.2.1",
"@elastic/lsp-extension": "^0.1.2",
"@elastic/node-crypto": "^1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,10 +1659,10 @@
tabbable "^1.1.0"
uuid "^3.1.0"

"@elastic/eui@12.3.1":
version "12.3.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-12.3.1.tgz#89ced2cf43d5363f0cbc9cca76f6fcdfb3466276"
integrity sha512-7XQSSsyJTPyJQR+tmo14z/ek7/9PDz7jI/t1sPa14hG8CLYKhOgtYjVFeLM4hHz4F4MLwfwK1t3gMHqFxnvGeQ==
"@elastic/eui@12.4.0":
version "12.4.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-12.4.0.tgz#a679c498e5890fea34dab35346212022538fef5d"
integrity sha512-b3bY5cRqvbyRa8Uain1drZc6djvxxcZFfx0uQbkHOe9iK+AppHfkqQ5KeXtH3CUF55PZI56DRkVzsBbcOMMtOQ==
dependencies:
"@types/lodash" "^4.14.116"
"@types/numeral" "^0.0.25"
Expand Down