Skip to content

Commit

Permalink
[8.8] Upgrade EUI to v77.1.2 (#156232) (#156284)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.8`:
- [Upgrade EUI to v77.1.2
(#156232)](#156232)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Cee
Chen","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-05-01T17:05:11Z","message":"Upgrade
EUI to v77.1.2 (#156232)\n\n## Summary\r\n\r\n`[email protected]` ⏩
`[email protected]`\r\n\r\nThis upgrade consists of a backport release intended
to fix a major bug\r\nwhere portals within `EuiFlyout`s and `EuiModal`s
are not scrollable.\r\nfixes
https://github.com/elastic/kibana/issues/156161\r\n\r\nThis release also
adds functionality that resolves the need for a TODO\r\nworkaround added
in https://github.com/elastic/kibana/pull/153227\r\n\r\n---\r\n\r\n##
[`77.1.2`](https://github.com/elastic/eui/tree/v77.1.2)\r\n\r\n- Updated
`EuiFocusTrap` to support the `gapMode` prop configuration\r\n(now
defaults to
`padding`)\r\n([#6744](https://github.com/elastic/eui/pull/6744))\r\n\r\n**Bug
fixes**\r\n\r\n- Fixed the `scrollLock` property on `EuiFocusTrap` (and
other\r\ncomponents using `EuiFocusTrap`, such as `EuiFlyout` and
`EuiModal`) to\r\nno longer block scrolling on nested portalled content,
such as combobox\r\ndropdowns
([#6744](https://github.com/elastic/eui/pull/6744))\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<[email protected]>","sha":"0564e5434e56ca24c7cbb3fbf4a58d6242714e71","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","EUI","v8.8.0","v8.9.0"],"number":156232,"url":"https://github.com/elastic/kibana/pull/156232","mergeCommit":{"message":"Upgrade
EUI to v77.1.2 (#156232)\n\n## Summary\r\n\r\n`[email protected]` ⏩
`[email protected]`\r\n\r\nThis upgrade consists of a backport release intended
to fix a major bug\r\nwhere portals within `EuiFlyout`s and `EuiModal`s
are not scrollable.\r\nfixes
https://github.com/elastic/kibana/issues/156161\r\n\r\nThis release also
adds functionality that resolves the need for a TODO\r\nworkaround added
in https://github.com/elastic/kibana/pull/153227\r\n\r\n---\r\n\r\n##
[`77.1.2`](https://github.com/elastic/eui/tree/v77.1.2)\r\n\r\n- Updated
`EuiFocusTrap` to support the `gapMode` prop configuration\r\n(now
defaults to
`padding`)\r\n([#6744](https://github.com/elastic/eui/pull/6744))\r\n\r\n**Bug
fixes**\r\n\r\n- Fixed the `scrollLock` property on `EuiFocusTrap` (and
other\r\ncomponents using `EuiFocusTrap`, such as `EuiFlyout` and
`EuiModal`) to\r\nno longer block scrolling on nested portalled content,
such as combobox\r\ndropdowns
([#6744](https://github.com/elastic/eui/pull/6744))\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<[email protected]>","sha":"0564e5434e56ca24c7cbb3fbf4a58d6242714e71"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"8.8","label":"v8.8.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/156232","number":156232,"mergeCommit":{"message":"Upgrade
EUI to v77.1.2 (#156232)\n\n## Summary\r\n\r\n`[email protected]` ⏩
`[email protected]`\r\n\r\nThis upgrade consists of a backport release intended
to fix a major bug\r\nwhere portals within `EuiFlyout`s and `EuiModal`s
are not scrollable.\r\nfixes
https://github.com/elastic/kibana/issues/156161\r\n\r\nThis release also
adds functionality that resolves the need for a TODO\r\nworkaround added
in https://github.com/elastic/kibana/pull/153227\r\n\r\n---\r\n\r\n##
[`77.1.2`](https://github.com/elastic/eui/tree/v77.1.2)\r\n\r\n- Updated
`EuiFocusTrap` to support the `gapMode` prop configuration\r\n(now
defaults to
`padding`)\r\n([#6744](https://github.com/elastic/eui/pull/6744))\r\n\r\n**Bug
fixes**\r\n\r\n- Fixed the `scrollLock` property on `EuiFocusTrap` (and
other\r\ncomponents using `EuiFocusTrap`, such as `EuiFlyout` and
`EuiModal`) to\r\nno longer block scrolling on nested portalled content,
such as combobox\r\ndropdowns
([#6744](https://github.com/elastic/eui/pull/6744))\r\n\r\n---------\r\n\r\nCo-authored-by:
Kibana Machine
<[email protected]>","sha":"0564e5434e56ca24c7cbb3fbf4a58d6242714e71"}}]}]
BACKPORT-->

Co-authored-by: Cee Chen <[email protected]>
  • Loading branch information
kibanamachine and cee-chen authored May 1, 2023
1 parent 8af3ab8 commit ccc95b5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "npm:@elastic/[email protected]",
"@elastic/ems-client": "8.4.0",
"@elastic/eui": "77.1.1",
"@elastic/eui": "77.1.2",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
Expand Down
9 changes: 0 additions & 9 deletions src/core/public/styles/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,3 @@
.euiPageHeader--bottomBorder:not(.euiPageHeader--tabsAtBottom):not([class*='euiPageHeader--padding']) {
padding-bottom: $euiSizeL;
}

// Kibana's body ignores the `margin-right !important` set by react-remove-scroll-bar
// (used by EUI's focus trap component & prevents page width jumps on full-screen overlays)
// due to the 100% width/min-width CSS set by Kibana in other places. To work around this, we
// grab the `--removed-body-scroll-bar-size` var added by the library & manually set `padding`
// TODO: Use `gapMode` instead once https://github.com/theKashey/react-focus-on/issues/65 is fixed
.kbnBody {
padding-right: var(--removed-body-scroll-bar-size, 0);
}
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ export const LICENSE_OVERRIDES = {
'[email protected]': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
'@mapbox/[email protected]': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'@elastic/[email protected]': ['Elastic License 2.0'],
'@elastic/[email protected].1': ['SSPL-1.0 OR Elastic License 2.0'],
'@elastic/[email protected].2': ['SSPL-1.0 OR Elastic License 2.0'],
'[email protected]': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
};
11 changes: 6 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1543,10 +1543,10 @@
resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==

"@elastic/[email protected].1":
version "77.1.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-77.1.1.tgz#82f4294bf3239d5d825c1d939c49d125bfdbeb72"
integrity sha512-guJmHoGDbvKh/738taKDZGSdNk+OXMse513oPaPf4NoXpQUeYvl3gLT50mX5J4nwILS1LFKNGrbU2Es77HM1cQ==
"@elastic/[email protected].2":
version "77.1.2"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-77.1.2.tgz#85c20c682058ada1a9478af2894c290cc20c1678"
integrity sha512-cq7TI/rOomifh/KXU1V+wGirClomkMcQ166K9/7eMyqJb50AAuweu5JkjiDRNvB06uX1lDP6GjSb+oGvf8885A==
dependencies:
"@types/chroma-js" "^2.0.0"
"@types/lodash" "^4.14.160"
Expand All @@ -1570,6 +1570,7 @@
react-focus-on "^3.7.0"
react-input-autosize "^3.0.0"
react-is "^17.0.2"
react-remove-scroll-bar "^2.3.4"
react-virtualized-auto-sizer "^1.0.6"
react-window "^1.8.6"
refractor "^3.5.0"
Expand Down Expand Up @@ -24228,7 +24229,7 @@ react-refresh@^0.11.0:
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==

react-remove-scroll-bar@^2.3.3:
react-remove-scroll-bar@^2.3.3, react-remove-scroll-bar@^2.3.4:
version "2.3.4"
resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"
integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==
Expand Down

0 comments on commit ccc95b5

Please sign in to comment.