From ef26239ac28f210bb827a1286eb85a12905d913d Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Mon, 2 May 2022 20:58:30 +0900
Subject: [PATCH] Remove unnecessary buttons

---
 .../TimelineSpace/Modals/NewToot.vue           |  6 +++++-
 .../TimelineSpace/Modals/NewToot/Status.vue    | 18 +-----------------
 .../store/TimelineSpace/Modals/NewToot.ts      |  7 ++++++-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index dbd95c35..35bc3bd2 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -145,7 +145,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, reactive, computed, onMounted, ComponentPublicInstance, nextTick } from 'vue'
+import { defineComponent, ref, reactive, computed, onMounted, ComponentPublicInstance, nextTick, onBeforeUnmount } from 'vue'
 import { useI18next } from 'vue3-i18next'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Entity } from 'megalodon'
@@ -242,6 +242,10 @@ export default defineComponent({
       spoilerText.value = initialSpoiler.value
     })
 
+    onBeforeUnmount(() => {
+      store.dispatch(`${space}/${ACTION_TYPES.TEARDOWN_LOADING}`)
+    })
+
     const close = () => {
       store.dispatch(`${space}/${ACTION_TYPES.RESET_MEDIA_COUNT}`)
       store.dispatch(`${space}/${ACTION_TYPES.CLOSE_MODAL}`)
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
index 1722b7da..e0dda252 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
@@ -43,7 +43,7 @@
       </ul>
       <!-- dummy object to open suggest popper -->
       <template #reference>
-        <el-button type="text" ref="suggestButtonRef" class="dummy-button">dummy</el-button>
+        <span></span>
       </template>
     </el-popover>
     <div>
@@ -73,7 +73,6 @@ import 'emoji-mart-vue-fast/css/emoji-mart.css'
 import data from 'emoji-mart-vue-fast/data/all.json'
 import { defineComponent, computed, toRefs, ref, onBeforeUnmount, onMounted } from 'vue'
 import { Picker, EmojiIndex } from 'emoji-mart-vue-fast/src'
-import { ElButton } from 'element-plus'
 
 import suggestText from '@/utils/suggestText'
 import { useStore } from '@/store'
@@ -109,7 +108,6 @@ export default defineComponent({
     const { modelValue } = toRefs(props)
     const highlightedIndex = ref(0)
     const statusRef = ref<HTMLTextAreaElement>()
-    const suggestButtonRef = ref<InstanceType<typeof ElButton>>()
     const suggestRef = ref()
     const suggestOpened = ref<boolean>(false)
 
@@ -152,14 +150,10 @@ export default defineComponent({
 
     const openSuggest = () => {
       suggestOpened.value = true
-      // suggestButtonRef.value?.$el.focus()
-      // statusRef.value?.click()
     }
     const closeSuggest = () => {
       store.dispatch(`${space}/${ACTION_TYPES.CLOSE_SUGGEST}`)
       highlightedIndex.value = 0
-      // suggestButtonRef.value?.$el.blur()
-      // statusRef.value?.focus()
       suggestOpened.value = false
     }
     const suggestAccount = async (start: number, word: string) => {
@@ -282,7 +276,6 @@ export default defineComponent({
 
     return {
       statusRef,
-      suggestButtonRef,
       suggestRef,
       suggestOpened,
       emojiIndex,
@@ -372,15 +365,6 @@ export default defineComponent({
     }
   }
 
-  .dummy-button {
-    height: 0;
-    font-size: 0;
-    padding: 0;
-    margin: 0;
-    border: none;
-    display: block;
-  }
-
   .emoji-selector {
     position: absolute;
     top: 4px;
diff --git a/src/renderer/store/TimelineSpace/Modals/NewToot.ts b/src/renderer/store/TimelineSpace/Modals/NewToot.ts
index a10a7865..d677b72d 100644
--- a/src/renderer/store/TimelineSpace/Modals/NewToot.ts
+++ b/src/renderer/store/TimelineSpace/Modals/NewToot.ts
@@ -158,6 +158,7 @@ const mutations: MutationTree<NewTootState> = {
 
 export const ACTION_TYPES = {
   SETUP_LOADING: 'setupLoading',
+  TEARDOWN_LOADING: 'tearDownLoading',
   START_LOADING: 'startLoading',
   STOP_LOADING: 'stopLoading',
   UPDATE_MEDIA: 'updateMedia',
@@ -175,9 +176,10 @@ export const ACTION_TYPES = {
   FETCH_VISIBILITY: 'fetchVisibility'
 }
 
+const axiosLoading = new AxiosLoading()
+
 const actions: ActionTree<NewTootState, RootState> = {
   [ACTION_TYPES.SETUP_LOADING]: ({ dispatch }) => {
-    const axiosLoading = new AxiosLoading()
     axiosLoading.on('start', (_: number) => {
       dispatch('startLoading')
     })
@@ -185,6 +187,9 @@ const actions: ActionTree<NewTootState, RootState> = {
       dispatch('stopLoading')
     })
   },
+  [ACTION_TYPES.TEARDOWN_LOADING]: () => {
+    axiosLoading.removeAllListeners()
+  },
   [ACTION_TYPES.START_LOADING]: ({ commit, state }) => {
     if (state.modalOpen && !state.loading) {
       commit(MUTATION_TYPES.CHANGE_LOADING, true)