wip

src/client/components/dialog.vue

@@ -1,5 +1,5 @@
 <template>
-<x-modal ref="modal" @closed="destroy" @click="onBgClick" :showing="showing">
+<x-modal ref="modal" @closed="$emit('closed')" @click="onBgClick" :showing="showing">
 	<div class="mk-dialog" :class="{ iconOnly }">
 		<template v-if="type == 'signin'">
 			<mk-signin/>
@@ -65,10 +65,7 @@ export default defineComponent({
 	},
 
 	props: {
-		destroy: {
-			required: true
-		},
-		emit: {
+		showing: {
 			required: true
 		},
 		type: {
@@ -121,9 +118,10 @@ export default defineComponent({
 		},
 	},
 
+	emits: ['done', 'closed'],
+
 	data() {
 		return {
-			showing: true,
 			inputValue: this.input && this.input.default ? this.input.default : null,
 			userInputValue: null,
 			selectedValue: this.select ? this.select.default ? this.select.default : this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
@@ -162,8 +160,7 @@ export default defineComponent({
 
 	methods: {
 		done(canceled, result?) {
-			this.showing = false;
-			this.emit({ canceled, result });
+			this.$emit('done', { canceled, result });
 		},
 
 		async ok() {

src/client/components/menu.vue

@@ -1,5 +1,5 @@
 <template>
-<x-modal :source="source" :no-center="noCenter" ref="popup" @click="close()" @closed="destroy" :showing="showing">
+<x-modal :source="source" :no-center="noCenter" ref="popup" @click="close()" @closed="$emit('closed')" :showing="showing">
 	<div class="rrevdjwt" :class="{ left: align === 'left' }" ref="items" :style="{ width: width + 'px' }">
 		<template v-for="(item, i) in items.filter(item => item !== undefined)">
 			<div v-if="item === null" class="divider" :key="i"></div>
@@ -44,7 +44,7 @@ export default defineComponent({
 		XModal
 	},
 	props: {
-		destroy: {
+		showing: {
 			required: true
 		},
 		source: {
@@ -77,7 +77,6 @@ export default defineComponent({
 	},
 	data() {
 		return {
-			showing: true,
 			faCircle
 		};
 	},
@@ -102,7 +101,7 @@ export default defineComponent({
 			this.close();
 		},
 		close() {
-			this.showing = false;
+			this.$emit('done');
 		},
 		focusUp() {
 			focusPrev(document.activeElement);

src/client/components/modal.vue

@@ -18,7 +18,6 @@ import * as os from '@/os';
 // memo: 旧popup.vueのfixedプロパティに相当するものはsource要素の祖先を辿るなどして自動で判定できるのでは
 
 export default defineComponent({
-	emits: ['click', 'esc', 'closed'],
 	props: {
 		showing: {
 			type: Boolean,
@@ -38,6 +37,7 @@ export default defineComponent({
 			required: false,
 		}
 	},
+	emits: ['click', 'esc', 'closed'],
 	data() {
 		return {
 			fixed: false,