Skip to content
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

Upgrade EUI to v88.5.4 #167555

Merged
merged 12 commits into from
Oct 4, 2023
Merged

Upgrade EUI to v88.5.4 #167555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a7b3a27
Upgrade EUI to v88.5.1
cee-chen Sep 28, 2023
3fdccfe
Use new namespaced nav body/footer components
cee-chen Sep 28, 2023
d79099d
Interim migration for removed `isGroupTitle` API
cee-chen Sep 28, 2023
f82b7c1
Merge branch 'main' into eui-v88.5.1
cee-chen Sep 29, 2023
de5011f
[EuiComboBox] Update snapshots
cee-chen Sep 29, 2023
85e2c70
Fix failing Jest tests due to changed combobox input dependency
cee-chen Sep 29, 2023
d8f4370
[Security Solution] Fix Cypress tests to account for combobox changes
cee-chen Sep 29, 2023
bfac93f
Merge branch 'main' into eui-v88.5.1
cee-chen Oct 2, 2023
25dd8b1
Upgrade EUI to v88.5.3 for combobox fix
cee-chen Oct 2, 2023
5f994cc
Merge branch 'main' into eui-v88.5.1
cee-chen Oct 2, 2023
85f06dd
Bump EUI to v88.5.4
cee-chen Oct 3, 2023
2cb42b9
Merge branch 'main' into eui-v88.5.1
cee-chen Oct 3, 2023
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 @@ -102,7 +102,7 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "npm:@elastic/[email protected]",
"@elastic/ems-client": "8.4.0",
"@elastic/eui": "88.5.0",
"@elastic/eui": "88.5.4",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
Expand Down
240 changes: 92 additions & 148 deletions ...s/kbn-securitysolution-autocomplete/src/field/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions packages/kbn-securitysolution-autocomplete/src/field/__tests__/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,7 @@ describe('FieldComponent', () => {
);
const fieldAutocompleteComboBox = wrapper.getByTestId('comboBoxSearchInput');
fireEvent.change(fieldAutocompleteComboBox, { target: { value: '_source' } });
await waitFor(() =>
expect(wrapper.getByTestId('fieldAutocompleteComboBox')).toHaveTextContent('_source')
);
expect(fieldAutocompleteComboBox).toHaveValue('_source');
});

it('it allows custom user input if "acceptsCustomOptions" is "true"', async () => {
Expand Down
28 changes: 25 additions & 3 deletions packages/shared-ux/chrome/navigation/src/ui/components/navigation_section_ui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import React, { FC, useEffect, useState } from 'react';
import {
EuiCollapsibleNavItem,
EuiCollapsibleNavItemProps,
EuiCollapsibleNavSubItemGroupTitle,
EuiCollapsibleNavSubItemProps,
EuiTitle,
} from '@elastic/eui';
import { ChromeProjectNavigationNode } from '@kbn/core-chrome-browser';
import classnames from 'classnames';
Expand All @@ -22,7 +23,7 @@ import { isAbsoluteLink } from '../../utils';
const navigationNodeToEuiItem = (
item: ChromeProjectNavigationNode,
{ navigateToUrl, basePath }: { navigateToUrl: NavigateToUrlFn; basePath: BasePathService }
): EuiCollapsibleNavSubItemGroupTitle | EuiCollapsibleNavItemProps => {
): EuiCollapsibleNavSubItemProps => {
const href = item.deepLink?.url ?? item.href;
const id = item.path ? item.path.join('.') : item.id;
const isExternal = Boolean(href) && isAbsoluteLink(href!);
Expand All @@ -33,9 +34,30 @@ const navigationNodeToEuiItem = (
[`nav-item-isActive`]: isSelected,
});

// Note: this can be replaced with an `isGroup` API or whatever you prefer
// Could also probably be pulled out to a separate component vs inlined
if (item.isGroupTitle) {
return {
renderItem: () => (
<EuiTitle
size="xxxs"
className="eui-textTruncate"
css={({ euiTheme }: any) => ({
marginTop: euiTheme.size.base,
paddingBlock: euiTheme.size.xs,
paddingInline: euiTheme.size.s,
})}
>
<div id={id} data-test-subj={dataTestSubj}>
{item.title}
</div>
</EuiTitle>
),
};
}

return {
id,
isGroupTitle: item.isGroupTitle,
title: item.title,
isSelected,
accordionProps: {
Expand Down
10 changes: 6 additions & 4 deletions packages/shared-ux/chrome/navigation/src/ui/components/navigation_ui.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

import { EuiFlyoutBody, EuiFlyoutFooter } from '@elastic/eui';
import { EuiCollapsibleNavBeta } from '@elastic/eui';
import React, { FC } from 'react';

interface Props {
Expand All @@ -22,10 +22,12 @@ export const NavigationUI: FC<Props> = ({ children, unstyled, footerChildren, da
<>{children}</>
) : (
<>
<EuiFlyoutBody scrollableTabIndex={-1} data-test-subj={dataTestSubj}>
<EuiCollapsibleNavBeta.Body data-test-subj={dataTestSubj}>
{children}
</EuiFlyoutBody>
{footerChildren && <EuiFlyoutFooter>{footerChildren}</EuiFlyoutFooter>}
</EuiCollapsibleNavBeta.Body>
{footerChildren && (
<EuiCollapsibleNavBeta.Footer>{footerChildren}</EuiCollapsibleNavBeta.Footer>
)}
</>
)}
</>
Expand Down
Loading
Loading