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.

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

[Feat/#51] useClickOutside 훅 구현 및 추가 #85

Merged
merged 4 commits into from
Feb 14, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const HomeNavigateConfirmModalStory = ({ isOpen, handleClose }: HomeNavigateConf
setIsShowButtonChecked((prev) => !prev);
};
return (
<Modal isOpen={isOpen}>
<Modal isOpen={isOpen} onClose={handleClose}>
<div className={styles.Modal}>
<Text variant="titleSm" color="primary" align="center" as="h2">
홈으로 가시겠어요?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const HomeNavigateConfirmModal = ({ isOpen, handleClose }: HomeNavigateConfirmMo
};

return (
<Modal isOpen={isOpen}>
<Modal isOpen={isOpen} onClose={handleClose}>
<div className={styles.Modal}>
<Text variant="titleSm" color="primary" align="center" as="h2">
홈으로 가시겠어요?
Expand Down
8 changes: 7 additions & 1 deletion src/components/SelectTag/TagSheet/TagSheet.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect } from "react";
import { useState, useEffect, useRef } from "react";

import * as Dialog from "@radix-ui/react-dialog";
import * as VisuallyHidden from "@radix-ui/react-visually-hidden";
Expand All @@ -10,6 +10,7 @@ import Icon from "@/components/ui/Icon/Icon";
import Input from "@/components/ui/Input/Input";
import Text from "@/components/ui/Text/Text";

import useOnClickOutside from "@/hooks/common/useClickOutside";
import { useFocus } from "@/hooks/common/useFocus";

interface TagSheetProps {
Expand All @@ -36,11 +37,16 @@ const TagSheet = ({ isOpen, handleClose, handleTagAdd }: TagSheetProps) => {
setNewTag(e.target.value);
};

const modalRef = useRef<HTMLDivElement>(null);

useOnClickOutside(modalRef, handleClose);

return (
<Dialog.Root open={isOpen}>
<Dialog.Portal>
<Dialog.Overlay className={styles.DialogOverlay} />
<Dialog.Content
ref={modalRef}
className={classNames(styles.BottomSheet, {
[styles.Open]: isOpen,
[styles.Closed]: !isOpen,
Expand Down
12 changes: 10 additions & 2 deletions src/components/ui/Modal/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import type { PropsWithChildren } from "react";
import { useEffect } from "react";
import { useEffect, useRef } from "react";

import classNames from "classnames";

import styles from "@/components/ui/Modal/Modal.module.scss";
import Portal from "@/components/ui/Modal/Portal";

import useClickOutside from "@/hooks/common/useClickOutside";

interface ModalProps extends PropsWithChildren {
onClose: () => void;
isOpen: boolean;
}

const Modal = ({ isOpen, children }: ModalProps) => {
const Modal = ({ isOpen, children, onClose }: ModalProps) => {
useEffect(() => {
document.body.style.overflow = "hidden";

Expand All @@ -19,6 +22,10 @@ const Modal = ({ isOpen, children }: ModalProps) => {
};
}, []);

const modalRef = useRef<HTMLDivElement>(null);

useClickOutside(modalRef, onClose);

return (
<>
{isOpen && (
Expand All @@ -30,6 +37,7 @@ const Modal = ({ isOpen, children }: ModalProps) => {
/>

<div
ref={modalRef}
className={classNames(styles.Modal, {
[styles.Open]: isOpen,
})}
Expand Down
21 changes: 21 additions & 0 deletions src/hooks/common/useClickOutside.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import type { RefObject } from "react";
import { useEffect } from "react";

export default function useOnClickOutside<T extends HTMLElement = HTMLElement>(
ref: RefObject<T>,
handler: (event: Event) => void,
) {
useEffect(() => {
const listener = (event: Event) => {
if (!ref.current || ref.current.contains(event.target as Node)) {
return;
}
handler(event);
};

document.addEventListener("click", listener, true);
return () => {
document.removeEventListener("click", listener, true);
};
}, [ref, handler]);
}
Loading