diff --git a/apps/cs/package.json b/apps/cs/package.json index b2b5f2355..9691a2a41 100644 --- a/apps/cs/package.json +++ b/apps/cs/package.json @@ -13,7 +13,7 @@ "@common/components": "workspace:*", "@frontend-opensource/use-react-hooks": "^1.1.4", "@hookform/resolvers": "^4.1.3", - "@minoru/react-dnd-treeview": "^3.5.0", + "@minoru/react-dnd-treeview": "3.5.1-alpha.1", "@radix-ui/react-label": "^2.1.2", "@radix-ui/react-slot": "^1.1.2", "@tanstack/react-query": "^5.67.1", diff --git a/apps/cs/src/app/providers/app-provider.tsx b/apps/cs/src/app/providers/app-provider.tsx index 6fd488b90..5973279a3 100644 --- a/apps/cs/src/app/providers/app-provider.tsx +++ b/apps/cs/src/app/providers/app-provider.tsx @@ -1,5 +1,7 @@ "use client"; +import { DndProvider } from "react-dnd"; +import { MultiBackend, getBackendOptions } from "@minoru/react-dnd-treeview"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { ConfirmProvider } from "@frontend-opensource/use-react-hooks"; import { AuthWrapper } from "@/entities/auth"; @@ -15,7 +17,11 @@ const AppProvider = ({ children }: Readonly<{ children: React.ReactNode }>) => { - {children} + + + {children} + + diff --git a/apps/cs/src/pages/file/model/table-columns.tsx b/apps/cs/src/pages/file/model/table-columns.tsx index 2606397c9..1974808f5 100644 --- a/apps/cs/src/pages/file/model/table-columns.tsx +++ b/apps/cs/src/pages/file/model/table-columns.tsx @@ -66,7 +66,6 @@ export const createColumns = ( ]; const formatFileSize = (bytes: number): string => { - console.log("bytes: ", bytes); if (bytes === 0) return "0 Bytes"; const k = 1024; diff --git a/apps/cs/src/pages/menu/ui/menu-tree.tsx b/apps/cs/src/pages/menu/ui/menu-tree.tsx index 45a4cbb37..07c15c7ae 100644 --- a/apps/cs/src/pages/menu/ui/menu-tree.tsx +++ b/apps/cs/src/pages/menu/ui/menu-tree.tsx @@ -1,13 +1,10 @@ "use client"; import { useRef } from "react"; -import { DndProvider } from "react-dnd"; import type { UseFormReturn } from "react-hook-form"; import { useMutation, useQueryClient } from "@tanstack/react-query"; import { Tree, - MultiBackend, - getBackendOptions, type NodeModel, type TreeMethods, } from "@minoru/react-dnd-treeview"; @@ -61,66 +58,61 @@ function MenuTree({ return ( <>
- - , - { depth, isOpen, onToggle }, - ) => { - if (node.id === -1) { - return ( - - additionalNodeForm.setValue("menuKornNm", e.target.value) - } - depth={depth} - onSave={onAdditionalNodeSave} - onCancel={onAdditionalNodeCancel} - /> - ); - } + , { depth, isOpen, onToggle }) => { + if (node.id === -1) { return ( - + additionalNodeForm.setValue("menuKornNm", e.target.value) + } depth={depth} - treeMethods={treeMethods.current} - isOpen={isOpen} - isSelected={selectedMenu?.menuCd === node.id} - isAdditionalParent={isAdditionalParent(node)} - onToggle={onToggle} - onSelect={handleSelectNode(onSelectNode)} + onSave={onAdditionalNodeSave} + onCancel={onAdditionalNodeCancel} /> ); - }} - onDrop={handleDropNode(updateTreeMenu)} - classes={{ - root: "p-4", - container: "flex flex-col", - dropTarget: "!bg-[rgba(32,148,250,0.5)] rounded-sm", - placeholder: "relative", - }} - sort={false} - dropTargetOffset={5} - insertDroppableFirst={false} - canDrop={(_, { dragSource, dropTargetId }) => { - if (dragSource?.parent === dropTargetId) { - return true; - } - }} - placeholderRender={(_, { depth }) => { - return ( -
- ); - }} - /> - + } + return ( + + ); + }} + onDrop={handleDropNode(updateTreeMenu)} + classes={{ + root: "p-4", + container: "flex flex-col", + dropTarget: "!bg-[rgba(32,148,250,0.5)] rounded-sm", + placeholder: "relative", + }} + sort={false} + dropTargetOffset={5} + insertDroppableFirst={false} + canDrop={(_, { dragSource, dropTargetId }) => { + if (dragSource?.parent === dropTargetId) { + return true; + } + }} + placeholderRender={(_, { depth }) => { + return ( +
+ ); + }} + />