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 @@ -166,7 +166,9 @@ const { stampsMapFetched } = useStampsStore()
const rootRef = shallowRef<HTMLElement | null>(null)
const state = reactive({
height: 0,
scrollTop: lastScrollPosition.value
scrollTop: lastScrollPosition.value,
// 古いメッセージを読み込むとき、読み込み開始直後は高さの調整を無効化する
skipResizeAdjustment: false
})

const { onChangeHeight, onEntryMessageLoaded } =
Expand Down Expand Up @@ -229,10 +231,18 @@ watch(
}
//上に追加された時はスクロール位置を変更する。
if (props.lastLoadingDirection === 'former') {
// onChangeHeight の調整を一時的に無効化
state.skipResizeAdjustment = true
rootRef.value.scrollTo({
top: newHeight - state.height
})
state.height = newHeight
// 十分に DOMが更新されたら無効化を解除
requestAnimationFrame(() => {
requestAnimationFrame(() => {
state.skipResizeAdjustment = false
})
})
}

if (props.lastLoadingDirection === 'latest') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const useMessageScrollerElementResizeObserver = (
},
viewPortState: {
height: number
skipResizeAdjustment?: boolean
}
) => {
const onChangeHeight = (payload: ChangeHeightData) => {
Expand Down Expand Up @@ -44,6 +45,10 @@ const useMessageScrollerElementResizeObserver = (
scrollerProps.lastLoadingDirection === 'latest' ||
scrollerProps.lastLoadingDirection === 'former'
) {
// 古いメッセージを読み込んですぐはここで高さの調整をしない
if (viewPortState.skipResizeAdjustment) {
return
}
rootRef.value.scrollTop += payload.heightDiff
viewPortState.height = rootRef.value.scrollHeight
}
Expand Down