Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ const useChannelMessageFetcher = (
unreadChannelsMapInitialFetchPromise,
deleteUnreadChannelWithSend
} = useSubscriptionStore()
const getFetchLimit = useFetchLimit(scrollerRef, MESSAGE_HEIGHT)
const { fetchLimit, waitHeightResolved } = useFetchLimit(
scrollerRef,
MESSAGE_HEIGHT
)
const loadedMessageLatestDate = ref<Date>()
const loadedMessageOldestDate = ref<Date>()
const unreadSince = ref()
Expand Down Expand Up @@ -94,10 +97,10 @@ const useChannelMessageFetcher = (
}

const fetchFormerMessages = async (isReachedEnd: Ref<boolean>) => {
const limit = await getFetchLimit()
await waitHeightResolved
const { messages: messagesDesc, hasMore } = await fetchMessagesByChannelId({
channelId: props.channelId,
limit,
limit: fetchLimit.value,
order: 'desc',
until: loadedMessageOldestDate.value
})
Expand All @@ -115,10 +118,10 @@ const useChannelMessageFetcher = (
const fetchLatterMessages = async (
isReachedLatest: Ref<boolean>
): Promise<ChannelId[]> => {
const limit = await getFetchLimit()
await waitHeightResolved
const { messages: messagesAsc, hasMore } = await fetchMessagesByChannelId({
channelId: props.channelId,
limit,
limit: fetchLimit.value,
order: 'asc',
since: loadedMessageLatestDate.value
})
Expand All @@ -141,6 +144,7 @@ const useChannelMessageFetcher = (
loadedMessageLatestDate.value = date
loadedMessageOldestDate.value = date

await waitHeightResolved
const [formerMessageIds, latterMessageIds] = await Promise.all([
fetchFormerMessages(isReachedEnd),
fetchLatterMessages(isReachedLatest)
Expand All @@ -152,10 +156,10 @@ const useChannelMessageFetcher = (

// 直近のメッセージを取得し作成日時昇順で並べ替えて返す
const fetchNewMessages = async (isReachedLatest: Ref<boolean>) => {
const limit = await getFetchLimit()
await waitHeightResolved
const { messages: messagesDesc, hasMore } = await fetchMessagesByChannelId({
channelId: props.channelId,
limit,
limit: fetchLimit.value,
order: 'desc',
since: loadedMessageLatestDate.value
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ const useClipsFetcher = (
}
) => {
const { fetchMessage, extendMessagesMap } = useMessagesStore()
const getFetchLimit = useFetchLimit(scrollerRef, MESSAGE_HEIGHT)
const { fetchLimit, waitHeightResolved } = useFetchLimit(
scrollerRef,
MESSAGE_HEIGHT
)
const state = reactive({
nextLoadOffset: 0
})
Expand Down Expand Up @@ -62,17 +65,17 @@ const useClipsFetcher = (
}

const fetchFormerMessages = async (isReachedEnd: Ref<boolean>) => {
const limit = await getFetchLimit()
await waitHeightResolved
const { clips, hasMore } = await fetchMessagesInClipFolder({
folderId: props.clipFolderId,
limit,
limit: fetchLimit.value,
offset: state.nextLoadOffset
})

if (!hasMore) {
isReachedEnd.value = true
} else {
state.nextLoadOffset += limit
state.nextLoadOffset += fetchLimit.value
}

return clips.toReversed().map(clip => clip.message.id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
>
<div
v-if="stampsMapFetched"
ref="viewportRef"
:class="$style.viewport"
data-testid="channel-viewport"
>
Expand All @@ -37,7 +36,7 @@ import type { ComponentPublicInstance, Ref } from 'vue'
import { nextTick, onMounted, reactive, shallowRef, watch } from 'vue'
import { useRoute } from 'vue-router'

import { useEventListener, useResizeObserver } from '@vueuse/core'
import { useEventListener } from '@vueuse/core'
import { throttle } from 'throttle-debounce'

import { isMessageScrollerRoute } from '/@/router'
Expand Down Expand Up @@ -110,7 +109,6 @@ const { lastScrollPosition } = useMainViewStore()
const { stampsMapFetched } = useStampsStore()

const rootRef = shallowRef<HTMLElement | null>(null)
const viewportRef = shallowRef<HTMLElement | null>(null)
const state = reactive({
height: 0,
scrollTop: lastScrollPosition.value,
Expand Down Expand Up @@ -212,7 +210,8 @@ const requestLoadMessages = () => {
if (props.isLoading) return
if (state.scrollTop < LOAD_MORE_THRESHOLD && !props.isReachedEnd) {
emit('requestLoadFormer')
} else if (
}
if (
scrollHeight - state.scrollTop - clientHeight < LOAD_MORE_THRESHOLD &&
!props.isReachedLatest
) {
Expand All @@ -222,23 +221,6 @@ const requestLoadMessages = () => {

const handleScroll = throttle(17, requestLoadMessages)

const loadIfContentFits = () => {
const root = rootRef.value
if (!root || !viewportRef.value || !props.messageIds.length) return

// 一覧が表示領域に収まる場合はスクロール操作で追加取得を始められない
if (root.clientHeight > 0 && root.scrollHeight <= root.clientHeight) {
requestLoadMessages()
}
}

useResizeObserver([rootRef, viewportRef], loadIfContentFits)
watch(
[() => props.isLoading, () => props.messageIds.length],
loadIfContentFits,
{ flush: 'post' }
)

const visibilitychangeListener = () => {
if (document.visibilityState === 'visible') {
requestLoadMessages()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ShallowRef } from 'vue'
import { nextTick, watch } from 'vue'
import { computed, watch } from 'vue'

import useBoxSize from '/@/composables/dom/useBoxSize'
import { unrefElement } from '/@/lib/dom/unrefElement'

import type { MessageScrollerInstance } from '../MessagesScroller.vue'
Expand All @@ -11,25 +12,29 @@ const useFetchLimit = (
scrollerRef: ShallowRef<MessageScrollerInstance | undefined>,
messageHeight: number
) => {
const scrollerMounted = new Promise<void>(resolve => {
const stop = watch(scrollerRef, scroller => {
if (!scroller) return

stop()
resolve()
})
const { height } = useBoxSize(
computed(() => unrefElement(scrollerRef) ?? null),
false
)

const fetchLimit = computed(() =>
Math.min(Math.ceil((height.value ?? 0) / messageHeight), MAX_COUNT)
)

const waitHeightResolved = new Promise<void>(resolve => {
const stop = watch(
height,
newHeight => {
if (newHeight !== undefined) {
stop()
resolve()
}
},
{ immediate: true }
)
})

return async () => {
await scrollerMounted
// 遷移先の入力欄が反映されてから一覧の高さを測る
await nextTick()

const height = unrefElement(scrollerRef)?.clientHeight
return height
? Math.min(Math.ceil(height / messageHeight), MAX_COUNT)
: MAX_COUNT
}
return { fetchLimit, waitHeightResolved }
}

export default useFetchLimit
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,9 @@ const useMessageFetcher = (
}

const onLoadFormerMessagesRequest = async () => {
if (isLoading.value || isReachedEnd.value) {
if (isReachedEnd.value) {
return
}

isLoading.value = true

await runWithIdentifierCheck(
Expand Down Expand Up @@ -117,10 +116,9 @@ const useMessageFetcher = (
}

const onLoadLatterMessagesRequest = async () => {
if (isLoading.value || !fetchLatterMessages || isReachedLatest.value) {
if (!fetchLatterMessages || isReachedLatest.value) {
return
}

isLoading.value = true

await runWithIdentifierCheck(
Expand Down
69 changes: 0 additions & 69 deletions tests/e2e/specs/main.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,75 +13,6 @@ test.describe('Main', () => {
await expect(page.locator('.markdown-body')).toContainText([initialMessage])
})

test('can scroll history after leaving a large draft with an attachment', async ({
authenticatedPage: page,
testData
}) => {
await page.setViewportSize({ width: 1280, height: 720 })

const channelName = `${testData.channelName}-log`
const channelResponse = await page.request.post('/api/v3/channels', {
data: { name: channelName }
})
await expect(channelResponse).toBeOK()

const { id: channelId } = await channelResponse.json()
const messagesPath = `/api/v3/channels/${channelId}/messages`
const subscriptionResponse = await page.request.put(
`/api/v3/users/me/subscriptions/${channelId}`,
{ data: { level: 1 } }
)
await expect(subscriptionResponse).toBeOK()

for (let i = 1; i <= 30; i++) {
const response = await page.request.post(messagesPath, {
data: { content: `History message ${i}` }
})
await expect(response).toBeOK()
}

await page.reload()
await page
.getByTestId('message-input-textarea')
.fill('Draft line\n'.repeat(80))

const fileChooserPromise = page.waitForEvent('filechooser')
await page.getByTitle('ファイルを添付する').click()
const fileChooser = await fileChooserPromise
await fileChooser.setFiles({
name: 'draft.txt',
mimeType: 'text/plain',
buffer: Buffer.from('Unsent attachment')
})
await expect(page.getByText('draft.txt', { exact: true })).toBeVisible()

await page.getByRole('link', { name: channelName, exact: true }).click()

const viewport = page.getByTestId('channel-viewport')
await expect(viewport.getByText('History message 30')).toBeInViewport()

const olderMessages = page.waitForResponse(response => {
const url = new URL(response.url())
return (
url.pathname === messagesPath &&
url.searchParams.has('until') &&
response.ok()
)
})
const scroller = viewport.locator('..')
await scroller.hover()
await page.mouse.wheel(0, -1000)

const response = await olderMessages
const messages: { content: string }[] = await response.json()
const oldestMessage = messages.at(-1)
if (!oldestMessage) throw new Error('Expected an older history message')

await expect(
viewport.getByText(oldestMessage.content, { exact: true })
).toBeAttached()
})

test('can show user modal', async ({ authenticatedPage: page }) => {
await page.getByTestId('my-icon-button').click()
await expect(
Expand Down
Loading