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

Jump to bottom

Reduce iterations count while render to displayed pages count #223

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reduce iterations count while render to displayed pages count #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 47 additions & 37 deletions dist/PaginationBoxView.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 54 additions & 41 deletions react_components/PaginationBoxView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,53 +156,66 @@ export default class PaginationBoxView extends Component {
}

} else {

let leftSide = (pageRangeDisplayed / 2);
let rightSide = (pageRangeDisplayed - leftSide);

if (selected > pageCount - pageRangeDisplayed / 2) {
rightSide = pageCount - selected;
leftSide = pageRangeDisplayed - rightSide;
}
else if (selected < pageRangeDisplayed / 2) {
leftSide = selected;
rightSide = pageRangeDisplayed - leftSide;
}

let index;
let page;
let breakView;
let createPageView = (index) => this.getPageElement(index);

for (index = 0; index < pageCount; index++) {

page = index + 1;

if (page <= marginPagesDisplayed) {
items.push(createPageView(index));
continue;
}

if (page > pageCount - marginPagesDisplayed) {
items.push(createPageView(index));
continue;
}

if ((index >= selected - leftSide) && (index <= selected + rightSide)) {
items.push(createPageView(index));
continue;
}

if (breakLabel && items[items.length - 1] !== breakView) {
breakView = (
// 1,2,3...5,6,7,8,9...11,12,13
// ^
let leftSideIndex = selected - Math.floor(pageRangeDisplayed / 2);
leftSideIndex = Math.max(0, leftSideIndex);

// 1,2,3...5,6,7,8,9...11,12,13
// ^^^^^
const leftMarginIndexes = Array.from(
{ length: marginPagesDisplayed },
(_, k) => k
);

// 1,2,3...5,6,7,8,9...11,12,13
// ^^^^^^^^
const rightMarginIndexes = Array.from(
{ length: marginPagesDisplayed },
(_, k) => k + pageCount - marginPagesDisplayed
);

// 1,2,3...5,6,7,8,9...11,12,13
// ^^^^^^^^^
const rangeIndexes = Array.from(
// pageRangeDisplayed can be 0
// but at least one item must be in this array (selected item)
{ length: Math.max(pageRangeDisplayed, 1) },
(_, k) => k + leftSideIndex
);

// 1,2,3...5,6,7,8,9...11,12,13
// ^^^^^ + ^^^^^^^^^ + ^^^^^^^^
let lastIndex = -1;
const indexes = [
...leftMarginIndexes,
...rangeIndexes,
...rightMarginIndexes
].filter(i => {
const outOfRange = i < 0 || i >= pageCount;
const duplicated = i <= lastIndex;
lastIndex = Math.max(i, lastIndex);
return !outOfRange && !duplicated;
});

const createPageView = index => this.getPageElement(index);

for (let i = 0; i < indexes.length; i++) {
const index = indexes[i];
const prevIndex = i > 0 ? indexes[i - 1] : indexes[i];

// if distance between current and previous page more than 1, then render BreakView
if (index - prevIndex > 1) {
items.push(
<BreakView
key={index}
key={`breakview-${index}`}
breakLabel={breakLabel}
breakClassName={breakClassName}
/>
);
items.push(breakView);
}

items.push(createPageView(index));
}
}

Expand Down