chore: add types on MkAutocomplete
This commit is contained in:
parent
b0030d148d
commit
e8ce14ecd6
|
@ -15,12 +15,12 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</li>
|
</li>
|
||||||
<li tabindex="-1" :class="$style.item" @click="chooseUser()" @keydown="onKeydown">{{ i18n.ts.selectUser }}</li>
|
<li tabindex="-1" :class="$style.item" @click="chooseUser()" @keydown="onKeydown">{{ i18n.ts.selectUser }}</li>
|
||||||
</ol>
|
</ol>
|
||||||
<ol v-else-if="hashtags.length > 0" ref="suggests" :class="$style.list">
|
<ol v-else-if="type === 'hashtag' && hashtags.length > 0" ref="suggests" :class="$style.list">
|
||||||
<li v-for="hashtag in hashtags" tabindex="-1" :class="$style.item" @click="complete(type, hashtag)" @keydown="onKeydown">
|
<li v-for="hashtag in hashtags" tabindex="-1" :class="$style.item" @click="complete(type, hashtag)" @keydown="onKeydown">
|
||||||
<span class="name">{{ hashtag }}</span>
|
<span class="name">{{ hashtag }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
<ol v-else-if="emojis.length > 0" ref="suggests" :class="$style.list">
|
<ol v-else-if="type === 'emoji' && emojis.length > 0" ref="suggests" :class="$style.list">
|
||||||
<li v-for="emoji in emojis" :key="emoji.emoji" :class="$style.item" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
|
<li v-for="emoji in emojis" :key="emoji.emoji" :class="$style.item" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
|
||||||
<MkCustomEmoji v-if="'isCustomEmoji' in emoji && emoji.isCustomEmoji" :name="emoji.emoji" :class="$style.emoji"/>
|
<MkCustomEmoji v-if="'isCustomEmoji' in emoji && emoji.isCustomEmoji" :name="emoji.emoji" :class="$style.emoji"/>
|
||||||
<MkEmoji v-else :emoji="emoji.emoji" :class="$style.emoji"/>
|
<MkEmoji v-else :emoji="emoji.emoji" :class="$style.emoji"/>
|
||||||
|
@ -30,12 +30,12 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<span v-if="emoji.aliasOf" :class="$style.emojiAlias">({{ emoji.aliasOf }})</span>
|
<span v-if="emoji.aliasOf" :class="$style.emojiAlias">({{ emoji.aliasOf }})</span>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
<ol v-else-if="mfmTags.length > 0" ref="suggests" :class="$style.list">
|
<ol v-else-if="type === 'mfmTag' && mfmTags.length > 0" ref="suggests" :class="$style.list">
|
||||||
<li v-for="tag in mfmTags" tabindex="-1" :class="$style.item" @click="complete(type, tag)" @keydown="onKeydown">
|
<li v-for="tag in mfmTags" tabindex="-1" :class="$style.item" @click="complete(type, tag)" @keydown="onKeydown">
|
||||||
<span>{{ tag }}</span>
|
<span>{{ tag }}</span>
|
||||||
</li>
|
</li>
|
||||||
</ol>
|
</ol>
|
||||||
<ol v-else-if="mfmParams.length > 0" ref="suggests" :class="$style.list">
|
<ol v-else-if="type === 'mfmParam' && mfmParams.length > 0" ref="suggests" :class="$style.list">
|
||||||
<li v-for="param in mfmParams" tabindex="-1" :class="$style.item" @click="complete(type, q.params.toSpliced(-1, 1, param).join(','))" @keydown="onKeydown">
|
<li v-for="param in mfmParams" tabindex="-1" :class="$style.item" @click="complete(type, q.params.toSpliced(-1, 1, param).join(','))" @keydown="onKeydown">
|
||||||
<span>{{ param }}</span>
|
<span>{{ param }}</span>
|
||||||
</li>
|
</li>
|
||||||
|
@ -58,6 +58,32 @@ import { miLocalStorage } from '@/local-storage.js';
|
||||||
import { customEmojis } from '@/custom-emojis.js';
|
import { customEmojis } from '@/custom-emojis.js';
|
||||||
import { MFM_TAGS, MFM_PARAMS } from '@/const.js';
|
import { MFM_TAGS, MFM_PARAMS } from '@/const.js';
|
||||||
|
|
||||||
|
export type CompleteInfo = {
|
||||||
|
user: {
|
||||||
|
payload: any;
|
||||||
|
query: string | null;
|
||||||
|
},
|
||||||
|
hashtag: {
|
||||||
|
payload: string;
|
||||||
|
query: string;
|
||||||
|
},
|
||||||
|
emoji: {
|
||||||
|
payload: string;
|
||||||
|
query: string;
|
||||||
|
},
|
||||||
|
mfmTag: {
|
||||||
|
payload: string;
|
||||||
|
query: string;
|
||||||
|
},
|
||||||
|
mfmParam: {
|
||||||
|
payload: string;
|
||||||
|
query: {
|
||||||
|
tag: string;
|
||||||
|
params: string[];
|
||||||
|
};
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
type EmojiDef = {
|
type EmojiDef = {
|
||||||
emoji: string;
|
emoji: string;
|
||||||
name: string;
|
name: string;
|
||||||
|
@ -132,18 +158,23 @@ export default {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup generic="T extends keyof CompleteInfo">
|
||||||
const props = defineProps<{
|
type PropsType<T extends keyof CompleteInfo> = {
|
||||||
type: string;
|
type: T;
|
||||||
q: any;
|
q: CompleteInfo[T]['query'];
|
||||||
textarea: HTMLTextAreaElement;
|
// なぜかわからないけど HTMLTextAreaElement | HTMLInputElement だと addEventListener/removeEventListenerがエラー
|
||||||
|
textarea: (HTMLTextAreaElement | HTMLInputElement) & HTMLElement;
|
||||||
close: () => void;
|
close: () => void;
|
||||||
x: number;
|
x: number;
|
||||||
y: number;
|
y: number;
|
||||||
}>();
|
}
|
||||||
|
//const props = defineProps<PropsType<keyof CompleteInfo>>();
|
||||||
|
// ↑と同じだけど↓にしないとdiscriminated unionにならない。
|
||||||
|
// https://www.typescriptlang.org/docs/handbook/typescript-in-5-minutes-func.html#discriminated-unions
|
||||||
|
const props = defineProps<PropsType<'user'> | PropsType<'hashtag'> | PropsType<'emoji'> | PropsType<'mfmTag'> | PropsType<'mfmParam'>>();
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
(event: 'done', value: { type: string; value: any }): void;
|
<T extends keyof CompleteInfo>(event: 'done', value: { type: T; value: CompleteInfo[T]['payload'] }): void;
|
||||||
(event: 'closed'): void;
|
(event: 'closed'): void;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
|
@ -160,7 +191,7 @@ const mfmParams = ref<string[]>([]);
|
||||||
const select = ref(-1);
|
const select = ref(-1);
|
||||||
const zIndex = os.claimZIndex('high');
|
const zIndex = os.claimZIndex('high');
|
||||||
|
|
||||||
function complete(type: string, value: any) {
|
function complete<T extends keyof CompleteInfo>(type: T, value: CompleteInfo[T]['payload']) {
|
||||||
emit('done', { type, value });
|
emit('done', { type, value });
|
||||||
emit('closed');
|
emit('closed');
|
||||||
if (type === 'emoji') {
|
if (type === 'emoji') {
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
import { nextTick, Ref, ref, defineAsyncComponent } from 'vue';
|
import { nextTick, Ref, ref, defineAsyncComponent } from 'vue';
|
||||||
import getCaretCoordinates from 'textarea-caret';
|
import getCaretCoordinates from 'textarea-caret';
|
||||||
import { toASCII } from 'punycode/';
|
import { toASCII } from 'punycode/';
|
||||||
|
import type { CompleteInfo } from '@/components/MkAutocomplete.vue';
|
||||||
import { popup } from '@/os.js';
|
import { popup } from '@/os.js';
|
||||||
|
|
||||||
export type SuggestionType = 'user' | 'hashtag' | 'emoji' | 'mfmTag' | 'mfmParam';
|
export type SuggestionType = 'user' | 'hashtag' | 'emoji' | 'mfmTag' | 'mfmParam';
|
||||||
|
@ -18,7 +19,7 @@ export class Autocomplete {
|
||||||
close: () => void;
|
close: () => void;
|
||||||
} | null;
|
} | null;
|
||||||
private textarea: HTMLInputElement | HTMLTextAreaElement;
|
private textarea: HTMLInputElement | HTMLTextAreaElement;
|
||||||
private currentType: string;
|
private currentType: keyof CompleteInfo | undefined;
|
||||||
private textRef: Ref<string | number | null>;
|
private textRef: Ref<string | number | null>;
|
||||||
private opening: boolean;
|
private opening: boolean;
|
||||||
private onlyType: SuggestionType[];
|
private onlyType: SuggestionType[];
|
||||||
|
@ -73,7 +74,7 @@ export class Autocomplete {
|
||||||
* テキスト入力時
|
* テキスト入力時
|
||||||
*/
|
*/
|
||||||
private onInput() {
|
private onInput() {
|
||||||
const caretPos = this.textarea.selectionStart;
|
const caretPos = Number(this.textarea.selectionStart);
|
||||||
const text = this.text.substring(0, caretPos).split('\n').pop()!;
|
const text = this.text.substring(0, caretPos).split('\n').pop()!;
|
||||||
|
|
||||||
const mentionIndex = text.lastIndexOf('@');
|
const mentionIndex = text.lastIndexOf('@');
|
||||||
|
@ -155,7 +156,7 @@ export class Autocomplete {
|
||||||
/**
|
/**
|
||||||
* サジェストを提示します。
|
* サジェストを提示します。
|
||||||
*/
|
*/
|
||||||
private async open(type: string, q: any) {
|
private async open<T extends keyof CompleteInfo>(type: T, q: CompleteInfo[T]['query']) {
|
||||||
if (type !== this.currentType) {
|
if (type !== this.currentType) {
|
||||||
this.close();
|
this.close();
|
||||||
}
|
}
|
||||||
|
@ -222,10 +223,10 @@ export class Autocomplete {
|
||||||
/**
|
/**
|
||||||
* オートコンプリートする
|
* オートコンプリートする
|
||||||
*/
|
*/
|
||||||
private complete({ type, value }) {
|
private complete<T extends keyof CompleteInfo>({ type, value }: { type: T; value: CompleteInfo[T]['payload'] }) {
|
||||||
this.close();
|
this.close();
|
||||||
|
|
||||||
const caret = this.textarea.selectionStart;
|
const caret = Number(this.textarea.selectionStart);
|
||||||
|
|
||||||
if (type === 'user') {
|
if (type === 'user') {
|
||||||
const source = this.text;
|
const source = this.text;
|
||||||
|
|
Loading…
Reference in New Issue