Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

๐Ÿ”จ refactor: ํ˜๋Ÿฌ์˜จํŽธ์ง€ ํŽ˜์ด์ง€ UI ์ˆ˜์ • #296

Merged
merged 3 commits into from
Apr 18, 2024
Merged

๐Ÿ”จ refactor: ํ˜๋Ÿฌ์˜จํŽธ์ง€ ํŽ˜์ด์ง€ UI ์ˆ˜์ • #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4457d3
โœจ feat: ์•„์ฝ”๋””์–ธ ํด๋ผ๋กœ์ด๋“œ ์ด๋ฏธ์ง€ ์• ๋‹ˆ๋ฉ”์ด์…˜ ์ ์šฉ
easyhyun00 Apr 18, 2024
2ab56c5
๐Ÿ’„ design: reception ํŽ˜์ด์ง€ ๋ฒ„ํŠผ ๊ธธ์ด ์ˆ˜์ •
easyhyun00 Apr 18, 2024
a718a83
๐Ÿ”จ refactor: ์˜์กด์„ฑ ๋ฐฐ์—ด์— watch ์ถ”๊ฐ€
easyhyun00 Apr 18, 2024
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
17 changes: 12 additions & 5 deletions src/pages/LetterReceptionPage/NormalReception/ReplyToLetter/ReceivedAccordionLetter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { motion } from 'framer-motion';
import LetterCard from '@/components/LetterCard';
import LetterAccordion from '@/components/LetterAccordion';
import useBoolean from '@/hooks/useBoolean';
import TagList from '@/components/TagList';
import LetterHeader from '@/components/LetterHeader';
import ReceptionPolaroid from '../components/ReceptionPolaroid';
import { ReceptionLetterType } from '../hooks/useLetterWithTags';
import ReceptionPolaroid from '../components/ReceptionPolaroid';

interface ReceivedAccordionLetterProps {
receptionLetter: ReceptionLetterType;
Expand All @@ -30,10 +31,16 @@ const ReceivedAccordionLetter = ({
type="send"
/>
{receptionLetter.sendImagePath !== null && isOpen === true && (
<ReceptionPolaroid
bottomPosition={1}
img={receptionLetter.sendImagePath}
/>
<motion.div
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 1, ease: 'easeOut' }}
>
<ReceptionPolaroid
bottomPosition={1}
img={receptionLetter.sendImagePath}
/>
</motion.div>
)}
</LetterCard>
);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/LetterReceptionPage/NormalReception/ReplyToLetter/ReplyButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ const style = {
navbar: css`
position: fixed;
bottom: 0;
width: 96vw;
max-width: 580px;
width: calc(100vw - 2rem);
max-width: calc(600px - 2rem);
padding-inline: 0;
`,
};
10 changes: 5 additions & 5 deletions src/pages/LetterReceptionPage/NormalReception/ReplyToLetter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useFormContext } from 'react-hook-form';
import { toast } from 'react-toastify';
import { useEffect } from 'react';
import LetterCard from '@/components/LetterCard';
import LetterTextarea from '@/components/LetterTextarea';
import LetterLengthDate from '@/components/LetterLengthDate';
import LetterHeader from '@/components/LetterHeader';
import useBoolean from '@/hooks/useBoolean';
import LetterHeader from '@/components/LetterHeader';
import LetterLengthDate from '@/components/LetterLengthDate';
import LetterTextarea from '@/components/LetterTextarea';
import LetterCard from '@/components/LetterCard';
import LetterContent from '../components/LetterContent';
import useLetterWithTags from '../hooks/useLetterWithTags';
import { ReplyInputs } from '..';
Expand Down Expand Up @@ -47,7 +47,7 @@ const ReplyToLetter = ({ letterId, onPrev }: ReplyToLetterProps) => {
hideProgressBar: true,
});
}
}, [errors]);
}, [errors, watch]);

return (
<LetterContent isBlock={true}>
Expand Down
Loading