Skip to content
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

Jump to bottom

Stop mentions dropdown from jumping around #48

Merged
merged 3 commits into from
Jul 1, 2020
Merged

Stop mentions dropdown from jumping around #48

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f4c4f8
In the mentions dropdown, display users from the API AFTER posts in t…
askvortsov1 Jun 30, 2020
e402019
Only start sending API calls for users once more than 2 characters ha…
askvortsov1 Jul 1, 2020
5ab467d
Serve user list in the order that it was provided, revert back to pos…
askvortsov1 Jul 1, 2020
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
22 changes: 18 additions & 4 deletions js/src/forum/addComposerAutocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ export default function addComposerAutocomplete() {
let typed;
let searchTimeout;

// We store users returned from an API here to preserve order in which they are returned
// This prevents the user list jumping around while users are returned.
// We also use a hashset for user IDs to provide O(1) lookup for the users already in the list.
const returnedUsers = Array.from(app.store.all('users'));
const returnedUserIds = new Set(returnedUsers.map(u => u.id()));

const applySuggestion = function(replacement) {
const insert = replacement + ' ';

Expand Down Expand Up @@ -112,7 +118,7 @@ export default function addComposerAutocomplete() {
// If the user has started to type a username, then suggest users
// matching that username.
if (typed) {
app.store.all('users').forEach(user => {
returnedUsers.forEach(user => {
if (!userMatches(user)) return;

suggestions.push(
Expand Down Expand Up @@ -140,7 +146,7 @@ export default function addComposerAutocomplete() {
const user = post.user();
suggestions.push(
makeSuggestion(user, '@' + user.username() + '#' + post.id(), [
app.translator.trans('flarum-mentions.forum.composer.reply_to_post_text', {number: post.number()}), ' — ',
app.translator.trans('flarum-mentions.forum.composer.reply_to_post_text', { number: post.number() }), ' — ',
truncate(post.contentPlain(), 200)
], 'MentionsDropdown-post')
);
Expand Down Expand Up @@ -179,11 +185,19 @@ export default function addComposerAutocomplete() {
dropdown.$().scrollTop(0);

clearTimeout(searchTimeout);
if (typed) {
// Don't send API calls searching for users until at least 2 characters have been typed.
// This focuses the mention results on users and posts in the discussion.
if (typed.length > 1) {
searchTimeout = setTimeout(function() {
const typedLower = typed.toLowerCase();
if (searched.indexOf(typedLower) === -1) {
app.store.find('users', {filter: {q: typed}, page: {limit: 5}}).then(() => {
app.store.find('users', { filter: { q: typed }, page: { limit: 5 } }).then(results => {
results.forEach(u => {
if (!returnedUserIds.has(u.id())) {
returnedUserIds.add(u.id());
returnedUsers.push(u);
}
})
if (dropdown.active) buildSuggestions();
});
searched.push(typedLower);
Expand Down