e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

fix: broken chats (#8983)

Browse source 
* Fix broken chats

Co-authored-by: @ltlapy

* 🎨
This commit is contained in:
Kainoa Kanter 2022-07-22 08:46:52 -07:00 committed by GitHub
parent 43ee600fb3
commit e371120c8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -197,21 +197,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%;