github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade EUI to 12.4.0 (#41577) (#41691)

Browse source 
* eui 12.4.0

* styled-components ts conflict

* update combobox test service to always open on open call

* Revert "update combobox test service to always open on open call"

This reverts commit 43074e6006.

* scroll combobox into view

* scroll before filter
This commit is contained in:
Greg Thompson 2019-07-22 14:15:18 -05:00 • committed by GitHub
parent 88b03b2d23
commit 657d45df62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -105,7 +105,7 @@
"@babel/register": "7.4.4",
"@elastic/charts": "^7.0.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",

3
test/functional/services/combo_box.ts
View file

@ -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');
@ -58,6 +60,7 @@ export function ComboBoxProvider({ getService, getPageObjects }: FtrProviderCont
return;
}
comboBoxElement.scrollIntoViewIfNecessary();
await this._filterOptionsList(comboBoxElement, value);
await this.openOptionsList(comboBoxElement);

2
test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
View file

@ -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"
}

2
test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
View file

@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0"
}
}

2
test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
View file

@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0"
},
"scripts": {

2
test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
View file

@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"@elastic/eui": "12.3.1",
"@elastic/eui": "12.4.0",
"react": "^16.8.0"
},
"scripts": {

2
test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
View file

@ -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"
}

22
x-pack/legacy/plugins/code/public/components/diff_page/diff.tsx
View file

@ -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};
@ -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={
@ -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> {

2
x-pack/package.json
View file

@ -171,7 +171,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",

8
yarn.lock
View file

@ -1644,10 +1644,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"