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
45 changes: 31 additions & 14 deletions app/(my)/my-study-review/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import Image from 'next/image';
import { useState } from 'react';
import { useEffect, useRef, useState } from 'react';
import KeywordReview from '@/entities/user/ui/keyword-review';
import MoreKeywordReviewModal from '@/entities/user/ui/more-keyword-review-modal';
import { MyReviewItem } from '@/features/study/api/types';
Expand All @@ -11,6 +11,7 @@ import {
useUserPositiveKeywordsQuery,
} from '@/features/study/model/use-review-query';
import { formatKoreaRelativeTime } from '@/shared/lib/time';
import UserAvatar from '@/shared/ui/avatar';

export default function MyStudyReview() {
const { data: positiveKeywordsData } = useUserPositiveKeywordsQuery({
Expand Down Expand Up @@ -172,16 +173,27 @@ function MoreNegativeKeywordsModal() {

function Review({ data }: { data: MyReviewItem }) {
const [expanded, setExpanded] = useState(false);
const [showButton, setShowButton] = useState(false);
const contentRef = useRef<HTMLParagraphElement>(null);

useEffect(() => {
if (contentRef.current) {
const lineHeight = parseInt(
window.getComputedStyle(contentRef.current).lineHeight,
10,
);
const maxHeight = lineHeight * 3; // 3줄 기준
setShowButton(contentRef.current.scrollHeight > maxHeight);
}
}, [data.content]);

return (
<li className="border-b-border-subtle flex flex-col gap-150 border-b py-250">
<div className="flex items-center gap-150">
<Image
src={data.writer.profileImageUrl || '/profile-default.svg'}
width={32}
height={32}
<UserAvatar
size={32}
image={data.writer.profileImageUrl}
alt={`${data.writer.memberName} 프로필 이미지`}
className="rounded-full"
/>

<div>
Expand All @@ -197,18 +209,23 @@ function Review({ data }: { data: MyReviewItem }) {

<div>
<p
className={`text-text-default font-designer-15r ${expanded ? 'line-clamp-none' : 'line-clamp-3'}`}
ref={contentRef}
className={`text-text-default font-designer-15r ${
expanded ? 'line-clamp-none' : 'line-clamp-3'
}`}
>
{data.content}
</p>
<button
className="font-designer-14r text-text-subtlest cursor-pointer"
onClick={() => setExpanded(!expanded)}
>
{expanded ? '접기' : '더보기'}
</button>
</div>

{showButton && (
<button
className="font-designer-14r text-text-subtlest cursor-pointer"
onClick={() => setExpanded(!expanded)}
>
{expanded ? '접기' : '더보기'}
</button>
)}
</div>
<div>
<div className="text-text-subtle">
<span className="font-designer-14b mr-100">스터디 기간</span>
Expand Down
2 changes: 1 addition & 1 deletion src/features/study/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export interface AddStudyReviewRequest {
targetMemberId: number;
satisfactionId: 10 | 20 | 30;
keywordIds: number[];
content: string;
content?: string;
}

interface Keyword {
Expand Down
23 changes: 12 additions & 11 deletions src/features/study/ui/study-review-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,19 @@ function StudyReviewForm({ onClose }: { onClose: () => void }) {
if (!data) return null;

const handleSubmit = () => {
if (
form.keywordIds.length === 0 ||
form.satisfactionId === null ||
form.content === ''
)
return;

addStudyReview(form, {
onSuccess: () => {
onClose();
if (form.keywordIds.length === 0 || form.satisfactionId === null) return;

addStudyReview(
{
...form,
content: form.content || undefined,
},
{
onSuccess: () => {
onClose();
},
},
});
);
};

return (
Expand Down