diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf712ce035..94728fb3151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [`master`](https://github.com/elastic/eui/tree/master) +- Adding a `branch` icon to `EuiIcon` ([#1249](https://github.com/elastic/eui/pull/1249/)) + +No public interface changes since `4.7.0`. + - Added and updated new product logos to `EuiIcon` ([#1279](https://github.com/elastic/eui/pull/1279)) **Bug fixes** diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js index 0a372561c2c..fd565c20ec5 100644 --- a/src-docs/src/views/icon/icons.js +++ b/src-docs/src/views/icon/icons.js @@ -20,6 +20,7 @@ const iconTypes = [ 'bolt', 'boxesHorizontal', 'boxesVertical', + 'branch', 'broom', 'brush', 'bullseye', diff --git a/src/components/icon/__snapshots__/icon.test.js.snap b/src/components/icon/__snapshots__/icon.test.js.snap index 99216f45f12..02e261a65d0 100644 --- a/src/components/icon/__snapshots__/icon.test.js.snap +++ b/src/components/icon/__snapshots__/icon.test.js.snap @@ -609,6 +609,28 @@ exports[`EuiIcon props type boxesVertical is rendered 1`] = ` `; +exports[`EuiIcon props type branch is rendered 1`] = ` + + + + + + +`; + exports[`EuiIcon props type broom is rendered 1`] = ` + + + + + + + diff --git a/src/components/icon/icon.js b/src/components/icon/icon.js index 133e3b45ede..ec6c802d7f0 100644 --- a/src/components/icon/icon.js +++ b/src/components/icon/icon.js @@ -17,6 +17,7 @@ import auditbeatApp from './assets/app_auditbeat.svg'; import bolt from './assets/bolt.svg'; import boxesHorizontal from './assets/boxes_horizontal.svg'; import boxesVertical from './assets/boxes_vertical.svg'; +import branch from './assets/branch.svg'; import broom from './assets/broom.svg'; import brush from './assets/brush.svg'; import bullseye from './assets/bullseye.svg'; @@ -252,6 +253,7 @@ const typeToIconMap = { bolt, boxesHorizontal, boxesVertical, + branch, broom, brush, bullseye, diff --git a/src/components/icon/index.d.ts b/src/components/icon/index.d.ts index 2b85836d05d..7d7bb02d8a4 100644 --- a/src/components/icon/index.d.ts +++ b/src/components/icon/index.d.ts @@ -24,6 +24,7 @@ declare module '@elastic/eui' { | 'bolt' | 'boxesHorizontal' | 'boxesVertical' + | 'branch' | 'broom' | 'brush' | 'bullseye'