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

Updated pagination prop descriptions for EuiInMemoryTable #3142

Merged
merged 10 commits into from
Mar 30, 2020
Merged

Updated pagination prop descriptions for EuiInMemoryTable #3142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1707160
Fixed pagination example for BasicTable set up backwards
walnutdust Mar 21, 2020
051c3cd
Added hidePerPageOptions to EuiInMemoryTable prop documentation
walnutdust Mar 21, 2020
6ea8976
Updated initialPageSize prop description for EuiInMemoryTable
walnutdust Mar 21, 2020
9afe8ba
Fixed typo in pagination prop description in EuiInMemoryTable
walnutdust Mar 21, 2020
48804de
Updated Changelog
walnutdust Mar 21, 2020
d7bfdcb
Updated Changelog
walnutdust Mar 21, 2020
635664c
Removed bugfix line in CHANGELOG
walnutdust Mar 24, 2020
1af5aa6
Merge branch 'master' into docs/table-pagination
cchaos Mar 25, 2020
5e99630
Update CHANGELOG.md
cchaos Mar 25, 2020
3942baa
Merge branch 'master' into docs/table-pagination
cchaos Mar 30, 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
@@ -1,6 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Improved `htmlIdGenerator` when supplying both `prefix` and `suffix` ([#3076](https://github.com/elastic/eui/pull/3076))
- Updated pagination prop descriptions for `EuiInMemoryTable` ([#3142](https://github.com/elastic/eui/pull/3142))

## [`22.2.0`](https://github.com/elastic/eui/tree/v22.2.0)

Expand Down
8 changes: 5 additions & 3 deletions src-docs/src/views/tables/in_memory/props_info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const propsInfo = {
columns: basicPropsInfo.EuiBasicTable.__docgenInfo.props.columns,
pagination: {
description:
'Enables/disables pagination. Can be an object that configured pagination when enabled',
'Enables/disables pagination. Can be an object that configures pagination when enabled',
required: false,
type: { name: 'boolean | #Pagination' },
},
Expand Down Expand Up @@ -80,13 +80,15 @@ export const propsInfo = {
type: { name: 'number' },
},
initialPageSize: {
cchaos marked this conversation as resolved.
Show resolved Hide resolved
description:
'Configures the default page size to show, must be one of "pageSizeOptions"',
description: `Configures the default page size to show, must be one of \`pageSizeOptions\`. Defaults to
the first page size in \`pageSizeOptions\`.`,
required: false,
type: { name: 'number' },
},
pageSizeOptions:
basicPropsInfo.Pagination.__docgenInfo.props.pageSizeOptions,
hidePerPageOptions:
basicPropsInfo.Pagination.__docgenInfo.props.hidePerPageOptions,
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/views/tables/paginated/paginated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export class Table extends Component {
return (
<div>
<EuiSwitch
checked={this.state.showPerPageOptions}
checked={!this.state.showPerPageOptions}
cchaos marked this conversation as resolved.
Show resolved Hide resolved
label={
<span>
Hide per page options with{' '}
Expand Down