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

Jump to bottom

Upgrade EUI to v90.0.1 #172261

Merged
merged 3 commits into from
Nov 30, 2023
+9 −6
Merged

Upgrade EUI to v90.0.1 #172261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1082c4b
Upgrade EUI to v90.0.1
cee-chen Nov 30, 2023
167f818
Merge branch 'main' into eui-90.0.1
cee-chen Nov 30, 2023
03f8ae5
Ignore EuiCollapsibleNavItem typescript errors for now
cee-chen Nov 30, 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/elasticsearch-canary@8.9.1-canary.1",
"@elastic/ems-client": "8.5.1",
"@elastic/eui": "90.0.0",
"@elastic/eui": "90.0.1",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
Expand Down
3 changes: 3 additions & 0 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 @@ -290,6 +290,7 @@ const nodeToEuiCollapsibleNavProps = (
}

const items: Array<EuiCollapsibleNavItemProps | EuiCollapsibleNavSubItemPropsEnhanced> = [
// @ts-ignore - TODO
Copy link
Member Author

@cee-chen cee-chen Nov 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebelga Apologies for these TODOs for you/your team - I briefly (5-15 minutes) spiked out resolving the Typescript errors, but it involved removing several props and I was not confident that I was doing it correctly.

Unfortunately the EUI team doesn't have bandwidth right now to correctly address this before 8.12FF, so I thought I'd just get in the component changes sooner and have you take a look at the type reconciliation later.

FWIW, the type was updated in elastic/eui#7337 to use an ExclusiveUnion and not accept either href/linkProps or items/accordionProps/isCollapsed, but not both.

The type errors do not affect actual production behavior, the component handles excess props gracefully and does not pass href down to accordions or groups with items.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok no worries, I'll fix the type in a separate PR 👍

{
id,
path,
Expand Down Expand Up @@ -519,6 +520,7 @@ export const NavigationSectionUI: FC<Props> = React.memo(({ navNode: _navNode })
if (item.renderItem) {
return item;
}
// @ts-ignore - TODO
const parsed: EuiCollapsibleNavSubItemProps = {
...item,
items: serializeAccordionItems(item.items),
Expand All @@ -539,6 +541,7 @@ export const NavigationSectionUI: FC<Props> = React.memo(({ navNode: _navNode })
}

return (
// @ts-ignore - TODO
<EuiCollapsibleNavItem
{...props}
className={className}
Expand Down
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const LICENSE_OVERRIDES = {
'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
'@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'@elastic/ems-client@8.5.1': ['Elastic License 2.0'],
'@elastic/eui@90.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
'@elastic/eui@90.0.1': ['SSPL-1.0 OR Elastic License 2.0'],
'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary
};
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 @@ -1627,10 +1627,10 @@
resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==

"@elastic/eui@90.0.0":
version "90.0.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-90.0.0.tgz#f105576513ed2fb31fefab5e1287be4e090ba0f3"
integrity sha512-4LXY4CwXU3FHeOiW76VPTaYcPVKEiqpb8GGHFEkYfBPWBgXyUJUVJyXwX9k8pzXElxM9I68OTDVRxIUzEzFiug==
"@elastic/eui@90.0.1":
version "90.0.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-90.0.1.tgz#f70391559a113d6df4622f5c0160fb94dc064885"
integrity sha512-KMr3blXQUBQjCjb4hskKaNMxLwJOOLSOwAvoZQjqj3ZxQS9yinZ1Ly8mn16ua8iC6HVra1GB0lsNyrCD+VlgwA==
dependencies:
"@hello-pangea/dnd" "^16.3.0"
"@types/lodash" "^4.14.198"
Expand Down
Loading