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

Merge branch 'feat/emoji' into feat/gw7750-set-emojiPicker-position-relative-to-cursor

Mudana-Grune 4 лет назад
Родитель
Сommit
a50d7ddb90

+ 0 - 1
packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -697,7 +697,6 @@ export default class CodeMirrorEditor extends AbstractEditor {
             <EmojiPicker
             <EmojiPicker
               onClose={() => this.setState({ isEmojiPickerShown: false, emojiSearchText: null })}
               onClose={() => this.setState({ isEmojiPickerShown: false, emojiSearchText: null })}
               emojiSearchText={emojiSearchText}
               emojiSearchText={emojiSearchText}
-              editor={this.getCodeMirror()}
               emojiPickerHelper={this.emojiPickerHelper}
               emojiPickerHelper={this.emojiPickerHelper}
               isOpen={this.state.isEmojiPickerShown}
               isOpen={this.state.isEmojiPickerShown}
             />
             />

+ 0 - 1
packages/app/src/components/PageEditor/EmojiPicker.tsx

@@ -10,7 +10,6 @@ import EmojiPickerHelper, { getEmojiTranslation } from './EmojiPickerHelper';
 type Props = {
 type Props = {
   onClose: () => void,
   onClose: () => void,
   emojiSearchText: string,
   emojiSearchText: string,
-  editor: any
   emojiPickerHelper: EmojiPickerHelper,
   emojiPickerHelper: EmojiPickerHelper,
   isOpen: boolean
   isOpen: boolean
 }
 }