From 805e817554f28547580fd2e18713bb0f08a35e2a Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 20 May 2026 16:27:47 +0200
Subject: [PATCH] use cn helper for alert-dialog modals

---
 resources/js/Components/ui/alert-dialog/AlertDialogAction.vue | 4 ++--
 resources/js/Components/ui/alert-dialog/AlertDialogCancel.vue | 4 ++--
 resources/js/packages/ui/src/calendar/CalendarCell.vue        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/js/Components/ui/alert-dialog/AlertDialogAction.vue b/resources/js/Components/ui/alert-dialog/AlertDialogAction.vue
index 0d7bfe5f..d90500e3 100644
--- a/resources/js/Components/ui/alert-dialog/AlertDialogAction.vue
+++ b/resources/js/Components/ui/alert-dialog/AlertDialogAction.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
 import { AlertDialogAction, type AlertDialogActionProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
-import { twMerge } from 'tailwind-merge';
 const props = defineProps<AlertDialogActionProps & { class?: HTMLAttributes['class'] }>();
 
 const delegatedProps = computed(() => {
@@ -13,7 +13,7 @@ const delegatedProps = computed(() => {
 </script>
 
 <template>
-    <AlertDialogAction v-bind="delegatedProps" :class="twMerge(buttonVariants(), props.class)">
+    <AlertDialogAction v-bind="delegatedProps" :class="cn(buttonVariants(), props.class)">
         <slot />
     </AlertDialogAction>
 </template>
diff --git a/resources/js/Components/ui/alert-dialog/AlertDialogCancel.vue b/resources/js/Components/ui/alert-dialog/AlertDialogCancel.vue
index b81c4659..22fa8db0 100644
--- a/resources/js/Components/ui/alert-dialog/AlertDialogCancel.vue
+++ b/resources/js/Components/ui/alert-dialog/AlertDialogCancel.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { buttonVariants } from '@/packages/ui/src';
+import { cn } from '@/lib/utils';
 import { AlertDialogCancel, type AlertDialogCancelProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
-import { twMerge } from 'tailwind-merge';
 
 const props = defineProps<AlertDialogCancelProps & { class?: HTMLAttributes['class'] }>();
 
@@ -16,7 +16,7 @@ const delegatedProps = computed(() => {
 <template>
     <AlertDialogCancel
         v-bind="delegatedProps"
-        :class="twMerge(buttonVariants({ variant: 'outline' }), 'mt-2 sm:mt-0', props.class)">
+        :class="cn(buttonVariants({ variant: 'outline' }), 'mt-2 sm:mt-0', props.class)">
         <slot />
     </AlertDialogCancel>
 </template>
diff --git a/resources/js/packages/ui/src/calendar/CalendarCell.vue b/resources/js/packages/ui/src/calendar/CalendarCell.vue
index cb3a3291..e7f073fc 100644
--- a/resources/js/packages/ui/src/calendar/CalendarCell.vue
+++ b/resources/js/packages/ui/src/calendar/CalendarCell.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { CalendarCell, type CalendarCellProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
-import { twMerge } from 'tailwind-merge';
+import { cn } from '../utils/cn';
 
 const props = defineProps<CalendarCellProps & { class?: HTMLAttributes['class'] }>();
 
@@ -17,7 +17,7 @@ const forwardedProps = useForwardProps(delegatedProps);
 <template>
     <CalendarCell
         :class="
-            twMerge(
+            cn(
                 'relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([data-selected])]:rounded-md [&:has([data-selected])]:bg-accent [&:has([data-selected][data-outside-view])]:bg-accent/50',
                 props.class
             )