Skip to content

Optimized string column sort (comparator + splitNested) #1627

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Optimized string column sort (comparator + splitNested) #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7abd060
Optimized splitNested
Avasam May 20, 2021
847df15
More efficient comparator for large array of string
Avasam May 20, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions packages/react-bootstrap-table2/src/store/sort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
import _ from '../utils';
import Const from '../const';

const collator = new Intl.Collator();
function comparator(a, b) {
let result;
if (typeof b === 'string') {
result = b.localeCompare(a);
return collator.compare(a, b);
} else {
result = a > b ? -1 : ((a < b) ? 1 : 0);
return a > b ? -1 : ((a < b) ? 1 : 0);
}
return result;
}

export const sort = (data, sortOrder, { dataField, sortFunc, sortValue }) => {
Expand Down
12 changes: 5 additions & 7 deletions packages/react-bootstrap-table2/src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
import _ from 'underscore';

function splitNested(str) {
return [str]
.join('.')
.replace(/\[/g, '.')
.replace(/\]/g, '')
.split('.');
return str
.replace(']', '')
.split(/\[\./);
}

function contains(list, value) {
Expand Down Expand Up @@ -58,8 +56,8 @@ function isEmptyObject(obj) {
const hasOwnProperty = Object.prototype.hasOwnProperty;
const keys = Object.keys(obj);

for (let i = 0; i < keys.length; i += 1) {
if (hasOwnProperty.call(obj, keys[i])) return false;
for (let key of keys) {
if (hasOwnProperty.call(obj, key)) return false;
}

return true;
Expand Down