Merge pull request #229 from dnd-side-project/fix-228

[# 228] 식물 물주기, 비료주기 추가 바텀 시트 오류 수정
dnd-side-project · Sep 23, 2024 · 62ee7b3 · 62ee7b3
2 parents 404fa16 + d65d09e
commit 62ee7b3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/src/components/LoadingSpinner.tsx b/src/components/LoadingSpinner.tsx
@@ -9,7 +9,7 @@ const LoadingSpinner = ({ transparent }: LoadingSpinnerProps) => {
   return (
     <Screen
       className={cn(
-        'flex fixed top-0 right-0 z-50 w-screen overflow-hidden items-center justify-center h-screen p-0',
+        'flex fixed top-0 right-0 z-50 w-screen overflow-hidden items-center justify-center h-screen p-0 max-w-none',
         transparent ? 'bg-black bg-opacity-25' : 'bg-white',
       )}
     >

diff --git a/src/components/addPlant/NotificationToggle.tsx b/src/components/addPlant/NotificationToggle.tsx
@@ -93,7 +93,7 @@ const NotificationToggle = ({
           <CTAButton
             onClick={() => {
               onSelect?.(selected);
-              onClose();
+              setIsOpen(false);
             }}
             text={'선택하기'}
             className={'bg-BloomingGreen500 text-white'}

diff --git a/src/components/addPlant/NotificationToggleList.tsx b/src/components/addPlant/NotificationToggleList.tsx
@@ -53,6 +53,9 @@ const NotificationToggleList = ({
   };
 
   const handleBottomSheetClose = (type: 'water' | 'fertilizer') => {
+    console.log('type', type);
+    console.log('water', water.period);
+    console.log('fertilizer', fertilizer.period);
     switch (type) {
       case 'water':
         if (!water.period) {

diff --git a/src/components/addPlant/PlantTypeTextField.tsx b/src/components/addPlant/PlantTypeTextField.tsx
@@ -22,6 +22,7 @@ const PlantTypeTextField = () => {
         icon={<IconSearchMono />}
         value={plantType ?? ''}
         onMouseDown={onMouseDown}
+        readOnly={true}
       />
       {open && (
         <div className={'w-screen h-screen fixed top-0 left-0 bg-white z-50'}>

diff --git a/src/components/common/CenterBottomSheet/index.tsx b/src/components/common/CenterBottomSheet/index.tsx
@@ -1,6 +1,12 @@
 import { ReactNode } from 'react';
 import { cn } from '@/utils.ts';
-import { Dialog, DialogContent, DialogDescription, DialogFooter } from '@/components/ui/dialog.tsx';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogTitle,
+} from '@/components/ui/dialog.tsx';
 
 interface CenterBottomSheetProps {
   title: string | ReactNode;
@@ -27,7 +33,7 @@ const CenterBottomSheet = ({
         <div className="flex justify-center my-2.5">
           <div className="w-12 h-1 bg-Gray100 rounded-full" />
         </div>
-        <header
+        <DialogTitle
           className={cn(
             'text-start px-2.5 text-Gray800 whitespace-pre-wrap',
             headerAsLabel
@@ -36,7 +42,7 @@ const CenterBottomSheet = ({
           )}
         >
           {title}
-        </header>
+        </DialogTitle>
         <DialogDescription>{content}</DialogDescription>
         <DialogFooter
           className={cn(