Skip to content

loadMoreLabel #542

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

Merged
metagrover merged 10 commits into from
Sep 28, 2018
Merged

loadMoreLabel #542

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
3f13b4c
showMoreLabel
rap2hpoutre Sep 27, 2018
aeff636
Update MultiList.js
rap2hpoutre Sep 27, 2018
5ecc002
Update MultiList.js
rap2hpoutre Sep 28, 2018
0c2eae0
Update SingleList.js
rap2hpoutre Sep 28, 2018
f86156d
Update SingleDropdownList.js
rap2hpoutre Sep 28, 2018
cee749b
Update MultiDropdownList.js
rap2hpoutre Sep 28, 2018
ff29f7c
Update MultiDropdownList.d.ts
rap2hpoutre Sep 28, 2018
64b4e15
Update MultiList.d.ts
rap2hpoutre Sep 28, 2018
5f4fb2d
Update SingleDropdownList.d.ts
rap2hpoutre Sep 28, 2018
03d37ee
Update SingleList.d.ts
rap2hpoutre Sep 28, 2018
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 packages/web/src/components/list/MultiDropdownList.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface MultiDropdownList extends CommonProps {
showMissing?: boolean;
missingLabel?: string;
showLoadMore?: boolean;
loadMoreLabel?: types.title;
}

declare const MultiDropdownList: React.ComponentType<MultiDropdownList>;
Expand Down
6 changes: 4 additions & 2 deletions packages/web/src/components/list/MultiDropdownList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class MultiDropdownList extends Component {
}

render() {
const { showLoadMore } = this.props;
const { showLoadMore, loadMoreLabel } = this.props;
const { isLastBucket } = this.state;
let selectAll = [];

Expand Down Expand Up @@ -364,7 +364,7 @@ class MultiDropdownList extends Component {
footer={
showLoadMore && !isLastBucket && (
<div css={loadMoreContainer}>
<Button onClick={this.handleLoadMore}>Load More</Button>
<Button onClick={this.handleLoadMore}>{loadMoreLabel}</Button>
</div>
)
}
Expand Down Expand Up @@ -412,6 +412,7 @@ MultiDropdownList.propTypes = {
missingLabel: types.string,
showSearch: types.bool,
showLoadMore: types.bool,
loadMoreLabel: types.title,
};

MultiDropdownList.defaultProps = {
Expand All @@ -428,6 +429,7 @@ MultiDropdownList.defaultProps = {
missingLabel: 'N/A',
showSearch: false,
showLoadMore: false,
loadMoreLabel: 'Load More',
};

const mapStateToProps = (state, props) => ({
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/components/list/MultiList.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export interface MultiList extends CommonProps {
showMissing?: boolean;
missingLabel?: string;
showLoadMore?: boolean;
loadMoreLabel?: types.title;
}

declare const MultiList: React.ComponentType<MultiList>;
Expand Down
6 changes: 4 additions & 2 deletions packages/web/src/components/list/MultiList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ class MultiList extends Component {
};

render() {
const { selectAllLabel, renderListItem, showLoadMore } = this.props;
const { selectAllLabel, renderListItem, showLoadMore, loadMoreLabel } = this.props;
const { isLastBucket } = this.state;

if (this.state.options.length === 0) {
Expand Down Expand Up @@ -453,7 +453,7 @@ class MultiList extends Component {
{
showLoadMore && !isLastBucket && (
<div css={loadMoreContainer}>
<Button onClick={this.handleLoadMore}>Load More</Button>
<Button onClick={this.handleLoadMore}>{loadMoreLabel}</Button>
</div>
)
}
Expand Down Expand Up @@ -501,6 +501,7 @@ MultiList.propTypes = {
showMissing: types.bool,
missingLabel: types.string,
showLoadMore: types.bool,
loadMoreLabel: types.title,
};

MultiList.defaultProps = {
Expand All @@ -517,6 +518,7 @@ MultiList.defaultProps = {
showMissing: false,
missingLabel: 'N/A',
showLoadMore: false,
loadMoreLabel: 'Load More',
};

const mapStateToProps = (state, props) => ({
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/components/list/SingleDropdownList.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface SingleDropdownList extends CommonProps {
showMissing?: boolean;
missingLabel?: string;
showLoadMore?: boolean;
loadMoreLabel?: types.title;
}

declare const SingleDropdownList: React.ComponentType<SingleDropdownList>;
Expand Down
6 changes: 4 additions & 2 deletions packages/web/src/components/list/SingleDropdownList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class SingleDropdownList extends Component {
}

render() {
const { showLoadMore } = this.props;
const { showLoadMore, loadMoreLabel } = this.props;
const { isLastBucket } = this.state;
let selectAll = [];

Expand Down Expand Up @@ -266,7 +266,7 @@ class SingleDropdownList extends Component {
footer={
showLoadMore && !isLastBucket && (
<div css={loadMoreContainer}>
<Button onClick={this.handleLoadMore}>Load More</Button>
<Button onClick={this.handleLoadMore}>{loadMoreLabel}</Button>
</div>
)
}
Expand Down Expand Up @@ -313,6 +313,7 @@ SingleDropdownList.propTypes = {
missingLabel: types.string,
showSearch: types.bool,
showLoadMore: types.bool,
loadMoreLabel: types.title,
};

SingleDropdownList.defaultProps = {
Expand All @@ -328,6 +329,7 @@ SingleDropdownList.defaultProps = {
missingLabel: 'N/A',
showSearch: false,
showLoadMore: false,
loadMoreLabel: 'Load More',
};

const mapStateToProps = (state, props) => ({
Expand Down
1 change: 1 addition & 0 deletions packages/web/src/components/list/SingleList.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface SingleList extends CommonProps {
showMissing?: boolean;
missingLabel?: string;
showLoadMore?: boolean;
loadMoreLabel?: types.title;
}

declare const SingleList: React.ComponentType<SingleList>;
Expand Down
6 changes: 4 additions & 2 deletions packages/web/src/components/list/SingleList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class SingleList extends Component {
};

render() {
const { selectAllLabel, renderListItem, showLoadMore } = this.props;
const { selectAllLabel, renderListItem, showLoadMore, loadMoreLabel } = this.props;
const { isLastBucket } = this.state;

if (this.state.options.length === 0) {
Expand Down Expand Up @@ -363,7 +363,7 @@ class SingleList extends Component {
{
showLoadMore && !isLastBucket && (
<div css={loadMoreContainer}>
<Button onClick={this.handleLoadMore}>Load More</Button>
<Button onClick={this.handleLoadMore}>{loadMoreLabel}</Button>
</div>
)
}
Expand Down Expand Up @@ -411,6 +411,7 @@ SingleList.propTypes = {
showMissing: types.bool,
missingLabel: types.string,
showLoadMore: types.bool,
loadMoreLabel: types.title,
};

SingleList.defaultProps = {
Expand All @@ -427,6 +428,7 @@ SingleList.defaultProps = {
showMissing: false,
missingLabel: 'N/A',
showLoadMore: false,
loadMoreLabel: 'Load More',
};

const mapStateToProps = (state, props) => ({
Expand Down