summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2024-01-19 20:51:49 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2024-01-19 20:51:49 +0900
commita637b4e28259e89285fc1c67589c731a053f5562 (patch)
treebda9783430b2e75e14484d0bd0ef0541c160c09e /packages/frontend/src/components
parentEnhance(frontend): MFMの属性にオートコンプリートが利用でき... (diff)
downloadmisskey-a637b4e28259e89285fc1c67589c731a053f5562.tar.gz
misskey-a637b4e28259e89285fc1c67589c731a053f5562.tar.bz2
misskey-a637b4e28259e89285fc1c67589c731a053f5562.zip
feat: reversi
Resolve #12962
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkRadios.vue3
-rw-r--r--packages/frontend/src/components/MkSelect.vue4
-rw-r--r--packages/frontend/src/components/MkUserSelectDialog.vue12
3 files changed, 11 insertions, 8 deletions
diff --git a/packages/frontend/src/components/MkRadios.vue b/packages/frontend/src/components/MkRadios.vue
index d9178f3362..22e7ed1ef7 100644
--- a/packages/frontend/src/components/MkRadios.vue
+++ b/packages/frontend/src/components/MkRadios.vue
@@ -18,6 +18,9 @@ export default defineComponent({
watch(value, () => {
context.emit('update:modelValue', value.value);
});
+ watch(() => props.modelValue, v => {
+ value.value = v;
+ });
if (!context.slots.default) return null;
let options = context.slots.default();
const label = context.slots.label && context.slots.label();
diff --git a/packages/frontend/src/components/MkSelect.vue b/packages/frontend/src/components/MkSelect.vue
index 33b8a9a86d..16416fd2e4 100644
--- a/packages/frontend/src/components/MkSelect.vue
+++ b/packages/frontend/src/components/MkSelect.vue
@@ -52,7 +52,7 @@ const props = defineProps<{
}>();
const emit = defineEmits<{
- (ev: 'change', _ev: KeyboardEvent): void;
+ (ev: 'changeByUser'): void;
(ev: 'update:modelValue', value: string | null): void;
}>();
@@ -77,7 +77,6 @@ const height =
const focus = () => inputEl.value.focus();
const onInput = (ev) => {
changed.value = true;
- emit('change', ev);
};
const updated = () => {
@@ -136,6 +135,7 @@ function show(ev: MouseEvent) {
active: computed(() => v.value === option.props.value),
action: () => {
v.value = option.props.value;
+ emit('changeByUser', v.value);
},
});
};
diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue
index f4aa06950d..ad11ba1940 100644
--- a/packages/frontend/src/components/MkUserSelectDialog.vue
+++ b/packages/frontend/src/components/MkUserSelectDialog.vue
@@ -85,7 +85,7 @@ const recentUsers = ref<Misskey.entities.UserDetailed[]>([]);
const selected = ref<Misskey.entities.UserDetailed | null>(null);
const dialogEl = ref();
-const search = () => {
+function search() {
if (username.value === '' && host.value === '') {
users.value = [];
return;
@@ -98,9 +98,9 @@ const search = () => {
}).then(_users => {
users.value = _users;
});
-};
+}
-const ok = () => {
+function ok() {
if (selected.value == null) return;
emit('ok', selected.value);
dialogEl.value.close();
@@ -110,12 +110,12 @@ const ok = () => {
recents = recents.filter(x => x !== selected.value.id);
recents.unshift(selected.value.id);
defaultStore.set('recentlyUsedUsers', recents.splice(0, 16));
-};
+}
-const cancel = () => {
+function cancel() {
emit('cancel');
dialogEl.value.close();
-};
+}
onMounted(() => {
misskeyApi('users/show', {