From 1669f5b2658c84183bb0332eb7b3ea99934d1594 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 28 Dec 2020 19:57:09 +0900
Subject: [PATCH] fix deck

---
 src/client/pizzax.ts               | 2 ++
 src/client/ui/deck.vue             | 2 +-
 src/client/ui/deck/column-core.vue | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/client/pizzax.ts b/src/client/pizzax.ts
index 127f543003..fdaf2bebb6 100644
--- a/src/client/pizzax.ts
+++ b/src/client/pizzax.ts
@@ -109,6 +109,8 @@ export class Storage<T extends StateDef> {
 		const stop = watch(this.reactiveState[key], val => {
 			valueRef.value = val;
 		});
+
+		// NOTE: vueコンポーネント内で呼ばれない限りは、onUnmounted は無意味なのでメモリリークする
 		onUnmounted(() => {
 			stop();
 		});
diff --git a/src/client/ui/deck.vue b/src/client/ui/deck.vue
index d7d4944295..9d11a89330 100644
--- a/src/client/ui/deck.vue
+++ b/src/client/ui/deck.vue
@@ -18,7 +18,7 @@
 			:key="ids[0]"
 			:column="columns.find(c => c.id === ids[0])"
 			@parent-focus="moveFocus(ids[0], $event)"
-			:style="columns.find(c => c.id === ids[0]).flexible ? { flex: 1 } : { width: columns.find(c => c.id === ids[0]).width + 'px' }"
+			:style="columns.find(c => c.id === ids[0]).flexible ? { flex: 1, minWidth: '350px' } : { width: columns.find(c => c.id === ids[0]).width + 'px' }"
 		/>
 	</template>
 
diff --git a/src/client/ui/deck/column-core.vue b/src/client/ui/deck/column-core.vue
index c6a2104268..5393bac736 100644
--- a/src/client/ui/deck/column-core.vue
+++ b/src/client/ui/deck/column-core.vue
@@ -6,7 +6,6 @@
 <XTlColumn v-else-if="column.type === 'tl'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
 <XListColumn v-else-if="column.type === 'list'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
 <XAntennaColumn v-else-if="column.type === 'antenna'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
-<!-- TODO: <XTlColumn v-else-if="column.type === 'hashtag'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/> -->
 <XMentionsColumn v-else-if="column.type === 'mentions'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
 <XDirectColumn v-else-if="column.type === 'direct'" :column="column" :is-stacked="isStacked" @parent-focus="$emit('parent-focus', $event)"/>
 </template>