@pnkx-lib/ui 1.9.292 → 1.9.294

package/es/ui/ErrorMessage.js

@@ -2,7 +2,7 @@ import { jsx } from 'react/jsx-runtime';
 import React__default from 'react';
 
 const ErrorMessage = React__default.memo(
-  ({ errorMessage, isTouched, isSubmitted }) => {
+  ({ errorMessage }) => {
     if (!errorMessage) return null;
     return /* @__PURE__ */ jsx("div", { className: "ml-2 text-red-600", children: errorMessage });
   }

package/es/ui/Sidebar.js

@@ -155,7 +155,8 @@ const Sidebar = ({ children, menu, userInfo }) => {
                 };
                 acc.push(group);
               }
-              group.options.push(renderItem(itemSub.name, itemSub.path));
+              const path = `/${itemChildren.path}/${itemSub.path}`;
+              group.options.push(renderItem(itemSub.name, path));
             }
           }
         );
@@ -258,7 +259,7 @@ const Sidebar = ({ children, menu, userInfo }) => {
             openSubCollapse && "absolute"
           ),
           children: /* @__PURE__ */ jsx("nav", { className: twMerge("flex mt-2 flex-1 flex-col px-2"), children: /* @__PURE__ */ jsx("ul", { role: "list", className: twMerge("-mx-2 space-y-1 relative"), children: newMenu.flatMap((item) => {
-            const isActiveMainMenu = activeMainMenu === item.path;
+            const isActiveMainMenu = activeMainMenu === item.code;
             const isActivePathUrl = pathUrl === item.path;
             const isActive = isActiveMainMenu || isActivePathUrl;
             return /* @__PURE__ */ jsx(
@@ -280,7 +281,7 @@ const Sidebar = ({ children, menu, userInfo }) => {
                       {
                         onClick: () => {
                           setCollapse(false);
-                          setActiveMainMenu(item.path);
+                          setActiveMainMenu(item?.code);
                           setOpenSubCollapse(true);
                         },
                         className: twMerge(
@@ -318,7 +319,7 @@ const Sidebar = ({ children, menu, userInfo }) => {
                 "flex flex-1 transition-all duration-300 flex-col"
               ),
               children: /* @__PURE__ */ jsx("ul", { role: "list", className: twMerge("cursor-pointer ml-[10px]"), children: newMenu?.map((sub) => {
-                const isActiveMainMenu = activeMainMenu === sub.path;
+                const isActiveMainMenu = activeMainMenu === sub.code;
                 if (!isActiveMainMenu) return null;
                 return /* @__PURE__ */ jsxs("div", { children: [
                   /* @__PURE__ */ jsx(
@@ -383,7 +384,7 @@ const Sidebar = ({ children, menu, userInfo }) => {
                       ) })
                     ] }, itemSubMenu.path);
                   }) })
-                ] }, sub.path);
+                ] }, sub?.code);
               }) })
             }
           )

package/es/ui/index.js

@@ -5392,6 +5392,7 @@ const Table = ({
   const status = filters?.status;
   //! State
   const [openSetting, setOpenStting] = useState(false);
+  const tableContainerRef = useRef(null);
   const rowSelection = {
     selectedRowKeys: rowsSelected,
     onChange: onSelect,
@@ -5425,7 +5426,7 @@ const Table = ({
         return "default";
     }
   };
-  const handleTableChange = (pagination, filters2, sorter) => {
+  const handleTableChange = (_pagination, _filters, sorter) => {
     if (sorter && onSort) {
       onSort(sorter);
     }
@@ -5458,6 +5459,18 @@ const Table = ({
     minHeight: 200
     // chiều cao tối thiểu
   });
+  useEffect(() => {
+    const scrollToTop = () => {
+      if (tableContainerRef.current) {
+        const tableBody = tableContainerRef.current.querySelector(".ant-table-body");
+        if (tableBody) {
+          tableBody.scrollTop = 0;
+        }
+      }
+    };
+    const timeoutId = setTimeout(scrollToTop, 0);
+    return () => clearTimeout(timeoutId);
+  }, [filters.page]);
   const tableContent = /* @__PURE__ */ jsxs(
     "div",
     {
@@ -5482,6 +5495,7 @@ const Table = ({
         /* @__PURE__ */ jsxs(
           "div",
           {
+            ref: tableContainerRef,
             id: "table_content",
             className: "bg-[#FFFFFF] p-2 rounded-bl-lg rounded-br-lg",
             children: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pnkx-lib/ui",
   "private": false,
-  "version": "1.9.292",
+  "version": "1.9.294",
   "type": "module",
   "main": "./es/index.js",
   "module": "./es/index.js",

package/types/components/fields/Textarea.d.ts

@@ -1,4 +1,3 @@
-import { default as React } from 'react';
 import { ControllerRenderProps, UseFormStateReturn } from 'react-hook-form';
 import { TextAreaProps as TextAreaPropsAntd } from 'antd/es/input';
 export interface TextAreaProps extends TextAreaPropsAntd {
@@ -9,4 +8,4 @@ export interface TextAreaProps extends TextAreaPropsAntd {
     afterOnChange?: (value: string) => void;
     required?: boolean;
 }
-export declare const Textarea: React.ForwardRefExoticComponent<TextAreaProps & React.RefAttributes<HTMLTextAreaElement>>;
+export declare const Textarea: import('react').ForwardRefExoticComponent<TextAreaProps & import('react').RefAttributes<HTMLTextAreaElement>>;

package/types/components/ui/ErrorMessage.d.ts

@@ -4,4 +4,4 @@ export interface ErrorMessageProps {
     isTouched?: boolean;
     isSubmitted?: boolean;
 }
-export declare const ErrorMessage: React.MemoExoticComponent<({ errorMessage, isTouched, isSubmitted }: ErrorMessageProps) => import("react/jsx-runtime").JSX.Element | null>;
+export declare const ErrorMessage: React.MemoExoticComponent<({ errorMessage }: ErrorMessageProps) => import("react/jsx-runtime").JSX.Element | null>;

package/types/components/ui/Sidebar.d.ts

@@ -5,6 +5,7 @@ export type MenuType = {
     isShow?: boolean;
     isPrivateRoute?: boolean;
     icon?: ReactNode;
+    code?: string;
     isShowLabel?: boolean;
     component?: React.LazyExoticComponent<React.MemoExoticComponent<any>> | React.ExoticComponent<any> | ReactNode | React.FC;
     componentProps?: Record<string, any>;