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
@@ -1,6 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Updated `barSeriesStyle.displayValue` of the elastic-charts `Theme` for better default styles ([#4845](https://github.com/elastic/eui/pull/4845))
- Updated `titleProps` and `descriptionProps` on `EuiDescriptionList` to extend `CommonProps` ([#5166](https://github.com/elastic/eui/pull/5166))

**Bug fixes**

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,46 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[` 1`] = `
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Title 1
</dt>
<dd
class="euiDescriptionList__description"
>
Description 1
</dd>
<dt
class="euiDescriptionList__title"
>
<em>
Title 2
</em>
</dt>
<dd
class="euiDescriptionList__description"
>
<code>
Description 2
</code>
</dd>
<dt
class="euiDescriptionList__title"
>
Title 3
</dt>
<dd
class="euiDescriptionList__description"
>
Description 3
</dd>
</dl>
`;

exports[`EuiDescriptionList is rendered 1`] = `
<dl
aria-label="aria-label"
Expand Down Expand Up @@ -28,7 +69,7 @@ exports[`EuiDescriptionList props compressed is rendered 1`] = `
/>
`;

exports[`EuiDescriptionList props listItems is rendered as strings and elements 1`] = `
exports[`EuiDescriptionList props listItems descriptionProps is rendered 1`] = `
<dl
class="euiDescriptionList euiDescriptionList--row"
>
Expand All @@ -38,7 +79,9 @@ exports[`EuiDescriptionList props listItems is rendered as strings and elements
Title 1
</dt>
<dd
class="euiDescriptionList__description"
aria-label="aria-label"
class="euiDescriptionList__description testClass1 testClass2"
data-test-subj="test subject string"
>
Description 1
</dd>
Expand All @@ -50,7 +93,9 @@ exports[`EuiDescriptionList props listItems is rendered as strings and elements
</em>
</dt>
<dd
class="euiDescriptionList__description"
aria-label="aria-label"
class="euiDescriptionList__description testClass1 testClass2"
data-test-subj="test subject string"
>
<code>
Description 2
Expand All @@ -61,6 +106,55 @@ exports[`EuiDescriptionList props listItems is rendered as strings and elements
>
Title 3
</dt>
<dd
aria-label="aria-label"
class="euiDescriptionList__description testClass1 testClass2"
data-test-subj="test subject string"
>
Description 3
</dd>
</dl>
`;

exports[`EuiDescriptionList props listItems titleProps is rendered 1`] = `
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
aria-label="aria-label"
class="euiDescriptionList__title testClass1 testClass2"
data-test-subj="test subject string"
>
Title 1
</dt>
<dd
class="euiDescriptionList__description"
>
Description 1
</dd>
<dt
aria-label="aria-label"
class="euiDescriptionList__title testClass1 testClass2"
data-test-subj="test subject string"
>
<em>
Title 2
</em>
</dt>
<dd
class="euiDescriptionList__description"
>
<code>
Description 2
</code>
</dd>
<dt
aria-label="aria-label"
class="euiDescriptionList__title testClass1 testClass2"
data-test-subj="test subject string"
>
Title 3
</dt>
<dd
class="euiDescriptionList__description"
>
Expand Down
67 changes: 45 additions & 22 deletions src/components/description_list/description_list.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,54 @@ describe('EuiDescriptionList', () => {
expect(component).toMatchSnapshot();
});

const listItems = [
{
title: 'Title 1',
description: 'Description 1',
},
{
title: <em>Title 2</em>,
description: <code>Description 2</code>,
},
{
title: 'Title 3',
description: 'Description 3',
},
];
describe('props', () => {
describe('listItems', () => {
test('is rendered as strings and elements', () => {
const listItems = [
{
title: 'Title 1',
description: 'Description 1',
},
{
title: <em>Title 2</em>,
description: <code>Description 2</code>,
},
{
title: 'Title 3',
description: 'Description 3',
},
];

const component = render(
<EuiDescriptionList listItems={listItems}>
listItems will render instead of this content
</EuiDescriptionList>
);
const component = render(
<EuiDescriptionList listItems={listItems}>
listItems will render instead of this content
</EuiDescriptionList>
);

expect(component).toMatchSnapshot();
expect(component).toMatchSnapshot();

describe('titleProps', () => {
test('is rendered', () => {
const component = render(
<EuiDescriptionList
listItems={listItems}
titleProps={requiredProps}
/>
);

expect(component).toMatchSnapshot();
});
});

describe('descriptionProps', () => {
test('is rendered', () => {
const component = render(
<EuiDescriptionList
listItems={listItems}
descriptionProps={requiredProps}
/>
);

expect(component).toMatchSnapshot();
});
});
});

Expand Down
4 changes: 2 additions & 2 deletions src/components/description_list/description_list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ export interface EuiDescriptionListProps {
/**
* Props object to be passed to `EuiDescriptionListTitle`
*/
titleProps?: HTMLAttributes<HTMLElement>;
titleProps?: HTMLAttributes<HTMLElement> & CommonProps;
/**
* Props object to be passed to `EuiDescriptionListDescription`
*/
descriptionProps?: HTMLAttributes<HTMLElement>;
descriptionProps?: HTMLAttributes<HTMLElement> & CommonProps;
}

const typesToClassNameMap = {
Expand Down