From 05cf77b9159a88094e24e7ea2dce045c5493bbd7 Mon Sep 17 00:00:00 2001
From: AmirHossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Tue, 21 Jan 2025 16:49:11 +0330
Subject: [PATCH] change size

---
 .../fieldsType/CustomDate/MuiDatePicker.jsx   |  5 ++--
 .../filter/fieldsType/CustomSelect.jsx        | 30 +++++--------------
 .../fieldsType/CustomSelectByDependency.jsx   |  9 +++---
 .../fieldsType/CustomSelectMultiple.jsx       |  9 +++---
 .../filter/fieldsType/CustomTextField.jsx     |  4 +--
 .../fieldsType/CustomTextFieldRange.jsx       |  6 ++--
 6 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx b/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
index 0e91257..fafbb9b 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomDate/MuiDatePicker.jsx
@@ -30,6 +30,7 @@ function MuiDatePicker({ label, value, setFieldValue, name, minDate, maxDate, he
                     maxDate={maxDate ? new Date(maxDate) : null}
                     slotProps={{
                         textField: {
+                            size: 'small',
                             error: error,
                             placeholder: placeholder,
                             InputProps: {
@@ -60,9 +61,9 @@ function MuiDatePicker({ label, value, setFieldValue, name, minDate, maxDate, he
                         },
                     }}
                 />
-                <FormHelperText id="component-helper-text" sx={{ ml: 2, color: error ? "#d32f2f" : "unset" }}>
+                {/* <FormHelperText id="component-helper-text" variant="caption" sx={{ ml: 2, color: error ? "#d32f2f" : "unset", fontWeight: 'bold' }}>
                     {helperText ? helperText : ""}
-                </FormHelperText>
+                </FormHelperText> */}
             </LocalizationProvider>
         </Box>
     );
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
index 274a58b..5fefa2f 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelect.jsx
@@ -1,46 +1,32 @@
 "use client";
 
 import { FormControl, FormHelperText, InputLabel, MenuItem, OutlinedInput, Select, Typography } from "@mui/material";
-import { useEffect, useMemo } from "react";
-
-function CustomSelect({ column, dependencyFieldValue, filterParameters, defaultFilterTranslation, handleChange }) {
-    const columnSelectOption = useMemo(() => {
-        return column?.columnSelectOption?.(dependencyFieldValue) || [];
-    }, [dependencyFieldValue]);
-
-    useEffect(() => {
-        const isValidValue = columnSelectOption.some((option) => option.value === filterParameters.value);
-        if (!isValidValue) {
-            handleChange({ ...filterParameters, value: "" });
-        }
-    }, [columnSelectOption, filterParameters.value, handleChange]);
-
-    const isValidValue = columnSelectOption.some((option) => option.value === filterParameters.value);
-    const selectedValue = isValidValue ? filterParameters.value : "";
+function CustomSelect({ column, filterParameters, defaultFilterTranslation, handleChange }) {
 
     return (
-        <FormControl fullWidth sx={{ marginY: 1 }}>
+        <FormControl fullWidth sx={{ marginY: 1 }} size="small">
             <InputLabel id={`label${column.id}`}>{column.header}</InputLabel>
             <Select
                 labelId={`label${column.id}`}
                 id={column.id}
                 name={`${column.id}.value`}
-                value={selectedValue}
+                value={filterParameters.value}
                 input={<OutlinedInput label={column.header} />}
+                size="small"
                 onChange={(e) => handleChange({ ...filterParameters, value: e.target.value })}
             >
                 <MenuItem value="">{column.header}</MenuItem>
-                {columnSelectOption.map((option) => (
+                {column.columnSelectOption().map((option) => (
                     <MenuItem key={option.value} value={option.value}>
                         {option.label}
                     </MenuItem>
                 ))}
             </Select>
-            <FormHelperText>
-                <Typography variant="button" sx={{ color: "#155175" }}>
+            {/* <FormHelperText>
+                <Typography variant="caption" sx={{ color: "#155175", fontWeight: 'bold' }}>
                     نوع فیلتر: {defaultFilterTranslation}
                 </Typography>
-            </FormHelperText>
+            </FormHelperText> */}
         </FormControl>
     );
 }
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
index 5d809e3..b1ee04d 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
@@ -12,13 +12,14 @@ function CustomSelectByDependency({
     columnSelectOption,
 }) {
     return (
-        <FormControl fullWidth sx={{ marginY: 1 }}>
+        <FormControl fullWidth sx={{ marginY: 1 }} size="small">
             <InputLabel id={`label${column.id}`}>{column.header}</InputLabel>
             <Select
                 labelId={`label${column.id}`}
                 id={column.id}
                 name={`${column.id}.value`}
                 value={value}
+                size="small"
                 input={<OutlinedInput label={column.header} />}
                 onChange={(e) => handleChange({ ...filterParameters, value: e.target.value })}
             >
@@ -28,11 +29,11 @@ function CustomSelectByDependency({
                     </MenuItem>
                 ))}
             </Select>
-            <FormHelperText>
-                <Typography variant="button" sx={{ color: "#155175" }}>
+            {/* <FormHelperText>
+                <Typography variant="caption" sx={{ color: "#155175", fontWeight: 'bold' }}>
                     نوع فیلتر: {defaultFilterTranslation}
                 </Typography>
-            </FormHelperText>
+            </FormHelperText> */}
         </FormControl>
     );
 }
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx
index 22ff8aa..4d28321 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelectMultiple.jsx
@@ -21,7 +21,7 @@ function CustomSelectMultiple({ column, filterParameters, defaultFilterTranslati
     };
 
     return (
-        <FormControl fullWidth sx={{ marginY: 1 }}>
+        <FormControl fullWidth sx={{ marginY: 1 }} size="small">
             <InputLabel htmlFor="uncontrolled-native" id={`label${column.id}`}>
                 {column.header}
             </InputLabel>
@@ -30,6 +30,7 @@ function CustomSelectMultiple({ column, filterParameters, defaultFilterTranslati
                 id={column.id}
                 value={filterParameters.value}
                 multiple
+                size="small"
                 onChange={(e) => handleChange({ ...filterParameters, value: e.target.value })}
                 renderValue={(selected) => (
                     <Box sx={{ display: "flex", flexWrap: "wrap", gap: 0.5 }}>
@@ -46,11 +47,11 @@ function CustomSelectMultiple({ column, filterParameters, defaultFilterTranslati
                     </MenuItem>
                 ))}
             </Select>
-            <FormHelperText>
-                <Typography variant="button" sx={{ color: "#155175" }}>
+            {/* <FormHelperText>
+                <Typography variant="caption" sx={{ color: "#155175", fontWeight: 'bold' }}>
                     نوع فیلتر: {defaultFilterTranslation}
                 </Typography>
-            </FormHelperText>
+            </FormHelperText> */}
         </FormControl>
     );
 }
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx b/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx
index 619237a..cfaab03 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomTextField.jsx
@@ -19,12 +19,12 @@ function CustomTextField({
             onBlur={handleBlur}
             fullWidth
             helperText={
-                <Typography variant="button" sx={{ color: "#155175" }}>
+                <Typography variant="caption" sx={{ color: "#155175", fontWeight: 'bold' }}>
                     نوع فیلتر: {defaultFilterTranslation}
                 </Typography>
             }
             variant="outlined"
-            size="normal"
+            size="small"
             sx={{ marginY: 1 }}
             InputProps={{
                 endAdornment: (
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx b/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx
index 20afcbd..114744c 100644
--- a/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx
+++ b/src/core/components/DataTable/filter/fieldsType/CustomTextFieldRange.jsx
@@ -24,12 +24,12 @@ function CustomTextFieldRange({
                 fullWidth
                 error={touched?.[`${column.id}`]?.value && Boolean(errors?.[`${column.id}`]?.value)}
                 helperText={
-                    <Typography variant="button" sx={{ color: "#155175" }}>
+                    <Typography variant="caption" sx={{ color: "#155175", fontWeight: 'bold' }}>
                         نوع فیلتر: {defaultFilterTranslation}
                     </Typography>
                 }
                 variant="outlined"
-                size="normal"
+                size="small"
                 sx={{ marginY: 1, marginRight: 1 }}
             />
             <TextField
@@ -45,7 +45,7 @@ function CustomTextFieldRange({
                 value={filterParameters.value[1]}
                 fullWidth
                 variant="outlined"
-                size="normal"
+                size="small"
                 sx={{ marginY: 1 }}
                 InputProps={{
                     endAdornment: (