Merge pull request #3754 from matrix-org/t3chguy/fuzzy_filter_room_list

apply unhomoglyph when filtering room list to fuzzify it
pull/21833/head
Michael Telatynski 2019-12-19 17:16:09 +00:00 committed by GitHub
commit ba2078e262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions

View File

@ -22,6 +22,7 @@ import React from "react";
import ReactDOM from "react-dom";
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';
import utils from "matrix-js-sdk/lib/utils";
import { _t } from '../../../languageHandler';
const MatrixClientPeg = require("../../../MatrixClientPeg");
const CallHandler = require('../../../CallHandler');
@ -588,11 +589,16 @@ module.exports = createReactClass({
_applySearchFilter: function(list, filter) {
if (filter === "") return list;
const fuzzyFilter = utils.removeHiddenChars(filter).toLowerCase();
const lcFilter = filter.toLowerCase();
// case insensitive if room name includes filter,
// or if starts with `#` and one of room's aliases starts with filter
return list.filter((room) => (room.name && room.name.toLowerCase().includes(lcFilter)) ||
(filter[0] === '#' && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))));
return list.filter((room) => {
if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
return true;
}
return room.name ? utils.removeHiddenChars(room.name).toLowerCase().includes(fuzzyFilter) : false;
});
},
_handleCollapsedState: function(key, collapsed) {