From 9f61d05c10b7af8624fb44f6e3a4e2551d84dd67 Mon Sep 17 00:00:00 2001
From: nokhnaton <sage_of_forest@icloud.com>
Date: Thu, 23 Jan 2025 16:57:12 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=93=E3=83=A5=E3=83=BC=E3=81=AE=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Main/MainView/ChannelView/ChannelView.vue |   1 -
 .../MainView/QallView/QallMessageView.vue     | 149 ++++++++++++++++++
 .../Main/MainView/QallView/QallView.vue       |  14 ++
 .../NavigationBar/DesktopNavigationBar.vue    |   2 +-
 4 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 src/components/Main/MainView/QallView/QallMessageView.vue

diff --git a/src/components/Main/MainView/ChannelView/ChannelView.vue b/src/components/Main/MainView/ChannelView/ChannelView.vue
index 9c6221d158..a67cc95d31 100644
--- a/src/components/Main/MainView/ChannelView/ChannelView.vue
+++ b/src/components/Main/MainView/ChannelView/ChannelView.vue
@@ -12,7 +12,6 @@
         :pinned-messages="pinnedMessages"
         :typing-users="typingUsers"
       />
-      <!-- <SubQallView /> -->
     </template>
     <template #sidebar>
       <channel-sidebar
diff --git a/src/components/Main/MainView/QallView/QallMessageView.vue b/src/components/Main/MainView/QallView/QallMessageView.vue
new file mode 100644
index 0000000000..91775a4a58
--- /dev/null
+++ b/src/components/Main/MainView/QallView/QallMessageView.vue
@@ -0,0 +1,149 @@
+<template>
+  <div :class="$style.container">
+    <scroll-loading-bar
+      :class="$style.loadingBar"
+      :show="isLoading && isMessageShow"
+    />
+    <transition name="fade-bottom" mode="out-in">
+      <messages-scroller
+        v-show="isMessageShow"
+        ref="scrollerEle"
+        :message-ids="messageIds"
+        :is-reached-end="isReachedEnd"
+        :is-reached-latest="isReachedLatest"
+        :is-loading="isLoading"
+        :last-loading-direction="lastLoadingDirection"
+        @request-load-former="onLoadFormerMessagesRequest"
+        @request-load-latter="onLoadLatterMessagesRequest"
+        @scroll-passive="handleScroll"
+        @reset-is-reached-latest="resetIsReachedLatest"
+      >
+        <template
+          #default="{ messageId, onChangeHeight, onEntryMessageLoaded }"
+        >
+          <message-element
+            :class="$style.element"
+            :message-id="messageId"
+            :is-archived="isArchived"
+            @change-height="onChangeHeight"
+            @entry-message-loaded="onEntryMessageLoaded"
+          />
+        </template>
+      </messages-scroller>
+    </transition>
+    <FormButton
+      label="メッセージを表示"
+      @click="
+        () => {
+          if (isMessageShow) {
+            isMessageShow = false
+            toNewMessage('smooth')
+          } else {
+            isMessageShow = true
+            nextTick(() => toNewMessage())
+          }
+        }
+      "
+    />
+    <message-input
+      :channel-id="channelId"
+      :typing-users="typingUsers"
+      :show-to-new-message-button="showToNewMessageButton"
+      @click-to-new-message-button="toNewMessage"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import MessagesScroller from '/@/components/Main/MainView/MessagesScroller/MessagesScroller.vue'
+import MessageInput from '/@/components/Main/MainView/MessageInput/MessageInput.vue'
+import ScrollLoadingBar from '/@/components/Main/MainView/ScrollLoadingBar.vue'
+import { computed, nextTick, ref, shallowRef } from 'vue'
+import type { ChannelId, UserId } from '/@/types/entity-ids'
+import useChannelMessageFetcher from '../ChannelView/ChannelViewContent/composables/useChannelMessageFetcher'
+import { useChannelsStore } from '/@/store/entities/channels'
+import MessageElement from '/@/components/Main/MainView/MessageElement/MessageElement.vue'
+import { useSubscriptionStore } from '/@/store/domain/subscription'
+import FormButton from '/@/components/UI/FormButton.vue'
+
+const props = defineProps<{
+  channelId: ChannelId
+  typingUsers: UserId[]
+}>()
+
+const isMessageShow = ref(false)
+
+const scrollerEle = shallowRef<{ $el: HTMLDivElement } | undefined>()
+const {
+  messageIds,
+  isReachedEnd,
+  isReachedLatest,
+  isLoading,
+  lastLoadingDirection,
+  onLoadFormerMessagesRequest,
+  onLoadLatterMessagesRequest
+} = useChannelMessageFetcher(scrollerEle, props)
+
+const { channelsMap } = useChannelsStore()
+const isArchived = computed(
+  () => channelsMap.value.get(props.channelId)?.archived ?? false
+)
+
+const { unreadChannelsMap } = useSubscriptionStore()
+const resetIsReachedLatest = () => {
+  if (!unreadChannelsMap.value.get(props.channelId)) return
+  isReachedLatest.value = false
+}
+
+const showToNewMessageButton = ref(false)
+const toNewMessage = (behavior?: ScrollBehavior) => {
+  if (!scrollerEle.value) return
+  showToNewMessageButton.value = false
+  scrollerEle.value.$el.scrollTo({
+    top: scrollerEle.value.$el.scrollHeight,
+    behavior: behavior
+  })
+}
+
+const handleScroll = () => {
+  if (scrollerEle.value === undefined || isLoading.value) return
+  const { scrollTop, scrollHeight, clientHeight } = scrollerEle.value.$el
+  showToNewMessageButton.value = scrollHeight - 2 * clientHeight > scrollTop
+  if (!isReachedLatest.value) {
+    showToNewMessageButton.value = true
+  }
+}
+</script>
+
+<style lang="scss" module>
+.container {
+  display: flex;
+  flex: 1 1;
+  flex-direction: column;
+  justify-content: end;
+  position: relative;
+  height: 100%;
+  width: 100%;
+}
+
+.loadingBar {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 12px;
+  z-index: $z-index-message-loading;
+}
+
+.unreadSeparator {
+  color: $theme-accent-notification-default;
+}
+
+.dateSeparator {
+  @include color-ui-secondary;
+}
+.element {
+  margin: 4px 0;
+  contain: content;
+}
+</style>
diff --git a/src/components/Main/MainView/QallView/QallView.vue b/src/components/Main/MainView/QallView/QallView.vue
index da432b5d0b..5fc9fcfa5c 100644
--- a/src/components/Main/MainView/QallView/QallView.vue
+++ b/src/components/Main/MainView/QallView/QallView.vue
@@ -8,10 +8,13 @@ import CallControlButton from './CallControlButton.vue'
 import CallControlButtonSmall from './CallControlButtonSmall.vue'
 import ScreenShareComponent from './ScreenShareComponent.vue'
 import { LocalTrackPublication } from 'livekit-client'
