Merge pull request #1106 from lbryio/fix-sort-again
Add height sorting back in where appropriate
This commit is contained in:
commit
4bb9d854ab
2 changed files with 35 additions and 2 deletions
|
@ -13,8 +13,40 @@ class FileList extends React.PureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
this._sortFunctions = {
|
this._sortFunctions = {
|
||||||
dateNew: fileInfos => [...fileInfos].reverse(),
|
dateNew: fileInfos =>
|
||||||
dateOld: fileInfos => fileInfos,
|
this.props.sortByHeight
|
||||||
|
? fileInfos.slice().sort((fileInfo1, fileInfo2) => {
|
||||||
|
const height1 = this.props.claimsById[fileInfo1.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo1.claim_id].height
|
||||||
|
: 0;
|
||||||
|
const height2 = this.props.claimsById[fileInfo2.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo2.claim_id].height
|
||||||
|
: 0;
|
||||||
|
if (height1 > height2) {
|
||||||
|
return -1;
|
||||||
|
} else if (height1 < height2) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
})
|
||||||
|
: [...fileInfos].reverse(),
|
||||||
|
dateOld: fileInfos =>
|
||||||
|
this.props.sortByHeight
|
||||||
|
? fileInfos.slice().sort((fileInfo1, fileInfo2) => {
|
||||||
|
const height1 = this.props.claimsById[fileInfo1.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo1.claim_id].height
|
||||||
|
: 999999;
|
||||||
|
const height2 = this.props.claimsById[fileInfo2.claim_id]
|
||||||
|
? this.props.claimsById[fileInfo2.claim_id].height
|
||||||
|
: 999999;
|
||||||
|
if (height1 < height2) {
|
||||||
|
return -1;
|
||||||
|
} else if (height1 > height2) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
})
|
||||||
|
: fileInfos,
|
||||||
title: fileInfos =>
|
title: fileInfos =>
|
||||||
fileInfos.slice().sort((fileInfo1, fileInfo2) => {
|
fileInfos.slice().sort((fileInfo1, fileInfo2) => {
|
||||||
const title1 = fileInfo1.value
|
const title1 = fileInfo1.value
|
||||||
|
|
|
@ -25,6 +25,7 @@ class FileListPublished extends React.PureComponent {
|
||||||
fileInfos={claims}
|
fileInfos={claims}
|
||||||
fetching={isFetching}
|
fetching={isFetching}
|
||||||
fileTileShowEmpty={FileTile.SHOW_EMPTY_PENDING}
|
fileTileShowEmpty={FileTile.SHOW_EMPTY_PENDING}
|
||||||
|
sortByHeight
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else if (isFetching) {
|
} else if (isFetching) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue