@djangocfg/ext-support 1.0.8 → 1.0.9

package/dist/config.cjs

@@ -27,7 +27,7 @@ var import_ext_base = require("@djangocfg/ext-base");
 // package.json
 var package_default = {
   name: "@djangocfg/ext-support",
-  version: "1.0.8",
+  version: "1.0.9",
   description: "Support ticket system extension for DjangoCFG",
   keywords: [
     "django",
@@ -89,7 +89,6 @@ var package_default = {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
     "@djangocfg/ui-core": "workspace:*",
-    "@djangocfg/ui-nextjs": "workspace:*",
     consola: "^3.4.2",
     "lucide-react": "^0.545.0",
     moment: "^2.30.1",
@@ -103,6 +102,7 @@ var package_default = {
   devDependencies: {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
+    "@djangocfg/ui-core": "workspace:*",
     "@djangocfg/typescript-config": "workspace:*",
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",

package/dist/config.js

@@ -4,7 +4,7 @@ import { createExtensionConfig } from "@djangocfg/ext-base";
 // package.json
 var package_default = {
   name: "@djangocfg/ext-support",
-  version: "1.0.8",
+  version: "1.0.9",
   description: "Support ticket system extension for DjangoCFG",
   keywords: [
     "django",
@@ -66,7 +66,6 @@ var package_default = {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
     "@djangocfg/ui-core": "workspace:*",
-    "@djangocfg/ui-nextjs": "workspace:*",
     consola: "^3.4.2",
     "lucide-react": "^0.545.0",
     moment: "^2.30.1",
@@ -80,6 +79,7 @@ var package_default = {
   devDependencies: {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
+    "@djangocfg/ui-core": "workspace:*",
     "@djangocfg/typescript-config": "workspace:*",
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",

package/dist/hooks.cjs

@@ -6,13 +6,14 @@ var zod = require('zod');
 var api = require('@djangocfg/ext-base/api');
 var lucideReact = require('lucide-react');
 var React7 = require('react');
-var uiNextjs = require('@djangocfg/ui-nextjs');
+var uiCore = require('@djangocfg/ui-core');
 var useSWR = require('swr');
 var jsxRuntime = require('react/jsx-runtime');
 var moment2 = require('moment');
 var lib = require('@djangocfg/ui-core/lib');
 var auth = require('@djangocfg/api/auth');
 var useSWRInfinite = require('swr/infinite');
+var hooks = require('@djangocfg/ui-core/hooks');
 var reactHookForm = require('react-hook-form');
 var zod$1 = require('@hookform/resolvers/zod');
 var extBase = require('@djangocfg/ext-base');
@@ -1816,7 +1817,7 @@ var formatRelativeTime = (date) => {
 };
 var TicketCard = ({ ticket, isSelected, onClick }) => {
   return /* @__PURE__ */ jsxRuntime.jsx(
-    uiNextjs.Card,
+    uiCore.Card,
     {
       className: lib.cn(
         "cursor-pointer transition-all duration-200 ease-out",
@@ -1825,11 +1826,11 @@ var TicketCard = ({ ticket, isSelected, onClick }) => {
         isSelected && "bg-accent border-primary shadow-sm"
       ),
       onClick,
-      children: /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.CardContent, { className: "p-4", children: [
+      children: /* @__PURE__ */ jsxRuntime.jsxs(uiCore.CardContent, { className: "p-4", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-start justify-between mb-2", children: [
           /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "font-semibold text-sm line-clamp-2 flex-1", children: ticket.subject }),
           (ticket.unanswered_messages_count || 0) > 0 && /* @__PURE__ */ jsxRuntime.jsx(
-            uiNextjs.Badge,
+            uiCore.Badge,
             {
               variant: "destructive",
               className: "ml-2 shrink-0 animate-pulse",
@@ -1838,7 +1839,7 @@ var TicketCard = ({ ticket, isSelected, onClick }) => {
           )
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between text-xs text-muted-foreground", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Badge, { variant: getStatusBadgeVariant(ticket.status || "open"), className: "text-xs", children: ticket.status || "open" }),
+          /* @__PURE__ */ jsxRuntime.jsx(uiCore.Badge, { variant: getStatusBadgeVariant(ticket.status || "open"), className: "text-xs", children: ticket.status || "open" }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1", children: [
             /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Clock, { className: "h-3 w-3" }),
             /* @__PURE__ */ jsxRuntime.jsx("span", { children: formatRelativeTime(ticket.created_at) })
@@ -2158,7 +2159,7 @@ var TicketList = () => {
   }, [hasMore, isLoadingMore, loadMore]);
   if (isLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4 space-y-2", children: [1, 2, 3, 4, 5].map((i) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(
-      uiNextjs.Skeleton,
+      uiCore.Skeleton,
       {
         className: "h-24 w-full animate-pulse",
         style: { animationDelay: `${i * 100}ms` }
@@ -2172,7 +2173,7 @@ var TicketList = () => {
       /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground max-w-sm", children: "Create your first support ticket to get help from our team" })
     ] });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ScrollArea, { className: "h-full", viewportRef: scrollRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-4 space-y-2", children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(uiCore.ScrollArea, { className: "h-full", viewportRef: scrollRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-4 space-y-2", children: [
     tickets.map((ticket, index) => /* @__PURE__ */ jsxRuntime.jsx(
       "div",
       {
@@ -2195,7 +2196,7 @@ var TicketList = () => {
       /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm", children: "Loading more tickets..." })
     ] }) }),
     hasMore && !isLoadingMore && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center pt-2 pb-4", children: /* @__PURE__ */ jsxRuntime.jsxs(
-      uiNextjs.Button,
+      uiCore.Button,
       {
         variant: "outline",
         size: "sm",
@@ -2233,22 +2234,22 @@ var MessageBubble = ({ message, isFromUser, currentUser }) => {
       className: `flex gap-3 ${isFromUser ? "justify-end" : "justify-start"}
                  animate-in fade-in slide-in-from-bottom-2 duration-300`,
       children: [
-        !isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Avatar, { className: "h-8 w-8 shrink-0", children: sender?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarImage, { src: sender.avatar, alt: sender.display_username || "Support" }) : /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarFallback, { className: "bg-primary text-primary-foreground", children: sender?.is_staff ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Headphones, { className: "h-4 w-4" }) : senderInitial }) }),
+        !isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiCore.Avatar, { className: "h-8 w-8 shrink-0", children: sender?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarImage, { src: sender.avatar, alt: sender.display_username || "Support" }) : /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarFallback, { className: "bg-primary text-primary-foreground", children: sender?.is_staff ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Headphones, { className: "h-4 w-4" }) : senderInitial }) }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex flex-col gap-1 flex-1 max-w-[80%] ${isFromUser ? "items-end" : "items-start"}`, children: [
           !isFromUser && sender && /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs text-muted-foreground px-1", children: [
             sender.display_username || sender.email || "Support Team",
             sender.is_staff && " (Staff)"
           ] }),
           /* @__PURE__ */ jsxRuntime.jsx(
-            uiNextjs.Card,
+            uiCore.Card,
             {
               className: `${isFromUser ? "bg-primary text-primary-foreground" : "bg-muted"} transition-all duration-200 hover:shadow-md`,
-              children: /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.CardContent, { className: "p-3", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm whitespace-pre-wrap break-words", children: message.text }) })
+              children: /* @__PURE__ */ jsxRuntime.jsx(uiCore.CardContent, { className: "p-3", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm whitespace-pre-wrap break-words", children: message.text }) })
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs text-muted-foreground px-1", children: formatTime(message.created_at) })
         ] }),
-        isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Avatar, { className: "h-8 w-8 shrink-0", children: currentUser?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarImage, { src: currentUser.avatar, alt: currentUser.display_username || currentUser.email || "You" }) : /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarFallback, { className: "bg-primary/10 text-primary font-semibold", children: userInitial || /* @__PURE__ */ jsxRuntime.jsx(lucideReact.User, { className: "h-4 w-4" }) }) })
+        isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiCore.Avatar, { className: "h-8 w-8 shrink-0", children: currentUser?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarImage, { src: currentUser.avatar, alt: currentUser.display_username || currentUser.email || "You" }) : /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarFallback, { className: "bg-primary/10 text-primary font-semibold", children: userInitial || /* @__PURE__ */ jsxRuntime.jsx(lucideReact.User, { className: "h-4 w-4" }) }) })
       ]
     }
   );
@@ -2324,8 +2325,8 @@ var MessageList = () => {
         className: "flex gap-3 animate-pulse",
         style: { animationDelay: `${i * 100}ms` },
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Skeleton, { className: "h-8 w-8 rounded-full" }),
-          /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Skeleton, { className: "h-16 flex-1 max-w-[70%]" })
+          /* @__PURE__ */ jsxRuntime.jsx(uiCore.Skeleton, { className: "h-8 w-8 rounded-full" }),
+          /* @__PURE__ */ jsxRuntime.jsx(uiCore.Skeleton, { className: "h-16 flex-1 max-w-[70%]" })
         ]
       },
       i
@@ -2338,14 +2339,14 @@ var MessageList = () => {
       /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground max-w-sm", children: "Start the conversation by sending a message below" })
     ] });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ScrollArea, { className: "h-full bg-muted/50", viewportRef: scrollAreaRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-6 space-y-4", ref: scrollRef, children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(uiCore.ScrollArea, { className: "h-full bg-muted/50", viewportRef: scrollAreaRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-6 space-y-4", ref: scrollRef, children: [
     /* @__PURE__ */ jsxRuntime.jsx("div", { ref: loadMoreRef, className: "h-2" }),
     isLoadingMore && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 text-muted-foreground", children: [
       /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "h-4 w-4 animate-spin" }),
       /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm", children: "Loading older messages..." })
     ] }) }),
     hasMore && !isLoadingMore && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center pt-2 pb-4", children: /* @__PURE__ */ jsxRuntime.jsxs(
-      uiNextjs.Button,
+      uiCore.Button,
       {
         variant: "outline",
         size: "sm",
@@ -2393,7 +2394,7 @@ var logger = consola.createConsola({
 var supportLogger = logger;
 var MessageInput = () => {
   const { selectedTicket, sendMessage } = useSupportLayoutContext();
-  const { toast } = uiNextjs.useToast();
+  const { toast } = hooks.useToast();
   const [message, setMessage] = React7.useState("");
   const [isSending, setIsSending] = React7.useState(false);
   const handleSubmit = async (e) => {
@@ -2424,7 +2425,7 @@ var MessageInput = () => {
   return /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: handleSubmit, className: "p-4 border-t bg-background/50 backdrop-blur-sm flex-shrink-0", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-2", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.Textarea,
+        uiCore.Textarea,
         {
           value: message,
           onChange: (e) => setMessage(e.target.value),
@@ -2435,7 +2436,7 @@ var MessageInput = () => {
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.Button,
+        uiCore.Button,
         {
           type: "submit",
           size: "icon",
@@ -2454,7 +2455,7 @@ var createTicketSchema = zod.z.object({
 });
 var CreateTicketDialog = () => {
   const { uiState, createTicket, closeCreateDialog } = useSupportLayoutContext();
-  const { toast } = uiNextjs.useToast();
+  const { toast } = uiCore.useToast();
   const [isSubmitting, setIsSubmitting] = React7__default.default.useState(false);
   const form = reactHookForm.useForm({
     resolver: zod$1.zodResolver(createTicketSchema),
@@ -2487,49 +2488,49 @@ var CreateTicketDialog = () => {
     form.reset();
     closeCreateDialog();
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Dialog, { open: uiState.isCreateDialogOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.DialogContent, { className: "sm:max-w-[600px] animate-in fade-in slide-in-from-bottom-4 duration-300", children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.DialogHeader, { children: [
-      /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.DialogTitle, { className: "flex items-center gap-2", children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(uiCore.Dialog, { open: uiState.isCreateDialogOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(uiCore.DialogContent, { className: "sm:max-w-[600px] animate-in fade-in slide-in-from-bottom-4 duration-300", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(uiCore.DialogHeader, { children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(uiCore.DialogTitle, { className: "flex items-center gap-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, { className: "h-5 w-5" }),
         "Create Support Ticket"
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.DialogDescription, { children: "Describe your issue and we'll help you resolve it as quickly as possible." })
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.DialogDescription, { children: "Describe your issue and we'll help you resolve it as quickly as possible." })
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Form, { ...form, children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: form.handleSubmit(onSubmit), className: "space-y-6", children: [
+    /* @__PURE__ */ jsxRuntime.jsx(uiCore.Form, { ...form, children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: form.handleSubmit(onSubmit), className: "space-y-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.FormField,
+        uiCore.FormField,
         {
           control: form.control,
           name: "subject",
-          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.FormItem, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormLabel, { children: "Subject" }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Input, { placeholder: "Brief description of your issue...", ...field }) }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormMessage, {})
+          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiCore.FormItem, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormLabel, { children: "Subject" }),
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(uiCore.Input, { placeholder: "Brief description of your issue...", ...field }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormMessage, {})
           ] })
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.FormField,
+        uiCore.FormField,
         {
           control: form.control,
           name: "message",
-          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.FormItem, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormLabel, { children: "Message" }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(
-              uiNextjs.Textarea,
+          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiCore.FormItem, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormLabel, { children: "Message" }),
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(
+              uiCore.Textarea,
               {
                 placeholder: "Describe your issue in detail. Include any error messages, steps to reproduce, or relevant information...",
                 className: "min-h-[120px]",
                 ...field
               }
             ) }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormMessage, {})
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormMessage, {})
           ] })
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-3 pt-4", children: [
         /* @__PURE__ */ jsxRuntime.jsx(
-          uiNextjs.Button,
+          uiCore.Button,
           {
             type: "button",
             variant: "outline",
@@ -2538,7 +2539,7 @@ var CreateTicketDialog = () => {
             children: "Cancel"
           }
         ),
-        /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Button, { type: "submit", disabled: isSubmitting, children: isSubmitting ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(uiCore.Button, { type: "submit", disabled: isSubmitting, children: isSubmitting ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
           /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "h-4 w-4 mr-2 animate-spin" }),
           "Creating..."
         ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -2564,7 +2565,7 @@ var SupportLayoutContent = () => {
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between p-4 border-b bg-background flex-shrink-0", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
           selectedTicket ? /* @__PURE__ */ jsxRuntime.jsx(
-            uiNextjs.Button,
+            uiCore.Button,
             {
               variant: "ghost",
               size: "sm",
@@ -2576,7 +2577,7 @@ var SupportLayoutContent = () => {
           /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-xl font-semibold", children: selectedTicket ? selectedTicket.subject : "Support" }),
           unreadCount > 0 && !selectedTicket && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-5 w-5 bg-red-500 text-white text-xs rounded-full flex items-center justify-center", children: unreadCount })
         ] }),
-        !selectedTicket && /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.Button, { onClick: openCreateDialog, size: "sm", children: [
+        !selectedTicket && /* @__PURE__ */ jsxRuntime.jsxs(uiCore.Button, { onClick: openCreateDialog, size: "sm", children: [
           /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, { className: "h-4 w-4 mr-2" }),
           "New Ticket"
         ] })
@@ -2604,15 +2605,15 @@ var SupportLayoutContent = () => {
         ] }),
         unreadCount > 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-6 w-6 bg-red-500 text-white text-sm rounded-full flex items-center justify-center", children: unreadCount })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.Button, { onClick: openCreateDialog, children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(uiCore.Button, { onClick: openCreateDialog, children: [
         /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, { className: "h-4 w-4 mr-2" }),
         "New Ticket"
       ] })
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.ResizablePanelGroup, { direction: "horizontal", className: "h-full", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ResizablePanel, { defaultSize: 35, minSize: 25, maxSize: 50, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full border-r overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx(TicketList, {}) }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ResizableHandle, { withHandle: true, className: "hover:bg-accent transition-colors" }),
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ResizablePanel, { defaultSize: 65, minSize: 50, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "h-full flex flex-col overflow-hidden", children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsxs(uiCore.ResizablePanelGroup, { direction: "horizontal", className: "h-full", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.ResizablePanel, { defaultSize: 35, minSize: 25, maxSize: 50, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full border-r overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx(TicketList, {}) }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.ResizableHandle, { withHandle: true, className: "hover:bg-accent transition-colors" }),
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.ResizablePanel, { defaultSize: 65, minSize: 50, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "h-full flex flex-col overflow-hidden", children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx(MessageList, {}) }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-shrink-0", children: /* @__PURE__ */ jsxRuntime.jsx(MessageInput, {}) })
       ] }) })
@@ -2627,7 +2628,7 @@ var SupportLayout = () => {
 // package.json
 var package_default = {
   name: "@djangocfg/ext-support",
-  version: "1.0.8",
+  version: "1.0.9",
   description: "Support ticket system extension for DjangoCFG",
   keywords: [
     "django",
@@ -2689,7 +2690,6 @@ var package_default = {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
     "@djangocfg/ui-core": "workspace:*",
-    "@djangocfg/ui-nextjs": "workspace:*",
     consola: "^3.4.2",
     "lucide-react": "^0.545.0",
     moment: "^2.30.1",
@@ -2703,6 +2703,7 @@ var package_default = {
   devDependencies: {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
+    "@djangocfg/ui-core": "workspace:*",
     "@djangocfg/typescript-config": "workspace:*",
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",

package/dist/hooks.js

@@ -4,13 +4,14 @@ import { z } from 'zod';
 import { createExtensionAPI } from '@djangocfg/ext-base/api';
 import { Clock, MessageSquare, Loader2, Send, Plus, Headphones, User, ArrowLeft, LifeBuoy } from 'lucide-react';
 import React7, { createContext, useContext, useState, useCallback, useEffect, useRef } from 'react';
-import { Card, CardContent, Badge, Skeleton, ScrollArea, Button, useToast, Textarea, Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, Form, FormField, FormItem, FormLabel, FormControl, Input, FormMessage, Avatar, AvatarImage, AvatarFallback, ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@djangocfg/ui-nextjs';
+import { Card, CardContent, Badge, Skeleton, ScrollArea, Button, Textarea, useToast as useToast$1, Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, Form, FormField, FormItem, FormLabel, FormControl, Input, FormMessage, Avatar, AvatarImage, AvatarFallback, ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@djangocfg/ui-core';
 import useSWR, { useSWRConfig } from 'swr';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import moment2 from 'moment';
 import { cn } from '@djangocfg/ui-core/lib';
 import { useAuth } from '@djangocfg/api/auth';
 import useSWRInfinite from 'swr/infinite';
+import { useToast } from '@djangocfg/ui-core/hooks';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { createExtensionConfig } from '@djangocfg/ext-base';
@@ -2444,7 +2445,7 @@ var createTicketSchema = z.object({
 });
 var CreateTicketDialog = () => {
   const { uiState, createTicket, closeCreateDialog } = useSupportLayoutContext();
-  const { toast } = useToast();
+  const { toast } = useToast$1();
   const [isSubmitting, setIsSubmitting] = React7.useState(false);
   const form = useForm({
     resolver: zodResolver(createTicketSchema),
@@ -2617,7 +2618,7 @@ var SupportLayout = () => {
 // package.json
 var package_default = {
   name: "@djangocfg/ext-support",
-  version: "1.0.8",
+  version: "1.0.9",
   description: "Support ticket system extension for DjangoCFG",
   keywords: [
     "django",
@@ -2679,7 +2680,6 @@ var package_default = {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
     "@djangocfg/ui-core": "workspace:*",
-    "@djangocfg/ui-nextjs": "workspace:*",
     consola: "^3.4.2",
     "lucide-react": "^0.545.0",
     moment: "^2.30.1",
@@ -2693,6 +2693,7 @@ var package_default = {
   devDependencies: {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
+    "@djangocfg/ui-core": "workspace:*",
     "@djangocfg/typescript-config": "workspace:*",
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",

package/dist/index.cjs

@@ -6,13 +6,14 @@ var zod = require('zod');
 var api = require('@djangocfg/ext-base/api');
 var lucideReact = require('lucide-react');
 var React7 = require('react');
-var uiNextjs = require('@djangocfg/ui-nextjs');
+var uiCore = require('@djangocfg/ui-core');
 var useSWR = require('swr');
 var jsxRuntime = require('react/jsx-runtime');
 var moment2 = require('moment');
 var lib = require('@djangocfg/ui-core/lib');
 var auth = require('@djangocfg/api/auth');
 var useSWRInfinite = require('swr/infinite');
+var hooks = require('@djangocfg/ui-core/hooks');
 var reactHookForm = require('react-hook-form');
 var zod$1 = require('@hookform/resolvers/zod');
 var extBase = require('@djangocfg/ext-base');
@@ -1816,7 +1817,7 @@ var formatRelativeTime = (date) => {
 };
 var TicketCard = ({ ticket, isSelected, onClick }) => {
   return /* @__PURE__ */ jsxRuntime.jsx(
-    uiNextjs.Card,
+    uiCore.Card,
     {
       className: lib.cn(
         "cursor-pointer transition-all duration-200 ease-out",
@@ -1825,11 +1826,11 @@ var TicketCard = ({ ticket, isSelected, onClick }) => {
         isSelected && "bg-accent border-primary shadow-sm"
       ),
       onClick,
-      children: /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.CardContent, { className: "p-4", children: [
+      children: /* @__PURE__ */ jsxRuntime.jsxs(uiCore.CardContent, { className: "p-4", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-start justify-between mb-2", children: [
           /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "font-semibold text-sm line-clamp-2 flex-1", children: ticket.subject }),
           (ticket.unanswered_messages_count || 0) > 0 && /* @__PURE__ */ jsxRuntime.jsx(
-            uiNextjs.Badge,
+            uiCore.Badge,
             {
               variant: "destructive",
               className: "ml-2 shrink-0 animate-pulse",
@@ -1838,7 +1839,7 @@ var TicketCard = ({ ticket, isSelected, onClick }) => {
           )
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between text-xs text-muted-foreground", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Badge, { variant: getStatusBadgeVariant(ticket.status || "open"), className: "text-xs", children: ticket.status || "open" }),
+          /* @__PURE__ */ jsxRuntime.jsx(uiCore.Badge, { variant: getStatusBadgeVariant(ticket.status || "open"), className: "text-xs", children: ticket.status || "open" }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1", children: [
             /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Clock, { className: "h-3 w-3" }),
             /* @__PURE__ */ jsxRuntime.jsx("span", { children: formatRelativeTime(ticket.created_at) })
@@ -2158,7 +2159,7 @@ var TicketList = () => {
   }, [hasMore, isLoadingMore, loadMore]);
   if (isLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4 space-y-2", children: [1, 2, 3, 4, 5].map((i) => /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(
-      uiNextjs.Skeleton,
+      uiCore.Skeleton,
       {
         className: "h-24 w-full animate-pulse",
         style: { animationDelay: `${i * 100}ms` }
@@ -2172,7 +2173,7 @@ var TicketList = () => {
       /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground max-w-sm", children: "Create your first support ticket to get help from our team" })
     ] });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ScrollArea, { className: "h-full", viewportRef: scrollRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-4 space-y-2", children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(uiCore.ScrollArea, { className: "h-full", viewportRef: scrollRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-4 space-y-2", children: [
     tickets.map((ticket, index) => /* @__PURE__ */ jsxRuntime.jsx(
       "div",
       {
@@ -2195,7 +2196,7 @@ var TicketList = () => {
       /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm", children: "Loading more tickets..." })
     ] }) }),
     hasMore && !isLoadingMore && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center pt-2 pb-4", children: /* @__PURE__ */ jsxRuntime.jsxs(
-      uiNextjs.Button,
+      uiCore.Button,
       {
         variant: "outline",
         size: "sm",
@@ -2233,22 +2234,22 @@ var MessageBubble = ({ message, isFromUser, currentUser }) => {
       className: `flex gap-3 ${isFromUser ? "justify-end" : "justify-start"}
                  animate-in fade-in slide-in-from-bottom-2 duration-300`,
       children: [
-        !isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Avatar, { className: "h-8 w-8 shrink-0", children: sender?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarImage, { src: sender.avatar, alt: sender.display_username || "Support" }) : /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarFallback, { className: "bg-primary text-primary-foreground", children: sender?.is_staff ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Headphones, { className: "h-4 w-4" }) : senderInitial }) }),
+        !isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiCore.Avatar, { className: "h-8 w-8 shrink-0", children: sender?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarImage, { src: sender.avatar, alt: sender.display_username || "Support" }) : /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarFallback, { className: "bg-primary text-primary-foreground", children: sender?.is_staff ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Headphones, { className: "h-4 w-4" }) : senderInitial }) }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex flex-col gap-1 flex-1 max-w-[80%] ${isFromUser ? "items-end" : "items-start"}`, children: [
           !isFromUser && sender && /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "text-xs text-muted-foreground px-1", children: [
             sender.display_username || sender.email || "Support Team",
             sender.is_staff && " (Staff)"
           ] }),
           /* @__PURE__ */ jsxRuntime.jsx(
-            uiNextjs.Card,
+            uiCore.Card,
             {
               className: `${isFromUser ? "bg-primary text-primary-foreground" : "bg-muted"} transition-all duration-200 hover:shadow-md`,
-              children: /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.CardContent, { className: "p-3", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm whitespace-pre-wrap break-words", children: message.text }) })
+              children: /* @__PURE__ */ jsxRuntime.jsx(uiCore.CardContent, { className: "p-3", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm whitespace-pre-wrap break-words", children: message.text }) })
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs text-muted-foreground px-1", children: formatTime(message.created_at) })
         ] }),
-        isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Avatar, { className: "h-8 w-8 shrink-0", children: currentUser?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarImage, { src: currentUser.avatar, alt: currentUser.display_username || currentUser.email || "You" }) : /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.AvatarFallback, { className: "bg-primary/10 text-primary font-semibold", children: userInitial || /* @__PURE__ */ jsxRuntime.jsx(lucideReact.User, { className: "h-4 w-4" }) }) })
+        isFromUser && /* @__PURE__ */ jsxRuntime.jsx(uiCore.Avatar, { className: "h-8 w-8 shrink-0", children: currentUser?.avatar ? /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarImage, { src: currentUser.avatar, alt: currentUser.display_username || currentUser.email || "You" }) : /* @__PURE__ */ jsxRuntime.jsx(uiCore.AvatarFallback, { className: "bg-primary/10 text-primary font-semibold", children: userInitial || /* @__PURE__ */ jsxRuntime.jsx(lucideReact.User, { className: "h-4 w-4" }) }) })
       ]
     }
   );
@@ -2324,8 +2325,8 @@ var MessageList = () => {
         className: "flex gap-3 animate-pulse",
         style: { animationDelay: `${i * 100}ms` },
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Skeleton, { className: "h-8 w-8 rounded-full" }),
-          /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Skeleton, { className: "h-16 flex-1 max-w-[70%]" })
+          /* @__PURE__ */ jsxRuntime.jsx(uiCore.Skeleton, { className: "h-8 w-8 rounded-full" }),
+          /* @__PURE__ */ jsxRuntime.jsx(uiCore.Skeleton, { className: "h-16 flex-1 max-w-[70%]" })
         ]
       },
       i
@@ -2338,14 +2339,14 @@ var MessageList = () => {
       /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground max-w-sm", children: "Start the conversation by sending a message below" })
     ] });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ScrollArea, { className: "h-full bg-muted/50", viewportRef: scrollAreaRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-6 space-y-4", ref: scrollRef, children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(uiCore.ScrollArea, { className: "h-full bg-muted/50", viewportRef: scrollAreaRef, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "p-6 space-y-4", ref: scrollRef, children: [
     /* @__PURE__ */ jsxRuntime.jsx("div", { ref: loadMoreRef, className: "h-2" }),
     isLoadingMore && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 text-muted-foreground", children: [
       /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "h-4 w-4 animate-spin" }),
       /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm", children: "Loading older messages..." })
     ] }) }),
     hasMore && !isLoadingMore && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center pt-2 pb-4", children: /* @__PURE__ */ jsxRuntime.jsxs(
