Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/pages/home/components/SearchPostList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useEffect } from "react";
import { useGetSearchPost, useSearchHistory } from "../../../lib/search";
import { CardItem } from "../../../shared/CardItem";
import type { CardItemProps } from "../../../types/post";
import useUserStore from "../../../store/useUserStore";

interface SearchPostListProps {
query: string;
Expand All @@ -10,10 +11,11 @@ interface SearchPostListProps {
export const SearchPostList = ({ query }: SearchPostListProps) => {
const { data: searchData } = useGetSearchPost(query);
const history = useSearchHistory();
const { user } = useUserStore();
const isLogin = !!user?.accessToken;

useEffect(() => {
if (!query) return;

if (!query || !isLogin) return;
history.mutate({
searchWord: query,
searchedAt: new Date().toISOString(),
Expand Down
31 changes: 21 additions & 10 deletions src/shared/SystemHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const SystemHeader = () => {

const { data } = useGetMyProfile(isLogin);
const [searchParams] = useSearchParams();
const searchQuery = searchParams.get("search") ?? "";
const [input, setInput] = useState<string>("");

const handleLogout = async () => {
try {
Expand All @@ -49,6 +49,25 @@ export const SystemHeader = () => {
}
};

useEffect(() => {
const searchQuery = searchParams.get("search") || "";
if (input !== searchQuery) {
setInput(searchQuery);
}
}, [searchParams]);

useEffect(() => {
if (input === "") {
if (searchParams.get("search")) {
navigate("/", { replace: true });
}
return;
}
if (input !== searchParams.get("search")) {
navigate(`/?search=${input}`, { replace: true });
}
}, [input, navigate]);

useEffect(() => {
const handleClick = (e: MouseEvent) => {
if (!modalRef.current?.contains(e.target as Node))
Expand All @@ -61,14 +80,6 @@ export const SystemHeader = () => {
document.removeEventListener("click", handleClick);
};
}, []);
const [input, setInput] = useState<string>("");

useEffect(() => {
if (!input) return;
if (input) {
navigate(`/?search=${input}`);
}
}, [input, navigate]);

useEffect(() => {
if (userModal) {
Expand All @@ -94,7 +105,7 @@ export const SystemHeader = () => {
type="text"
placeholder="검색어 또는 태그명 입력"
className="w-full px-3 py-2 focus:outline-none outline-none"
value={searchQuery}
value={input}
onChange={e => setInput(e.target.value)}
/>
</div>
Expand Down