bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lexical: Use selectAccount selector

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2023-07-22 00:21:14 +02:00
parent 35319747fa
commit 176a3b5ece
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/soapbox/features/compose/editor/plugins/autosuggest-plugin.tsx
View file

@ -37,6 +37,7 @@ import { useEmoji } from 'soapbox/actions/emojis';
import AutosuggestEmoji from 'soapbox/components/autosuggest-emoji'; import AutosuggestEmoji from 'soapbox/components/autosuggest-emoji';
import { isNativeEmoji } from 'soapbox/features/emoji'; import { isNativeEmoji } from 'soapbox/features/emoji';
import { useAppDispatch, useCompose } from 'soapbox/hooks'; import { useAppDispatch, useCompose } from 'soapbox/hooks';
import { selectAccount } from 'soapbox/selectors';
import { textAtCursorMatchesToken } from 'soapbox/utils/suggestions'; import { textAtCursorMatchesToken } from 'soapbox/utils/suggestions';
import AutosuggestAccount from '../../components/autosuggest-account'; import AutosuggestAccount from '../../components/autosuggest-account';
@ -314,7 +315,9 @@ const AutosuggestPlugin = ({
const state = editor.getEditorState(); const state = editor.getEditorState();
const node = (state._selection as RangeSelection)?.anchor?.getNode(); const node = (state._selection as RangeSelection)?.anchor?.getNode();
if (typeof suggestion === 'object' && suggestion.id) { if (typeof suggestion === 'object') {
if (!suggestion.id) return;
dispatch(useEmoji(suggestion)); // eslint-disable-line react-hooks/rules-of-hooks dispatch(useEmoji(suggestion)); // eslint-disable-line react-hooks/rules-of-hooks
const { leadOffset, matchingString } = resolution!.match; const { leadOffset, matchingString } = resolution!.match;
@ -333,11 +336,11 @@ const AutosuggestPlugin = ({
emojiText?.replace($createEmojiNode(completion, suggestion.imageUrl)); emojiText?.replace($createEmojiNode(completion, suggestion.imageUrl));
} }
} else if ((suggestion as string)[0] === '#') { } else if (suggestion[0] === '#') {
node.setTextContent(`${suggestion} `); node.setTextContent(`${suggestion} `);
node.select(); node.select();
} else { } else {
const content = getState().accounts.get(suggestion)!.acct; const content = selectAccount(getState(), suggestion)!.acct;
node.setTextContent(`@${content} `); node.setTextContent(`@${content} `);
node.select(); node.select();