Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Extending `EuiSelectable[options]` type with correct HTML element ([#2869](https://github.com/elastic/eui/pull/2869))
- Added check mark to single selection `EuiComboBox` ([#2890](https://github.com/elastic/eui/pull/2890))
- Added `logoGoogleG` third-party logo to `EuiIcon` ([#2853](https://github.com/elastic/eui/pull/2853))
- Added Jest `modulesNameMapper` alias for `EuiIcon` using test environment mock ([#2878](https://github.com/elastic/eui/pull/2878))

**Bug fixes**

Expand Down
3 changes: 2 additions & 1 deletion scripts/jest/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
],
"moduleNameMapper": {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/scripts/jest/mocks/file_mock.js",
"\\.(css|less|scss)$": "<rootDir>/scripts/jest/mocks/style_mock.js"
"\\.(css|less|scss)$": "<rootDir>/scripts/jest/mocks/style_mock.js",
"/icon$": "<rootDir>/scripts/jest/mocks/icon_mock.js"
},
"setupFiles": [
"<rootDir>/scripts/jest/setup/polyfills.js",
Expand Down
1 change: 1 addition & 0 deletions scripts/jest/mocks/icon_mock.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from '../../../src/components/icon/icon.testenv';
108 changes: 25 additions & 83 deletions src/components/accordion/__snapshots__/accordion.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,11 @@ exports[`EuiAccordion behavior closes when clicked twice 1`] = `
size="m"
type="arrowRight"
>
<EuiIconEmpty
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
focusable="false"
role="img"
style={null}
>
<svg
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
/>
</EuiIconEmpty>
<div
className="euiAccordion__icon"
data-euiicon-type="arrowRight"
size="m"
/>
</EuiIcon>
</span>
<span />
Expand Down Expand Up @@ -105,25 +91,11 @@ exports[`EuiAccordion behavior opens when clicked once 1`] = `
size="m"
type="arrowRight"
>
<EuiIconEmpty
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon euiAccordion__icon-isOpen"
focusable="false"
role="img"
style={null}
>
<svg
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon euiAccordion__icon-isOpen"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
/>
</EuiIconEmpty>
<div
className="euiAccordion__icon euiAccordion__icon-isOpen"
data-euiicon-type="arrowRight"
size="m"
/>
</EuiIcon>
</span>
<span />
Expand Down Expand Up @@ -174,15 +146,9 @@ exports[`EuiAccordion is rendered 1`] = `
<span
class="euiAccordion__iconWrapper"
>
<svg
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiAccordion__icon"
data-euiicon-type="arrowRight"
/>
</span>
<span />
Expand Down Expand Up @@ -217,15 +183,9 @@ exports[`EuiAccordion props buttonContent is rendered 1`] = `
<span
class="euiAccordion__iconWrapper"
>
<svg
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiAccordion__icon"
data-euiicon-type="arrowRight"
/>
</span>
<span>
Expand Down Expand Up @@ -264,15 +224,9 @@ exports[`EuiAccordion props buttonContentClassName is rendered 1`] = `
<span
class="euiAccordion__iconWrapper"
>
<svg
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiAccordion__icon"
data-euiicon-type="arrowRight"
/>
</span>
<span
Expand Down Expand Up @@ -309,15 +263,9 @@ exports[`EuiAccordion props extraAction is rendered 1`] = `
<span
class="euiAccordion__iconWrapper"
>
<svg
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiAccordion__icon"
data-euiicon-type="arrowRight"
/>
</span>
<span />
Expand Down Expand Up @@ -359,15 +307,9 @@ exports[`EuiAccordion props initialIsOpen is rendered 1`] = `
<span
class="euiAccordion__iconWrapper"
>
<svg
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon euiAccordion__icon-isOpen"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiAccordion__icon euiAccordion__icon-isOpen"
data-euiicon-type="arrowRight"
/>
</span>
<span />
Expand Down
36 changes: 9 additions & 27 deletions src/components/badge/__snapshots__/badge.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,9 @@ exports[`EuiBadge props iconSide left is rendered 1`] = `
>
Content
</span>
<svg
aria-hidden="true"
class="euiIcon euiIcon--small euiIcon-isLoading euiBadge__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiBadge__icon"
data-euiicon-type="user"
/>
</span>
</span>
Expand All @@ -237,15 +231,9 @@ exports[`EuiBadge props iconSide right is rendered 1`] = `
>
Content
</span>
<svg
aria-hidden="true"
class="euiIcon euiIcon--small euiIcon-isLoading euiBadge__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiBadge__icon"
data-euiicon-type="user"
/>
</span>
</span>
Expand All @@ -264,15 +252,9 @@ exports[`EuiBadge props iconType is rendered 1`] = `
>
Content
</span>
<svg
aria-hidden="true"
class="euiIcon euiIcon--small euiIcon-isLoading euiBadge__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
<div
class="euiBadge__icon"
data-euiicon-type="user"
/>
</span>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,10 @@ exports[`CollapsedItemActions render 1`] = `
data-test-subj="euiCollapsedItemActionsButton"
type="button"
>
<svg
<div
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
class="euiButtonIcon__icon"
data-euiicon-type="boxesHorizontal"
/>
</button>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,25 +389,12 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
size="m"
type="arrowDown"
>
<EuiIconEmpty
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
focusable="false"
role="img"
style={null}
>
<svg
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
/>
</EuiIconEmpty>
<div
aria-hidden="true"
className="euiButtonEmpty__icon"
data-euiicon-type="arrowDown"
size="m"
/>
</EuiIcon>
<span
className="euiButtonEmpty__text"
Expand Down Expand Up @@ -471,25 +458,12 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
size="m"
type="arrowLeft"
>
<EuiIconEmpty
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
focusable="false"
role="img"
style={null}
>
<svg
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
/>
</EuiIconEmpty>
<div
aria-hidden="true"
className="euiButtonIcon__icon"
data-euiicon-type="arrowLeft"
size="m"
/>
</EuiIcon>
</button>
</EuiButtonIcon>
Expand Down Expand Up @@ -612,25 +586,12 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
size="m"
type="arrowRight"
>
<EuiIconEmpty
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
focusable="false"
role="img"
style={null}
>
<svg
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
/>
</EuiIconEmpty>
<div
aria-hidden="true"
className="euiButtonIcon__icon"
data-euiicon-type="arrowRight"
size="m"
/>
</EuiIcon>
</button>
</EuiButtonIcon>
Expand Down
Loading