usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test

This commit is contained in:
syuilo 2025-05-03 08:20:21 +09:00
parent 6c45aeec32
commit 53948b5469
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/frontend/src/components/MkPullToRefresh.vue
View File

@ -39,7 +39,6 @@ const isPullEnd = ref(false);
const isRefreshing = ref(false); const isRefreshing = ref(false);
const pullDistance = ref(0); const pullDistance = ref(0);
let supportPointerDesktop = false;
let startScreenY: number | null = null; let startScreenY: number | null = null;
const rootEl = useTemplateRef('rootEl'); const rootEl = useTemplateRef('rootEl');
@ -58,10 +57,11 @@ const emit = defineEmits<{
}>(); }>();
function getScreenY(event) { function getScreenY(event) {
if (supportPointerDesktop) { if (event.touches && event.touches[0] && event.touches[0].screenY != null) {
return event.touches[0].screenY;
} else {
return event.screenY; return event.screenY;
} }
return event.touches[0].screenY;
} }
function moveStart(event) { function moveStart(event) {
@ -72,6 +72,16 @@ function moveStart(event) {
} }
} }
function moveStartByMouse(event: MouseEvent) {
if (!isPullStart.value && !isRefreshing.value && !disabled) {
isPullStart.value = true;
startScreenY = event.screenY;
pullDistance.value = 0;
window.addEventListener('mousemove', moving, { passive: false });
window.addEventListener('mouseup', moveEnd, { passive: true, once: true });
}
}
function moveBySystem(to: number): Promise<void> { function moveBySystem(to: number): Promise<void> {
return new Promise(r => { return new Promise(r => {
const startHeight = pullDistance.value; const startHeight = pullDistance.value;
@ -129,7 +139,7 @@ function moveEnd() {
function moving(event: TouchEvent | PointerEvent) { function moving(event: TouchEvent | PointerEvent) {
if (!isPullStart.value || isRefreshing.value || disabled) return; if (!isPullStart.value || isRefreshing.value || disabled) return;
if ((scrollEl?.scrollTop ?? 0) > (supportPointerDesktop ? SCROLL_STOP : SCROLL_STOP + pullDistance.value) || isHorizontalSwipeSwiping.value) { if ((scrollEl?.scrollTop ?? 0) > SCROLL_STOP + pullDistance.value || isHorizontalSwipeSwiping.value) {
pullDistance.value = 0; pullDistance.value = 0;
isPullEnd.value = false; isPullEnd.value = false;
moveEnd(); moveEnd();
@ -186,14 +196,17 @@ function onScrollContainerScroll() {
function registerEventListenersForReadyToPull() { function registerEventListenersForReadyToPull() {
if (rootEl.value == null) return; if (rootEl.value == null) return;
rootEl.value.addEventListener('mousedown', moveStartByMouse, { passive: true });
rootEl.value.addEventListener('touchstart', moveStart, { passive: true }); rootEl.value.addEventListener('touchstart', moveStart, { passive: true });
rootEl.value.addEventListener('touchmove', moving, { passive: false }); // passive: falseにしないとpreventDefaultが使えない rootEl.value.addEventListener('touchmove', moving, { passive: false }); // passive: falseにしないとpreventDefaultが使えない
} }
function unregisterEventListenersForReadyToPull() { function unregisterEventListenersForReadyToPull() {
if (rootEl.value == null) return; if (rootEl.value == null) return;
rootEl.value.removeEventListener('mousedown', moveStartByMouse);
rootEl.value.removeEventListener('touchstart', moveStart); rootEl.value.removeEventListener('touchstart', moveStart);
rootEl.value.removeEventListener('touchmove', moving); rootEl.value.removeEventListener('touchmove', moving);
window.removeEventListener('pointermove', moving);
} }
onMounted(() => { onMounted(() => {