InputDatePicker, Dropdown error props 추가

thebbodek · Oct 7, 2024 · e49df4c · e49df4c
1 parent ca56f55
commit e49df4c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/src/core/components/Dropdown/DropdownBase/index.tsx b/src/core/components/Dropdown/DropdownBase/index.tsx
@@ -55,14 +55,14 @@ const DropdownBase = ({
         )}
         {trigger}
         {isVisibleContent && content}
+        {feedback ? (
+          <Typography
+            theme='body-03-regular'
+            color={feedbackColor}
+            text={feedback}
+          />
+        ) : null}
       </div>
-      {feedback ? (
-        <Typography
-          theme='body-03-regular'
-          color={feedbackColor}
-          text={feedback}
-        />
-      ) : null}
     </DropdownContext.Provider>
   );
 };

diff --git a/src/core/components/Dropdown/DropdownBase/types/index.ts b/src/core/components/Dropdown/DropdownBase/types/index.ts
@@ -44,6 +44,7 @@ export interface DropdownItemsProps extends HTMLAttributes<HTMLUListElement> {
 export interface DropdownTriggerProps
   extends Omit<HTMLAttributes<HTMLButtonElement>, 'children'> {
   onClick?: (e: MouseEvent<HTMLButtonElement>) => void;
+  error?: boolean;
   children:
     | ReactNode
     | ((

diff --git a/src/core/components/Dropdown/DropdownSelect/DropdownSelectTrigger.tsx b/src/core/components/Dropdown/DropdownSelect/DropdownSelectTrigger.tsx
@@ -8,7 +8,7 @@ import { DropdownSelectTriggerProps } from './types';
 
 const DropdownSelectTrigger = forwardRef(
   (
-    { currentValue, ...props }: DropdownSelectTriggerProps,
+    { currentValue, error, ...props }: DropdownSelectTriggerProps,
     ref: React.Ref<HTMLButtonElement>,
   ) => {
     const { className, placeholder, ...rest } = props;
@@ -18,7 +18,8 @@ const DropdownSelectTrigger = forwardRef(
       <DropdownBase.Trigger
         ref={ref}
         className={clsx(
-          'flex h-[3.75rem] w-full items-center justify-between gap-x-2 overflow-hidden rounded-xl border border-gray-03 p-3',
+          'flex h-[3.75rem] w-full items-center justify-between gap-x-2 overflow-hidden rounded-xl border p-3',
+          error ? 'border-error' : ' border-gray-03',
           className,
         )}
         {...rest}

diff --git a/src/core/components/Input/InputDatePicker/index.tsx b/src/core/components/Input/InputDatePicker/index.tsx
@@ -19,6 +19,7 @@ const InputDatePicker = ({
   isFixStartDate,
   getPeriodDates,
   externalDates,
+  error = false,
   useTab = false,
   useHoliday = false,
   disabled = false,
@@ -107,6 +108,7 @@ const InputDatePicker = ({
       onClick={handleDatePicker}
       label={label}
       required={required}
+      error={error}
       feedback={feedback}
       feedbackColor={feedbackColor}
       disabled={disabled}

diff --git a/src/core/components/Input/InputDatePicker/types/index.ts b/src/core/components/Input/InputDatePicker/types/index.ts
@@ -44,6 +44,7 @@ export interface InputDatePickerProps
     >,
     Pick<
       InputBaseProps<'input'>,
+      | 'error'
       | 'feedback'
       | 'feedbackColor'
       | 'disabled'