From 73534226e3a6dd17f89b0131b35665cc4113b8ab Mon Sep 17 00:00:00 2001 From: Kartik Sharma Date: Wed, 15 Oct 2025 14:38:17 +0530 Subject: [PATCH] Changes in Filter panel when on close --- src/pages/Directory/ContactFilterPanel.jsx | 55 ++++++++++++---------- src/pages/Directory/NoteFilterPanel.jsx | 9 +++- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/src/pages/Directory/ContactFilterPanel.jsx b/src/pages/Directory/ContactFilterPanel.jsx index ea33db42..db95414f 100644 --- a/src/pages/Directory/ContactFilterPanel.jsx +++ b/src/pages/Directory/ContactFilterPanel.jsx @@ -21,6 +21,12 @@ const ContactFilterPanel = forwardRef( useContactFilter(); const { status } = useParams(); + useEffect(() => { + return () => { + closePanel(); + }; + }, []); + const dynamicdefaultContactFilter = useMemo(() => { return { ...defaultContactFilter, @@ -37,17 +43,17 @@ const ContactFilterPanel = forwardRef( const { handleSubmit, reset, setValue, getValues } = methods; useImperativeHandle(ref, () => ({ - resetFieldValue: (name, value) => { - setTimeout(() => { - if (value !== undefined) { - setValue(name, value); - } else { - reset({ ...getValues(), [name]: defaultContactFilter[name] }); - } - }, 0); - }, - getValues, - })); + resetFieldValue: (name, value) => { + setTimeout(() => { + if (value !== undefined) { + setValue(name, value); + } else { + reset({ ...getValues(), [name]: defaultContactFilter[name] }); + } + }, 0); + }, + getValues, + })); useEffect(() => { if (data && setFilterdata) { @@ -61,13 +67,13 @@ const ContactFilterPanel = forwardRef( const onSubmit = (formData) => { onApply(formData); - closePanel(); + // closePanel(); }; const handleClose = () => { reset(defaultContactFilter); onApply(defaultContactFilter); - closePanel(); + // closePanel(); }; if (isLoading || isFetching) return ; @@ -93,19 +99,18 @@ const ContactFilterPanel = forwardRef( valueKey="id" /> -
- - -
+ + + ); diff --git a/src/pages/Directory/NoteFilterPanel.jsx b/src/pages/Directory/NoteFilterPanel.jsx index fa8e58c7..7496f2be 100644 --- a/src/pages/Directory/NoteFilterPanel.jsx +++ b/src/pages/Directory/NoteFilterPanel.jsx @@ -12,6 +12,11 @@ import SelectMultiple from "../../components/common/SelectMultiple"; const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref) => { const { data, isError, isLoading, error, isFetched, isFetching } = useNoteFilter(); + useEffect(() => { + return () => { + closePanel(); + }; + }, []); //Add this for Filter chip remover const dynamicdefaultNotesFilter = useMemo(() => { @@ -35,13 +40,13 @@ const NoteFilterPanel = forwardRef(({ onApply, clearFilter, setFilterdata }, ref const onSubmit = (formData) => { onApply(formData); - closePanel(); + // closePanel(); }; const handleClose = () => { reset(defaultNotesFilter); onApply(defaultNotesFilter); - closePanel(); + // closePanel(); }; //Add this for Filter chip remover