fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 14:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor selectComposeSuggestion so that different paths can be updated

Browse source
This commit is contained in:
Thibaut Girka 2019-04-11 17:07:06 +02:00 committed by ThibG
parent 1c0402c103
commit 3a671470ec
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/flavours/glitch/actions/compose.js
View file

@ -407,7 +407,7 @@ export function readyComposeSuggestionsAccounts(token, accounts) {
}; };
}; };
export function selectComposeSuggestion(position, token, suggestion) { export function selectComposeSuggestion(position, token, suggestion, path) {
return (dispatch, getState) => { return (dispatch, getState) => {
let completion; let completion;
if (typeof suggestion === 'object' && suggestion.id) { if (typeof suggestion === 'object' && suggestion.id) {
@ -424,6 +424,7 @@ export function selectComposeSuggestion(position, token, suggestion) {
position, position,
token, token,
completion, completion,
path,
}); });
}; };
}; };

2
app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
View file

@ -91,7 +91,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
}, },
onSuggestionSelected(position, token, suggestion) { onSuggestionSelected(position, token, suggestion) {
dispatch(selectComposeSuggestion(position, token, suggestion)); dispatch(selectComposeSuggestion(position, token, suggestion, ['text']));
}, },
onChangeSpoilerText(text) { onChangeSpoilerText(text) {

12
app/javascript/flavours/glitch/reducers/compose.js
View file

@ -41,7 +41,7 @@ import {
import { TIMELINE_DELETE } from 'flavours/glitch/actions/timelines'; import { TIMELINE_DELETE } from 'flavours/glitch/actions/timelines';
import { STORE_HYDRATE } from 'flavours/glitch/actions/store'; import { STORE_HYDRATE } from 'flavours/glitch/actions/store';
import { REDRAFT } from 'flavours/glitch/actions/statuses'; import { REDRAFT } from 'flavours/glitch/actions/statuses';
import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS, is } from 'immutable';
import uuid from 'flavours/glitch/util/uuid'; import uuid from 'flavours/glitch/util/uuid';
import { privacyPreference } from 'flavours/glitch/util/privacy_preference'; import { privacyPreference } from 'flavours/glitch/util/privacy_preference';
import { me } from 'flavours/glitch/util/initial_state'; import { me } from 'flavours/glitch/util/initial_state';
@ -214,12 +214,14 @@ function removeMedia(state, mediaId) {
}); });
}; };
const insertSuggestion = (state, position, token, completion) => { const insertSuggestion = (state, position, token, completion, path) => {
return state.withMutations(map => { return state.withMutations(map => {
map.update('text', oldText => `${oldText.slice(0, position)}${completion}${completion[0] === ':' ? '\u200B' : ' '}${oldText.slice(position + token.length)}`); map.updateIn(path, oldText => `${oldText.slice(0, position)}${completion}${completion[0] === ':' ? '\u200B' : ' '}${oldText.slice(position + token.length)}`);
map.set('suggestion_token', null); map.set('suggestion_token', null);
map.update('suggestions', ImmutableList(), list => list.clear()); map.set('suggestions', ImmutableList());
if (is(path, ImmutableList(['text']))) {
map.set('focusDate', new Date()); map.set('focusDate', new Date());
}
map.set('caretPosition', position + completion.length + 1); map.set('caretPosition', position + completion.length + 1);
map.set('idempotencyKey', uuid()); map.set('idempotencyKey', uuid());
}); });
@ -397,7 +399,7 @@ export default function compose(state = initialState, action) {
case COMPOSE_SUGGESTIONS_READY: case COMPOSE_SUGGESTIONS_READY:
return state.set('suggestions', ImmutableList(action.accounts ? action.accounts.map(item => item.id) : action.emojis)).set('suggestion_token', action.token); return state.set('suggestions', ImmutableList(action.accounts ? action.accounts.map(item => item.id) : action.emojis)).set('suggestion_token', action.token);
case COMPOSE_SUGGESTION_SELECT: case COMPOSE_SUGGESTION_SELECT:
return insertSuggestion(state, action.position, action.token, action.completion); return insertSuggestion(state, action.position, action.token, action.completion, action.path);
case COMPOSE_SUGGESTION_TAGS_UPDATE: case COMPOSE_SUGGESTION_TAGS_UPDATE:
return updateSuggestionTags(state, action.token); return updateSuggestionTags(state, action.token);
case COMPOSE_TAG_HISTORY_UPDATE: case COMPOSE_TAG_HISTORY_UPDATE: