Merge pull request #4065 from h3poteto/refactor/overlaid

[refactor] Remove overlaid props from Toot
2023-01-31 21:15:21 +09:00 · 2023-01-31 21:15:21 +09:00 · 37e09aa25f
parent 48d315c184 8e0355a79c
commit 37e09aa25f
18 changed files with 8 additions and 73 deletions
--- a/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue
@ -8,7 +8,6 @@
            v-if="account.account && account.server"
            :message="item"
            :focused="item.uri === focusedId"
-            :overlaid="modalOpened"
            :filters="[]"
            :account="account.account"
            :server="account.server"
@ -218,7 +217,6 @@ export default defineComponent({
      scroller,
      bookmarks,
      focusedId,
-      modalOpened,
      updateToot,
      deleteToot,
      focusToot,
--- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
+++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
@ -7,7 +7,6 @@
            v-if="account.account && account.server"
            :message="item"
            :focused="item.uri + item.id === focusedId"
-            :overlaid="modalOpened"
            :filters="[]"
            :account="account.account"
            :server="account.server"
@ -159,7 +158,6 @@ export default defineComponent({
      timeline,
      scroller,
      focusedId,
-      modalOpened,
      updateToot,
      deleteToot,
      focusToot,
--- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
@ -8,7 +8,6 @@
            v-if="account.account && account.server"
            :message="item"
            :focused="item.uri === focusedId"
-            :overlaid="modalOpened"
            :filters="[]"
            :account="account.account"
            :server="account.server"
@ -222,7 +221,6 @@ export default defineComponent({
      backgroundColor,
      scroller,
      focusedId,
-      modalOpened,
      updateToot,
      deleteToot,
      focusToot,
--- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
@ -8,7 +8,6 @@
            v-if="account.account && account.server"
            :message="item"
            :focused="item.uri + item.id === focusedId"
-            :overlaid="modalOpened"
            :filters="[]"
            :account="account.account"
            :server="account.server"
@ -235,7 +234,6 @@ export default defineComponent({
      statuses,
      scroller,
      focusedId,
-      modalOpened,
      updateToot,
      deleteToot,
      focusToot,
--- a/src/renderer/components/TimelineSpace/Contents/Home.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Home.vue
@ -13,7 +13,6 @@
              v-if="account.account && account.server"
              :message="item"
              :focused="item.uri + item.id === focusedId"
-              :overlaid="modalOpened"
              :filters="filters"
              :account="account.account"
              :server="account.server"
@ -219,7 +218,6 @@ export default defineComponent({
      loadingMore,
      fetchTimelineSince,
      focusedId,
-      modalOpened,
      filters,
      updateToot,
      deleteToot,
--- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
@ -8,7 +8,6 @@
            v-if="account.account && account.server"
            :message="item"
            :focused="item.uri + item.id === focusedId"
-            :overlaid="modalOpened"
            :filters="[]"
            :account="account.account"
            :server="account.server"
@ -232,7 +231,6 @@ export default defineComponent({
      scroller,
      statuses,
      focusedId,
-      modalOpened,
      updateToot,
      deleteToot,
      focusToot,
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@ -7,7 +7,6 @@
            v-if="account.account && account.server"
            :message="item"
            :focused="item.uri + item.id === focusedId"
-            :overlaid="modalOpened"
            :filters="[]"
            :account="account.account"
            :server="account.server"
@ -167,7 +166,6 @@ export default defineComponent({
      scroller,
      timeline,
      focusedId,
-      modalOpened,
      updateToot,
      deleteToot,
      focusToot,
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@ -13,7 +13,6 @@
              v-if="account.account && account.server"
              :message="item"
              :focused="item.id === focusedId"
-              :overlaid="modalOpened"
              :filters="filters"
              :account="account.account"
              :server="account.server"
@ -204,7 +203,6 @@ export default defineComponent({
      loadingMore,
      fetchNotificationsSince,
      focusedId,
-      modalOpened,
      filters,
      updateToot,
      focusNext,
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@ -8,7 +8,6 @@
            v-if="account.account && account.server"
            :message="item"
            :focused="item.uri + item.id === focusedId"
-            :overlaid="modalOpened"
            :filters="filters"
            :account="account.account"
            :server="account.server"
@ -203,7 +202,6 @@ export default defineComponent({
      statuses,
      scroller,
      focusedId,
-      modalOpened,
      filters,
      updateToot,
      deleteToot,
--- a/src/renderer/components/TimelineSpace/Detail/Profile/Posts.vue
+++ b/src/renderer/components/TimelineSpace/Detail/Profile/Posts.vue
@ -6,7 +6,6 @@
          v-if="account && server"
          :message="item"
          :focused="item.uri + item.id === focusedId"
-          :overlaid="modalOpened"
          :account="account"
          :server="server"
          @update="updateToot"
@ -52,7 +51,6 @@ export default defineComponent({
    const focusedId = ref<string | null>(null)

    const userAgent = computed(() => store.state.App.userAgent)
-    const modalOpened = computed<boolean>(() => store.getters[`TimelineSpace/Modals/modalOpened`])

    onMounted(async () => {
      client.value = generator(server.value.sns, server.value.baseURL, account.value.accessToken, userAgent.value)
@ -86,7 +84,6 @@ export default defineComponent({

    return {
      statuses,
-      modalOpened,
      updateToot,
      deleteToot,
      focusedId,
--- a/src/renderer/components/TimelineSpace/Detail/Status.vue
+++ b/src/renderer/components/TimelineSpace/Detail/Status.vue
@ -4,7 +4,6 @@
      <Toot
        v-if="account.account && account.server"
        :message="mes"
-        :overlaid="modalOpened"
        :account="account.account"
        :server="account.server"
        @update="updateStatus"
@ -14,7 +13,6 @@
      <Toot
        v-if="status !== null && account.account && account.server"
        :message="status"
-        :overlaid="modalOpened"
        :account="account.account"
        :server="account.server"
        @update="updateStatus"
@ -24,7 +22,6 @@
      <Toot
        v-if="account.account && account.server"
        :message="mes"
-        :overlaid="modalOpened"
        :account="account.account"
        :server="account.server"
        @update="updateStatus"
@ -62,7 +59,6 @@ export default defineComponent({
      account: null,
      server: null
    })
-    const modalOpened = computed(() => store.getters[`TimelineSpace/Modals/modalOpened`])

    onMounted(async () => {
      const [a, s]: [LocalAccount, LocalServer] = await win.ipcRenderer.invoke('get-local-account', id.value)
@ -112,8 +108,7 @@ export default defineComponent({
      status,
      ancestors,
      descendants,
-      updateStatus,
-      modalOpened
+      updateStatus
    }
  }
 })
--- a/src/renderer/components/organisms/Notification.vue
+++ b/src/renderer/components/organisms/Notification.vue
@ -5,7 +5,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      reaction-type="favourite"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
@ -15,7 +14,6 @@
      v-else-if="message.type === 'follow'"
      :message="message"
      :focused="focused"
-      :overlaid="overlaid"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
    >
@ -24,7 +22,6 @@
      v-else-if="message.type === 'follow_request'"
      :message="message"
      :focused="focused"
-      :overlaid="overlaid"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
    >
@ -34,7 +31,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      :account="account"
      :server="server"
      @update="updateToot"
@ -48,7 +44,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      reaction-type="quote"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
@ -59,7 +54,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      reaction-type="reblog"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
@ -70,7 +64,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      :account="account"
      :server="server"
      @focus-right="$emit('focusRight')"
@ -82,7 +75,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      reaction-type="poll-vote"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
@ -93,7 +85,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      reaction-type="poll-expired"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
@ -104,7 +95,6 @@
      :message="message"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      reaction-type="emoji-reaction"
      @focus-right="$emit('focusRight')"
      @select="$emit('selectNotification')"
@ -146,10 +136,6 @@ export default defineComponent({
      type: Boolean,
      default: () => false
    },
-    overlaid: {
-      type: Boolean,
-      default: () => false
-    },
    account: {
      type: Object as PropType<LocalAccount>,
      required: true
--- a/src/renderer/components/organisms/Notification/Follow.vue
+++ b/src/renderer/components/organisms/Notification/Follow.vue
@ -48,10 +48,6 @@ export default defineComponent({
    focused: {
      type: Boolean,
      default: false
-    },
-    overlaid: {
-      type: Boolean,
-      default: false
    }
  },
  emits: ['select'],
@ -61,7 +57,6 @@ export default defineComponent({
    const router = useRouter()
    const notificationRef = ref<any>(null)

-    // const shortcutEnabled = computed(() => focused.value && !overlaid.value)
    const displayNameStyle = computed(() => store.state.App.displayNameStyle)

    watch(focused, (newVal, oldVal) => {
--- a/src/renderer/components/organisms/Notification/FollowRequest.vue
+++ b/src/renderer/components/organisms/Notification/FollowRequest.vue
@ -48,10 +48,6 @@ export default defineComponent({
    focused: {
      type: Boolean,
      default: false
-    },
-    overlaid: {
-      type: Boolean,
-      default: false
    }
  },
  emits: ['select'],
@ -61,7 +57,6 @@ export default defineComponent({
    const router = useRouter()
    const notificationRef = ref<any>(null)

-    // const shortcutEnabled = computed(() => focused.value && !overlaid.value)
    const displayNameStyle = computed(() => store.state.App.displayNameStyle)

    watch(focused, (newVal, oldVal) => {
--- a/src/renderer/components/organisms/Notification/Mention.vue
+++ b/src/renderer/components/organisms/Notification/Mention.vue
@ -4,7 +4,6 @@
      :message="message.status"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      :account="account"
      :server="server"
      v-on:update="updateToot"
@ -38,10 +37,6 @@ export default defineComponent({
      type: Boolean,
      default: false
    },
-    overlaid: {
-      type: Boolean,
-      default: false
-    },
    account: {
      type: Object as PropType<LocalAccount>,
      required: true
--- a/src/renderer/components/organisms/Notification/Status.vue
+++ b/src/renderer/components/organisms/Notification/Status.vue
@ -25,7 +25,6 @@
      :message="message.status"
      :filters="filters"
      :focused="focused"
-      :overlaid="overlaid"
      :account="account"
      :server="server"
      v-on:update="updateToot"
@ -64,10 +63,6 @@ export default defineComponent({
      type: Boolean,
      default: false
    },
-    overlaid: {
-      type: Boolean,
-      default: false
-    },
    account: {
      type: Object as PropType<LocalAccount>,
      required: true
--- a/src/renderer/components/organisms/Notification/StatusReaction.vue
+++ b/src/renderer/components/organisms/Notification/StatusReaction.vue
@ -130,10 +130,6 @@ export default defineComponent({
    focused: {
      type: Boolean,
      default: false
-    },
-    overlaid: {
-      type: Boolean,
-      default: false
    }
  },
  emits: ['select'],
@ -152,7 +148,6 @@ export default defineComponent({
    const timeFormat = computed(() => store.state.App.timeFormat)
    const language = computed(() => store.state.App.language)
    const hideAllAttachments = computed(() => store.state.App.hideAllAttachments)
-    // const shortcutEnabled = computed(() => focused.value && !overlaid.value)
    const timestamp = computed(() => parseDatetime(message.value.created_at, timeFormat.value, language.value))
    const readableTimestamp = computed(() => {
      moment.locale(language.value)
--- a/src/renderer/components/organisms/Toot.vue
+++ b/src/renderer/components/organisms/Toot.vue
@ -232,7 +232,7 @@
 <script lang="ts">
 import { defineComponent, PropType, ref, computed, toRefs, watch, nextTick, onMounted } from 'vue'
 import { logicAnd } from '@vueuse/math'
-import { useMagicKeys, whenever } from '@vueuse/core'
+import { useActiveElement, useMagicKeys, whenever } from '@vueuse/core'
 import 'emoji-mart-vue-fast/css/emoji-mart.css'
 import data from 'emoji-mart-vue-fast/data/all.json'
 import moment from 'moment'
@ -284,10 +284,6 @@ export default defineComponent({
      type: Boolean,
      default: false
    },
-    overlaid: {
-      type: Boolean,
-      default: false
-    },
    pinned: {
      type: Boolean,
      default: false
@ -312,8 +308,9 @@ export default defineComponent({
    const router = useRouter()
    const i18n = useI18next()
    const win = (window as any) as MyWindow
-    const { focused, overlaid, message, filters, account, server } = toRefs(props)
+    const { focused, message, filters, account, server } = toRefs(props)
    const { r, b, f, o, p, i, x } = useMagicKeys()
+    const activeElement = useActiveElement()

    const statusRef = ref<any>(null)
    const showContent = ref(store.state.App.ignoreCW)
@ -327,7 +324,10 @@ export default defineComponent({
    const displayNameStyle = computed(() => store.state.App.displayNameStyle)
    const timeFormat = computed(() => store.state.App.timeFormat)
    const language = computed(() => store.state.App.language)
-    const shortcutEnabled = computed(() => focused.value && !overlaid.value)
+    const modalOpened = computed<boolean>(() => store.getters[`TimelineSpace/Modals/modalOpened`])
+    const shortcutEnabled = computed(
+      () => focused.value && activeElement.value?.tagName !== 'INPUT' && activeElement.value?.tagName !== 'TEXTAREA' && !modalOpened.value
+    )
    const originalMessage = computed(() => {
      if (message.value.reblog && !message.value.quote) {
        return message.value.reblog