Skip to content

A self-hosted media server and file management system

fix: code smells

aminnausind7f7dc465a5b
diff --git a/resources/js/components/cards/pulse/PulseCache.vue b/resources/js/components/cards/pulse/PulseCache.vue
index 26ff7079..043f9a92 100644
--- a/resources/js/components/cards/pulse/PulseCache.vue
+++ b/resources/js/components/cards/pulse/PulseCache.vue
@@ -44,7 +44,7 @@ const config = computed(() => {
:cols="cols"
name="Cache"
:title="`Time: ${format_number(pulseData.slow_outgoing_requests?.time ?? 0)}ms; Run at: ${pulseData.slow_outgoing_requests?.runAt ? new Date(pulseData.slow_outgoing_requests?.runAt).toLocaleDateString() : ''};`"
- :details="`past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconRocketLaunch />
diff --git a/resources/js/components/cards/pulse/PulseExceptions.vue b/resources/js/components/cards/pulse/PulseExceptions.vue
index 01f32775..bad062db 100644
--- a/resources/js/components/cards/pulse/PulseExceptions.vue
+++ b/resources/js/components/cards/pulse/PulseExceptions.vue
@@ -53,7 +53,7 @@ const exceptions = computed(() => {
return [...list]
.map((val) => {
- return { ...val, count: parseFloat(val.count) };
+ return { ...val, count: Number.parseFloat(val.count) };
})
.sort(sortObject(sortKey, sortKey === 'count' ? -1 : 1, ['latest']));
});
@@ -64,7 +64,7 @@ const exceptions = computed(() => {
:cols="cols"
name="Exceptions"
:title="`Time: ${format_number(pulseData?.exceptions?.time ?? 0)}ms; Run at: ${pulseData?.exceptions?.runAt ? new Date(pulseData?.exceptions?.runAt).toLocaleDateString() : ''};`"
- :details="`past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconBugAnt />
diff --git a/resources/js/components/cards/pulse/PulseQueues.vue b/resources/js/components/cards/pulse/PulseQueues.vue
index 22ea17af..4a9f969e 100644
--- a/resources/js/components/cards/pulse/PulseQueues.vue
+++ b/resources/js/components/cards/pulse/PulseQueues.vue
@@ -38,7 +38,7 @@ function scale(data: { [key: string]: any }) {
:rows="rows"
name="Queues"
:title="`Time: ${format_number(pulseData?.queues?.time ?? 0)}ms; Run at: ${pulseData?.queues?.runAt ? new Date(pulseData?.queues?.runAt).toLocaleDateString() : ''};`"
- :details="`past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconQueueList />
diff --git a/resources/js/components/cards/pulse/PulseRequests.vue b/resources/js/components/cards/pulse/PulseRequests.vue
index de62c444..2472524a 100644
--- a/resources/js/components/cards/pulse/PulseRequests.vue
+++ b/resources/js/components/cards/pulse/PulseRequests.vue
@@ -43,7 +43,7 @@ function scale(data: { [key: string]: any }) {
:rows="rows"
name="Requests"
:title="`Time: ${format_number(pulseData?.requests?.time ?? 0)}ms; Run at: ${pulseData?.requests?.runAt ? new Date(pulseData?.requests?.runAt).toLocaleDateString() : ''};`"
- :details="`past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconArrowsLeftRight />
diff --git a/resources/js/components/cards/pulse/PulseSlowJobs.vue b/resources/js/components/cards/pulse/PulseSlowJobs.vue
index 74c733de..33c829cc 100644
--- a/resources/js/components/cards/pulse/PulseSlowJobs.vue
+++ b/resources/js/components/cards/pulse/PulseSlowJobs.vue
@@ -63,7 +63,7 @@ const config = computed(() => {
:cols="cols"
name="Slow Jobs"
:title="`Time: ${format_number(pulseData.slow_jobs.time ?? 0)}ms; Run at: ${pulseData.slow_jobs.runAt ? new Date(pulseData.slow_jobs.runAt).toLocaleDateString() : ''};`"
- :details="`${config.threshold ?? 1000}ms threshold, past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`${config.threshold ?? 1000}ms threshold, past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconCommandLine />
diff --git a/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue b/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue
index d3d90bcb..ff29695e 100644
--- a/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue
+++ b/resources/js/components/cards/pulse/PulseSlowOutgoingRequests.vue
@@ -73,7 +73,7 @@ function getDomainFromUrl(input: string): string | null {
:cols="cols"
name="Slow Outgoing Requests"
:title="`Time: ${format_number(pulseData.slow_outgoing_requests?.time ?? 0)}ms; Run at: ${pulseData.slow_outgoing_requests?.runAt ? new Date(pulseData.slow_outgoing_requests?.runAt).toLocaleDateString() : ''};`"
- :details="`${config?.threshold ?? 1000}ms threshold, past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`${config?.threshold ?? 1000}ms threshold, past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconCloudArrowUp />
diff --git a/resources/js/components/cards/pulse/PulseSlowQueries.vue b/resources/js/components/cards/pulse/PulseSlowQueries.vue
index 54e43d09..8c3bc0cc 100644
--- a/resources/js/components/cards/pulse/PulseSlowQueries.vue
+++ b/resources/js/components/cards/pulse/PulseSlowQueries.vue
@@ -63,7 +63,7 @@ const config = computed(() => {
:cols="cols"
name="Slow Queries"
:title="`Time: ${format_number(pulseData.slow_queries.time ?? 0)}ms; Run at: ${pulseData.slow_queries.runAt ? new Date(pulseData.slow_queries.runAt).toLocaleDateString() : ''};`"
- :details="`${config.threshold ?? 1000}ms threshold, past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`${config.threshold ?? 1000}ms threshold, past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconCircleStack />
diff --git a/resources/js/components/cards/pulse/PulseSlowRequests.vue b/resources/js/components/cards/pulse/PulseSlowRequests.vue
index 5b9abfec..0b7e89b8 100644
--- a/resources/js/components/cards/pulse/PulseSlowRequests.vue
+++ b/resources/js/components/cards/pulse/PulseSlowRequests.vue
@@ -64,7 +64,7 @@ const config = computed(() => {
:cols="cols"
name="Slow Requests"
:title="`Time: ${format_number(pulseData.slow_requests?.time ?? 0)}ms; Run at: ${pulseData.slow_requests?.runAt ? new Date(pulseData.slow_requests?.runAt).toLocaleDateString() : ''};`"
- :details="`${pulseData.slow_requests.config?.threshold ?? 1000}ms threshold, past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`${pulseData.slow_requests.config?.threshold ?? 1000}ms threshold, past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconArrowsLeftRight />
diff --git a/resources/js/components/cards/pulse/PulseUsage.vue b/resources/js/components/cards/pulse/PulseUsage.vue
index 02da5394..9878a141 100644
--- a/resources/js/components/cards/pulse/PulseUsage.vue
+++ b/resources/js/components/cards/pulse/PulseUsage.vue
@@ -76,7 +76,7 @@ const sampleRate = () => {
:class="`col-span-2 lg:col-span-4`"
:name="`${'Application Usage'}`"
:title="`Time: ${format_number(pulseData?.queues?.time ?? 0)}ms; Run at: ${pulseData?.servers?.runAt ? new Date(pulseData?.servers?.runAt).toLocaleDateString() : ''};`"
- :details="`past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
+ :details="`past ${validPeriods.includes(period) ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"
>
<template #icon>
<IconArrowTrendingUp v-if="type.value === 'requests'" />
diff --git a/resources/js/components/cedar-ui/date-picker/DatePicker.vue b/resources/js/components/cedar-ui/date-picker/DatePicker.vue
index d37413f4..b4cf19e2 100644
--- a/resources/js/components/cedar-ui/date-picker/DatePicker.vue
+++ b/resources/js/components/cedar-ui/date-picker/DatePicker.vue
@@ -4,7 +4,6 @@ import { nextTick, useTemplateRef, watch } from 'vue';
import { ButtonIcon, ButtonText } from '../button';
import { OnClickOutside } from '@vueuse/components';
import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
-import { cn } from '@aminnausin/cedar-ui';
import { ButtonDatePicker, useDatePicker } from '.';
import { InputShell } from '../input';
diff --git a/resources/js/components/cedar-ui/hover-card/HoverCard.vue b/resources/js/components/cedar-ui/hover-card/HoverCard.vue
index de469320..4eeddb83 100644
--- a/resources/js/components/cedar-ui/hover-card/HoverCard.vue
+++ b/resources/js/components/cedar-ui/hover-card/HoverCard.vue
@@ -16,8 +16,8 @@ const props = withDefaults(defineProps<HoverCardProps>(), {
});
const hoverCardHovered = ref<boolean>(false);
-const hoverCardTimout = ref<number | null>(null);
-const hoverCardLeaveTimeout = ref<number | null>(null);
+const hoverCardTimout = ref<NodeJS.Timeout | null>(null);
+const hoverCardLeaveTimeout = ref<NodeJS.Timeout | null>(null);
const tooltipStyles = ref<Record<string, string>>({});
const init = ref(false);
@@ -33,7 +33,7 @@ const hoverCardEnter = (event: MouseEvent) => {
if (!init.value) init.value = true; // Loads into Dom after hover for the first time
- hoverCardTimout.value = window.setTimeout(() => {
+ hoverCardTimout.value = globalThis.setTimeout(() => {
hoverCardHovered.value = true;
updateTooltipPosition(event);
}, props.hoverCardDelay);
@@ -45,7 +45,7 @@ const hoverCardLeave = () => {
if (!hoverCardHovered.value) return;
if (hoverCardLeaveTimeout.value) clearTimeout(hoverCardLeaveTimeout.value);
- hoverCardLeaveTimeout.value = window.setTimeout(() => {
+ hoverCardLeaveTimeout.value = globalThis.setTimeout(() => {
hoverCardHovered.value = false;
}, props.hoverCardLeaveDelay);
};
diff --git a/resources/js/components/cedar-ui/hover-card/RelativeHoverCard.vue b/resources/js/components/cedar-ui/hover-card/RelativeHoverCard.vue
index ea674c0d..6d7ceabe 100644
--- a/resources/js/components/cedar-ui/hover-card/RelativeHoverCard.vue
+++ b/resources/js/components/cedar-ui/hover-card/RelativeHoverCard.vue
@@ -12,8 +12,8 @@ const props = withDefaults(defineProps<RelativeHoverCardProps>(), {
});
const hoverCardHovered = ref<boolean>(false);
-const hoverCardTimout = ref<number | null>(null);
-const hoverCardLeaveTimeout = ref<number | null>(null);
+const hoverCardTimout = ref<NodeJS.Timeout | null>(null);
+const hoverCardLeaveTimeout = ref<NodeJS.Timeout | null>(null);
const tooltipStyles = ref<Record<string, string>>({});
const init = ref(false);
@@ -29,7 +29,7 @@ const hoverCardEnter = () => {
if (!init.value) init.value = true; // Loads into Dom after hover for the first time
- hoverCardTimout.value = window.setTimeout(() => {
+ hoverCardTimout.value = globalThis.setTimeout(() => {
hoverCardHovered.value = true;
}, props.hoverCardDelay);
};
@@ -41,7 +41,7 @@ const hoverCardLeave = () => {
if (!hoverCardHovered.value) return;
if (hoverCardLeaveTimeout.value) clearTimeout(hoverCardLeaveTimeout.value);
- hoverCardLeaveTimeout.value = window.setTimeout(() => {
+ hoverCardLeaveTimeout.value = globalThis.setTimeout(() => {
hoverCardHovered.value = false;
}, props.hoverCardLeaveDelay);
};
diff --git a/resources/js/components/cedar-ui/modal/useModalCore.ts b/resources/js/components/cedar-ui/modal/useModalCore.ts
index 042cd374..a7a6d154 100644
--- a/resources/js/components/cedar-ui/modal/useModalCore.ts
+++ b/resources/js/components/cedar-ui/modal/useModalCore.ts
@@ -5,7 +5,7 @@ import { shallowRef, ref, reactive } from 'vue';
const isAnimating = ref(false);
const isOpen = ref(false);
const animationTime = ref(300);
-const timeoutId = ref<number | null>(null);
+const timeoutId = ref<NodeJS.Timeout | null>(null);
const props = reactive<Record<string, any>>({});
const component = shallowRef<Component | null>(null);
@@ -18,7 +18,7 @@ function open(comp: Component, newProps: Record<string, any> = {}) {
isOpen.value = true;
isAnimating.value = true;
- timeoutId.value = window.setTimeout(() => {
+ timeoutId.value = globalThis.setTimeout(() => {
isAnimating.value = false;
}, animationTime.value);
}
@@ -27,7 +27,7 @@ function close() {
if (timeoutId.value) clearTimeout(timeoutId.value);
isOpen.value = false;
isAnimating.value = true;
- timeoutId.value = window.setTimeout(() => {
+ timeoutId.value = globalThis.setTimeout(() => {
isAnimating.value = false;
}, animationTime.value);
}
diff --git a/resources/js/components/cedar-ui/popover/BasePopover.vue b/resources/js/components/cedar-ui/popover/BasePopover.vue
index 8a67674c..94b31051 100644
--- a/resources/js/components/cedar-ui/popover/BasePopover.vue
+++ b/resources/js/components/cedar-ui/popover/BasePopover.vue
@@ -108,7 +108,7 @@ watch(
onMounted(() => {
window.addEventListener('resize', popoverPositionCalculate);
- window.setTimeout(function () {
+ globalThis.setTimeout(function () {
popoverHeightCalculate();
}, 100);
});
diff --git a/resources/js/components/cedar-ui/select/InputSelect.vue b/resources/js/components/cedar-ui/select/InputSelect.vue
index a0b68f42..898abd46 100644
--- a/resources/js/components/cedar-ui/select/InputSelect.vue
+++ b/resources/js/components/cedar-ui/select/InputSelect.vue
@@ -47,7 +47,7 @@ const selectableItemsList = useTemplateRef('selectableItemsList');
const selectableItemsRoot = useTemplateRef('selectableItemsRoot');
const select = useSelect(props.options, { selectableItemsList, selectButton });
-const closeFocusOutTimeout = ref<number | null>(null);
+const closeFocusOutTimeout = ref<NodeJS.Timeout | null>(null);
const handleItemClick = (item: any, setFocus = true) => {
select.selectedItem = item;
@@ -70,7 +70,7 @@ const handleFocusOut = () => {
clearTimeout(closeFocusOutTimeout.value);
}
- closeFocusOutTimeout.value = window.setTimeout(() => {
+ closeFocusOutTimeout.value = globalThis.setTimeout(() => {
if (!selectableItemsRoot.value) return;
const active = document.activeElement;
diff --git a/resources/js/components/cedar-ui/toast/ToastController.vue b/resources/js/components/cedar-ui/toast/ToastController.vue
index 4049c227..403142a0 100644
--- a/resources/js/components/cedar-ui/toast/ToastController.vue
+++ b/resources/js/components/cedar-ui/toast/ToastController.vue
@@ -25,7 +25,7 @@ const layout = ref<ToastLayout>(props.layout);
const toastsHovered = ref(false);
const expanded = ref(props.layout === 'expanded');
const paddingBetweenToasts = ref(props.paddingBetweenToasts);
-const heightRecalculateTimeout = ref<null | number>(null);
+const heightRecalculateTimeout = ref<NodeJS.Timeout | null>(null);
function deleteToastWithId(id: string) {
messages.value = messages.value.filter((msg) => msg.id !== id);
@@ -45,7 +45,7 @@ function stackToasts(_?: any) {
// This calculates container height after the toasts are positioned
if (!expanded.value) return;
- heightRecalculateTimeout.value = window.setTimeout(() => {
+ heightRecalculateTimeout.value = globalThis.setTimeout(() => {
calculateHeightOfToastsContainer();
}, 100);
}
diff --git a/resources/js/components/cedar-ui/toast/ToastNotification.vue b/resources/js/components/cedar-ui/toast/ToastNotification.vue
index 155f3abe..a431dd44 100644
--- a/resources/js/components/cedar-ui/toast/ToastNotification.vue
+++ b/resources/js/components/cedar-ui/toast/ToastNotification.vue
@@ -45,8 +45,8 @@ const isBottom = computed(() => {
return props.position.includes('bottom');
});
-const closeTimeout = ref<null | number>(null);
-const stackTimeout = ref<null | number>(null);
+const closeTimeout = ref<NodeJS.Timeout | null>(null);
+const stackTimeout = ref<NodeJS.Timeout | null>(null);
const toastHovered = ref(false);
const isMounted = ref(false);
@@ -84,7 +84,7 @@ function onClose() {
leaveDirection.value = getLeaveDirection();
isMounted.value = false;
cancelToastTimer();
- closeTimeout.value = window.setTimeout(() => {
+ closeTimeout.value = globalThis.setTimeout(() => {
emit('close', props.id);
}, 350);
}
@@ -109,7 +109,7 @@ onMounted(() => {
if (stackTimeout.value) clearTimeout(stackTimeout.value);
- stackTimeout.value = window.setTimeout(() => {
+ stackTimeout.value = globalThis.setTimeout(() => {
props.stack();
});
});
diff --git a/resources/js/components/video/VideoAmbientPlayer.vue b/resources/js/components/video/VideoAmbientPlayer.vue
index 17b4715d..28fd2f04 100755
--- a/resources/js/components/video/VideoAmbientPlayer.vue
+++ b/resources/js/components/video/VideoAmbientPlayer.vue
@@ -14,8 +14,8 @@ const player = ref<null | HTMLVideoElement>(null);
const canvas = ref<null | HTMLCanvasElement>(null);
const ctx = ref<null | CanvasRenderingContext2D>(null);
+const adjustTimeout = ref<NodeJS.Timeout | null>(null); //timeout for resizing canvas
const canUseAmbient = ref<null | boolean>(null);
-const adjustTimeout = ref<null | number>(null); //timeout for resizing canvas
const drawInterval = ref<null | number>(null); //interval for fading between frames
const videoPlayer = useTemplateRef('video-player');
const isDrawing = ref(false);
@@ -140,7 +140,7 @@ const onLoadedMetadata = async () => {
await nextTick();
if (adjustTimeout.value) clearTimeout(adjustTimeout.value);
- adjustTimeout.value = window.setTimeout(() => {
+ adjustTimeout.value = globalThis.setTimeout(() => {
adjustOverlayDiv();
if (!lightMode.value) preloadDraw();
}, 100);
diff --git a/resources/js/components/video/VideoHeatmap.vue b/resources/js/components/video/VideoHeatmap.vue
index 23e08cfc..13b24fb8 100644
--- a/resources/js/components/video/VideoHeatmap.vue
+++ b/resources/js/components/video/VideoHeatmap.vue
@@ -96,10 +96,7 @@ const heatMap = computed(() => {
</script>
<template>
<svg
- :class="[
- getScreenSize() === 'default' ? 'opacity-65' : 'opacity-0 peer-hover:opacity-65',
- 'ytp-heat-map-svg pointer-events-none h-6 w-full fill-indigo-200/20 transition-opacity duration-(--duration-input)',
- ]"
+ :class="[getScreenSize() === 'default' ? 'opacity-65' : 'opacity-0 peer-hover:opacity-65', 'pointer-events-none h-6 w-full transition-opacity duration-(--duration-input)']"
preserveAspectRatio="none"
viewBox="0 0 1000 100"
v-show="playbackHeatmap"
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 492894de..d6d95e65 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -142,9 +142,9 @@ const currentSpeed = ref(1);
const shouldUpdateUI = computed(() => (isShowingControls.value || isShowingStats.value) && !isScrubbing.value && !isLoading.value);
const latestPlayRequestId = ref<number>(0);
-const controlsHideTimeout = ref<number>();
-const volumeChangeTimeout = ref<number>();
-const autoSeekTimeout = ref<number>();
+const controlsHideTimeout = ref<NodeJS.Timeout>();
+const volumeChangeTimeout = ref<NodeJS.Timeout>();
+const autoSeekTimeout = ref<NodeJS.Timeout>();
const timeDisplay = ref<'timeElapsed' | 'timeRemaining'>('timeElapsed');
const isPictureInPicture = ref(false);
@@ -625,7 +625,7 @@ const handleVolumeWheel = (event: WheelEvent) => {
if (!handleVolumeChange(event.deltaY < 0 ? 1 : -1)) return;
if (volumeChangeTimeout.value) clearTimeout(volumeChangeTimeout.value);
- volumeChangeTimeout.value = window.setTimeout(() => {
+ volumeChangeTimeout.value = globalThis.setTimeout(() => {
isChangingVolume.value = true;
}, 100);
};
@@ -688,7 +688,7 @@ function handleAutoSeek(seconds: number) {
if (!isPaused.value) onPlayerPlay(false, false);
if (autoSeekTimeout.value) clearTimeout(autoSeekTimeout.value);
- autoSeekTimeout.value = window.setTimeout(() => {
+ autoSeekTimeout.value = globalThis.setTimeout(() => {
timeAutoSeek.value = seconds;
if (seconds > 0) isFastForward.value = true;
else isRewind.value = true;
@@ -802,7 +802,7 @@ function resetControlsTimeout() {
isShowingControls.value = true;
clearTimeout(controlsHideTimeout.value);
- controlsHideTimeout.value = window.setTimeout(handleControlsTimeout, controlsHideTime);
+ controlsHideTimeout.value = globalThis.setTimeout(handleControlsTimeout, controlsHideTime);
}
function handleControlsTimeout() {
diff --git a/resources/js/components/video/VideoPopover.vue b/resources/js/components/video/VideoPopover.vue
index a29621e8..cdaaaec2 100644
--- a/resources/js/components/video/VideoPopover.vue
+++ b/resources/js/components/video/VideoPopover.vue
@@ -88,7 +88,7 @@ watch(
);
onMounted(() => {
- window.setTimeout(function () {
+ globalThis.setTimeout(function () {
popoverHeightCalculate();
}, 100);
});
diff --git a/resources/js/components/video/VideoTooltipBase.vue b/resources/js/components/video/VideoTooltipBase.vue
index ad778c05..90c3a2e9 100644
--- a/resources/js/components/video/VideoTooltipBase.vue
+++ b/resources/js/components/video/VideoTooltipBase.vue
@@ -24,8 +24,8 @@ const props = withDefaults(
const data = reactive<{
tooltipDelay: number;
tooltipLeaveDelay: number;
- tooltipTimout: number | null;
- tooltipLeaveTimeout: number | null;
+ tooltipTimout: NodeJS.Timeout | null;
+ tooltipLeaveTimeout: NodeJS.Timeout | null;
}>({
tooltipDelay: 200,
tooltipLeaveDelay: 100,
@@ -47,7 +47,7 @@ function tooltipEnter(event?: MouseEvent) {
tooltipWidth.value = tooltip.value?.offsetWidth ?? 48;
- data.tooltipTimout = window.setTimeout(
+ data.tooltipTimout = globalThis.setTimeout(
async () => {
tooltipVisible.value = true;
@@ -67,7 +67,7 @@ function tooltipLeave(timeout: number = data.tooltipLeaveDelay) {
if (data.tooltipTimout) clearTimeout(data.tooltipTimout);
if (!tooltipVisible.value) return;
if (data.tooltipLeaveTimeout) clearTimeout(data.tooltipLeaveTimeout);
- data.tooltipLeaveTimeout = window.setTimeout(() => {
+ data.tooltipLeaveTimeout = globalThis.setTimeout(() => {
tooltipVisible.value = false;
}, timeout);
}
@@ -140,7 +140,7 @@ watch(
<div ref="tooltip" v-show="tooltipVisible" :class="`absolute text-white!`" style="z-index: 9" :style="{ top: verticalOffset }">
<slot name="content">
<p
- class="flex min-h-4 shrink-0 items-center justify-center whitespace-nowrap rounded-md bg-neutral-800 bg-opacity-90 px-2 py-1 font-mono text-xs shadow-xs backdrop-blur-xs"
+ class="bg-opacity-90 flex min-h-4 shrink-0 items-center justify-center rounded-md bg-neutral-800 px-2 py-1 font-mono text-xs whitespace-nowrap shadow-xs backdrop-blur-xs"
>
{{ tooltipText }}
</p>
@@ -149,7 +149,7 @@ watch(
v-show="tooltipArrow"
class="absolute bottom-0 left-1/2 inline-flex w-2.5 -translate-x-1/2 translate-y-full items-center justify-center overflow-hidden"
>
- <div class="h-1.5 w-1.5 origin-top-left -rotate-45 transform bg-neutral-800 bg-opacity-90"></div>
+ <div class="bg-opacity-90 h-1.5 w-1.5 origin-top-left -rotate-45 transform bg-neutral-800"></div>
</div>
</slot>
</div>
diff --git a/resources/js/components/video/VideoTooltipSlider.vue b/resources/js/components/video/VideoTooltipSlider.vue
index f48590a3..09847ee1 100644
--- a/resources/js/components/video/VideoTooltipSlider.vue
+++ b/resources/js/components/video/VideoTooltipSlider.vue
@@ -25,8 +25,8 @@ const props = withDefaults(
);
const data = reactive<{
- tooltipTimout: number | null;
- tooltipLeaveTimeout: number | null;
+ tooltipTimout: NodeJS.Timeout | null;
+ tooltipLeaveTimeout: NodeJS.Timeout | null;
}>({
tooltipTimout: null,
tooltipLeaveTimeout: null,
@@ -42,7 +42,7 @@ const tooltipEnter = () => {
if (data.tooltipTimout) clearTimeout(data.tooltipTimout);
- data.tooltipTimout = window.setTimeout(() => {
+ data.tooltipTimout = globalThis.setTimeout(() => {
tooltipVisible.value = true;
if (!tooltip.value) return;
}, props.tooltipDelay);
@@ -52,7 +52,7 @@ const tooltipLeave = () => {
if (data.tooltipTimout) clearTimeout(data.tooltipTimout);
if (!tooltipVisible.value) return;
if (data.tooltipLeaveTimeout) clearTimeout(data.tooltipLeaveTimeout);
- data.tooltipLeaveTimeout = window.setTimeout(() => {
+ data.tooltipLeaveTimeout = globalThis.setTimeout(() => {
tooltipVisible.value = false;
}, props.tooltipLeaveDelay);
};
@@ -95,7 +95,7 @@ defineExpose({ calculateTooltipPosition, tooltipToggle, tooltipVisible });
<slot name="content">
<div :class="`pointer-events-none h-full w-full transition-transform ${tooltipVisible ? 'scale-100' : 'scale-0 duration-150 ease-in-out'}`">
<p
- class="flex min-h-4 shrink-0 items-center justify-center whitespace-nowrap rounded-md bg-neutral-800 bg-opacity-90 px-2 py-1 font-mono text-xs shadow-xs backdrop-blur-xs"
+ class="bg-opacity-90 flex min-h-4 shrink-0 items-center justify-center rounded-md bg-neutral-800 px-2 py-1 font-mono text-xs whitespace-nowrap shadow-xs backdrop-blur-xs"
>
{{ tooltipText }}
</p>
@@ -104,7 +104,7 @@ defineExpose({ calculateTooltipPosition, tooltipToggle, tooltipVisible });
v-show="tooltipArrow"
class="absolute bottom-0 left-1/2 inline-flex w-2.5 -translate-x-1/2 translate-y-full items-center justify-center overflow-hidden"
>
- <div class="h-1.5 w-1.5 origin-top-left -rotate-45 transform bg-neutral-800 bg-opacity-90"></div>
+ <div class="bg-opacity-90 h-1.5 w-1.5 origin-top-left -rotate-45 transform bg-neutral-800"></div>
</div>
</div>
</slot>
diff --git a/resources/js/composables/useForm.ts b/resources/js/composables/useForm.ts
index 2da0ae23..eb87f833 100644
--- a/resources/js/composables/useForm.ts
+++ b/resources/js/composables/useForm.ts
@@ -29,7 +29,7 @@ interface FormState<T> {
export default function useForm<T extends Record<string, any>>(fields: FormFields<T>) {
let defaults = fields;
- let recentlySuccessfulTimeoutId: number;
+ let recentlySuccessfulTimeoutId: NodeJS.Timeout;
const form = reactive<FormState<T>>({
fields: cloneDeep(fields),
@@ -57,7 +57,7 @@ export default function useForm<T extends Record<string, any>>(fields: FormField
this.wasSuccessful = true;
this.recentlySuccessful = true;
- recentlySuccessfulTimeoutId = window.setTimeout(() => {
+ recentlySuccessfulTimeoutId = globalThis.setTimeout(() => {
this.recentlySuccessful = false;
}, 2000);