Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/decouple button content #3730

Merged
merged 14 commits into from
Jul 15, 2020
Merged

Chore/decouple button content #3730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
be07c13
[New] EuiButtonContent
Jul 8, 2020
b8ff8d7
Use EuiButtonContent in EuiButtonEmpty
Jul 8, 2020
84585b9
Fixing classNames and disabled states
Jul 8, 2020
2a45dca
Create EuiButtonDisplay for internal usage
Jul 8, 2020
cf41154
Fix snaps
Jul 8, 2020
ef8b023
ts gymnastics
thompsongl Jul 13, 2020
9ffe430
clean up
thompsongl Jul 13, 2020
3a718ea
generic display comopnent
thompsongl Jul 13, 2020
d109ab1
createElement; comments
thompsongl Jul 14, 2020
1f2357b
Added tests for EuiButtonContent
Jul 14, 2020
a922012
cl
Jul 14, 2020
84b61d2
More optimization
Jul 14, 2020
8c5a5ab
Merge branch 'master' into chore/decouple_button_content
cchaos Jul 14, 2020
2b6da39
Restricted list of `element`s
Jul 15, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Added `index.d.ts` file to `lib/test` and `es/test` ([#3715](https://github.com/elastic/eui/pull/3715))
- Added `descriptionFlexItemProps` and `fieldFlexItemProps` props to `EuiDescribedFormGroup` ([#3717](https://github.com/elastic/eui/pull/3717))
- Expanded `EuiBasicTable`'s default action's name configuration to accept a function that returns a React node ([#3739](https://github.com/elastic/eui/pull/3739))
- Added internal use only button building blocks for reusability in other button components ([#3730](https://github.com/elastic/eui/pull/3730))

## [`27.0.0`](https://github.com/elastic/eui/tree/v27.0.0)
- Added `paddingSize` prop to `EuiCard` ([#3638](https://github.com/elastic/eui/pull/3638))
Expand Down
12 changes: 6 additions & 6 deletions src/components/accessibility/__snapshots__/skip_link.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`EuiSkipLink is rendered 1`] = `
rel="noreferrer"
>
<span
class="euiButton__content"
class="euiButtonContent euiButton__content"
>
<span
class="euiButton__text"
Expand All @@ -27,7 +27,7 @@ exports[`EuiSkipLink props onClick is rendered 1`] = `
rel="noreferrer"
>
<span
class="euiButton__content"
class="euiButtonContent euiButton__content"
>
<span
class="euiButton__text"
Expand All @@ -43,7 +43,7 @@ exports[`EuiSkipLink props position absolute is rendered 1`] = `
rel="noreferrer"
>
<span
class="euiButton__content"
class="euiButtonContent euiButton__content"
>
<span
class="euiButton__text"
Expand All @@ -60,7 +60,7 @@ exports[`EuiSkipLink props position fixed is rendered 1`] = `
tabindex="0"
>
<span
class="euiButton__content"
class="euiButtonContent euiButton__content"
>
<span
class="euiButton__text"
Expand All @@ -76,7 +76,7 @@ exports[`EuiSkipLink props position static is rendered 1`] = `
rel="noreferrer"
>
<span
class="euiButton__content"
class="euiButtonContent euiButton__content"
>
<span
class="euiButton__text"
Expand All @@ -93,7 +93,7 @@ exports[`EuiSkipLink props tabIndex is rendered 1`] = `
tabindex="-1"
>
<span
class="euiButton__content"
class="euiButtonContent euiButton__content"
>
<span
class="euiButton__text"
Expand Down
95 changes: 62 additions & 33 deletions src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,40 +383,49 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
size="xs"
>
<button
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--iconRight"
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
data-test-subj="tablePaginationPopoverButton"
onClick={[Function]}
type="button"
>
<span
<EuiButtonContent
className="euiButtonEmpty__content"
iconSide="right"
iconType="arrowDown"
textProps={
Object {
"className": "euiButtonEmpty__text",
}
}
>
<EuiIcon
aria-hidden="true"
className="euiButtonEmpty__icon"
size="m"
type="arrowDown"
>
<div
aria-hidden="true"
className="euiButtonEmpty__icon"
data-euiicon-type="arrowDown"
size="m"
/>
</EuiIcon>
<span
className="euiButtonEmpty__text"
className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
>
<EuiI18n
default="Rows per page"
token="euiTablePagination.rowsPerPage"
<EuiIcon
className="euiButtonContent__icon"
size="m"
type="arrowDown"
>
Rows per page
</EuiI18n>
:
2
<div
className="euiButtonContent__icon"
data-euiicon-type="arrowDown"
size="m"
/>
</EuiIcon>
<span
className="euiButtonEmpty__text"
>
<EuiI18n
default="Rows per page"
token="euiTablePagination.rowsPerPage"
>
Rows per page
</EuiI18n>
:
2
</span>
</span>
</span>
</EuiButtonContent>
</button>
</EuiButtonEmpty>
</div>
Expand Down Expand Up @@ -545,15 +554,25 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
onClick={[Function]}
rel="noreferrer"
>
<span
<EuiButtonContent
className="euiButtonEmpty__content"
iconSide="left"
textProps={
Object {
"className": "euiButtonEmpty__text",
}
}
>
<span
className="euiButtonEmpty__text"
className="euiButtonContent euiButtonEmpty__content"
>
1
<span
className="euiButtonEmpty__text"
>
1
</span>
</span>
</span>
</EuiButtonContent>
</a>
</EuiButtonEmpty>
</EuiI18n>
Expand Down Expand Up @@ -611,21 +630,31 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
aria-controls="generated-id"
aria-current={true}
aria-label="Page 2 of 2"
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-1"
disabled={true}
onClick={[Function]}
type="button"
>
<span
<EuiButtonContent
className="euiButtonEmpty__content"
iconSide="left"
textProps={
Object {
"className": "euiButtonEmpty__text",
}
}
>
<span
className="euiButtonEmpty__text"
className="euiButtonContent euiButtonEmpty__content"
>
2
<span
className="euiButtonEmpty__text"
>
2
</span>
</span>
</span>
</EuiButtonContent>
</button>
</EuiButtonEmpty>
</EuiI18n>
Expand Down
Loading