This commit is contained in:
かっこかり 2024-10-25 00:01:59 +09:00 committed by GitHub
commit d6280305ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions

View file

@ -14,6 +14,8 @@
- Fix: Turnstileが失敗・期限切れした際にも成功扱いとなってしまう問題を修正
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/768)
- Fix: デッキのタイムラインカラムで「センシティブなファイルを含むノートを表示」設定が使用できなかった問題を修正
- Fix: ごくまれに上方向へのスクロールができなくなる問題を抑制
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/244)
### Server
- Fix: Nested proxy requestsを検出した際にブロックするように

View file

@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
import { onMounted, onUnmounted, ref, shallowRef } from 'vue';
import { onMounted, onUnmounted, onActivated, onDeactivated, ref, shallowRef } from 'vue';
import { i18n } from '@/i18n.js';
import { getScrollContainer } from '@@/js/scroll.js';
import { isHorizontalSwipeSwiping } from '@/scripts/touch.js';
@ -198,8 +198,8 @@ function unregisterEventListenersForReadyToPull() {
}
onMounted(() => {
isRefreshing.value = false;
if (rootEl.value == null) return;
scrollEl = getScrollContainer(rootEl.value);
if (scrollEl == null) return;
@ -210,7 +210,18 @@ onMounted(() => {
registerEventListenersForReadyToPull();
});
onActivated(() => {
isRefreshing.value = false;
});
onDeactivated(() => {
scrollEl!.style.touchAction = 'auto';
isRefreshing.value = true;
});
onUnmounted(() => {
scrollEl!.style.touchAction = 'auto';
isRefreshing.value = true;
if (scrollEl) scrollEl.removeEventListener('scroll', onScrollContainerScroll);
unregisterEventListenersForReadyToPull();