From cea1277edb9ba10edaec9e1dea5a5263b10cf95a Mon Sep 17 00:00:00 2001 From: karimaldeen Date: Sun, 15 Sep 2024 16:28:30 +0300 Subject: [PATCH] dix text --- src/Components/DataTable/SearchField.tsx | 1 - .../ValidationField/View/TextField.tsx | 1 + .../Admin/question/Model/Field/TextField.tsx | 3 ++- .../Model/Malty/ChoiceField/TextField.tsx | 2 +- .../Model/Malty/QuestionFIeld/TextField.tsx | 2 +- src/Styles/Layout/DataTable.scss | 1 + src/api/helper/useGetQuery.ts | 8 ++++---- src/utils/shallowEqual.ts | 16 ++++++++++++++++ 8 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 src/utils/shallowEqual.ts diff --git a/src/Components/DataTable/SearchField.tsx b/src/Components/DataTable/SearchField.tsx index 280a778..fa5c5a8 100644 --- a/src/Components/DataTable/SearchField.tsx +++ b/src/Components/DataTable/SearchField.tsx @@ -18,7 +18,6 @@ const SearchField: React.FC = ({ placeholder, searchBy }) => { const handleInputChange = (value: string) => { setSearchQuery(value); }; - console.log(searchBy,"searchBy"); const handleInputChangeWithDebounce = useDebounce((value: string) => { setFilter({ diff --git a/src/Components/ValidationField/View/TextField.tsx b/src/Components/ValidationField/View/TextField.tsx index 35babba..7a96e2c 100644 --- a/src/Components/ValidationField/View/TextField.tsx +++ b/src/Components/ValidationField/View/TextField.tsx @@ -47,6 +47,7 @@ const TextField = ({ showCount maxLength={1000} autoSize={{ minRows: 4, maxRows: 10 }} + onChange={onChange || TextFilehandleChange} id={name} {...props} diff --git a/src/Pages/Admin/question/Model/Field/TextField.tsx b/src/Pages/Admin/question/Model/Field/TextField.tsx index 8dfa38e..b0c07eb 100644 --- a/src/Pages/Admin/question/Model/Field/TextField.tsx +++ b/src/Pages/Admin/question/Model/Field/TextField.tsx @@ -60,7 +60,8 @@ const TextField = ({ showCount maxLength={1000} onChange={onChange || TextFilehandleChange} - style={{ height: 120 }} + autoSize={{ minRows: 4, maxRows: 10 }} + id={id} /> diff --git a/src/Pages/Admin/question/Model/Malty/ChoiceField/TextField.tsx b/src/Pages/Admin/question/Model/Malty/ChoiceField/TextField.tsx index 792b442..65c090d 100644 --- a/src/Pages/Admin/question/Model/Malty/ChoiceField/TextField.tsx +++ b/src/Pages/Admin/question/Model/Malty/ChoiceField/TextField.tsx @@ -60,7 +60,7 @@ const TextField = ({ showCount maxLength={1000} onChange={onChange || TextFilehandleChange} - style={{ height: 120 }} + autoSize={{ minRows: 4, maxRows: 10 }} /> diff --git a/src/Pages/Admin/question/Model/Malty/QuestionFIeld/TextField.tsx b/src/Pages/Admin/question/Model/Malty/QuestionFIeld/TextField.tsx index ce95951..593a2f0 100644 --- a/src/Pages/Admin/question/Model/Malty/QuestionFIeld/TextField.tsx +++ b/src/Pages/Admin/question/Model/Malty/QuestionFIeld/TextField.tsx @@ -59,7 +59,7 @@ const TextField = ({ showCount maxLength={1000} onChange={onChange || TextFilehandleChange} - style={{ height: 120 }} + autoSize={{ minRows: 4, maxRows: 10 }} /> diff --git a/src/Styles/Layout/DataTable.scss b/src/Styles/Layout/DataTable.scss index acd9b62..1954b60 100644 --- a/src/Styles/Layout/DataTable.scss +++ b/src/Styles/Layout/DataTable.scss @@ -62,6 +62,7 @@ transition: 1s ease-in-out; animation: fadeInRight 1s ease-in-out; max-height: 90vh; + min-height: 90vh; overflow-y: scroll; @include Scrollbar; diff --git a/src/api/helper/useGetQuery.ts b/src/api/helper/useGetQuery.ts index 77fc3c0..da7bdb6 100644 --- a/src/api/helper/useGetQuery.ts +++ b/src/api/helper/useGetQuery.ts @@ -3,9 +3,6 @@ import useAxios from "./useAxios"; import { useLocation } from "react-router-dom"; import { PaginationParams } from "../utils/PaginationParams"; import { filterParams } from "../utils/filterParams"; -import useAuthState from "../../zustand/AuthState"; -import { useFilterStateState } from "../../zustand/Filter"; - function useGetQuery( KEY: string | string[], url: string, @@ -16,10 +13,13 @@ function useGetQuery( const { show, pagination, ...remainingParams } = params; const location = useLocation(); - + const { page, per_page } = PaginationParams(location); + console.log(remainingParams) const paramToSend = pagination + + ? { page: page, per_page: per_page, ...remainingParams } : { ...remainingParams }; diff --git a/src/utils/shallowEqual.ts b/src/utils/shallowEqual.ts new file mode 100644 index 0000000..22b3580 --- /dev/null +++ b/src/utils/shallowEqual.ts @@ -0,0 +1,16 @@ +export function shallowEqual(obj1: any, obj2: any): boolean { + const keys1 = Object.keys(obj1); + const keys2 = Object.keys(obj2); + + if (keys1.length !== keys2.length) { + return false; + } + + for (const key of keys1) { + if (obj1[key] !== obj2[key]) { + return false; + } + } + + return true; + } \ No newline at end of file