Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

enhance(frontend/PullToRefresh): コンポーネントがDOMから消えた時点でタッチ操作などのコールバック関数が止まるように (MisskeyIO#244)

Browse source
This commit is contained in:
まっちゃとーにゅ 2023-11-22 01:10:06 +09:00 committed by GitHub
parent 5c4dfd3948
commit 3f5d0c60dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/frontend/src/components/MkPullToRefresh.vue
View file

@ -24,8 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup> <script lang="ts" setup>
import MkLoading from '@/components/global/MkLoading.vue'; import MkLoading from '@/components/global/MkLoading.vue';
import { onMounted, onUnmounted, watch } from 'vue'; import { onMounted, onUnmounted, onActivated, onDeactivated } from 'vue';
import { deviceKind } from '@/scripts/device-kind.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { getScrollContainer } from '@/scripts/scroll.js'; import { getScrollContainer } from '@/scripts/scroll.js';
@ -197,6 +196,7 @@ function onScrollContainerScroll() {
} }
onMounted(() => { onMounted(() => {
isRefreshing = false;
if (rootEl == null) return; if (rootEl == null) return;
scrollEl = getScrollContainer(rootEl); scrollEl = getScrollContainer(rootEl);
if (scrollEl == null) return; if (scrollEl == null) return;
@ -206,7 +206,18 @@ onMounted(() => {
rootEl.addEventListener('touchend', moveEnd, { passive: true }); rootEl.addEventListener('touchend', moveEnd, { passive: true });
}); });
onActivated(() => {
isRefreshing = false;
});
onDeactivated(() => {
scrollEl!.style.touchAction = 'auto';
isRefreshing = true;
});
onUnmounted(() => { onUnmounted(() => {
scrollEl!.style.touchAction = 'auto';
isRefreshing = true;
if (scrollEl) scrollEl.removeEventListener('scroll', onScrollContainerScroll); if (scrollEl) scrollEl.removeEventListener('scroll', onScrollContainerScroll);
if (rootEl == null) return; if (rootEl == null) return;
rootEl.removeEventListener('touchstart', moveStart); rootEl.removeEventListener('touchstart', moveStart);