luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 21:26:52 +00:00
Code Issues Projects Releases Wiki Activity

Make emoji autosuggestions immediate, usernames appear sooner (#5149)

Browse source 
* Do not debounce emoji search

* Make autosuggestions appear sooner
This commit is contained in:
Eugen Rochko 2017-09-30 05:11:44 +02:00 committed by GitHub
parent ebb8c89207
commit d6fe0954e3
3 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/javascript/mastodon/actions/compose.js
View file

@ -1,5 +1,6 @@
import api from '../api';
import { emojiIndex } from 'emoji-mart';
import { throttle } from 'lodash';
import {
updateTimeline,
@ -247,14 +248,7 @@ export function clearComposeSuggestions() {
};
};
export function fetchComposeSuggestions(token) {
return (dispatch, getState) => {
if (token[0] === ':') {
const results = emojiIndex.search(token.replace(':', ''), { maxResults: 3 });
dispatch(readyComposeSuggestionsEmojis(token, results));
return;
}
const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) => {
api(getState).get('/api/v1/accounts/search', {
params: {
q: token.slice(1),
@ -264,6 +258,20 @@ export function fetchComposeSuggestions(token) {
}).then(response => {
dispatch(readyComposeSuggestionsAccounts(token, response.data));
});
}, 200, { leading: true, trailing: true });
const fetchComposeSuggestionsEmojis = (dispatch, getState, token) => {
const results = emojiIndex.search(token.replace(':', ''), { maxResults: 5 });
dispatch(readyComposeSuggestionsEmojis(token, results));
};
export function fetchComposeSuggestions(token) {
return (dispatch, getState) => {
if (token[0] === ':') {
fetchComposeSuggestionsEmojis(dispatch, getState, token);
} else {
fetchComposeSuggestionsAccounts(dispatch, getState, token);
}
};
};

9
app/javascript/mastodon/components/autosuggest_emoji.js
View file

@ -17,8 +17,13 @@ export default class AutosuggestEmoji extends React.PureComponent {
if (emoji.custom) {
url = emoji.imageUrl;
} else {
const [ filename ] = unicodeMapping[emoji.native];
url = `${assetHost}/emoji/${filename}.svg`;
const mapping = unicodeMapping[emoji.native] || unicodeMapping[emoji.native.replace(/\uFE0F$/, '')];
if (!mapping) {
return null;
}
url = `${assetHost}/emoji/${mapping[0]}.svg`;
}
return (

5
app/javascript/mastodon/features/compose/components/compose_form.js
View file

@ -5,7 +5,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import ReplyIndicatorContainer from '../containers/reply_indicator_container';
import AutosuggestTextarea from '../../../components/autosuggest_textarea';
import { debounce } from 'lodash';
import UploadButtonContainer from '../containers/upload_button_container';
import { defineMessages, injectIntl } from 'react-intl';
import Collapsable from '../../../components/collapsable';
@ -82,9 +81,9 @@ export default class ComposeForm extends ImmutablePureComponent {
this.props.onClearSuggestions();
}
onSuggestionsFetchRequested = debounce((token) => {
onSuggestionsFetchRequested = (token) => {
this.props.onFetchSuggestions(token);
}, 500, { trailing: true })
}
onSuggestionSelected = (tokenStart, token, value) => {
this._restoreCaret = null;