amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse Source
This commit is contained in:
syuilo 2020-10-31 10:19:12 +09:00
commit b64d3af1f3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/components/autocomplete.vue
View File

@ -122,6 +122,7 @@ export default defineComponent({
users: [], users: [],
hashtags: [], hashtags: [],
emojis: [], emojis: [],
items: [],
select: -1, select: -1,
emojilist, emojilist,
emojiDb: [] as EmojiDef[] emojiDb: [] as EmojiDef[]
@ -129,10 +130,6 @@ export default defineComponent({
}, },
computed: { computed: {
items(): HTMLCollection {
return (this.$refs.suggests as Element).children;
},
useOsNativeEmojis(): boolean { useOsNativeEmojis(): boolean {
return this.$store.state.device.useOsNativeEmojis; return this.$store.state.device.useOsNativeEmojis;
} }
@ -148,6 +145,7 @@ export default defineComponent({
updated() { updated() {
this.setPosition(); this.setPosition();
this.items = (this.$refs.suggests as Element | undefined)?.children || [];
}, },
mounted() { mounted() {
@ -371,6 +369,7 @@ export default defineComponent({
selectNext() { selectNext() {
if (++this.select >= this.items.length) this.select = 0; if (++this.select >= this.items.length) this.select = 0;
if (this.items.length === 0) this.select = -1;
this.applySelect(); this.applySelect();
}, },
@ -384,8 +383,10 @@ export default defineComponent({
el.removeAttribute('data-selected'); el.removeAttribute('data-selected');
} }
if (this.select !== -1) {
this.items[this.select].setAttribute('data-selected', 'true'); this.items[this.select].setAttribute('data-selected', 'true');
(this.items[this.select] as any).focus(); (this.items[this.select] as any).focus();
}
}, },
chooseUser() { chooseUser() {