Просмотр исходного кода

fix autocompletion for setting

reiji-h 1 год назад
Родитель
Сommit
10123db742

+ 0 - 1
packages/editor/src/client/components-internal/CodeMirrorEditor/Toolbar/EmojiButton.tsx

@@ -29,7 +29,6 @@ export const EmojiButton = (props: Props): JSX.Element => {
       return;
       return;
     }
     }
 
 
-
     codeMirrorEditor?.insertText(emoji.shortcodes);
     codeMirrorEditor?.insertText(emoji.shortcodes);
 
 
     toggle();
     toggle();

+ 1 - 4
packages/editor/src/client/services-internal/extensions/emojiAutocompletionSettings.ts

@@ -1,7 +1,6 @@
 import { type CompletionContext, type Completion, autocompletion } from '@codemirror/autocomplete';
 import { type CompletionContext, type Completion, autocompletion } from '@codemirror/autocomplete';
 import { syntaxTree } from '@codemirror/language';
 import { syntaxTree } from '@codemirror/language';
 import emojiData from '@emoji-mart/data';
 import emojiData from '@emoji-mart/data';
-import { emojiIndex } from 'emoji-mart';
 
 
 
 
 const getEmojiDataArray = (): string[] => {
 const getEmojiDataArray = (): string[] => {
@@ -61,9 +60,7 @@ export const emojiAutocompletionSettings = autocompletion({
   addToOptions: [{
   addToOptions: [{
     render: (completion: Completion) => {
     render: (completion: Completion) => {
       const emojiName = completion.type ?? '';
       const emojiName = completion.type ?? '';
-      const emojiData = emojiIndex.emojis[emojiName];
-
-      const emoji = emojiData.native ?? emojiData[1].native;
+      const emoji = emojiData.emojis[emojiName].skins[0].native;
 
 
       const element = document.createElement('span');
       const element = document.createElement('span');
       element.innerHTML = emoji;
       element.innerHTML = emoji;