trithuc-mvc-react 3.1.2 → 3.1.3

package/components/DataManagement/EditorForm.jsx

@@ -1,5 +1,5 @@
 import { Box, useMediaQuery, useTheme } from "@mui/material";
-import Grid from "@mui/material/Unstable_Grid2";
+import { Grid } from "@mui/material";
 import PropTypes from "prop-types";
 import { FormProvider, useForm } from "react-hook-form";
 
@@ -185,7 +185,7 @@ function EditorForm({ fields, submitRef }) {
               ...rest
             }) => {
               return (
-                <Grid item md={size?.md} xs={size?.xs} sm={size?.sm} key={field}>
+                <Grid md={size?.md} xs={size?.xs} sm={size?.sm} key={field}>
                   <FormField
                     type={type}
                     label={label}

package/components/DataManagement/FilterGod.jsx

@@ -1,5 +1,5 @@
 import { Accordion, AccordionSummary, Box, IconButton, Slider, Typography } from "@mui/material";
-import Grid from "@mui/material/Unstable_Grid2";
+import { Grid } from "@mui/material";
 import { useFormContext } from "react-hook-form";
 import { FilterElement } from "./FilterElement";
 import { useDataTable } from "./hooks";
@@ -36,16 +36,22 @@ export const FilterGod = ({ tableName, filters, elementSize = "small", setPage =
         <AccordionSummary
           sx={{
             minHeight: 40,
+            "&.Mui-expanded": {
+              minHeight: 40
+            },
             "& .MuiAccordionSummary-content": {
-              my: 1
+              my: 0.5
             }
           }}
-          expandIcon={<ExpandMoreIcon />}
+          expandIcon={<ExpandMoreIcon sx={{ fontSize: "0.95rem", minHeight: "40px" }} />}
           aria-controls="panel1a-content"
           id="panel1a-header"
         >
-          <Typography variant="h6">Tìm kiếm</Typography>
+          <Typography variant="h6" sx={{ fontSize: "0.75rem" }}>
+            Tìm kiếm
+          </Typography>
         </AccordionSummary>
+
         <AccordionDetails>
           <Grid container spacing={1}>
             {filters.map(({ field, size, ...rest }) => {
@@ -147,20 +153,16 @@ export const FilterGod = ({ tableName, filters, elementSize = "small", setPage =
                 );
 
                 return (
-                  <Grid container key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
-                    <Grid item xs={6}>
-                      {renderDatePicker(field[0], label1, field[1], "max")}
-                    </Grid>
-                    <Grid item xs={6}>
-                      {renderDatePicker(field[1], label2, field[0], "min")}
-                    </Grid>
+                  <Grid container key={field.toString()} size={{ ...size }}>
+                    <Grid size={{ xs: 12, md: 6 }}>{renderDatePicker(field[0], label1, field[1], "max")}</Grid>
+                    <Grid size={{ xs: 12, md: 6 }}>{renderDatePicker(field[1], label2, field[0], "min")}</Grid>
                   </Grid>
                 );
               }
 
               if (rest.type === "slider-range") {
                 return (
-                  <Grid key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                  <Grid key={field.toString()} size={{ ...size }}>
                     <Slider
                       onChange={(e, value) => {
                         setDataSearch({
@@ -181,7 +183,7 @@ export const FilterGod = ({ tableName, filters, elementSize = "small", setPage =
                 );
               }
               return (
-                <Grid key={field.toString()} md={size?.md} xs={size?.xs} sm={size?.sm}>
+                <Grid key={field.toString()} size={{ ...size }}>
                   <FilterElement name={field.toString()} {...rest} setPage={setPage} />
                 </Grid>
               );

package/components/DataManagement/upload/RhfUploadAvatar.jsx

@@ -2,7 +2,7 @@ import { useCallback } from "react";
 import { uploadFile } from "@/apis/index";
 import { URL_APPLICATION } from "@/constants";
 import UploadAvatar from "./UploadAvatar";
-import { FormHelperText, Typography } from "@mui/material/index";
+import { FormHelperText, Typography } from "@mui/material";
 import bytesToSize from "@/utils/bytesToSize";
 import { Controller, useFormContext } from "react-hook-form";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -13,40 +13,40 @@
   },
   "description": "",
   "dependencies": {
-    "@emotion/react": "^11.13.5",
-    "@emotion/styled": "^11.13.5",
-    "@hookform/resolvers": "^3.9.1",
-    "@iconify/react": "^5.0.2",
-    "axios": "^1.7.7",
-    "date-fns": "^3.6.0",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.0",
+    "@hookform/resolvers": "^5.0.1",
+    "@iconify/react": "^5.2.1",
+    "axios": "^1.8.4",
+    "date-fns": "^4.1.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "prop-types": "^15.8.1",
-    "yup": "^1.4.0"
+    "yup": "^1.6.1"
   },
   "devDependencies": {
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "eslint": "^9.15.0",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.0.0",
-    "eslint-plugin-react-refresh": "^0.4.14",
+    "@types/react": "^19.1.2",
+    "@types/react-dom": "^19.1.2",
+    "eslint": "^9.24.0",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-refresh": "^0.4.19",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
   "peerDependencies": {
-    "@mui/lab": "^5.0.0-alpha.142",
-    "@mui/material": "^5.15.12",
-    "@mui/system": "^5.15.12",
-    "@mui/icons-material": "^5.15.12",
-    "@mui/x-tree-view": "^7.22.1",
-    "@mui/x-date-pickers": "^6.19.6",
-    "material-ui-confirm": "^3.0.16",
+    "@mui/lab": "^7.0.0-beta.11",
+    "@mui/material": "^7.0.2",
+    "@mui/system": "^7.0.2",
+    "@mui/icons-material": "^7.0.2",
+    "@mui/x-tree-view": "^7.28.1",
+    "@mui/x-date-pickers": "^7.28.3",
+    "material-ui-confirm": "^4.0.0",
     "react": ">=16",
     "react-dom": ">=16",
-    "react-hook-form": "^7.53.2",
+    "react-hook-form": "^7.55.0",
     "react-query": "^3.39.3",
-    "react-toastify": "^11.0.2",
+    "react-toastify": "^11.0.5",
     "dayjs": "^1.11.13"
   }
 }