Added tooltips to facilitate navigation
This commit is contained in:
@@ -1,26 +1,20 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { computed } from 'vue'
|
|
||||||
import { Popover, PopoverTrigger } from '@/components/ui/popover'
|
import { Popover, PopoverTrigger } from '@/components/ui/popover'
|
||||||
import type { CalendarEvent } from '@/stores/events'
|
import type { CalendarEvent } from '@/stores/events'
|
||||||
import CalendarEventDetails from './CalendarEventDetails.vue'
|
import CalendarEventDetails from './CalendarEventDetails.vue'
|
||||||
|
|
||||||
const props = defineProps<{
|
defineProps<{
|
||||||
event: CalendarEvent
|
event: CalendarEvent
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const eventTitleExcerpt = computed(() => {
|
|
||||||
if (props.event.title.length > 20) return props.event.title.substring(0, 20) + '…'
|
|
||||||
return props.event.title
|
|
||||||
})
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<Popover>
|
<Popover>
|
||||||
<PopoverTrigger as-child>
|
<PopoverTrigger as-child>
|
||||||
<button
|
<button
|
||||||
class="text-xs text-white px-2 py-1 bg-pink-700 block w-full text-left rounded-sm hover:bg-pink-800"
|
class="text-xs text-white px-2 py-1 bg-pink-700 block w-full text-left rounded-sm hover:bg-pink-800 whitespace-nowrap overflow-hidden text-ellipsis"
|
||||||
>
|
>
|
||||||
{{ eventTitleExcerpt }}
|
{{ event.title }}
|
||||||
</button>
|
</button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
import { computed } from 'vue'
|
||||||
import {
|
import {
|
||||||
Select,
|
Select,
|
||||||
SelectContent,
|
SelectContent,
|
||||||
@@ -7,17 +8,22 @@ import {
|
|||||||
SelectTrigger,
|
SelectTrigger,
|
||||||
SelectValue
|
SelectValue
|
||||||
} from '@/components/ui/select'
|
} from '@/components/ui/select'
|
||||||
|
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
|
||||||
import { useCalendar } from '@/stores/calendar'
|
import { useCalendar } from '@/stores/calendar'
|
||||||
import Button from '../ui/button/Button.vue'
|
import Button from '../ui/button/Button.vue'
|
||||||
|
|
||||||
const {
|
const {
|
||||||
currentConfig,
|
currentConfig,
|
||||||
currentDate,
|
currentDate,
|
||||||
|
defaultDate,
|
||||||
viewTypeOptions,
|
viewTypeOptions,
|
||||||
decrementMonth,
|
decrementMonth,
|
||||||
incrementMonth,
|
incrementMonth,
|
||||||
jumpToDefaultDate
|
jumpToDefaultDate,
|
||||||
|
getFormattedDateTitle
|
||||||
} = useCalendar()
|
} = useCalendar()
|
||||||
|
|
||||||
|
const defaultDateFormatted = computed(() => getFormattedDateTitle(defaultDate, true))
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -28,39 +34,66 @@ const {
|
|||||||
<div class="flex items-center gap-6">
|
<div class="flex items-center gap-6">
|
||||||
<menu class="flex items-center gap-2">
|
<menu class="flex items-center gap-2">
|
||||||
<li>
|
<li>
|
||||||
<Button @click="jumpToDefaultDate" size="sm"> Today </Button>
|
<TooltipProvider :delayDuration="250">
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger>
|
||||||
|
<Button @click="jumpToDefaultDate" size="sm"> Aujourd'hui </Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>{{ defaultDateFormatted }}</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</TooltipProvider>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<!-- Implement decrementDate to account for other mods -->
|
<!-- Implement decrementDate to account for other mods -->
|
||||||
<Button variant="outline" size="icon" @click="decrementMonth">
|
<TooltipProvider :delayDuration="250">
|
||||||
<svg
|
<Tooltip>
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
<TooltipTrigger>
|
||||||
width="16"
|
<Button variant="outline" size="icon" @click="decrementMonth">
|
||||||
height="16"
|
<svg
|
||||||
fill="#FFF"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
viewBox="0 0 256 256"
|
width="16"
|
||||||
>
|
height="16"
|
||||||
<path
|
fill="#FFF"
|
||||||
d="M165.66,202.34a8,8,0,0,1-11.32,11.32l-80-80a8,8,0,0,1,0-11.32l80-80a8,8,0,0,1,11.32,11.32L91.31,128Z"
|
viewBox="0 0 256 256"
|
||||||
/>
|
>
|
||||||
</svg>
|
<path
|
||||||
</Button>
|
d="M165.66,202.34a8,8,0,0,1-11.32,11.32l-80-80a8,8,0,0,1,0-11.32l80-80a8,8,0,0,1,11.32,11.32L91.31,128Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Mois précédent</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</TooltipProvider>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<!-- Implement decrementDate to account for other mods -->
|
<!-- Implement decrementDate to account for other mods -->
|
||||||
<Button variant="outline" size="icon" @click="incrementMonth">
|
<TooltipProvider :delayDuration="250">
|
||||||
<svg
|
<Tooltip>
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
<TooltipTrigger>
|
||||||
width="16"
|
<Button variant="outline" size="icon" @click="incrementMonth">
|
||||||
height="16"
|
<svg
|
||||||
fill="#FFF"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
viewBox="0 0 256 256"
|
width="16"
|
||||||
>
|
height="16"
|
||||||
<path
|
fill="#FFF"
|
||||||
d="M181.66,133.66l-80,80a8,8,0,0,1-11.32-11.32L164.69,128,90.34,53.66a8,8,0,0,1,11.32-11.32l80,80A8,8,0,0,1,181.66,133.66Z"
|
viewBox="0 0 256 256"
|
||||||
/>
|
>
|
||||||
</svg>
|
<path
|
||||||
</Button>
|
d="M181.66,133.66l-80,80a8,8,0,0,1-11.32-11.32L164.69,128,90.34,53.66a8,8,0,0,1,11.32-11.32l80,80A8,8,0,0,1,181.66,133.66Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>
|
||||||
|
<p>Mois suivant</p>
|
||||||
|
</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
</TooltipProvider>
|
||||||
</li>
|
</li>
|
||||||
</menu>
|
</menu>
|
||||||
<h1 class="text-2xl font-bold">
|
<h1 class="text-2xl font-bold">
|
||||||
|
|||||||
@@ -40,8 +40,11 @@ const isDefaultDate = computed(() => {
|
|||||||
>{{ date.day }}</span
|
>{{ date.day }}</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<ul v-if="eventsForTheDay.length > 0" class="absolute top-12 bottom-0 inset-x-2 grid gap-1">
|
<ul
|
||||||
<li v-for="event in eventsForTheDay" :key="event.title">
|
v-if="eventsForTheDay.length > 0"
|
||||||
|
class="absolute top-12 bottom-2 inset-x-2 grid auto-rows-min gap-1"
|
||||||
|
>
|
||||||
|
<li v-for="event in eventsForTheDay" :key="event.title" class="grid">
|
||||||
<CalendarEvent :event />
|
<CalendarEvent :event />
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ import type { LeimDate } from '@/models/Date'
|
|||||||
import { useCalendar } from '@/stores/calendar'
|
import { useCalendar } from '@/stores/calendar'
|
||||||
import { computed } from 'vue'
|
import { computed } from 'vue'
|
||||||
import CalendarTile from '../CalendarTile.vue'
|
import CalendarTile from '../CalendarTile.vue'
|
||||||
|
import { useThrottleFn } from '@vueuse/core'
|
||||||
|
|
||||||
const { staticConfig, currentDate } = useCalendar()
|
const { staticConfig, currentDate, decrementMonth, incrementMonth } = useCalendar()
|
||||||
|
|
||||||
const daysPerMonth = computed(() => staticConfig.daysPerMonth)
|
const daysPerMonth = computed(() => staticConfig.daysPerMonth)
|
||||||
|
|
||||||
@@ -32,10 +33,27 @@ function getNextMonthDate(day: number): LeimDate {
|
|||||||
period: nextPeriod
|
period: nextPeriod
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleWheel(e: WheelEvent) {
|
||||||
|
const isMovingUp = e.deltaY < 0
|
||||||
|
if (isMovingUp) {
|
||||||
|
moveCalendarLeft()
|
||||||
|
} else {
|
||||||
|
moveCalendarRight()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const moveCalendarLeft = useThrottleFn(() => {
|
||||||
|
decrementMonth()
|
||||||
|
}, 100)
|
||||||
|
|
||||||
|
const moveCalendarRight = useThrottleFn(() => {
|
||||||
|
incrementMonth()
|
||||||
|
}, 100)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="grid" :class="`grid-cols-10`">
|
<div class="grid" :class="`grid-cols-10`" @wheel="handleWheel">
|
||||||
<CalendarTile
|
<CalendarTile
|
||||||
v-for="day in daysPerMonth"
|
v-for="day in daysPerMonth"
|
||||||
:key="day"
|
:key="day"
|
||||||
|
|||||||
19
src/components/ui/tooltip/Tooltip.vue
Normal file
19
src/components/ui/tooltip/Tooltip.vue
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {
|
||||||
|
TooltipRoot,
|
||||||
|
type TooltipRootEmits,
|
||||||
|
type TooltipRootProps,
|
||||||
|
useForwardPropsEmits
|
||||||
|
} from 'radix-vue'
|
||||||
|
|
||||||
|
const props = defineProps<TooltipRootProps>()
|
||||||
|
const emits = defineEmits<TooltipRootEmits>()
|
||||||
|
|
||||||
|
const forwarded = useForwardPropsEmits(props, emits)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<TooltipRoot v-bind="forwarded">
|
||||||
|
<slot />
|
||||||
|
</TooltipRoot>
|
||||||
|
</template>
|
||||||
48
src/components/ui/tooltip/TooltipContent.vue
Normal file
48
src/components/ui/tooltip/TooltipContent.vue
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { type HTMLAttributes, computed } from 'vue'
|
||||||
|
import {
|
||||||
|
TooltipContent,
|
||||||
|
type TooltipContentEmits,
|
||||||
|
type TooltipContentProps,
|
||||||
|
TooltipPortal,
|
||||||
|
useForwardPropsEmits
|
||||||
|
} from 'radix-vue'
|
||||||
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
|
defineOptions({
|
||||||
|
inheritAttrs: false
|
||||||
|
})
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<TooltipContentProps & { class?: HTMLAttributes['class'] }>(),
|
||||||
|
{
|
||||||
|
sideOffset: 4
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emits = defineEmits<TooltipContentEmits>()
|
||||||
|
|
||||||
|
const delegatedProps = computed(() => {
|
||||||
|
const { class: _, ...delegated } = props
|
||||||
|
|
||||||
|
return delegated
|
||||||
|
})
|
||||||
|
|
||||||
|
const forwarded = useForwardPropsEmits(delegatedProps, emits)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<TooltipPortal>
|
||||||
|
<TooltipContent
|
||||||
|
v-bind="{ ...forwarded, ...$attrs }"
|
||||||
|
:class="
|
||||||
|
cn(
|
||||||
|
'z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
|
||||||
|
props.class
|
||||||
|
)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</TooltipContent>
|
||||||
|
</TooltipPortal>
|
||||||
|
</template>
|
||||||
11
src/components/ui/tooltip/TooltipProvider.vue
Normal file
11
src/components/ui/tooltip/TooltipProvider.vue
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { TooltipProvider, type TooltipProviderProps } from 'radix-vue'
|
||||||
|
|
||||||
|
const props = defineProps<TooltipProviderProps>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<TooltipProvider v-bind="props">
|
||||||
|
<slot />
|
||||||
|
</TooltipProvider>
|
||||||
|
</template>
|
||||||
11
src/components/ui/tooltip/TooltipTrigger.vue
Normal file
11
src/components/ui/tooltip/TooltipTrigger.vue
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { TooltipTrigger, type TooltipTriggerProps } from 'radix-vue'
|
||||||
|
|
||||||
|
const props = defineProps<TooltipTriggerProps>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<TooltipTrigger v-bind="props">
|
||||||
|
<slot />
|
||||||
|
</TooltipTrigger>
|
||||||
|
</template>
|
||||||
4
src/components/ui/tooltip/index.ts
Normal file
4
src/components/ui/tooltip/index.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
export { default as Tooltip } from './Tooltip.vue'
|
||||||
|
export { default as TooltipContent } from './TooltipContent.vue'
|
||||||
|
export { default as TooltipTrigger } from './TooltipTrigger.vue'
|
||||||
|
export { default as TooltipProvider } from './TooltipProvider.vue'
|
||||||
Reference in New Issue
Block a user