Merge branch 'iipbs/common/main' into iipbs/sn/ii

packages/common/business_components/src/ui/select/index-2.tsx

@@ -1,45 +0,0 @@
-/**
- * @remarks
- * 이 버전은 SearchModal에서 사용하기 위해 `SelectContent`의 z-index를 `z-[101]`로 수정하였습니다.
- */
-import { Label } from "@common/components";
-import React from "react";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./lib/selectBox";
-
-/** 차트 기본 스타일 */
-interface SelectBox1 {
-  text:string,
-  val:string|number
-}
-
-const SelectBox2 = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement> & {
-    label:string, 
-    selectClass:string|undefined, 
-    className:string, 
-    selectArray:SelectBox1[], 
-    onSelectValue:(val:string|number)=>void,
-    value?: string|number
-  }
->(({ label, className, selectClass, selectArray, onSelectValue, value }, ref)=>{
-  const placeHolder = selectArray?.[0]?.text ?? "";
-
-  return (
-    <div className={className+" flex items-center flex-nowrap"} ref={ref}>
-      {label && <Label className="inline-block w-auto whitespace-nowrap text-xl text-gray-600 mr-2">{label}</Label>}
-      <Select onValueChange={onSelectValue} value={value !== undefined ? String(value) : undefined}>
-        <SelectTrigger className={selectClass?selectClass:"flex-1 p-2 border rounded"}>
-          <SelectValue placeholder={placeHolder} />
-        </SelectTrigger>
-        <SelectContent className="z-[101]">
-          {selectArray.map((selectArray) => (
-            <SelectItem key={selectArray.val} value={String(selectArray.val)}>{selectArray.text}</SelectItem>
-          ))}
-        </SelectContent>
-      </Select>
-    </div>
-  )  
-})
-
-export { SelectBox2 };

packages/common/business_components/src/ui/select/index.tsx

@@ -27,6 +27,7 @@ const SelectBox = React.forwardRef<
     onSelectValue: (val: string | number) => void;
     value?: string | number;
     readOnly?: boolean; // readOnly 속성 추가
+    selectContentClass?: string;
   }
 >(
   (
@@ -38,6 +39,7 @@ const SelectBox = React.forwardRef<
       onSelectValue,
       value,
       readOnly = false,
+      selectContentClass,
     },
     ref,
   ) => {
@@ -87,7 +89,7 @@ const SelectBox = React.forwardRef<
           >
             <SelectValue placeholder={placeHolder} />
           </SelectTrigger>
-          <SelectContent>
+          <SelectContent className={selectContentClass}>
             {visibleItems.map((selectArray) => (
               <SelectItem key={selectArray.val} value={String(selectArray.val)}>
                 {selectArray.text}