HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'user-dialog-pasting' into 'develop'

Browse source 
fix(client): split user name pasting and @ input into the correct fields

Co-authored-by: TrojanerHD <github@trojaner.dev>

Closes #10977

See merge request firefish/firefish!11226
This commit is contained in:
naskya 2024-07-31 22:59:52 +00:00
commit 9220d23b57
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/client/src/components/MkUserSelectDialog.vue
View file

@ -20,7 +20,11 @@
<template #label>{{ i18n.ts.username }}</template>
<template #prefix>@</template>
</MkInput>
<MkInput v-model="host" @update:modelValue="search">
<MkInput
ref="hostEl"
v-model="host"
@update:modelValue="search"
>
<template #label>{{ i18n.ts.host }}</template>
<template #prefix>@</template>
</MkInput>
@ -88,7 +92,7 @@
</template>
<script lang="ts" setup>
import { onMounted, ref } from "vue";
import { onMounted, ref, watch, nextTick } from "vue";
import type { entities } from "firefish-js";
import MkInput from "@/components/form/input.vue";
import FormSplit from "@/components/form/split.vue";
@ -109,6 +113,7 @@ const users = ref<entities.UserDetailed[]>([]);
const recentUsers = ref<entities.UserDetailed[]>([]);
const selected = ref<entities.UserDetailed | null>(null);
const dialogEl = ref();
const hostEl = ref();
const search = () => {
if (username.value === "" && host.value === "") {
@ -149,6 +154,21 @@ onMounted(() => {
recentUsers.value = users;
});
});
watch(username, (newValue) => {
if (newValue.includes("@")) {
if (newValue.length !== 1) {
hostEl.value.focus();
}
nextTick(() => {
const newUser = username.value.startsWith("@")
? username.value.substring(1)
: username.value;
username.value = newUser.substring(0, newUser.indexOf("@"));
host.value = newUser.substring(newUser.indexOf("@") + 1);
});
}
});
</script>
<style lang="scss" scoped>