moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'emoji-backspace' into 'main' 

Disable EmojiNode for now

Closes #1525

See merge request soapbox-pub/soapbox!2755
This commit is contained in:
Alex Gleason 2023-09-24 20:25:02 +00:00
parent e6023d725e 60f0e6ff6a
commit 72065ffe23
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/features/compose/editor/nodes/emoji-node.tsx
View File

@ -29,7 +29,7 @@ class EmojiNode extends DecoratorNode<JSX.Element> {
} }
static clone(node: EmojiNode): EmojiNode { static clone(node: EmojiNode): EmojiNode {
return new EmojiNode(node.__name, node.__src); return new EmojiNode(node.__name, node.__src, node.__key);
} }
constructor(name: string, src: string, key?: NodeKey) { constructor(name: string, src: string, key?: NodeKey) {
@ -79,7 +79,7 @@ class EmojiNode extends DecoratorNode<JSX.Element> {
return false; return false;
} }
isTextEntity(): true { isTextEntity(): boolean {
return true; return true;
} }

12
src/features/compose/editor/plugins/autosuggest-plugin.tsx
View File

@ -39,7 +39,6 @@ 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';
import { $createEmojiNode } from '../nodes/emoji-node';
import type { AutoSuggestion } from 'soapbox/components/autosuggest-input'; import type { AutoSuggestion } from 'soapbox/components/autosuggest-input';
@ -315,16 +314,7 @@ const AutosuggestPlugin = ({
if (isNativeEmoji(suggestion)) { if (isNativeEmoji(suggestion)) {
node.spliceText(leadOffset - 1, matchingString.length, `${suggestion.native} `, true); node.spliceText(leadOffset - 1, matchingString.length, `${suggestion.native} `, true);
} else { } else {
const completion = suggestion.colons; node.spliceText(leadOffset - 1, matchingString.length, `${suggestion.colons} `, true);
let emojiText;
if (leadOffset === 1) emojiText = node;
else [, emojiText] = node.splitText(leadOffset - 1);
[emojiText] = emojiText.splitText(matchingString.length);
emojiText?.replace($createEmojiNode(completion, suggestion.imageUrl));
} }
} else if (suggestion[0] === '#') { } else if (suggestion[0] === '#') {
node.setTextContent(`${suggestion} `); node.setTextContent(`${suggestion} `);