treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Insert space before shortcode if necessary (#6751)

lolsob-rspec
Akihiko Odaki 2018-03-12 20:47:51 +09:00 committed by Eugen Rochko
parent b29feb5c67
commit 9d4e04bc34
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/mastodon/reducers/compose.js
View File

@ -35,6 +35,8 @@ import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrde
import uuid from '../uuid'; import uuid from '../uuid';
import { me } from '../initial_state'; import { me } from '../initial_state';
const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
const initialState = ImmutableMap({ const initialState = ImmutableMap({
mounted: 0, mounted: 0,
sensitive: false, sensitive: false,
@ -135,12 +137,14 @@ const updateSuggestionTags = (state, token) => {
}; };
const insertEmoji = (state, position, emojiData) => { const insertEmoji = (state, position, emojiData) => {
const emoji = emojiData.native; const oldText = state.get('text');
const needsSpace = emojiData.custom && position > 0 && !allowedAroundShortCode.includes(oldText[position - 1]);
const emoji = needsSpace ? ' ' + emojiData.native : emojiData.native;
return state.withMutations(map => { return state.merge({
map.update('text', oldText => `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`); text: `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`,
map.set('focusDate', new Date()); focusDate: new Date(),
map.set('idempotencyKey', uuid()); idempotencyKey: uuid(),
}); });
}; };