diff --git a/CHANGELOG.md b/CHANGELOG.md index 736c5520c52..14761c575e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## [`master`](https://github.com/elastic/eui/tree/master) - Converted `EuiTableHeaderMobile` to TS ([#1786](https://github.com/elastic/eui/pull/1786)) +- Added `menuLeft` and `menuRight` icons ([#1797](https://github.com/elastic/eui/pull/1797)) +- Updated EuiNavDrawer’s collapse/expand button to use `menuLeft` and `menuRight` icons ([#1797](https://github.com/elastic/eui/pull/1797)) ## [`9.8.0`](https://github.com/elastic/eui/tree/v9.8.0) diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 6c42696dace..f7d7fec0e2d 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -108,6 +108,8 @@ const iconTypes = [ 'mapMarker', 'memory', 'merge', + 'menuLeft', + 'menuRight', 'minusInCircle', 'minusInCircleFilled', 'node', diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 7bede540e39..c6a4cdd9103 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -4587,6 +4587,37 @@ exports[`EuiIcon props type memory is rendered 1`] = ` `; +exports[`EuiIcon props type menuLeft is rendered 1`] = ` + + + +`; + +exports[`EuiIcon props type menuRight is rendered 1`] = ` + + + +`; + exports[`EuiIcon props type merge is rendered 1`] = ` + + diff --git a/src/components/icon/assets/menuRight.svg b/src/components/icon/assets/menuRight.svg new file mode 100644 index 00000000000..fc6130ecef5 --- /dev/null +++ b/src/components/icon/assets/menuRight.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 8fe186cf3aa..2f7bf09e8ae 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -180,6 +180,8 @@ import managementApp from './assets/app_management.svg'; import mapMarker from './assets/map_marker.svg'; import memory from './assets/memory.svg'; import merge from './assets/merge.svg'; +import menuLeft from './assets/menuLeft.svg'; +import menuRight from './assets/menuRight.svg'; import metricbeatApp from './assets/app_metricbeat.svg'; import minusInCircle from './assets/minus_in_circle.svg'; import minusInCircleFilled from './assets/minus_in_circle_filled.svg'; @@ -475,6 +477,8 @@ const typeToIconMap = { mapMarker, memory, merge, + menuLeft, + menuRight, metricbeatApp, minusInCircle, minusInCircleFilled, diff --git a/src/components/nav_drawer/nav_drawer.js b/src/components/nav_drawer/nav_drawer.js index e6cdbc16541..bdb524edee3 100644 --- a/src/components/nav_drawer/nav_drawer.js +++ b/src/components/nav_drawer/nav_drawer.js @@ -174,7 +174,7 @@ export class EuiNavDrawer extends Component { {([sideNavCollapse, sideNavExpand]) => ( {this.expandDrawer(); this.collapseFlyout();} : () => this.collapseDrawer()}