diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-02-28 15:37:39 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-02-28 15:37:39 +0000 |
| commit | 91f93d4a55cbf927a6adee35dc184b09d1f9b75d (patch) | |
| tree | 882fb179fa7ed36e6c212a4874559b27a73f3d1e /src/components/react_button | |
| parent | 670abd633f97e75cf35981ee0f617d0be1b43816 (diff) | |
| parent | b4782ad159026e3fb50c476e5cf9d89176e441f4 (diff) | |
Merge branch 'develop' into 'feat/timeline-quick-settings'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/react_button')
| -rw-r--r-- | src/components/react_button/react_button.js | 6 | ||||
| -rw-r--r-- | src/components/react_button/react_button.vue | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index 5e7b7580..ce82c90d 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -23,6 +23,12 @@ const ReactButton = { this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji }) } close() + }, + focusInput () { + this.$nextTick(() => { + const input = this.$el.querySelector('input') + if (input) input.focus() + }) } }, computed: { diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index 04734674..4839024c 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -6,6 +6,7 @@ :offset="{ y: 5 }" :bound-to="{ x: 'container' }" remove-padding + @show="focusInput" > <div slot="content" |