Skip to content

Use compareStringSearch instead of rate function #565

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

Merged
frozenhelium merged 1 commit into from
May 9, 2019
Merged

Use compareStringSearch instead of rate function #565

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
9 changes: 5 additions & 4 deletions components/Input/MultiSelectInput/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import memoize from 'memoize-one';
import {
listToMap,
caseInsensitiveSubmatch,
getRatingForContentInString as rate,
isDefined,
compareStringSearch,
_cs,
} from '@togglecorp/fujs';
import { FaramInputElement } from '@togglecorp/faram';
Expand Down Expand Up @@ -138,8 +137,10 @@ export class NormalMultiSelectInput extends React.PureComponent {
value === undefined || caseInsensitiveSubmatch(labelSelector(option), value)
),
)
.sort((a, b) => (
rate(value, labelSelector(a)) - rate(value, labelSelector(b))
.sort((a, b) => compareStringSearch(
labelSelector(a),
labelSelector(b),
value,
));
return newOptions;
})
Expand Down
8 changes: 5 additions & 3 deletions components/Input/SelectInput/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import memoize from 'memoize-one';
import {
caseInsensitiveSubmatch,
getRatingForContentInString as rate,
compareStringSearch,
_cs,
} from '@togglecorp/fujs';
import { FaramInputElement } from '@togglecorp/faram';
Expand Down Expand Up @@ -125,8 +125,10 @@ class SelectInput extends React.PureComponent {
value === undefined || caseInsensitiveSubmatch(labelSelector(option), value)
),
)
.sort((a, b) => (
rate(value, labelSelector(a)) - rate(value, labelSelector(b))
.sort((a, b) => compareStringSearch(
labelSelector(a),
labelSelector(b),
value,
));
return newOptions;
});
Expand Down