Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
**Bug fixes**

- Fixed `id` attribute to be unique across `EuiButtonGroupButton` elements ([#4657](https://github.com/elastic/eui/pull/4657))
- Hid `of` text on small screens for compressed `EuiPagination`([#4661](https://github.com/elastic/eui/pull/4661))

**Breaking changes**

Expand All @@ -17,7 +18,6 @@
- Added `indexRuntime` glyph in `EuiIcon` ([#4650](https://github.com/elastic/eui/pull/4650))
- Added `iconType`, `iconColor`, and `iconSize` props to `EuiAvatar` ([#4620](https://github.com/elastic/eui/pull/4620))
- Added `'plain'` and `null` as `color` options of `EuiAvatar` ([#4620](https://github.com/elastic/eui/pull/4620))

Comment thread
elizabetdev marked this conversation as resolved.
## [`31.11.0`](https://github.com/elastic/eui/tree/v31.11.0)

- Added `EuiNotificationEvent` component ([#4513](https://github.com/elastic/eui/pull/4513))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,12 +533,12 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
href="#__table_generated-id"
isDisabled={false}
onClick={[Function]}
size="xs"
size="s"
>
<a
aria-controls="__table_generated-id"
aria-label="Page 1 of 2"
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-0"
href="#__table_generated-id"
onClick={[Function]}
Expand Down Expand Up @@ -614,13 +614,13 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
href="#__table_generated-id"
isDisabled={true}
onClick={[Function]}
size="xs"
size="s"
>
<button
aria-controls="__table_generated-id"
aria-current={true}
aria-label="Page 2 of 2"
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-1"
disabled={true}
onClick={[Function]}
Expand Down
4 changes: 2 additions & 2 deletions src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ exports[`EuiDataGrid pagination renders 1`] = `
<a
aria-controls="generated-id"
aria-label="Page 1 of 2"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-0"
href="#generated-id"
rel="noreferrer"
Expand All @@ -89,7 +89,7 @@ exports[`EuiDataGrid pagination renders 1`] = `
aria-controls="generated-id"
aria-current="true"
aria-label="Page 2 of 2"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-1"
disabled=""
type="button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ exports[`EuiPagination is rendered 1`] = `
>
<button
aria-label="Page 1 of 1"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-0"
type="button"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`EuiPaginationButton is rendered 1`] = `
<button
aria-label="aria-label"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton testClass1 testClass2"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton testClass1 testClass2"
data-test-subj="test subject string"
type="button"
>
Expand Down
8 changes: 2 additions & 6 deletions src/components/pagination/_pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
align-items: center;

&__compressedText {
// sass-lint:disable-block no-important
display: inline-flex;
align-items: center;
line-height: 1 !important; // Override EuiText line-height

> *:first-child {
margin-right: $euiSizeXS;
Expand All @@ -19,9 +21,3 @@
.euiPagination__list {
display: flex;
Comment thread
elizabetdev marked this conversation as resolved.
}

@include euiBreakpoint('xs', 's') {
.euiPagination__list {
display: none;
}
}
25 changes: 15 additions & 10 deletions src/components/pagination/pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { EuiPaginationButton } from './pagination_button';
import { EuiButtonIcon } from '../button';
import { EuiI18n } from '../i18n';
import { EuiText } from '../text';
import { EuiHideFor } from '../responsive';

const MAX_VISIBLE_PAGES = 5;
const NUMBER_SURROUNDING_PAGES = Math.floor(MAX_VISIBLE_PAGES * 0.5);
Expand Down Expand Up @@ -250,26 +251,30 @@ export const EuiPagination: FunctionComponent<Props> = ({
);

const selectablePages = pages;

if (compressed) {
const firstPageButtonCompressed = (
<PaginationButton pageIndex={activePage} inList={false} />
);
const lastPageButtonCompressed = (
<PaginationButton pageIndex={pageCount - 1} inList={false} />
);

return (
<nav className={classes} {...rest}>
{previousButton}
<EuiText size="s" className="euiPagination__compressedText">
<EuiI18n
token="euiPagination.pageOfTotalCompressed"
default="{page} of {total}"
values={{
page: firstPageButtonCompressed,
total: lastPageButtonCompressed,
}}
/>
</EuiText>
<EuiHideFor sizes={['xs', 's']}>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! This may even open it up for consumers to be able to customize these breakpoint sizes ❤️

<EuiText size="s" className="euiPagination__compressedText">
<EuiI18n
token="euiPagination.pageOfTotalCompressed"
default="{page} of {total}"
values={{
page: firstPageButtonCompressed,
total: lastPageButtonCompressed,
}}
/>
</EuiText>
</EuiHideFor>
{nextButton}
</nav>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/pagination/pagination_button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const EuiPaginationButton: FunctionComponent<Props> = ({

const props = {
className: classes,
size: 'xs',
size: 's',
color: 'text',
'data-test-subj': `pagination-button-${pageIndex}`,
isDisabled: isPlaceholder || isActive,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ exports[`EuiTablePagination is rendered 1`] = `
>
<button
aria-label="Page 1 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-0"
type="button"
>
Expand All @@ -85,7 +85,7 @@ exports[`EuiTablePagination is rendered 1`] = `
<button
aria-current="true"
aria-label="Page 2 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-1"
disabled=""
type="button"
Expand All @@ -106,7 +106,7 @@ exports[`EuiTablePagination is rendered 1`] = `
>
<button
aria-label="Page 3 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-2"
type="button"
>
Expand All @@ -126,7 +126,7 @@ exports[`EuiTablePagination is rendered 1`] = `
>
<button
aria-label="Page 4 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-3"
type="button"
>
Expand All @@ -146,7 +146,7 @@ exports[`EuiTablePagination is rendered 1`] = `
>
<button
aria-label="Page 5 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-4"
type="button"
>
Expand Down Expand Up @@ -215,7 +215,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
>
<button
aria-label="Page 1 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-0"
type="button"
>
Expand All @@ -236,7 +236,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
<button
aria-current="true"
aria-label="Page 2 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-1"
disabled=""
type="button"
Expand All @@ -257,7 +257,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
>
<button
aria-label="Page 3 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-2"
type="button"
>
Expand All @@ -277,7 +277,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
>
<button
aria-label="Page 4 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-3"
type="button"
>
Expand All @@ -297,7 +297,7 @@ exports[`EuiTablePagination is rendered when hiding the per page options 1`] = `
>
<button
aria-label="Page 5 of 5"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
data-test-subj="pagination-button-4"
type="button"
>
Expand Down