[Fix]intimacy filter 수정 시 generate 불가 상태 해결

HiK-Hi-Korea · Dec 5, 2023 · 69b8b5e · 69b8b5e
1 parent 7898beb
commit 69b8b5e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/src/screens/Translation.tsx b/src/screens/Translation.tsx
@@ -28,7 +28,6 @@ import FilterBtn, {personFilterType} from '../utils/FilterBtn';
 import IntimacyBtn from '../utils/IntimacyBtn';
 import {OnlineFilter, StoreFilter, UnivFilter} from '../assets/filterValues';
 import {useFocusEffect} from '@react-navigation/native';
-import App from '../../App';
 
 // var Sound = require('react-native-sound');
 // Sound.setCategory('Playback');
@@ -50,16 +49,6 @@ export default function Translation({navigation: {navigate}}) {
   const intimacyAtomVal = useRecoilValue(IntimacyFilterAtom);
   const userIdAtomVal = useRecoilValue(UserIdAtom);
 
-  // React.useEffect(() => {
-  //   if (location === 'university') {
-  //     setItems(UnivFilter);
-  //   } else if (location === 'store') {
-  //     setItems(StoreFilter);
-  //   } else {
-  //     setItems(OnlineFilter);
-  //   }
-  // }, []);
-
   useFocusEffect(
     React.useCallback(() => {
       if (location === 'university') {
@@ -84,13 +73,14 @@ export default function Translation({navigation: {navigate}}) {
     }, [selectedFilter]),
   );
 
-  useFocusEffect(
-    React.useCallback(() => {
-      if (pressed) {
-        setPressed(false);
-      }
-    }, [filterChanged]),
-  );
+  // useFocusEffect(
+  //   React.useCallback(() => {
+  //     console.log('if filter changed? text changed? filter useEffect');
+  //     if (pressed) {
+  //       setPressed(false);
+  //     }
+  //   }, [filterChanged, text]),
+  // );
 
   React.useEffect(() => {
     if (pressed) {
@@ -248,7 +238,10 @@ export default function Translation({navigation: {navigate}}) {
             <Text style={styles.contourStyle}>Intimacy</Text>
           </FilterContour>
           <FilterWrapper>
-            <IntimacyBtn setFilterChanged={setFilterChanged} />
+            <IntimacyBtn
+              setPressed={setPressed}
+              setFilterChanged={setFilterChanged}
+            />
           </FilterWrapper>
           <InputBoxWrapper>
             <InputBox>

diff --git a/src/utils/IntimacyBtn.tsx b/src/utils/IntimacyBtn.tsx
@@ -15,6 +15,7 @@ export type intimacyFilterType = {
 };
 
 export default function IntimacyBtn(props: {
+  setPressed: React.Dispatch<React.SetStateAction<boolean>>;
   setFilterChanged?: React.Dispatch<React.SetStateAction<boolean>>;
 }) {
   const [filters, setFilters] = React.useState([
@@ -35,10 +36,13 @@ export default function IntimacyBtn(props: {
 
   useFocusEffect(
     React.useCallback(() => {
+      console.log('내부 intimacy filter useEffect');
       setIntimacyFilter(selected.label);
       if (props.setFilterChanged) {
-        props.setFilterChanged(true);
+        console.log('get filter changed');
+        props.setFilterChanged(() => true);
       }
+      props.setPressed(false);
     }, [selected]),
   );