OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3783 from matrix-org/t3chguy/fuzzy_sort_memberlist 

fuzzy-sort MemberList
pull/21833/head
Michael Telatynski 2019-12-27 17:19:19 +00:00 committed by GitHub
parent c79bd791d6 f9e386adaa
commit eac66f020f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/rooms/MemberList.js
View File

@ -32,6 +32,10 @@ const INITIAL_LOAD_NUM_MEMBERS = 30;
const INITIAL_LOAD_NUM_INVITED = 5; const INITIAL_LOAD_NUM_INVITED = 5;
const SHOW_MORE_INCREMENT = 100; const SHOW_MORE_INCREMENT = 100;
// Regex applied to filter our punctuation in member names before applying sort, to fuzzy it a little
// matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g;
module.exports = createReactClass({ module.exports = createReactClass({
displayName: 'MemberList', displayName: 'MemberList',
@ -336,10 +340,13 @@ module.exports = createReactClass({
} }
// Fourth by name (alphabetical) // Fourth by name (alphabetical)
const nameA = memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name; const nameA = (memberA.name[0] === '@' ? memberA.name.substr(1) : memberA.name).replace(SORT_REGEX, "");
const nameB = memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name; const nameB = (memberB.name[0] === '@' ? memberB.name.substr(1) : memberB.name).replace(SORT_REGEX, "");
// console.log(`Comparing userA_name=${nameA} against userB_name=${nameB} - returning`); // console.log(`Comparing userA_name=${nameA} against userB_name=${nameB} - returning`);
return nameA.localeCompare(nameB); return nameA.localeCompare(nameB, {
ignorePunctuation: true,
sensitivity: "base",
});
}, },
onSearchQueryChanged: function(searchQuery) { onSearchQueryChanged: function(searchQuery) {