natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'thatonecalculator/fix-chat-continuation' into develop

This commit is contained in:
ThatOneCalculator 2022-07-18 20:34:53 -07:00
parent 4bfc6f2457 6f09e14225
commit fa8b52a0da
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/client/src/components/ui/pagination.vue
View File

@ -196,21 +196,23 @@ const prepend = (item: Item): void => {
if (props.pagination.reversed) { if (props.pagination.reversed) {
if (rootEl.value) { if (rootEl.value) {
const container = getScrollContainer(rootEl.value); const container = getScrollContainer(rootEl.value);
if (container == null) return; // TODO? if (container == null) {
// TODO?
const pos = getScrollPosition(rootEl.value); } else {
const viewHeight = container.clientHeight; const pos = getScrollPosition(rootEl.value);
const height = container.scrollHeight; const viewHeight = container.clientHeight;
const isBottom = (pos + viewHeight > height - 32); const height = container.scrollHeight;
if (isBottom) { const isBottom = (pos + viewHeight > height - 32);
// オーバーフローしたら古いアイテムは捨てる if (isBottom) {
if (items.value.length >= props.displayLimit) { // オーバーフローしたら古いアイテムは捨てる
// このやり方だとVue 3.2以降アニメーションが動かなくなる if (items.value.length >= props.displayLimit) {
//items.value = items.value.slice(-props.displayLimit); // このやり方だとVue 3.2以降アニメーションが動かなくなる
while (items.value.length >= props.displayLimit) { //items.value = items.value.slice(-props.displayLimit);
items.value.shift(); while (items.value.length >= props.displayLimit) {
items.value.shift();
}
more.value = true;
} }
more.value = true;
} }
} }
} }

6
packages/client/src/pages/messaging/messaging-room.vue
View File

@ -292,6 +292,7 @@ definePageMetadata(computed(() => !fetching ? user ? {
<style lang="scss" scoped> <style lang="scss" scoped>
.mk-messaging-room { .mk-messaging-room {
position: relative; position: relative;
overflow: auto;
> .body { > .body {
.more { .more {
@ -335,10 +336,7 @@ definePageMetadata(computed(() => !fetching ? user ? {
z-index: 2; z-index: 2;
bottom: 0; bottom: 0;
padding-top: 8px; padding-top: 8px;
bottom: calc(env(safe-area-inset-bottom, 0px) + 8px);
@media (max-width: 500px) {
bottom: calc(env(safe-area-inset-bottom, 0px) + 92px);
}
> .new-message { > .new-message {
width: 100%; width: 100%;