This commit is contained in:
syuilo
parent
36c11e1f0f
commit
83fde7c131
6 changed files with 121 additions and 85 deletions
|
|
@ -1,26 +1,40 @@
|
|||
<template>
|
||||
<div class="mk-autocomplete">
|
||||
<ol class="users" ref="users" v-if="users.length > 0">
|
||||
<li v-for="user in users" @click="complete(user)" @keydown="onKeydown" tabindex="-1">
|
||||
<div class="mk-autocomplete" @contextmenu.prevent="() => {}">
|
||||
<ol class="users" ref="suggests" v-if="users.length > 0">
|
||||
<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1">
|
||||
<img class="avatar" :src="`${user.avatar_url}?thumbnail&size=32`" alt=""/>
|
||||
<span class="name">{{ user.name }}</span>
|
||||
<span class="username">@{{ user.username }}</span>
|
||||
</li>
|
||||
</ol>
|
||||
<ol class="emojis" ref="suggests" v-if="emojis.length > 0">
|
||||
<li v-for="emoji in emojis" @click="complete(type, pictograph.dic[emoji])" @keydown="onKeydown" tabindex="-1">
|
||||
<span class="emoji">{{ pictograph.dic[emoji] }}</span>
|
||||
<span class="name" v-html="emoji.replace(q, `<b>${q}</b>`)"></span>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import * as pictograph from 'pictograph';
|
||||
import contains from '../../../common/scripts/contains';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['q', 'textarea', 'complete', 'close'],
|
||||
props: ['type', 'q', 'textarea', 'complete', 'close'],
|
||||
data() {
|
||||
return {
|
||||
fetching: true,
|
||||
users: [],
|
||||
select: -1
|
||||
emojis: [],
|
||||
select: -1,
|
||||
pictograph
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
items(): HTMLCollection {
|
||||
return (this.$refs.suggests as Element).children;
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -30,6 +44,7 @@ export default Vue.extend({
|
|||
el.addEventListener('mousedown', this.onMousedown);
|
||||
});
|
||||
|
||||
if (this.type == 'user') {
|
||||
(this as any).api('users/search_by_username', {
|
||||
query: this.q,
|
||||
limit: 30
|
||||
|
|
@ -37,6 +52,11 @@ export default Vue.extend({
|
|||
this.users = users;
|
||||
this.fetching = false;
|
||||
});
|
||||
} else if (this.type == 'emoji') {
|
||||
const emojis = Object.keys(pictograph.dic).sort((a, b) => a.length - b.length);
|
||||
const matched = emojis.filter(e => e.indexOf(this.q) > -1);
|
||||
this.emojis = matched.filter((x, i) => i <= 30);
|
||||
}
|
||||
},
|
||||
beforeDestroy() {
|
||||
this.textarea.removeEventListener('keydown', this.onKeydown);
|
||||
|
|
@ -61,7 +81,7 @@ export default Vue.extend({
|
|||
case 13: // [ENTER]
|
||||
if (this.select !== -1) {
|
||||
cancel();
|
||||
this.complete(this.users[this.select]);
|
||||
(this.items[this.select] as any).click();
|
||||
} else {
|
||||
this.close();
|
||||
}
|
||||
|
|
@ -93,24 +113,22 @@ export default Vue.extend({
|
|||
},
|
||||
|
||||
selectNext() {
|
||||
if (++this.select >= this.users.length) this.select = 0;
|
||||
if (++this.select >= this.items.length) this.select = 0;
|
||||
this.applySelect();
|
||||
},
|
||||
|
||||
selectPrev() {
|
||||
if (--this.select < 0) this.select = this.users.length - 1;
|
||||
if (--this.select < 0) this.select = this.items.length - 1;
|
||||
this.applySelect();
|
||||
},
|
||||
|
||||
applySelect() {
|
||||
const els = (this.$refs.users as Element).children;
|
||||
|
||||
Array.from(els).forEach(el => {
|
||||
Array.from(this.items).forEach(el => {
|
||||
el.removeAttribute('data-selected');
|
||||
});
|
||||
|
||||
els[this.select].setAttribute('data-selected', 'true');
|
||||
(els[this.select] as any).focus();
|
||||
this.items[this.select].setAttribute('data-selected', 'true');
|
||||
(this.items[this.select] as any).focus();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -126,7 +144,7 @@ export default Vue.extend({
|
|||
border solid 1px rgba(0, 0, 0, 0.1)
|
||||
border-radius 4px
|
||||
|
||||
> .users
|
||||
> ol
|
||||
display block
|
||||
margin 0
|
||||
padding 4px 0
|
||||
|
|
@ -149,24 +167,18 @@ export default Vue.extend({
|
|||
|
||||
&:hover
|
||||
&[data-selected='true']
|
||||
color #fff
|
||||
background $theme-color
|
||||
|
||||
.name
|
||||
color #fff
|
||||
|
||||
.username
|
||||
color #fff
|
||||
&, *
|
||||
color #fff !important
|
||||
|
||||
&:active
|
||||
color #fff
|
||||
background darken($theme-color, 10%)
|
||||
|
||||
.name
|
||||
color #fff
|
||||
&, *
|
||||
color #fff !important
|
||||
|
||||
.username
|
||||
color #fff
|
||||
> .users > li
|
||||
|
||||
.avatar
|
||||
vertical-align middle
|
||||
|
|
@ -187,4 +199,15 @@ export default Vue.extend({
|
|||
font-weight normal
|
||||
color rgba(0, 0, 0, 0.3)
|
||||
|
||||
> .emojis > li
|
||||
|
||||
.emoji
|
||||
display inline-block
|
||||
margin 0 4px 0 0
|
||||
width 24px
|
||||
|
||||
.name
|
||||
font-weight normal
|
||||
color rgba(0, 0, 0, 0.8)
|
||||
|
||||
</style>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="mk-messaging-form">
|
||||
<textarea v-model="text" @keypress="onKeypress" @paste="onPaste" placeholder="%i18n:common.input-message-here%"></textarea>
|
||||
<textarea v-model="text" @keypress="onKeypress" @paste="onPaste" placeholder="%i18n:common.input-message-here%" v-autocomplete></textarea>
|
||||
<div class="file" v-if="file">{{ file.name }}</div>
|
||||
<mk-uploader ref="uploader"/>
|
||||
<button class="send" @click="send" :disabled="sending" title="%i18n:common.send%">
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ class Autocomplete {
|
|||
* 対象のテキストエリアを与えてインスタンスを初期化します。
|
||||
*/
|
||||
constructor(textarea) {
|
||||
// BIND ---------------------------------
|
||||
//#region BIND
|
||||
this.onInput = this.onInput.bind(this);
|
||||
this.complete = this.complete.bind(this);
|
||||
this.close = this.close.bind(this);
|
||||
// --------------------------------------
|
||||
//#endregion
|
||||
|
||||
this.suggestion = null;
|
||||
this.textarea = textarea;
|
||||
|
|
@ -60,16 +60,21 @@ class Autocomplete {
|
|||
const text = this.textarea.value.substr(0, caret);
|
||||
|
||||
const mentionIndex = text.lastIndexOf('@');
|
||||
const emojiIndex = text.lastIndexOf(':');
|
||||
|
||||
if (mentionIndex == -1) return;
|
||||
|
||||
if (mentionIndex != -1 && mentionIndex > emojiIndex) {
|
||||
const username = text.substr(mentionIndex + 1);
|
||||
|
||||
if (!username.match(/^[a-zA-Z0-9-]+$/)) return;
|
||||
|
||||
this.open('user', username);
|
||||
}
|
||||
|
||||
if (emojiIndex != -1 && emojiIndex > mentionIndex) {
|
||||
const emoji = text.substr(emojiIndex + 1);
|
||||
if (!emoji.match(/^[\+\-a-z_]+$/)) return;
|
||||
this.open('emoji', emoji);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* サジェストを提示します。
|
||||
*/
|
||||
|
|
@ -88,14 +93,14 @@ class Autocomplete {
|
|||
}
|
||||
}).$mount();
|
||||
|
||||
// ~ サジェストを表示すべき位置を計算 ~
|
||||
|
||||
//#region サジェストを表示すべき位置を計算
|
||||
const caretPosition = getCaretCoordinates(this.textarea, this.textarea.selectionStart);
|
||||
|
||||
const rect = this.textarea.getBoundingClientRect();
|
||||
|
||||
const x = rect.left + window.pageXOffset + caretPosition.left;
|
||||
const y = rect.top + window.pageYOffset + caretPosition.top;
|
||||
const x = rect.left + window.pageXOffset + caretPosition.left - this.textarea.scrollLeft;
|
||||
const y = rect.top + window.pageYOffset + caretPosition.top - this.textarea.scrollTop;
|
||||
//#endregion
|
||||
|
||||
this.suggestion.$el.style.left = x + 'px';
|
||||
this.suggestion.$el.style.top = y + 'px';
|
||||
|
|
@ -119,24 +124,39 @@ class Autocomplete {
|
|||
/**
|
||||
* オートコンプリートする
|
||||
*/
|
||||
private complete(user) {
|
||||
private complete(type, value) {
|
||||
this.close();
|
||||
|
||||
const value = user.username;
|
||||
|
||||
const caret = this.textarea.selectionStart;
|
||||
|
||||
if (type == 'user') {
|
||||
const source = this.textarea.value;
|
||||
|
||||
const before = source.substr(0, caret);
|
||||
const trimmedBefore = before.substring(0, before.lastIndexOf('@'));
|
||||
const after = source.substr(caret);
|
||||
|
||||
// 結果を挿入する
|
||||
this.textarea.value = trimmedBefore + '@' + value + ' ' + after;
|
||||
// 挿入
|
||||
this.textarea.value = trimmedBefore + '@' + value.username + ' ' + after;
|
||||
|
||||
// キャレットを戻す
|
||||
this.textarea.focus();
|
||||
const pos = caret + value.username.length;
|
||||
this.textarea.setSelectionRange(pos, pos);
|
||||
} else if (type == 'emoji') {
|
||||
const source = this.textarea.value;
|
||||
|
||||
const before = source.substr(0, caret);
|
||||
const trimmedBefore = before.substring(0, before.lastIndexOf(':'));
|
||||
const after = source.substr(caret);
|
||||
|
||||
// 挿入
|
||||
this.textarea.value = trimmedBefore + value + after;
|
||||
|
||||
// キャレットを戻す
|
||||
this.textarea.focus();
|
||||
const pos = caret + value.length;
|
||||
this.textarea.setSelectionRange(pos, pos);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
export default {
|
||||
inserted(el) {
|
||||
el.focus();
|
||||
}
|
||||
};
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import Vue from 'vue';
|
||||
|
||||
import focus from './focus';
|
||||
import autocomplete from './autocomplete';
|
||||
|
||||
Vue.directive('focus', focus);
|
||||
Vue.directive('autocomplete', autocomplete);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
import Vue from 'vue';
|
||||
|
||||
import userPreview from './user-preview';
|
||||
import autocomplete from './autocomplete';
|
||||
|
||||
Vue.directive('userPreview', userPreview);
|
||||
Vue.directive('user-preview', userPreview);
|
||||
Vue.directive('autocomplete', autocomplete);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue