Skip to content

Commit cfd3db3

Browse files
authored
Merge pull request #117 from codeit-maso/feature/Yun
🐛 fix: 초기 데이터를 6개로만 고정하는 문제 수정
2 parents 0b58154 + a244004 commit cfd3db3

File tree

1 file changed

+1
-46
lines changed

1 file changed

+1
-46
lines changed

src/pages/Recipient/Recipient.jsx

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,9 @@ export default function Recipient({ showDelete }) {
1919
const [loading, setLoading] = useState(false);
2020
const [hasNextMessage, setHasNextMessage] = useState(false);
2121
const [selectedCardId, setSelectedCardId] = useState(null);
22-
const [userScrolled, setUserScrolled] = useState(false);
2322
const observerRef = useRef();
2423
const navigate = useNavigate();
2524

26-
useEffect(() => {
27-
const handleScroll = () => setUserScrolled(true);
28-
window.addEventListener('scroll', handleScroll);
29-
return () => window.removeEventListener('scroll', handleScroll);
30-
}, []);
31-
3225
useEffect(() => {
3326
const fetchRecipient = async () => {
3427
try {
@@ -44,49 +37,12 @@ export default function Recipient({ showDelete }) {
4437
fetchRecipient();
4538
}, [id]);
4639

47-
useEffect(() => {
48-
const fetchInitialMessages = async () => {
49-
setLoading(true);
50-
try {
51-
const limit = 6;
52-
const initialMessages = await getMessages(id, 0, limit);
53-
54-
setAllMessages(initialMessages.results);
55-
56-
if (showDelete) {
57-
setMessages(initialMessages.results);
58-
} else {
59-
if (initialMessages.results.length % 6 === 0) {
60-
setMessages(
61-
initialMessages.results.slice(
62-
0,
63-
initialMessages.results.length - 1,
64-
),
65-
);
66-
} else {
67-
setMessages(initialMessages.results);
68-
}
69-
}
70-
71-
if (postData) {
72-
setHasNextMessage(limit < postData.messageCount);
73-
}
74-
} catch (error) {
75-
console.error('초기 메시지 로딩 실패:', error);
76-
}
77-
setLoading(false);
78-
};
79-
80-
fetchInitialMessages();
81-
}, [id, postData]);
82-
8340
useEffect(() => {
8441
setLoading(true);
8542
const fetchMessages = async () => {
8643
try {
8744
const limit = 6;
8845
const newMessages = await getMessages(id, offset, limit);
89-
console.log('offset', offset, 'limit', limit);
9046
setAllMessages((prev) => {
9147
const combined = [...prev, ...newMessages.results];
9248

@@ -125,7 +81,6 @@ export default function Recipient({ showDelete }) {
12581

12682
useEffect(() => {
12783
const observer = new IntersectionObserver((entries) => {
128-
if (!userScrolled) return;
12984
const firstEntry = entries[0];
13085
if (firstEntry.isIntersecting && hasNextMessage && !loading) {
13186
loadMoreMessages();
@@ -135,7 +90,7 @@ export default function Recipient({ showDelete }) {
13590
return () => {
13691
if (observerRef.current) observer.unobserve(observerRef.current);
13792
};
138-
}, [userScrolled, hasNextMessage, loading, offset]);
93+
}, [hasNextMessage, loading, offset]);
13994

14095
const loadMoreMessages = () => {
14196
if (loading || !hasNextMessage) return;

0 commit comments

Comments
 (0)