Merge pull request #104 from delicious-algorithme/dev

bug: �fix filtering and sorting bug
delicious-algorithme · Nov 25, 2024 · 8a11375 · 8a11375
2 parents e5ea554 + 658261e
commit 8a11375
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/src/components/common/filtering/Filtering.jsx b/src/components/common/filtering/Filtering.jsx
@@ -51,6 +51,8 @@ const Filtering = ({ category }) => {
         return isEqual(filterParams, initialParams);
     }, [filterParams, initialParams]);
 
+    //필터링 하나만 되게 하는 조건
+
     useEffect(() => {
         const isInit = isInitFilterParams();
         if (isInit) {
@@ -208,9 +210,13 @@ const Filtering = ({ category }) => {
     };
 
     const CategoryClickHandler = (categoryId) => {
-        let newSelectState = [...selectState];
-        newSelectState[categoryId] = !selectState[categoryId];
-        setSelectState(newSelectState);
+        let allSelectState = [...selectState];
+
+        setSelectState(() => {
+            allSelectState = new Array(selectState.length).fill(false);
+            allSelectState[categoryId] = true;
+            return allSelectState;
+        });
     };
 
     useEffect(() => {

diff --git a/src/components/common/store/StoreList.jsx b/src/components/common/store/StoreList.jsx
@@ -131,15 +131,27 @@ const StoreList = () => {
     };
 
     const sortReviewClickHandler = (sortBy) => {
-        setFilterParams({ ...filterParams, orderByRating: sortBy, orderByPositiveRatio: null });
-        setOrderByRating(sortBy);
-        setorderByPositiveRatio(null);
+        if (!orderByRating) {
+            setFilterParams({ ...filterParams, orderByRating: sortBy, orderByPositiveRatio: null });
+            setOrderByRating(sortBy);
+            setorderByPositiveRatio(null);
+        } else {
+            setFilterParams({ ...filterParams, orderByRating: null, orderByPositiveRatio: null });
+            setOrderByRating(null);
+            setorderByPositiveRatio(null);
+        }
     };
 
     const sortPositiveClickHandler = (sortBy) => {
-        setFilterParams({ ...filterParams, orderByRating: null, orderByPositiveRatio: sortBy });
-        setorderByPositiveRatio(sortBy);
-        setOrderByRating(null);
+        if (!orderByPositiveRatio) {
+            setFilterParams({ ...filterParams, orderByRating: null, orderByPositiveRatio: sortBy });
+            setorderByPositiveRatio(sortBy);
+            setOrderByRating(null);
+        } else {
+            setFilterParams({ ...filterParams, orderByRating: null, orderByPositiveRatio: null });
+            setorderByPositiveRatio(null);
+            setOrderByRating(null);
+        }
     };
 
     if (isLoading)