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
56 changes: 25 additions & 31 deletions src/shared/components/Modal/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useEffect } from "react";
import React from "react";
import { createPortal } from "react-dom";

import { useModal } from "@/shared/components/Modal/useModal";
import { useInitialStyle } from "@/shared/hooks";
import { useOnMountAnimation } from "@/shared/hooks/useOnMountAnimation";
import { cn } from "@/shared/lib";

export interface ModalProps {
Expand Down Expand Up @@ -33,18 +33,18 @@ const Wrapper = ({ children }: { children?: React.ReactNode }) => {
const Overlay = () => {
const { closeModal } = useModal();

const { ref } = useInitialStyle<HTMLDivElement>({
opacity: "0",
transition: "all 200ms ease-in-out",
const { ref } = useOnMountAnimation<HTMLDivElement>({
initialStyles: {
opacity: "0",
},
animationStyles: {
opacity: "1",
},
duration: 200,
delay: 0,
timingFunction: "ease-in-out",
});

useEffect(() => {
const element = ref.current;
if (!element) return;

element.style.opacity = "1";
}, [ref]);

return (
<div
ref={ref}
Expand All @@ -55,27 +55,21 @@ const Overlay = () => {
};

const Container = ({ children }: { children?: React.ReactNode }) => {
const { isOpen } = useModal();

const { ref } = useInitialStyle<HTMLDivElement>({
opacity: "0",
transform: "scale(0.7)",
});

const { closeModal } = useModal();

useEffect(() => {
const element = ref.current;
if (!element) return;

if (isOpen) {
element.style.opacity = "1";
element.style.transform = "scale(1)";
} else {
element.style.opacity = "0";
element.style.transform = "scale(0.7)";
}
}, [isOpen, ref]);
const { ref } = useOnMountAnimation<HTMLDivElement>({
initialStyles: {
opacity: "0",
transform: "scale(0.7)",
},
animationStyles: {
opacity: "1",
transform: "scale(1)",
},
duration: 200,
delay: 0,
timingFunction: "ease-in-out",
});

return (
<div
Expand Down
52 changes: 52 additions & 0 deletions src/shared/hooks/useOnMountAnimation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { useCallback, useEffect, useLayoutEffect, useRef } from "react";

export interface UseOnMountAnimationOption {
initialStyles: React.CSSProperties;
animationStyles: React.CSSProperties;

duration: number;
delay: number;
timingFunction: string;
}

export const useOnMountAnimation = <Element extends HTMLElement = HTMLDivElement>({
initialStyles,
animationStyles,

duration = 200,
delay = 0,
timingFunction = "ease-in-out",
}: UseOnMountAnimationOption) => {
const ref = useRef<Element>(null);
const requestAnimationFrameRef = useRef<ReturnType<typeof requestAnimationFrame>>();

const animation = useCallback(() => {
const element = ref.current;
if (!element) throw new Error("[useOnMountAnimation] element 가 존재하지 않습니다.");

element.style.transition = `all ${duration}ms ${timingFunction} ${delay}ms`;
for (const [key, value] of Object.entries(animationStyles)) {
element.style.setProperty(key, value);
}
}, [animationStyles, delay, duration, timingFunction]);

useLayoutEffect(() => {
const element = ref.current;
if (!element) return;

for (const [key, value] of Object.entries(initialStyles)) {
element.style.setProperty(key, value);
}
}, [initialStyles]);

useEffect(() => {
requestAnimationFrameRef.current = requestAnimationFrame(animation);

return () => {
if (requestAnimationFrameRef.current)
cancelAnimationFrame(requestAnimationFrameRef.current);
};
}, [animation]);

return { ref };
};