From df0c14d5750a3b650c088d4dc3c73b347a64f275 Mon Sep 17 00:00:00 2001 From: rjsdn0 Date: Tue, 26 Sep 2023 22:54:05 +0900 Subject: [PATCH 1/2] fix: scroll of agneda description in agenda create --- .husky/pre-commit | 1 + client/src/components/molecules/ModalInnerTextBox.tsx | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/.husky/pre-commit b/.husky/pre-commit index 2f1ec70b..e9a388c2 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,3 +1,4 @@ +#!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" pnpm lint-staged \ No newline at end of file diff --git a/client/src/components/molecules/ModalInnerTextBox.tsx b/client/src/components/molecules/ModalInnerTextBox.tsx index 4709592d..7c6adc50 100644 --- a/client/src/components/molecules/ModalInnerTextBox.tsx +++ b/client/src/components/molecules/ModalInnerTextBox.tsx @@ -11,6 +11,8 @@ import { Clickable, TaggersBox, } from "@/components/atoms"; +import { scroll, scrollBar } from "@/styles"; +import { css } from "@emotion/react"; import "@/components/atoms/placeholder.css"; import { TrashIcon } from "@/assets"; @@ -52,6 +54,12 @@ interface SubComponents { TaggerBox: typeof TaggerBox; } +const textAreaScrollStyle = css` + ${scroll.y} + ${scrollBar} + overflow-y: scroll; +`; + export const ModalInner: React.FC & SubComponents = ({ title, count = undefined, @@ -165,6 +173,7 @@ const TextAreaInputBox: React.FC = ({ placeholder="내용을 입력하세요" value={value} onChange={onChange} + css={textAreaScrollStyle} /> ); From 985bedb4a7df8802698a760889ee3db935c833fd Mon Sep 17 00:00:00 2001 From: rjsdn0 Date: Tue, 26 Sep 2023 22:59:51 +0900 Subject: [PATCH 2/2] fix: scroll of agenda description in agenda edit --- client/src/components/molecules/ModalInnerTextBox.tsx | 2 +- client/src/components/organisms/EditAgendaModal.tsx | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/src/components/molecules/ModalInnerTextBox.tsx b/client/src/components/molecules/ModalInnerTextBox.tsx index 7c6adc50..93816f52 100644 --- a/client/src/components/molecules/ModalInnerTextBox.tsx +++ b/client/src/components/molecules/ModalInnerTextBox.tsx @@ -130,7 +130,7 @@ const WhiteTextBox: React.FC = ({ children = null }) => ( borderStyle="solid" gap={10} > - + {children} diff --git a/client/src/components/organisms/EditAgendaModal.tsx b/client/src/components/organisms/EditAgendaModal.tsx index d814d3bc..fee71709 100644 --- a/client/src/components/organisms/EditAgendaModal.tsx +++ b/client/src/components/organisms/EditAgendaModal.tsx @@ -53,7 +53,7 @@ export const EditAgendaModal: React.FC = () => { const onChangeTitle = (e: React.ChangeEvent) => { setTitle(e.target.value); }; - const onChangeContent = (e: React.ChangeEvent) => { + const onChangeContent = (e: React.ChangeEvent) => { setContent(e.target.value); }; const onChangeResolution = (e: React.ChangeEvent) => { @@ -150,7 +150,10 @@ export const EditAgendaModal: React.FC = () => { - +