-      uiNextjs.Button,
+      uiCore.Button,
       {
         variant: "outline",
         size: "sm",
@@ -2393,7 +2394,7 @@ var logger = consola.createConsola({
 var supportLogger = logger;
 var MessageInput = () => {
   const { selectedTicket, sendMessage } = useSupportLayoutContext();
-  const { toast } = uiNextjs.useToast();
+  const { toast } = hooks.useToast();
   const [message, setMessage] = React7.useState("");
   const [isSending, setIsSending] = React7.useState(false);
   const handleSubmit = async (e) => {
@@ -2424,7 +2425,7 @@ var MessageInput = () => {
   return /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: handleSubmit, className: "p-4 border-t bg-background/50 backdrop-blur-sm flex-shrink-0", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-2", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.Textarea,
+        uiCore.Textarea,
         {
           value: message,
           onChange: (e) => setMessage(e.target.value),
@@ -2435,7 +2436,7 @@ var MessageInput = () => {
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.Button,
+        uiCore.Button,
         {
           type: "submit",
           size: "icon",
@@ -2454,7 +2455,7 @@ var createTicketSchema = zod.z.object({
 });
 var CreateTicketDialog = () => {
   const { uiState, createTicket, closeCreateDialog } = useSupportLayoutContext();
-  const { toast } = uiNextjs.useToast();
+  const { toast } = uiCore.useToast();
   const [isSubmitting, setIsSubmitting] = React7__default.default.useState(false);
   const form = reactHookForm.useForm({
     resolver: zod$1.zodResolver(createTicketSchema),
@@ -2487,49 +2488,49 @@ var CreateTicketDialog = () => {
     form.reset();
     closeCreateDialog();
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Dialog, { open: uiState.isCreateDialogOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.DialogContent, { className: "sm:max-w-[600px] animate-in fade-in slide-in-from-bottom-4 duration-300", children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.DialogHeader, { children: [
-      /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.DialogTitle, { className: "flex items-center gap-2", children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(uiCore.Dialog, { open: uiState.isCreateDialogOpen, onOpenChange: (open) => !open && handleClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(uiCore.DialogContent, { className: "sm:max-w-[600px] animate-in fade-in slide-in-from-bottom-4 duration-300", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(uiCore.DialogHeader, { children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(uiCore.DialogTitle, { className: "flex items-center gap-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, { className: "h-5 w-5" }),
         "Create Support Ticket"
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.DialogDescription, { children: "Describe your issue and we'll help you resolve it as quickly as possible." })
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.DialogDescription, { children: "Describe your issue and we'll help you resolve it as quickly as possible." })
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Form, { ...form, children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: form.handleSubmit(onSubmit), className: "space-y-6", children: [
+    /* @__PURE__ */ jsxRuntime.jsx(uiCore.Form, { ...form, children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: form.handleSubmit(onSubmit), className: "space-y-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.FormField,
+        uiCore.FormField,
         {
           control: form.control,
           name: "subject",
-          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.FormItem, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormLabel, { children: "Subject" }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Input, { placeholder: "Brief description of your issue...", ...field }) }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormMessage, {})
+          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiCore.FormItem, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormLabel, { children: "Subject" }),
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(uiCore.Input, { placeholder: "Brief description of your issue...", ...field }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormMessage, {})
           ] })
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsx(
-        uiNextjs.FormField,
+        uiCore.FormField,
         {
           control: form.control,
           name: "message",
-          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.FormItem, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormLabel, { children: "Message" }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(
-              uiNextjs.Textarea,
+          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(uiCore.FormItem, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormLabel, { children: "Message" }),
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(
+              uiCore.Textarea,
               {
                 placeholder: "Describe your issue in detail. Include any error messages, steps to reproduce, or relevant information...",
                 className: "min-h-[120px]",
                 ...field
               }
             ) }),
-            /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.FormMessage, {})
+            /* @__PURE__ */ jsxRuntime.jsx(uiCore.FormMessage, {})
           ] })
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-3 pt-4", children: [
         /* @__PURE__ */ jsxRuntime.jsx(
-          uiNextjs.Button,
+          uiCore.Button,
           {
             type: "button",
             variant: "outline",
@@ -2538,7 +2539,7 @@ var CreateTicketDialog = () => {
             children: "Cancel"
           }
         ),
-        /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.Button, { type: "submit", disabled: isSubmitting, children: isSubmitting ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(uiCore.Button, { type: "submit", disabled: isSubmitting, children: isSubmitting ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
           /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "h-4 w-4 mr-2 animate-spin" }),
           "Creating..."
         ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -2564,7 +2565,7 @@ var SupportLayoutContent = () => {
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between p-4 border-b bg-background flex-shrink-0", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
           selectedTicket ? /* @__PURE__ */ jsxRuntime.jsx(
-            uiNextjs.Button,
+            uiCore.Button,
             {
               variant: "ghost",
               size: "sm",
@@ -2576,7 +2577,7 @@ var SupportLayoutContent = () => {
           /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-xl font-semibold", children: selectedTicket ? selectedTicket.subject : "Support" }),
           unreadCount > 0 && !selectedTicket && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-5 w-5 bg-red-500 text-white text-xs rounded-full flex items-center justify-center", children: unreadCount })
         ] }),
-        !selectedTicket && /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.Button, { onClick: openCreateDialog, size: "sm", children: [
+        !selectedTicket && /* @__PURE__ */ jsxRuntime.jsxs(uiCore.Button, { onClick: openCreateDialog, size: "sm", children: [
           /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, { className: "h-4 w-4 mr-2" }),
           "New Ticket"
         ] })
@@ -2604,15 +2605,15 @@ var SupportLayoutContent = () => {
         ] }),
         unreadCount > 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-6 w-6 bg-red-500 text-white text-sm rounded-full flex items-center justify-center", children: unreadCount })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.Button, { onClick: openCreateDialog, children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(uiCore.Button, { onClick: openCreateDialog, children: [
         /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, { className: "h-4 w-4 mr-2" }),
         "New Ticket"
       ] })
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsxs(uiNextjs.ResizablePanelGroup, { direction: "horizontal", className: "h-full", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ResizablePanel, { defaultSize: 35, minSize: 25, maxSize: 50, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full border-r overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx(TicketList, {}) }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ResizableHandle, { withHandle: true, className: "hover:bg-accent transition-colors" }),
-      /* @__PURE__ */ jsxRuntime.jsx(uiNextjs.ResizablePanel, { defaultSize: 65, minSize: 50, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "h-full flex flex-col overflow-hidden", children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsxs(uiCore.ResizablePanelGroup, { direction: "horizontal", className: "h-full", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.ResizablePanel, { defaultSize: 35, minSize: 25, maxSize: 50, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full border-r overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx(TicketList, {}) }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.ResizableHandle, { withHandle: true, className: "hover:bg-accent transition-colors" }),
+      /* @__PURE__ */ jsxRuntime.jsx(uiCore.ResizablePanel, { defaultSize: 65, minSize: 50, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "h-full flex flex-col overflow-hidden", children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1 min-h-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx(MessageList, {}) }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-shrink-0", children: /* @__PURE__ */ jsxRuntime.jsx(MessageInput, {}) })
       ] }) })
@@ -2627,7 +2628,7 @@ var SupportLayout = () => {
 // package.json
 var package_default = {
   name: "@djangocfg/ext-support",
-  version: "1.0.8",
+  version: "1.0.9",
   description: "Support ticket system extension for DjangoCFG",
   keywords: [
     "django",
@@ -2689,7 +2690,6 @@ var package_default = {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
     "@djangocfg/ui-core": "workspace:*",
-    "@djangocfg/ui-nextjs": "workspace:*",
     consola: "^3.4.2",
     "lucide-react": "^0.545.0",
     moment: "^2.30.1",
@@ -2703,6 +2703,7 @@ var package_default = {
   devDependencies: {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
+    "@djangocfg/ui-core": "workspace:*",
     "@djangocfg/typescript-config": "workspace:*",
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",

package/dist/index.js

@@ -4,13 +4,14 @@ import { z } from 'zod';
 import { createExtensionAPI } from '@djangocfg/ext-base/api';
 import { ArrowLeft, LifeBuoy, Plus, MessageSquare, Loader2, Send, Headphones, User, Clock } from 'lucide-react';
 import React7, { createContext, useState, useCallback, useEffect, useContext, useRef } from 'react';
-import { Button, ResizablePanelGroup, ResizablePanel, ResizableHandle, Skeleton, ScrollArea, useToast, Textarea, Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, Form, FormField, FormItem, FormLabel, FormControl, Input, FormMessage, Avatar, AvatarImage, AvatarFallback, Card, CardContent, Badge } from '@djangocfg/ui-nextjs';
+import { Button, ResizablePanelGroup, ResizablePanel, ResizableHandle, Skeleton, ScrollArea, Textarea, useToast as useToast$1, Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, Form, FormField, FormItem, FormLabel, FormControl, Input, FormMessage, Avatar, AvatarImage, AvatarFallback, Card, CardContent, Badge } from '@djangocfg/ui-core';
 import useSWR, { useSWRConfig } from 'swr';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import moment2 from 'moment';
 import { cn } from '@djangocfg/ui-core/lib';
 import { useAuth } from '@djangocfg/api/auth';
 import useSWRInfinite from 'swr/infinite';
+import { useToast } from '@djangocfg/ui-core/hooks';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { createExtensionConfig } from '@djangocfg/ext-base';
@@ -2444,7 +2445,7 @@ var createTicketSchema = z.object({
 });
 var CreateTicketDialog = () => {
   const { uiState, createTicket, closeCreateDialog } = useSupportLayoutContext();
-  const { toast } = useToast();
+  const { toast } = useToast$1();
   const [isSubmitting, setIsSubmitting] = React7.useState(false);
   const form = useForm({
     resolver: zodResolver(createTicketSchema),
@@ -2617,7 +2618,7 @@ var SupportLayout = () => {
 // package.json
 var package_default = {
   name: "@djangocfg/ext-support",
-  version: "1.0.8",
+  version: "1.0.9",
   description: "Support ticket system extension for DjangoCFG",
   keywords: [
     "django",
@@ -2679,7 +2680,6 @@ var package_default = {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
     "@djangocfg/ui-core": "workspace:*",
-    "@djangocfg/ui-nextjs": "workspace:*",
     consola: "^3.4.2",
     "lucide-react": "^0.545.0",
     moment: "^2.30.1",
@@ -2693,6 +2693,7 @@ var package_default = {
   devDependencies: {
     "@djangocfg/api": "workspace:*",
     "@djangocfg/ext-base": "workspace:*",
+    "@djangocfg/ui-core": "workspace:*",
     "@djangocfg/typescript-config": "workspace:*",
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/ext-support",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Support ticket system extension for DjangoCFG",
   "keywords": [
     "django",
@@ -59,10 +59,9 @@
     "check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@djangocfg/api": "^2.1.91",
+    "@djangocfg/api": "^2.1.104",
     "@djangocfg/ext-base": "^1.0.8",
-    "@djangocfg/ui-core": "^2.1.91",
-    "@djangocfg/ui-nextjs": "^2.1.91",
+    "@djangocfg/ui-core": "^2.1.104",
     "consola": "^3.4.2",
     "lucide-react": "^0.545.0",
     "moment": "^2.30.1",
@@ -74,9 +73,10 @@
     "zod": "^4.1.13"
   },
   "devDependencies": {
-    "@djangocfg/api": "^2.1.91",
+    "@djangocfg/api": "^2.1.104",
     "@djangocfg/ext-base": "^1.0.8",
-    "@djangocfg/typescript-config": "^2.1.91",
+    "@djangocfg/ui-core": "^2.1.104",
+    "@djangocfg/typescript-config": "^2.1.104",
     "@types/node": "^24.7.2",
     "@types/react": "^19.0.0",
     "consola": "^3.4.2",

package/src/layouts/SupportLayout/SupportLayout.tsx

@@ -9,7 +9,7 @@
 import { ArrowLeft, LifeBuoy, Plus } from 'lucide-react';
 import React from 'react';
 
-import { Button, ResizableHandle, ResizablePanel, ResizablePanelGroup } from '@djangocfg/ui-nextjs';
+import { Button, ResizableHandle, ResizablePanel, ResizablePanelGroup } from '@djangocfg/ui-core';
 
 import { SupportProvider } from '../../contexts/SupportContext';
 import { CreateTicketDialog, MessageInput, MessageList, TicketList } from './components';

package/src/layouts/SupportLayout/components/CreateTicketDialog.tsx

@@ -14,7 +14,7 @@ import { z } from 'zod';
 import {
     Button, Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, Form, FormControl,
     FormField, FormItem, FormLabel, FormMessage, Input, Textarea, useToast
-} from '@djangocfg/ui-nextjs';
+} from '@djangocfg/ui-core';
 import { zodResolver } from '@hookform/resolvers/zod';
 
 import { supportLogger } from '../../../utils/logger';

package/src/layouts/SupportLayout/components/MessageInput.tsx

@@ -8,7 +8,8 @@
 import { Send } from 'lucide-react';
 import React, { useState } from 'react';
 
-import { Button, Textarea, useToast } from '@djangocfg/ui-nextjs';
+import { Button, Textarea } from '@djangocfg/ui-core';
+import { useToast } from '@djangocfg/ui-core/hooks';
 
 import { supportLogger } from '../../../utils/logger';
 import { useSupportLayoutContext } from '../context';

package/src/layouts/SupportLayout/components/MessageList.tsx

@@ -12,7 +12,7 @@ import React, { useCallback, useEffect, useRef } from 'react';
 import { useAuth } from '@djangocfg/api/auth';
 import {
     Avatar, AvatarFallback, AvatarImage, Button, Card, CardContent, ScrollArea, Skeleton
-} from '@djangocfg/ui-nextjs';
+} from '@djangocfg/ui-core';
 
 import { useSupportLayoutContext } from '../context';
 import { useInfiniteMessages } from '../hooks';

package/src/layouts/SupportLayout/components/TicketCard.tsx

@@ -9,7 +9,7 @@ import { Clock, MessageSquare } from 'lucide-react';
 import moment from 'moment';
 import React from 'react';
 
-import { Badge, Card, CardContent } from '@djangocfg/ui-nextjs';
+import { Badge, Card, CardContent } from '@djangocfg/ui-core';
 import { cn } from '@djangocfg/ui-core/lib';
 
 import type { Ticket } from '../../../api/generated/ext_support/_utils/schemas';

package/src/layouts/SupportLayout/components/TicketList.tsx

@@ -8,7 +8,7 @@
 import { Loader2, MessageSquare } from 'lucide-react';
 import React, { useEffect, useRef } from 'react';
 
-import { Button, ScrollArea, Skeleton } from '@djangocfg/ui-nextjs';
+import { Button, ScrollArea, Skeleton } from '@djangocfg/ui-core';
 
 import { useSupportLayoutContext } from '../context';
 import { SUPPORT_LAYOUT_EVENTS } from '../events';