diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-07-10 20:06:18 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-07-10 20:06:18 -0600 |
| commit | 63519c325f879ea3f64052e39c019267d8238b54 (patch) | |
| tree | 187a55fb2035ddf93e84d0ce8ec4c9e4c0528be6 /src/components/react_button | |
| parent | 65b0b69f109c42f07fe14c764d6a4e01bd763a83 (diff) | |
| parent | c4cbad0df43a1b0c0644f7818d7e7eca97ceda40 (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status
Diffstat (limited to 'src/components/react_button')
| -rw-r--r-- | src/components/react_button/react_button.js | 3 | ||||
| -rw-r--r-- | src/components/react_button/react_button.vue | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index ce82c90d..e6f9dbff 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -1,6 +1,7 @@ import Popover from '../popover/popover.vue' import { library } from '@fortawesome/fontawesome-svg-core' import { faSmileBeam } from '@fortawesome/free-regular-svg-icons' +import { trim } from 'lodash' library.add(faSmileBeam) @@ -43,7 +44,7 @@ const ReactButton = { }, emojis () { if (this.filterWord !== '') { - const filterWordLowercase = this.filterWord.toLowerCase() + const filterWordLowercase = trim(this.filterWord.toLowerCase()) let orderedEmojiList = [] for (const emoji of this.$store.state.instance.emoji) { if (emoji.replacement === this.filterWord) return [emoji] diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index 7f35b7b5..8a4b4d3b 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -12,6 +12,7 @@ <div class="reaction-picker-filter"> <input v-model="filterWord" + @input="$event.target.composing = false" size="1" :placeholder="$t('emoji.search_emoji')" > |