Merge pull request #250 from Team-TenTen/feature/#245/style-dropdown

Dropdown, Comment 컴포넌트 UI 수정
Team-TenTen · Dec 3, 2023 · 6dc74b4 · 6dc74b4
2 parents fcd694a + 25934fa
commit 6dc74b4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/components/common/Comment/Comment.tsx b/src/components/common/Comment/Comment.tsx
@@ -112,12 +112,18 @@ const Comment = ({
             {getElapsedTime(createdAt)}
             {isRoot && (
               <>
-                {' • '}
-                <Button
-                  className="font-medium"
-                  onClick={() => replyCount > 0 && onOpen && onOpen(commentId)}>
-                  {replyCount}개의 답글
-                </Button>
+                {replyCount > 0 && (
+                  <>
+                    {' • '}
+                    <Button
+                      className="font-medium"
+                      onClick={() =>
+                        replyCount > 0 && onOpen && onOpen(commentId)
+                      }>
+                      {replyCount}개의 답글
+                    </Button>
+                  </>
+                )}
                 {' • '}
                 <Button
                   className="font-medium"

diff --git a/src/components/common/Dropdown/Dropdown.tsx b/src/components/common/Dropdown/Dropdown.tsx
@@ -57,7 +57,7 @@ const Dropdown = ({
         className={cls(
           'flex flex-col rounded-md border border-slate6 bg-bgColor p-2 shadow-lg',
           isOpen
-            ? 'absolute right-0 z-10 mt-2 min-w-max origin-top-right'
+            ? 'absolute right-0 z-10 mt-2 max-h-[40vh] min-w-max origin-top-right overflow-scroll'
             : 'hidden',
           PLACEMENTS[placement],
         )}>
@@ -66,7 +66,7 @@ const Dropdown = ({
             label={option}
             value={optionValues?.[i]}
             active={index === i}
-            danger={type === 'user_edit' && i === optionKeys.length - 1}
+            // danger={type === 'user_edit' && i === optionKeys.length - 1}
             onClick={(e) => handleClick(e, i)}
             key={option}
           />

diff --git a/src/components/common/Input/Input.tsx b/src/components/common/Input/Input.tsx
@@ -55,6 +55,7 @@ const Input = forwardRef(
             placeholder={placeholder}
             disabled={disabled}
             onChange={onChange}
+            size={15}
             {...rest}
           />
           {inputButton && (