+import ChannelViewContentMain from '../ChannelView/ChannelViewContent/ChannelViewContentMain.vue'
+import QallMessageView from './QallMessageView.vue'
 
 const {
   tracksMap,
   screenShareTrackSidMap,
+  callingChannel,
   leaveQall,
   addScreenShareTrack,
   addCameraTrack,
@@ -145,6 +148,11 @@ const backgroundType = ref<'original' | 'blur' | 'file' | 'screen'>('original')
 <template>
   <div :class="$style.Block">
     <DanmakuContainer />
+    <QallMessageView
+      :channel-id="callingChannel"
+      :typing-users="[]"
+      :class="$style.channelView"
+    />
     <h1 :class="$style.Header">Qall View</h1>
     {{ backgroundType }}
     <button @click="addScreenShareTrack">Add Screen Share Track</button>
@@ -269,6 +277,12 @@ const backgroundType = ref<'original' | 'blur' | 'file' | 'screen'>('original')
 .TrackContainer {
   height: fit-content;
 }
+.channelView {
+  position: absolute;
+  width: 30%;
+  right: 0;
+  bottom: 0;
+}
 .video {
   width: 50%;
   height: 50%;
diff --git a/src/components/Main/NavigationBar/DesktopNavigationBar.vue b/src/components/Main/NavigationBar/DesktopNavigationBar.vue
index 77930f8e9c..78f8006a81 100644
--- a/src/components/Main/NavigationBar/DesktopNavigationBar.vue
+++ b/src/components/Main/NavigationBar/DesktopNavigationBar.vue
@@ -20,7 +20,7 @@
       />
       <transition name="fade-bottom">
         <ephemeral-navigation-content
-          v-if="true"
+          v-if="ephemeralNavigationSelectorState.currentNavigation"
           :class="$style.ephemeralNavigation"
           :current-ephemeral-navigation="
             ephemeralNavigationSelectorState.currentNavigation