@capillarytech/blaze-ui 0.1.6-alpha.43 → 0.1.6-alpha.45

package/CapUnifiedSelect/CapUnifiedSelect.js

@@ -26,6 +26,7 @@ const CapUnifiedSelect = ({
   popupClassName,
   allowClear = false,
   headerLabel,
+  onUpload,
   tooltip,
   bylineText,
   disabled = false,
@@ -35,13 +36,15 @@ const CapUnifiedSelect = ({
   searchBasedOn = 'label',
   onConfirm,
   onCancel,
-  noResultText = 'No results found',
+  noResultCustomText = 'No results found',
+  noResultCustomIcon = 'warning',
   ...rest
 }) => {
 
   const [searchText, setSearchText] = useState('');
   const [tempValue, setTempValue] = useState(value);
   const [allSelected, setAllSelected] = useState(false);
+  const [dropdownOpen, setDropdownOpen] = useState(false);
 
 
   useEffect(() => {
@@ -53,14 +56,14 @@ const CapUnifiedSelect = ({
     listItemHeight: 32,
   };
 
-  const NoResult = memo(({ noResultText, className }) => (
+  const NoResult = memo(({ noResultCustomText, className }) => (
     <CapRow 
       className={classnames(className, "cap-unified-select-no-result")} 
       align="middle" 
       gap={8}
     >
-      <CapIcon type="warning" size="s" />
-      <CapLabel className="cap-unified-select-no-result-text">{noResultText}</CapLabel>
+      <CapIcon type={noResultCustomIcon} size="m" />
+      <CapLabel className="cap-unified-select-no-result-text">{showUpload && options.length === 0 ? noResultCustomText : 'No results found'}</CapLabel>
     </CapRow>
   ));
 
@@ -125,33 +128,51 @@ const CapUnifiedSelect = ({
 
   const handleConfirm = useCallback(() => {
     if (onChange) onChange(tempValue);
+    setDropdownOpen(false);
   }, [onChange, tempValue]);
 
   const handleCancel = useCallback(() => {
     setTempValue(value);
+    setDropdownOpen(false);
   }, [value]);
 
   const handleTempChange = useCallback(newValue => {
     setTempValue(newValue);
   }, []);
 
+  const handleDropdownVisibilityChange = open => {
+    if (!open) {
+      setTempValue(value);
+    }
+    setDropdownOpen(open);
+  };
+
   const suffix = useMemo(() => {
-    return isMulti && Array.isArray(value) && value?.length > 1 ? (
+    const displayValue = dropdownOpen ? tempValue : value;
+    return isMulti && Array.isArray(displayValue) && displayValue?.length > 1 ? (
       <>
-        <span>+{value.length - 1} more <CapIcon type="down" size="s" /></span>
+        <span>+{displayValue.length - 1} more <CapIcon type="down" size="s" /></span>
       </>
     ) : (
       <CapIcon type="down" size="s" />
     );
-  }, [isMulti, value]);
+  }, [isMulti, value, tempValue, dropdownOpen]);
 
   const prefix = useMemo(() => {
-    if (isMulti && Array.isArray(value) && value?.length > 0) {
-      const selectedLabels = options.filter(opt => value.includes(opt.value)).map(opt => opt.label);
-      return selectedLabels[0];
+    if (isMulti) {
+      if (Array.isArray(tempValue) && tempValue?.length > 0) {
+        const firstSelectedValue = tempValue[0];
+        const firstSelectedOption = options.find(opt => opt.value === firstSelectedValue);
+        return firstSelectedOption?.label || null;
+      }
+      else if (Array.isArray(value) && value?.length > 0) {
+        const firstSelectedValue = value[0];
+        const firstSelectedOption = options.find(opt => opt.value === firstSelectedValue);
+        return firstSelectedOption?.label || null;
+      }
     }
     return null;
-  }, [isMulti, value, options]);
+  }, [isMulti, value, tempValue, options]);
 
   const renderHeader = useCallback(() => {
     if (!headerLabel && !tooltip) return null;
@@ -195,48 +216,54 @@ const CapUnifiedSelect = ({
                 variant="borderless"
                 value={searchText}
                 onChange={e => setSearchText(e.target.value)}
-                onKeyDown={e => e.stopPropagation()}
               />
             </CapRow>
             )}
           {isMulti && showUpload && (
-            <CapRow className={classnames("cap-unified-select-upload-container")} align="middle">
-             <Button
-              type="link"
-              icon={<CapIcon type="upload" size="s" />}
-              onClick={() => {}}
-              className={classnames("cap-unified-select-upload-button")}
-            >
-              Upload
-            </Button>
+            <CapRow className={classnames("cap-unified-select-upload-container")} align="middle" onClick={onUpload}>
+             <CapIcon type="upload" size="s" style={{ color: styledVars.CAP_SECONDARY.base }}/>
+             <CapLabel type="label14" className={classnames("cap-unified-select-upload-label")}>Upload</CapLabel>
             </CapRow>
           )}
           {isMulti && currentItems.length > 0 && (
             <CapRow 
               className={classnames("cap-unified-select-select-all-container")} 
-              onClick={e => { e.stopPropagation(); handleSelectAll(); }}
+              onClick={handleSelectAll}
               align="middle"
-              gap={8}
+              gap={7}
             >
-              <input type="checkbox" checked={allSelected} className={classnames("cap-unified-select-select-all-checkbox")} onClick={e => e.stopPropagation()} />
-              <CapLabel className={classnames("cap-unified-select-select-all-label")}>Select all</CapLabel>
+              <input readOnly type="checkbox" checked={allSelected} className={classnames("cap-unified-select-select-all-checkbox")} onClick={handleSelectAll} />
+              <CapLabel type="label14" className={classnames("cap-unified-select-select-all-label")}>Select all</CapLabel>
             </CapRow>
           )}
 
-          {currentItems.length === 0 ? <NoResult noResultText={noResultText} className={classnames(className, "cap-unified-select-no-result")}/> : menu}
+          {currentItems.length === 0 ? <NoResult noResultCustomText={noResultCustomText} className={classnames(className, "cap-unified-select-no-result")}/> : menu}
 
           {currentItems.length > 0 && isMulti && (
-            <CapRow 
-              className={classnames("cap-unified-select-confirm-container")} 
-              justify="space-between" 
-              align="middle"
-            >
-              <CapRow gap={8}>
-                <Button type="primary" size="small" className={classnames("cap-unified-select-confirm-button")} onClick={e => { e.stopPropagation(); handleConfirm(); }}>Confirm</Button>
-                <Button type="text" size="small" onClick={e => { e.stopPropagation(); handleCancel(); }}>Cancel</Button>
-              </CapRow>
-              {selectedCount > 0 && <CapLabel className={classnames("cap-unified-select-selected-count")}>{selectedCount} selected</CapLabel>}
-            </CapRow>
+           <div className="cap-unified-select-confirm-container">
+           <div className="cap-unified-select-confirm-button-group">
+             <Button
+               type="primary"
+               size="small"
+               className="cap-unified-select-confirm-button"
+               onClick={handleConfirm}
+             >
+               Confirm
+             </Button>
+             <Button
+               type="text"
+               className="cap-unified-select-cancel-button"
+               size="small"
+               onClick={handleCancel}
+             >
+               Cancel
+             </Button>
+            <CapLabel className="cap-unified-select-selected-count">
+              {selectedCount} selected
+            </CapLabel>
+           </div>
+         </div>
+         
           )}
         </div>
       );
@@ -254,14 +281,16 @@ const CapUnifiedSelect = ({
           showSearch={false}
           maxTagCount={0}
           maxTagPlaceholder={() => null}
-          prefix={isMulti && value.length > 0 && prefix}
+          prefix={tempValue?.length > 0 ? prefix : undefined}
           suffixIcon={suffix}
-          className={classnames(`cap-unified-tree-select ${className || ''}`)}
+          className={classnames(`cap-unified-tree-select cap-unified-tree-select-${size}`, className)}
           style={style}
           status={isError ? 'error' : ''}
           allowClear={allowClear}
           multiple={isMulti}
           treeCheckable={isMulti}
+          open={dropdownOpen}
+          onOpenChange={handleDropdownVisibilityChange}
           showCheckedStrategy={TreeSelect.SHOW_PARENT}
           virtual
           disabled={disabled}
@@ -303,6 +332,7 @@ CapUnifiedSelect.propTypes = {
   errorMessage: PropTypes.string,
   popupClassName: PropTypes.string,
   showUpload: PropTypes.bool,
+  onUpload: PropTypes.func,
 };
 
 CapUnifiedSelect.defaultProps = {
@@ -318,7 +348,8 @@ CapUnifiedSelect.defaultProps = {
   disabled: false,
   showUpload: false,
   isError: false,
-  noResultText: 'No results found'
+  noResultText: 'No results found',
+  onUpload: () => {}
 };
 
 export default withStyles(CapUnifiedSelect, selectStyles);

package/CapUnifiedSelect/styles.js

@@ -95,78 +95,136 @@ export const StyledInfoIcon = styled.span`
 
 export const selectStyles = css`
   &.cap-unified-select-container {
+    text-align: justify;
+    .ant-btn-variant-solid:not(:disabled):not(.ant-btn-disabled):hover{
+      background-color: #42b040;
+    }
     .ant-tree-select-dropdown{
-      padding: 0px !important;
+      padding: 0px;
+    }
+    .cap-unified-tree-select-s{
+      height: 40px;
+      width: 160px;
+    }
+    .cap-unified-tree-select-m{
+      height: 40px;
+      width: 340px;
+    }
+    .cap-unified-tree-select-l{
+      height: 40px;
+      width: 400px;
     }
-    .cap-unified-tree-select{
-      height: 40px !important;
-      width: 340px !important;
+    .cap-unified-tree-select-xl{
+      height: 40px;
+      width: 480px;
     }
     .cap-unified-select-upload-container{
-      cursor: pointer !important;
-      display: flex !important;
-      align-items: center !important;
-      border-bottom: 1px solid #f0f0f0 !important;
-      height: 40px !important;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid #f0f0f0;
+      height: 40px;
+      padding-left: 15px;
+
+      .cap-unified-select-upload-label{
+        margin-left: 12px;
+        color: #2466EA;
+      }
     }
     .cap-unified-select-select-all-container{
-      padding: 8px 12px !important;
-      cursor: pointer !important;
-      display: flex !important;
-      align-items: center !important;
-      border-bottom: 1px solid #f0f0f0 !important;
-      height: 40px !important;
+      padding: 9px 9px;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid #f0f0f0;
+      height: 40px;
     }
     .ant-select-dropdown{
-      margin-top: -5px !important;
-      border-radius: 4px !important;
-      box-shadow: 0px 4px 8px -2px #091E4240, 0px 0px 1px 0px #091E424F !important;
+      margin-top: -5px;
+      border-radius: 4px;
+      box-shadow: 0px 4px 8px -2px #091E4240, 0px 0px 1px 0px #091E424F;
+      max-height: 368px;
     }
     .ant-select-prefix{
-      font-size: 14px !important;
-      font-weight: 400 !important;
-      color: #091E42 !important;
-      line-height: 20px !important;
+      font-size: 14px;
+      font-weight: 400;
+      color: #091E42;
+      line-height: 20px;
     }
     .cap-unified-select-header-label{
-      font-family: ${styledVars.FONT_FAMILY} !important;
-      font-weight: 500 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      letter-spacing: 0px !important;
-    }
-    .cap-unified-select-header-tooltip{
-      width: 16px !important;
-      height: 16px !important;
-      color: ${styledVars.CAP_G06} !important;
+      font-family: ${styledVars.FONT_FAMILY};
+      font-weight: 500;
+      font-size: 14px;
+      line-height: 20px;
+      letter-spacing: 0px;
     }
     .cap-unified-select-header-byline-text{
-      font-family: ${styledVars.FONT_FAMILY} !important;
-      font-weight: 400 !important;
-      font-size: 12px !important;
+      font-family: ${styledVars.FONT_FAMILY};
+      font-weight: 400;
+      font-size: 12px;
       margin-top: -10px;
-      letter-spacing: 0px !important;
-      color: #97A0AF !important;
+      letter-spacing: 0px;
+      color: #97A0AF;
+    }
+    .ant-input-affix-wrapper .ant-input-prefix{
+      left: 13px;
+    }
+    .ant-select-tree {
+      .ant-select-tree-node-content-wrapper{
+        background-color: transparent;
+      }
+      .ant-select-tree-node-content-wrapper:hover {
+        background-color: transparent;
+      }
+    }
+    .ant-select-tree .ant-select-tree-switcher:not(.ant-select-tree-switcher-noop):hover:before{
+      background-color: transparent;
+    }
+    .ant-select-selection-item{
+      background: transparent;
     }
     .cap-unified-tree-select .ant-select-selector:hover{
-      border: 1px solid #7A869A !important;
+      border: 1px solid #7A869A;
+    }
+    .cap-unified-tree-select .ant-select-selector:focus{
+      border: 1px solid #7A869A;
+    }
+    .cap-unified-tree-select .cap-unified-select-select-all-checkbox{
+      height: 18px;
+      width: 18px;
+      border-color: #B3BAC5;
+      border-radius: 2px;
     }
     .cap-unified-tree-select .select-popup-container .ant-select-tree-switcher-noop,
     .cap-unified-tree-select .multiSelect-popup-container .ant-select-tree-switcher-noop {
-      display: none !important;
+      display: none;
     }
-    .ant-tree-select-dropdown .treeSelect-popup-container .ant-select-tree .ant-select-tree-treenode{
-      margin: 0px !important;
+    .cap-unified-tree-select .multiSelect-popup-container .ant-select-tree-treenode{
+      padding-left: 15px;
     }
     .ant-tree-select-dropdown .ant-select-tree .ant-select-tree-treenode{
-      line-height: 40px !important;
-      margin-bottom: 0px !important;
+      line-height: 40px;
+      margin-bottom: 0px;
+      .ant-select-tree-checkbox .ant-select-tree-checkbox-inner{
+        height: 18px;
+        width: 18px;
+        border: 2px solid #B3BAC5;
+      }
+      &:hover{
+        background-color: #FFFBE6;
+        border-radius: 4px;
+      }
+      &:not(.ant-select-tree-treenode-disabled) .ant-select-tree-node-content-wrapper:hover{
+        background-color: none;
+      }
     }
-    .cap-unified-tree-select .multiSelect-popup-container .ant-tree-select-dropdown .ant-select-tree .ant-select-tree-treenode{
-      margin-left: 10px !important;
+    .ant-tree-select-dropdown .ant-select-tree .ant-select-tree-node-content-wrapper{
+      border-radius: 0px;
+      padding-left: 12px;
     }
-    .multiSelect-popup-container .ant-select-tree-treenode{
-      margin-left: 10px !important;
+    .ant-select-tree-treenode.ant-select-tree-treenode-selected{
+      background-color: #E9F0FE;
+      color: #2466EA;
     }
     .cap-unified-select-no-result{
       display: flex;
@@ -186,42 +244,84 @@ export const selectStyles = css`
       font-weight: 500;
     }
     .ant-tree-select:hover .ant-select-selector {
-      border-color: #7A869A !important;
+      border-color: #7A869A;
     }
     .ant-tree-select-focused .ant-select-selector,
     .ant-tree-select-open .ant-select-selector {
-      border-color: #7A869A !important;
-      box-shadow: none !important;
-      outline: none !important; /* remove blue outline */
+      border-color: #7A869A;
+      box-shadow: none;
+      outline: none;
     }
     .cap-unified-select-search-container{
       border-bottom: 1px solid #EBECF0 !important;
       line-height: 40px !important;
+      .ant-input-affix-wrapper{
+        padding-left: 8px;
+      }
     }
     .cap-unified-select-upload-button{
-      color: ${styledVars.CAP_BLUE01} !important;
-      display: flex !important;
-      align-items: center !important;
-      font-size: 14px !important;
-      font-weight: 400 !important;
-      line-height: 20px !important;
-    }
-    .cap-unified-select-confirm-container{
-      display: flex !important;
-      justify-content: space-between !important;
-      align-items: center !important;
-      padding: 8px 12px !important;
-      border-top: 1px solid #f0f0f0 !important;
-    }
-    .cap-unified-select-confirm-button{
-      margin-right: 8px !important;
-    }
-    .cap-unified-select-selected-count{
-      color: ${styledVars.CAP_G05} !important;
-      font-size: 14px !important;
+      border: none;
+      padding-left: 15px;
+    }
+    .cap-unified-select-confirm-container {
+      display: flex;
+      align-items: center;
+      height: 48px;
+      padding: 7px;
+      border-top: 1px solid #EBECF0;
+    }
+    .cap-unified-select-confirm-button-group {
+      display: flex;
+      padding-left: 8px;
+      align-items: center;
+      width: 100%; /* so it can push the label */
+      button{
+        height: 32px;
+        width: 94px;
+      }
+      .cap-unified-select-confirm-button{
+        background-color: #6ebd6e;
+      }
+      .cap-unified-select-cancel-button{
+        border: transparent;
+        box-shadow: none;
+      }
+    }
+    .cap-unified-select-selected-count {
+      display: flex;
+      margin-left: auto; /* pushes to far right */
+      font-size: 12px;
+      font-weight: 400;
+      line-height: 16px;
+      color: #5E6C84;
     }
     .cap-unified-select-status{
-      color: #E83135 !important;
+      color: #E83135;
+    }
+    .cap-unified-select-search-container {
+      .ant-input-affix-wrapper {
+        border: none;
+        box-shadow: none;
+        border-radius: 0;
+      }
+
+      .ant-input-affix-wrapper:hover {
+        border: none;
+        box-shadow: none;
+        border-bottom: 1px solid #EBECF0;
+      }
+
+      .ant-input-affix-wrapper:focus-within {
+        border: none;
+        box-shadow: none;
+        border-bottom: 1px solid #091E42;
+        outline: none;
+      }
+
+      .ant-input {
+        border: none !important;
+        box-shadow: none !important;
+      }
     }
   }
 `; 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/blaze-ui",
   "author": "Capillary Technologies",
-  "version": "0.1.6-alpha.43",
+  "version": "0.1.6-alpha.45",
   "description": "Capillary UI component library with Ant Design v5",
   "main": "./index.js",
   "sideEffects": [