user-listをexpandするまでfetchしないように

mei23 · Dec 5, 2021 · 7c1541f · 7c1541f
1 parent fa982f9
commit 7c1541f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue
@@ -1,5 +1,5 @@
 <template>
-<ui-container :body-togglable="true" :expanded="expanded">
+<ui-container :body-togglable="true" @toggle="onToggle" :expanded="expanded">
 	<template #header><slot></slot></template>
 
 	<mk-error v-if="!fetching && !inited" @retry="init()"/>
@@ -56,6 +56,7 @@ export default Vue.extend({
 
 	data() {
 		return {
+			initialized: false,
 			fetching: true,
 			fetchingMoreUsers: false,
 			us: [],
@@ -65,11 +66,12 @@ export default Vue.extend({
 	},
 
 	created() {
-		this.init();
+		if (this.expanded) this.init();
 	},
 
 	methods: {
 		init() {
+			this.initialized = true;
 			this.fetching = true;
 			this.makePromise().then(x => {
 				if (Array.isArray(x)) {
@@ -94,6 +96,10 @@ export default Vue.extend({
 			}, e => {
 				this.fetchingMoreUsers = false;
 			});
+		},
+
+		onToggle(show: boolean) {
+			if (show && !this.initialized) this.init();
 		}
 	}
 });

diff --git a/src/client/app/mobile/views/components/ui-container.vue b/src/client/app/mobile/views/components/ui-container.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="ukygtjoj" :class="{ naked, inNakedDeckColumn, hideHeader: !showHeader }">
-	<header v-if="showHeader" @click="() => showBody = !showBody">
+	<header v-if="showHeader" @click="toggleContent(!showBody)">
 		<div class="title"><slot name="header"></slot></div>
 		<slot name="func"></slot>
 		<button v-if="bodyTogglable">
@@ -49,6 +49,7 @@ export default Vue.extend({
 		toggleContent(show: boolean) {
 			if (!this.bodyTogglable) return;
 			this.showBody = show;
+			this.$emit('toggle', show);
 		}
 	}
 });