Skip to content

A self-hosted media server and file management system

feat: toast swipes

aminnausin0674f744a1e4
diff --git a/resources/js/components/pinesUI/ToastController.vue b/resources/js/components/pinesUI/ToastController.vue
index 17e8e5d0..2011ddc3 100755
--- a/resources/js/components/pinesUI/ToastController.vue
+++ b/resources/js/components/pinesUI/ToastController.vue
@@ -1,25 +1,13 @@
<script setup lang="ts">
// This is so bad lol pls fix
-import { type Message, type ToastControllerProps, type ToastLayout, type ToastPostion, type ToastToDismiss } from '@/types/pinesTypes';
+import type { Message, ToastControllerProps, ToastLayout, ToastPostion, ToastToDismiss } from '@/types/pinesTypes';
+import { DEFAULT_GAP, MOBILE_VIEWPORT_OFFSET, SCALE_STEP, TOAST_WIDTH, VIEWPORT_OFFSET, VISIBLE_TOASTS_AMOUNT, Y_OFFSET_STEP, Z_STEP } from '@/service/toaster/constants';
import { nextTick, onMounted, ref, watch, watchEffect } from 'vue';
import { ToastState } from '@/service/toaster/toastService';
import ToastNotification from '@/components/pinesUI/ToastNotification.vue';
-// Visible toasts amount
-const VISIBLE_TOASTS_AMOUNT = 3;
-
-// Viewport padding
-const VIEWPORT_OFFSET = '24px';
-const MOBILE_VIEWPORT_OFFSET = '16px';
-
-// Default toast width
-const TOAST_WIDTH = 0;
-
-// Default gap between toasts
-const DEFAULT_GAP = 16;
-
const props = withDefaults(defineProps<ToastControllerProps>(), {
layout: 'default',
position: 'bottom-right',
@@ -33,8 +21,8 @@ const props = withDefaults(defineProps<ToastControllerProps>(), {
const container = ref<HTMLElement>();
const messages = ref<Message[]>([]);
-const layout = ref<ToastLayout>(props.layout);
const position = ref<ToastPostion>(props.position);
+const layout = ref<ToastLayout>(props.layout);
const toastsHovered = ref(false);
const expanded = ref(props.layout === 'expanded');
@@ -45,35 +33,53 @@ const burnTimeout = ref<null | number>(null);
function deleteToastWithId(id: string) {
messages.value = messages.value.filter((msg) => msg.id !== id);
ToastState.dismiss(id);
- stackToasts();
+ stackToasts('DELETE');
}
-function stackToasts() {
- positionToasts();
+function stackToasts(_?: any) {
+ positionToasts(_);
calculateHeightOfToastsContainer();
if (heightRecalculateTimeout.value) clearTimeout(heightRecalculateTimeout.value);
+ // This calculates container height after the toasts are positioned
+ if (!expanded.value) return;
+
heightRecalculateTimeout.value = window.setTimeout(() => {
+ // positionToasts(_);
calculateHeightOfToastsContainer();
- }, 300);
+ }, 100);
}
-function positionToasts() {
- if (messages.value.length == 0) return;
+function positionToasts(_?: any) {
+ if (messages.value.length == 0) {
+ return;
+ }
try {
- let scaleBuffer = 1;
- let yBuffer = 0;
- let zBuffer = 200;
const bottomFlag = position.value.includes('bottom');
- let totalHeight = 0;
const toastElements = [];
+
+ let totalHeight = 0;
+
+ let scaleBuffer = 1 + SCALE_STEP;
+ let yBuffer = -Y_OFFSET_STEP;
+ let zBuffer = 200 + Z_STEP;
+
for (let i = 0; i < messages.value.length; i++) {
+ const msg = messages.value[i];
const toast = document.getElementById(`${messages.value[i].id}`);
if (!toast) return;
+ zBuffer -= Z_STEP;
+ scaleBuffer -= SCALE_STEP;
+ yBuffer += Y_OFFSET_STEP;
+
+ msg.scale = scaleBuffer;
+ msg.offsetY = yBuffer;
+ msg.zIndex = zBuffer;
+
toast.style.zIndex = `${zBuffer}`;
toastElements.push(toast);
@@ -87,22 +93,27 @@ function positionToasts() {
totalHeight += toast.offsetHeight;
- toast.style.scale = `1`;
- toast.style.transform = `translateY(0px)`;
- } else if (i > 0) {
- toast.style.scale = `${scaleBuffer}`;
-
- if (bottomFlag && i < props.maxVisibleToasts) {
- toast.style.transform = `translateY(-${yBuffer}px)`;
- } else {
- alignBottom(toastElements[0], toast);
- toast.style.transform = `translateY(${yBuffer}px)`;
- }
+ // toast.style.scale = `1`;
+ msg.scale = 1;
+
+ msg.offsetY = 0;
+
+ // toast.style.setProperty('--offset-y', '0px');
+ continue;
}
- zBuffer -= 10;
- scaleBuffer -= 0.06;
- yBuffer += 16;
+ msg.scale = scaleBuffer;
+ // toast.style.scale = `${scaleBuffer}`;
+
+ if (bottomFlag) {
+ msg.offsetY *= -1;
+ // toast.style.setProperty('--offset-y', `-${yBuffer}px`);
+ } else {
+ alignBottom(toastElements[0], toast);
+ // toast.style.setProperty('--offset-y', `${yBuffer}px`);
+ }
+
+ Object.assign(messages.value[i], msg);
}
handleToastsOverflow(toastElements);
@@ -123,12 +134,12 @@ function handleToastsOverflow(toastElements: HTMLElement[]) {
return;
}
- burnToast.firstElementChild?.classList.remove('opacity-100');
+ // burnToast.firstElementChild?.classList.remove('opacity-100');
burnToast.firstElementChild?.classList.add('opacity-0');
- if (burnTimeout.value) {
- clearTimeout(burnTimeout.value);
- }
+ // if (burnTimeout.value) {
+ // clearTimeout(burnTimeout.value);
+ // }
// Burn 🔥 (remove) last toast
burnTimeout.value = window.setTimeout(function () {
@@ -159,15 +170,17 @@ function calculateHeightOfToastsContainer() {
if (!firstToastRectangle || !lastToastRectangle) return;
- if (toastsHovered.value) {
- if (position.value.includes('bottom')) {
- container.value.style.height = firstToastRectangle.top + firstToastRectangle.height - lastToastRectangle.top + 'px';
- } else {
- container.value.style.height = lastToastRectangle.top + lastToastRectangle.height - firstToastRectangle.top + 'px';
- }
- } else {
+ if (!toastsHovered.value) {
container.value.style.height = firstToastRectangle.height + 'px';
+ return;
}
+
+ if (position.value.includes('bottom')) {
+ container.value.style.height = firstToastRectangle.top + firstToastRectangle.height - lastToastRectangle.top + 'px';
+ return;
+ }
+
+ container.value.style.height = lastToastRectangle.top + lastToastRectangle.height - firstToastRectangle.top + 'px';
}
function alignBottom(element1: HTMLElement, element2: HTMLElement) {
@@ -204,36 +217,44 @@ function resetTop() {
}
onMounted(() => {
- stackToasts();
+ stackToasts('MOUNT');
});
watch(
() => toastsHovered.value,
(value) => {
- if (layout.value == 'default') {
- if (position.value.includes('bottom')) {
- resetBottom();
- } else {
- resetTop();
- }
+ if (layout.value !== 'default') return;
- if (value) {
- // calculate the new positions
- expanded.value = true;
- if (layout.value == 'default') {
- stackToasts();
- }
- } else {
- if (layout.value == 'default') {
- expanded.value = false;
- //setTimeout(function(){
- stackToasts();
- //}, 10);
- window.setTimeout(function () {
- stackToasts();
- }, 10);
- }
- }
+ if (position.value.includes('bottom')) {
+ resetBottom();
+ } else {
+ resetTop();
+ }
+
+ if (value) {
+ // calculate the new positions
+ expanded.value = true;
+ stackToasts('HOVER');
+ return;
+ }
+
+ expanded.value = false;
+ // setTimeout(function () {
+ // This can get called a bunch of times but since the timer is so short, it will probably be called before the event happens again
+ stackToasts('HOVER CLOSE');
+ // }, 10);
+ // window.setTimeout(function () {
+ // stackToasts('POST HOVER CLOSE');
+ // }, 10);
+ },
+);
+
+watch(
+ () => messages.value,
+ () => {
+ // Ensure expanded is always false when no toasts are present / only one left
+ if (messages.value.length <= 1) {
+ expanded.value = false;
}
},
);
@@ -256,22 +277,21 @@ watchEffect((onInvalidate) => {
{ ...messages.value[indexOfExistingToast], ...newToast },
...messages.value.slice(indexOfExistingToast + 1),
];
- } else {
- const toast = newToast as Message;
-
- if (toast.position) position.value = toast.position;
-
- messages.value.unshift({
- ...toast,
- id: toast.id,
- type: toast.type ?? 'default',
- position: toast.position ?? position.value,
- life: toast.life ?? props.defaultLife,
- title: toast.title,
- });
- // messages.value = [toast as Message, ...messages.value];
+ return;
}
+ const toast = newToast as Message;
+
+ if (toast.position) position.value = toast.position;
+
+ messages.value.unshift({
+ ...toast,
+ id: toast.id,
+ type: toast.type ?? 'default',
+ position: toast.position ?? position.value,
+ life: toast.life ?? props.defaultLife,
+ title: toast.title,
+ });
});
});
@@ -281,31 +301,37 @@ watchEffect((onInvalidate) => {
<template>
<teleport to="body">
- <ul
+ <ol
v-cloak
ref="container"
- :tabindex="-1"
- :class="
- `fixed w-full ${TOAST_WIDTH ? `sm:w-[${TOAST_WIDTH}px]` : 'sm:max-w-sm'} group z-[500] [&>*]:px-4 [&>*]:px-[${mobileViewportOffset ?? viewportOffset}] [&>*]:sm:px-6 [&>*]:sm:px-[${viewportOffset}] my-4 sm:my-6 my-[${mobileViewportOffset ?? viewportOffset}] sm:my-[${viewportOffset}] ` +
- `${position == 'top-right' ? 'right-0 top-0' : ''} ` +
- `${position == 'top-left' ? 'left-0 top-0' : ''} ` +
- `${position == 'top-center' ? 'left-1/2 -translate-x-1/2 top-0' : ''} ` +
- `${position == 'bottom-right' ? 'right-0 bottom-0' : ''} ` +
- `${position == 'bottom-left' ? 'left-0 bottom-0' : ''} ` +
- `${position == 'bottom-center' ? 'left-1/2 -translate-x-1/2 bottom-0' : ''} `
- "
+ :class="[
+ `fixed w-full group z-[500] [&>*]:px-4 [&>*]:px-[${mobileViewportOffset ?? viewportOffset}] [&>*]:sm:px-6 [&>*]:sm:px-[${viewportOffset}] my-4 sm:my-6 my-[${mobileViewportOffset ?? viewportOffset}] sm:my-[${viewportOffset}]`,
+ `${TOAST_WIDTH ? `sm:w-[${TOAST_WIDTH}px]` : 'sm:max-w-sm'}`,
+ `${position == 'top-right' ? 'right-0 top-0' : ''}`,
+ `${position == 'top-left' ? 'left-0 top-0' : ''}`,
+ `${position == 'top-center' ? 'left-1/2 -translate-x-1/2 top-0' : ''}`,
+ `${position == 'bottom-right' ? 'right-0 bottom-0' : ''}`,
+ `${position == 'bottom-left' ? 'left-0 bottom-0' : ''}`,
+ `${position == 'bottom-center' ? 'left-1/2 -translate-x-1/2 bottom-0' : ''}`,
+ ]"
@mouseenter="toastsHovered = true"
@mouseleave="toastsHovered = false"
>
<ToastNotification
- v-for="toast in messages"
+ v-for="(toast, index) in messages"
v-bind="toast"
:key="toast.id"
- :stack="stackToasts"
+ :stack="
+ () => {
+ stackToasts('TOAST');
+ }
+ "
:toastCount="messages.length"
:position="position"
+ :expanded="expanded"
+ :index="index"
@close="deleteToastWithId"
/>
- </ul>
+ </ol>
</teleport>
</template>
diff --git a/resources/js/components/pinesUI/ToastNotification.vue b/resources/js/components/pinesUI/ToastNotification.vue
index 15aca131..0194db56 100755
--- a/resources/js/components/pinesUI/ToastNotification.vue
+++ b/resources/js/components/pinesUI/ToastNotification.vue
@@ -1,7 +1,10 @@
<script setup lang="ts">
-import type { ToastProps } from '@/types/pinesTypes';
+import type { SwipeDirection, ToastProps } from '@/types/pinesTypes';
-import { onBeforeUnmount, onMounted, ref } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
+import { SWIPE_THRESHOLD, TOAST_LIFE } from '@/service/toaster/constants';
+import { useToastTimer } from '@/composables/useToastTimer';
+import { useSwipeHandler } from '@/composables/useSwipeHandler';
const emit = defineEmits<{
(e: 'close', id: string): () => void; // removeToast
@@ -10,57 +13,95 @@ const emit = defineEmits<{
const props = withDefaults(defineProps<ToastProps>(), {
type: 'default',
position: 'bottom-center',
- life: 4000,
+ life: TOAST_LIFE,
title: 'Title',
html: '',
style: '',
+ swipeDirections: () => [],
+});
+
+const leaveDirection = ref('translate-y-0');
+const swipeDirections = computed(() => {
+ if (props.swipeDirections.length > 0) return props.swipeDirections;
+
+ const [y, x] = props.position.split('-');
+ const directions: Array<SwipeDirection> = [];
+
+ if (isSwipeDirection(y)) {
+ directions.push(y);
+ }
+
+ if (isSwipeDirection(x)) {
+ directions.push(x);
+ }
+
+ if (x === 'center') {
+ directions.push('left', 'right');
+ }
+
+ return directions;
});
-const toastHovered = ref(false);
-const mounted = ref(false);
-const animateTimeout = ref<null | number>(null);
const closeTimeout = ref<null | number>(null);
const stackTimeout = ref<null | number>(null);
+const toastHovered = ref(false);
+const isMounted = ref(false);
+
+const { offset, isSwiping, onPointerDown, onPointerMove, onPointerUp } = useSwipeHandler({ directions: swipeDirections, threshold: SWIPE_THRESHOLD, onSwipeOut: onClose });
+
+const { cancel: cancelToastTimer } = useToastTimer({
+ duration: props.life || TOAST_LIFE,
+ isPaused: () => props.expanded || props.type === 'loading' || !props.life || props.life === Infinity || toastHovered.value,
+ onTimeout: onClose,
+});
+
+function getLeaveDirection() {
+ if (isSwiping.value) {
+ return offset.value.x > 0 ? 'translate-x-full' : '-translate-x-full';
+ }
+
+ if (props.toastCount === 1) {
+ return props.position.includes('bottom') ? 'translate-y-full' : '-translate-y-full';
+ }
+
+ return 'translate-y-0';
+}
+
function onClose() {
if (closeTimeout.value) return;
- if (animateTimeout.value) clearTimeout(animateTimeout.value);
-
- mounted.value = false;
+ leaveDirection.value = getLeaveDirection();
+ isMounted.value = false;
+ cancelToastTimer();
closeTimeout.value = window.setTimeout(() => {
emit('close', props.id);
- }, 500);
+ }, 350);
}
+
function clearCloseTimeout() {
if (stackTimeout.value) {
clearTimeout(stackTimeout.value);
stackTimeout.value = null;
}
- if (animateTimeout.value) {
- clearTimeout(animateTimeout.value);
- animateTimeout.value = null;
- }
if (closeTimeout.value) {
clearTimeout(closeTimeout.value);
closeTimeout.value = null;
}
}
+function isSwipeDirection(val: string): val is SwipeDirection {
+ return ['top', 'right', 'bottom', 'left'].includes(val);
+}
+
onMounted(() => {
- mounted.value = true;
+ isMounted.value = true;
if (stackTimeout.value) clearTimeout(stackTimeout.value);
stackTimeout.value = window.setTimeout(() => {
props.stack();
});
-
- if (props.life) {
- animateTimeout.value = window.setTimeout(() => {
- onClose();
- }, props.life);
- }
});
onBeforeUnmount(() => {
@@ -71,9 +112,20 @@ onBeforeUnmount(() => {
<template>
<li
:id="props.id"
+ :class="`toast w-full absolute duration-300 transition-all ease-out ${!description ? 'toast-no-description' : ''} ${style}`"
+ :style="{
+ '--offset-x': `${offset.x}px`,
+ '--offset-y': `${offsetY}px`,
+ '--scale': scale,
+ '--z-index': zIndex,
+ }"
+ :data-isSwiping="isSwiping"
@mouseover="toastHovered = true"
@mouseout="toastHovered = false"
- :class="`w-full absolute duration-300 ease-out transition-all ${!description ? 'toast-no-description' : ''} ${style}`"
+ @dragend="onPointerUp"
+ @pointerdown="onPointerDown"
+ @pointermove="onPointerMove"
+ @pointerup="onPointerUp"
>
<Transition
enter-active-class=""
@@ -81,12 +133,20 @@ onBeforeUnmount(() => {
:enter-to-class="`opacity-100 translate-y-0`"
leave-active-class=""
:leave-from-class="`opacity-100 translate-y-0`"
- :leave-to-class="`opacity-0 ${props.toastCount === 1 ? `${props.position.includes('bottom') ? 'translate-y-full' : '-translate-y-full'}` : 'translate-y-0'}`"
+ :leave-to-class="`opacity-0 ${leaveDirection}`"
>
<span
- class="relative flex flex-col items-start shadow-[0_5px_15px_-3px_rgb(0_0_0_/_0.08)] transition-all duration-300 ease-out border bg-white dark:bg-primary-dark-700/70 backdrop-blur-lg border-gray-100 dark:border-neutral-800/50 text-gray-800 dark:text-neutral-100 rounded-md group"
- :class="{ 'p-4': !props.html, 'p-0': props.html }"
- v-show="mounted"
+ :class="[
+ { 'p-4': !props.html, 'p-0': props.html },
+ 'flex flex-col items-start backdrop-blur-lg rounded-md ',
+ 'group relative select-text',
+ 'transition-all duration-300 ease-out',
+ 'bg-white dark:bg-primary-dark-700/70 text-gray-800 dark:text-neutral-100 shadow-[0_5px_15px_-3px_rgb(0_0_0_/_0.08)]',
+ 'ring-inset ring-1 ring-gray-100 dark:ring-neutral-800/50',
+ '!outline-none focus:ring-gray-400 dark:focus:ring-indigo-500 focus:ring-2',
+ ]"
+ v-show="isMounted"
+ tabindex="0"
>
<div
v-if="!props.html"
@@ -138,28 +198,45 @@ onBeforeUnmount(() => {
:class="{ 'pl-5': props.type !== 'default' }"
class="mt-1.5 text-xs leading-tight opacity-70 w-full whitespace-pre-wrap break-words overflow-y-auto scrollbar-minimal max-h-32 min-h-3 pe-2"
>
- {{ props.description }}
+ {{ props.index }}
</p>
- <span
- v-if="!props.html"
- @click="onClose"
- class="absolute right-0 p-1.5 mr-2.5 text-gray-400 dark:text-rose-700 duration-100 ease-in-out rounded-full opacity-0 cursor-pointer hover:bg-gray-50 dark:bg-gray-800/50 hover:text-gray-500 dark:hover:text-rose-600"
- :class="{
- 'top-1/2 -translate-y-1/2': !props.description && !props.html,
- 'top-0 mt-2.5': props.description || props.html,
- 'opacity-100': toastHovered,
- 'opacity-0': !toastHovered,
- }"
- >
- <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
- <path
- fill-rule="evenodd"
- d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
- clip-rule="evenodd"
- ></path>
- </svg>
- </span>
+ <template v-if="!props.html">
+ <span
+ @click="onClose"
+ class="absolute right-0 p-1.5 mr-2.5 text-gray-400 dark:text-rose-700 duration-100 ease-in-out rounded-full opacity-0 cursor-pointer hover:bg-gray-50 dark:bg-gray-800/50 hover:text-gray-500 dark:hover:text-rose-600"
+ :class="{
+ 'top-1/2 -translate-y-1/2': !props.description && !props.html,
+ 'top-0 mt-2.5': props.description || props.html,
+ 'opacity-100': toastHovered,
+ 'opacity-0': !toastHovered,
+ }"
+ >
+ <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+ <path
+ fill-rule="evenodd"
+ d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+ clip-rule="evenodd"
+ ></path>
+ </svg>
+ </span>
+ </template>
</span>
</Transition>
</li>
</template>
+<style lang="css" scoped>
+.toast {
+ transform: translateY(var(--offset-y, 0px)) translateX(var(--offset-x, 0px)) scale(var(--scale, 1));
+ z-index: var(--z-index, 200);
+}
+
+@media (prefers-reduced-motion: reduce) {
+ .toast {
+ transition: none !important;
+ }
+}
+
+[data-isSwiping='true'] {
+ transition-property: none !important;
+}
+</style>
diff --git a/resources/js/composables/useSwipeHandler.ts b/resources/js/composables/useSwipeHandler.ts
new file mode 100644
index 00000000..6e0f80ad
--- /dev/null
+++ b/resources/js/composables/useSwipeHandler.ts
@@ -0,0 +1,81 @@
+import type { SwipeDirection } from '@/types/pinesTypes';
+
+import { ref, type Ref } from 'vue';
+
+interface UseSwipeHandlerOptions {
+ directions: Ref<SwipeDirection[]>;
+ threshold: number;
+ onSwipeOut: () => void;
+}
+
+export function useSwipeHandler({ directions, threshold, onSwipeOut }: UseSwipeHandlerOptions) {
+ const isSwiping = ref(false);
+ const offset = ref({ x: 0, y: 0 });
+ const dragStartTime = ref<number>();
+ const startOffset = ref({ x: 0, y: 0 });
+
+ const getDampening = (delta: number) => {
+ const factor = Math.abs(delta) / 20;
+ return 1 / (1.5 + factor);
+ };
+
+ function onPointerDown(e: PointerEvent) {
+ dragStartTime.value = Date.now();
+ // Ensure we maintain correct pointer capture even when going outside of the toast (e.g. when swiping)
+ (e.target as HTMLElement).setPointerCapture(e.pointerId);
+ if ((e.target as HTMLElement).closest('button, a, input, textarea, select')) return;
+
+ startOffset.value = { x: e.clientX, y: e.clientY };
+ isSwiping.value = true;
+ }
+
+ function onPointerMove(e: PointerEvent) {
+ if (!isSwiping.value) return;
+
+ const swipeAmount = { x: 0, y: 0 };
+ const xDelta = e.clientX - startOffset.value.x;
+ const yDelta = e.clientY - startOffset.value.y;
+
+ if ((directions.value.includes('left') && xDelta < 0) || (directions.value.includes('right') && xDelta > 0)) {
+ swipeAmount.x = xDelta;
+ } else {
+ // Smoothly transition to dampened movement
+ const dampened = xDelta * getDampening(xDelta);
+ // Ensure we don't jump when transitioning to dampened movement
+ swipeAmount.x = Math.abs(dampened) < Math.abs(xDelta) ? dampened : xDelta;
+ }
+
+ if ((directions.value.includes('top') && yDelta < 0) || (directions.value.includes('bottom') && yDelta > 0)) {
+ swipeAmount.y = yDelta;
+ } else {
+ const dampened = yDelta * getDampening(yDelta);
+ swipeAmount.y = Math.abs(dampened) < Math.abs(yDelta) ? dampened : yDelta;
+ }
+
+ offset.value = swipeAmount;
+ }
+
+ function onPointerUp() {
+ if (!isSwiping.value) return;
+
+ const timeTaken = Date.now() - (dragStartTime.value || 0);
+ const swipeAmount = offset.value.x;
+ const velocity = Math.abs(swipeAmount) / timeTaken;
+
+ if (Math.abs(swipeAmount) >= threshold || velocity > 0.11) {
+ onSwipeOut();
+ return;
+ }
+
+ isSwiping.value = false;
+ offset.value = { x: 0, y: 0 };
+ }
+
+ return {
+ offset,
+ isSwiping,
+ onPointerDown,
+ onPointerMove,
+ onPointerUp,
+ };
+}
diff --git a/resources/js/composables/useToastTimer.ts b/resources/js/composables/useToastTimer.ts
new file mode 100644
index 00000000..bd52f4c7
--- /dev/null
+++ b/resources/js/composables/useToastTimer.ts
@@ -0,0 +1,54 @@
+import { ref, watch, onBeforeUnmount } from 'vue';
+
+interface UseToastTimerOptions {
+ duration: number;
+ isPaused: () => boolean;
+ onTimeout: () => void;
+ immediate?: boolean;
+}
+
+export function useToastTimer({ duration, isPaused, onTimeout, immediate = true }: UseToastTimerOptions) {
+ const timeoutId = ref<number | null>();
+ const startTime = ref(0);
+ const remainingTime = ref(duration);
+
+ function start() {
+ if (remainingTime.value === Infinity || isPaused()) return;
+ startTime.value = Date.now();
+ timeoutId.value = window.setTimeout(() => {
+ onTimeout();
+ }, remainingTime.value);
+ }
+
+ function pause() {
+ cancel();
+
+ const elapsed = Date.now() - startTime.value;
+ remainingTime.value -= elapsed;
+ }
+
+ function cancel() {
+ if (timeoutId.value) {
+ clearTimeout(timeoutId.value);
+ timeoutId.value = null;
+ }
+ }
+
+ watch(
+ isPaused,
+ (paused) => {
+ if (paused) {
+ pause();
+ return;
+ }
+ start();
+ },
+ { immediate },
+ );
+
+ onBeforeUnmount(() => {
+ cancel();
+ });
+
+ return { cancel };
+}
diff --git a/resources/js/service/toaster/constants.ts b/resources/js/service/toaster/constants.ts
new file mode 100644
index 00000000..aeefb0e7
--- /dev/null
+++ b/resources/js/service/toaster/constants.ts
@@ -0,0 +1,22 @@
+// Visible toasts amount
+const VISIBLE_TOASTS_AMOUNT = 3;
+
+// Viewport padding
+const VIEWPORT_OFFSET = '24px';
+const MOBILE_VIEWPORT_OFFSET = '16px';
+
+// Default toast width
+const TOAST_WIDTH = 0;
+
+const TOAST_LIFE = 3000;
+
+// Default gap between toasts
+const DEFAULT_GAP = 16;
+
+const SWIPE_THRESHOLD = 45;
+
+const Z_STEP = 10;
+const SCALE_STEP = 0.06;
+const Y_OFFSET_STEP = 16;
+
+export { Z_STEP, SCALE_STEP, Y_OFFSET_STEP, VISIBLE_TOASTS_AMOUNT, VIEWPORT_OFFSET, MOBILE_VIEWPORT_OFFSET, TOAST_LIFE, TOAST_WIDTH, DEFAULT_GAP, SWIPE_THRESHOLD };
diff --git a/resources/js/service/toaster/toastService.ts b/resources/js/service/toaster/toastService.ts
index c9e5c9ef..ad4807a1 100644
--- a/resources/js/service/toaster/toastService.ts
+++ b/resources/js/service/toaster/toastService.ts
@@ -55,6 +55,9 @@ class Observer {
this.addToast({
title,
id,
+ scale: 1,
+ zIndex: 200,
+ offsetY: 0,
...options,
});
}
diff --git a/resources/js/types/pinesTypes.ts b/resources/js/types/pinesTypes.ts
index 3fc80c7e..58e9307a 100644
--- a/resources/js/types/pinesTypes.ts
+++ b/resources/js/types/pinesTypes.ts
@@ -1,6 +1,6 @@
import type { Component } from 'vue';
-export type ToastType = 'success' | 'info' | 'warning' | 'danger' | 'default';
+export type ToastType = 'success' | 'info' | 'warning' | 'danger' | 'default' | 'loading';
export type ToastPostion = 'top-right' | 'top-left' | 'top-center' | 'bottom-right' | 'bottom-left' | 'bottom-center';
export type ToastLayout = 'default' | 'expanded';
@@ -25,31 +25,32 @@ export interface ToastControllerProps {
icons?: ToastIcons;
}
-export interface ToastProps {
+export interface ToastProps extends Message {
id: string;
stack: (...args: unknown[]) => unknown;
- position: string;
+ position: ToastPostion;
toastCount: number;
-
- // idx: number;
-
- title?: string;
- description?: string;
- life?: number;
- type?: string;
+ expanded: boolean;
+ swipeDirections?: SwipeDirection[];
style?: string;
- html?: string;
+ index?: number;
}
+export type SwipeDirection = 'top' | 'right' | 'bottom' | 'left';
+
export interface Message<T extends Component = Component> {
- type?: ToastType;
- position?: ToastPostion;
- life?: number;
id: string;
title: string;
description?: string;
+ type?: ToastType;
+ position?: ToastPostion;
+ life?: number;
html?: string;
component?: T;
+ scale: number;
+ zIndex: number;
+ offsetY: number;
+ positionY?: string;
}
export interface ExternalToast {
diff --git a/resources/js/views/ProfileView.vue b/resources/js/views/ProfileView.vue
index 8e8feb3e..34ca2996 100755
--- a/resources/js/views/ProfileView.vue
+++ b/resources/js/views/ProfileView.vue
@@ -2,11 +2,11 @@
import { useAppStore } from '../stores/AppStore';
import { storeToRefs } from 'pinia';
import { onMounted } from 'vue';
+import { toast } from '@/service/toaster/toastService';
import ProfileHeader from '@/components/profile/ProfileHeader.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
-import { toast } from '@/service/toaster/toastService';
const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());