forstok-ui-lib 5.1.13 → 5.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forstok-ui-lib",
-  "version": "5.1.13",
+  "version": "5.1.15",
   "description": "Forstok UI Components Library",
   "path": "dist",
   "main": "dist/index.js",
@@ -9,8 +9,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "rollup -c --bundleConfigAsCjs",
-    "patch": "npm run build && npm version patch && npm publish",
-    "master": "git add . && git commit -m 'patch' && git push origin master"
+    "publish": "git add . && git commit -m 'patch' && git push origin master && npm run build && npm version patch && npm publish"
   },
   "repository": {
     "type": "git",

package/src/components/select/index.tsx

@@ -38,9 +38,10 @@ type TSelect = {
   'data-qa-id'?: string
   removeMessage?: TObject
   evCreateMessageQuestion?: TMessageQuestionFunction
+  isLoading?: boolean
 }
 
-const SelectComponent = ({ type, isError=false, mode, customOption, customLabel, MenuList, isCreateable=false, isClearable=false, selectKey, disabled, defaultValue, width, reset, setReset, isForceUpdate, setForceUpdate, isCheckAutoCopy, evChangeCustom, isField, evCreate, evChange, isMinOption, isMulti=false, options, name, placeholder, removeMessage, evCreateMessageQuestion, ...props }: TSelect) => {
+const SelectComponent = ({ type, isError=false, mode, customOption, customLabel, MenuList, isCreateable=false, isClearable=false, selectKey, disabled, defaultValue, width, reset, setReset, isForceUpdate, setForceUpdate, isCheckAutoCopy, evChangeCustom, isField, evCreate, evChange, isMinOption, isMulti=false, options, name, placeholder, removeMessage, evCreateMessageQuestion, isLoading, ...props }: TSelect) => {
   const [valueState, setValue] = useState<typeof defaultValue>(defaultValue || null)
 
   useEffect(()=> {
@@ -240,18 +241,18 @@ const SelectComponent = ({ type, isError=false, mode, customOption, customLabel,
       color: (disabled ? '#ADADAD' : (mode === 'form' ? '#2d3c48' : 'initial')),
       opacity: disabled ? '.7' : 1,
     } as CSSObjectWithLabel),
-    option: (provided: CSSObject, state: OptionProps<TOption, typeof isMulti>) => {
-      console.log(state, disabled, "--- pr", provided)
-      return ({
+    option: (provided: CSSObject, state: OptionProps<TOption, typeof isMulti>) => ({
       ...provided,
-      // color: (disabled || state.isDisabled) ? '#ADADAD' : (state.isSelected ? '#ffffff' : '#000000'),
-      // backgroundColor: (disabled || state.isDisabled) ? 'transparent' : (state.isSelected || state.isFocused ? '#fc5c64' : 'transparent'),
-      // cursor: 'pointer',
-      // '&:hover': {
-      //   backgroundColor: (disabled || state.isDisabled) ? 'transparent' : '#ec5b62',
-      //   color: (disabled || state.isDisabled) ? '#ADADAD' : '#ffffff'
-      // }
-    } as CSSObjectWithLabel)},
+      ...(!state.isDisabled && {
+        color: state.isSelected ? '#ffffff' : '#000000',
+        backgroundColor: state.isSelected || state.isFocused ? '#fc5c64' : 'transparent',
+        cursor: 'pointer',
+        '&:hover': {
+          backgroundColor: '#ec5b62',
+          color: '#ffffff'
+        }
+      })
+    } as CSSObjectWithLabel),
     menu: (provided: CSSObject) => ({
       ...provided,
       borderRadius: mode === 'filter' ? 'var(--sec-rd)' : 'var(--ter-rd)',
@@ -301,6 +302,7 @@ const SelectComponent = ({ type, isError=false, mode, customOption, customLabel,
       {...isMulti && { closeMenuOnSelect: false }}
       {...isMulti && { onBlur: handleBlur }}
       {...placeholder && { placeholder }}
+      {...isLoading && { isLoading: isLoading }}
       {...props} />
       : 
     <ReactSelect 
@@ -323,6 +325,7 @@ const SelectComponent = ({ type, isError=false, mode, customOption, customLabel,
       {...isMulti && { closeMenuOnSelect: false }}
       {...isMulti && { onBlur: handleBlur }}
       {...placeholder && { placeholder }}
+      {...isLoading && { isLoading: isLoading }}
       {...props} />
   
   return (