Skip to content

A self-hosted media server and file management system

fix mobile modal scroll

aminnausinbe196678c2d5
diff --git a/resources/js/components/pinesUI/ModalBase.vue b/resources/js/components/pinesUI/ModalBase.vue
index 50971a03..bfe68ac8 100755
--- a/resources/js/components/pinesUI/ModalBase.vue
+++ b/resources/js/components/pinesUI/ModalBase.vue
@@ -43,7 +43,7 @@ watch(
<Teleport to="body">
<div
v-show="modalData.modalOpen || modalData.isAnimating"
- class="fixed top-0 left-0 z-[300] flex items-center justify-center w-full h-screen text-neutral-900 dark:text-neutral-200"
+ class="fixed top-0 left-0 z-[300] flex items-center justify-center w-screen h-screen text-neutral-900 dark:text-neutral-200"
v-cloak
>
<Transition
@@ -64,10 +64,7 @@ watch(
leave-from-class="opacity-100 translate-y-0 sm:scale-100"
leave-to-class="opacity-0 -translate-y-2 sm:scale-95"
>
- <UseFocusTrap
- v-if="modalData.modalOpen"
- class="relative w-full p-6 max-h-screen h-full overflow-y-scroll scrollbar-hide flex items-center"
- >
+ <UseFocusTrap v-if="modalData.modalOpen" class="relative w-full p-6 max-h-screen h-full overflow-y-scroll scrollbar-hide flex items-center">
<OnClickOutside
@trigger="modalData.toggleModal(false)"
@keydown.esc="modalData.toggleModal(false)"
diff --git a/resources/js/layouts/LayoutBase.vue b/resources/js/layouts/LayoutBase.vue
index 7eaf2d54..948cc275 100755
--- a/resources/js/layouts/LayoutBase.vue
+++ b/resources/js/layouts/LayoutBase.vue
@@ -1,53 +1,46 @@
<script setup lang="ts">
-import type { UserResource } from '@/types/resources';
-
-import { onBeforeUnmount, onMounted, ref, watch, type Ref } from 'vue';
-import { useAuthStore } from '@/stores/AuthStore';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { toast } from '@/service/toaster/toastService';
+import { ref } from 'vue';
import NavBar from '@/components/panels/NavBar.vue';
const appStore = useAppStore();
-const authStore = useAuthStore();
-const { userData } = storeToRefs(authStore) as { userData: Ref<UserResource> };
const { selectedSideBar, sideBarTarget, scrollLock } = storeToRefs(appStore);
const scrollBody = ref(null);
-const userInit = ref(false);
-
-function handleEvent() {
- if (!userData.value?.id || userInit.value) return;
-
- userInit.value = true;
-
- window.Echo.private(`tasks.${userData.value.id}`).listen('TaskEnded', (event: any) => {
- console.log(event);
-
- toast.add(`"${event?.task?.name}" ${event?.resource?.status}`, { type: event?.task?.status > 0 ? 'success' : 'danger' });
- });
-}
-
-watch(
- () => userData.value,
- () => {
- handleEvent();
- },
-);
-
-onMounted(() => {
- handleEvent();
-});
-onBeforeUnmount(() => {
- if (userData.value?.id) {
- window.Echo.leave(`tasks.${userData.value.id}`);
- }
-});
</script>
<template>
- <div class="h-screen" :class="{ '': scrollLock }" ref="scrollBody">
+ <div
+ class="h-screen"
+ :class="{ 'overflow-y-hidden': scrollLock }"
+ @scroll="
+ (e) => {
+ if (scrollLock) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ }
+ "
+ @wheel="
+ (e) => {
+ if (scrollLock) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ }
+ "
+ @touchmove="
+ (e) => {
+ if (scrollLock) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ }
+ "
+ ref="scrollBody"
+ >
<!-- overflow-y-hidden -->
<!-- class="flex p-6 gap-6 flex-wrap lg:flex-nowrap snap-y bg-primary-950 dark:bg-primary-dark-950 dark:text-[#e2e0e2] font-sans text-gray-900 antialiased" -->
<main
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 0fb76e0a..ab0952f4 100755
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -10,8 +10,11 @@
<!-- local -->
@vite('resources/css/app.css')
- <script>
- </script>
+ <style>
+ html {
+ scrollbar-gutter: stable;
+ }
+ </style>
</head>
<body class="bg-primary-950 dark:bg-primary-dark-950 dark:text-[#e2e0e2] font-sans text-gray-900 antialiased dark:[color-scheme:dark]" id="root"> <!-- dark:bg-[#121216] dark:text-[#e2e0e2] text-gray-900 -->