@capillarytech/blaze-ui 0.1.6-alpha.44 → 0.1.6-alpha.46

package/CapUnifiedSelect/CapUnifiedSelect.js

@@ -36,7 +36,9 @@ const CapUnifiedSelect = ({
   searchBasedOn = 'label',
   onConfirm,
   onCancel,
-  noResultText = 'No results found',
+  size = 'm',
+  noResultCustomText = 'No results found',
+  noResultCustomIcon = 'warning',
   ...rest
 }) => {
 
@@ -50,19 +52,19 @@ const CapUnifiedSelect = ({
     setTempValue(value);
   }, [value]);
 
-  const treeSelectVirtualizationProps = {
-    listHeight: 256,
+  const treeSelectVirtualizationProps = useMemo(() => ({
+      listHeight: 256,
     listItemHeight: 32,
-  };
+  }), []);
 
-  const NoResult = memo(({ noResultText, className }) => (
+  const NoResult = memo(({ noResultCustomText, className, showUpload, options }) => (
     <CapRow 
       className={classnames(className, "cap-unified-select-no-result")} 
       align="middle" 
       gap={8}
     >
-      <CapIcon type="warning" size="m" />
-      <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>
   ));
 
@@ -70,14 +72,15 @@ const CapUnifiedSelect = ({
     if (!search) return data;
 
     const filterNode = node => {
+      if (!node) return false;
       if (searchBasedOn === 'value') {
-        const valueText = String(node.value || '').toLowerCase();
+        const valueText = String(node?.value || '').toLowerCase();
         return valueText.includes(search.toLowerCase());
       } else if (searchBasedOn === 'key') {
-        const keyText = String(node.key || '').toLowerCase();
+        const keyText = String(node?.key || '').toLowerCase();
         return keyText.includes(search.toLowerCase());
       } else {
-        const labelText = node.label?.toLowerCase() || '';
+        const labelText = node?.label?.toLowerCase() || '';
         return labelText.includes(search.toLowerCase());
       }
     };
@@ -95,13 +98,13 @@ const CapUnifiedSelect = ({
   }, [searchBasedOn]);
 
   const flattenLeafValues = useCallback(nodes =>
-    nodes?.flatMap(node => node.children ? flattenLeafValues(node.children) : [node.value]) || [], []);
+    nodes?.flatMap(node => node?.children ? flattenLeafValues(node.children) : [node?.value]) || [], []);
 
   const isMulti = useMemo(() => type === 'multiSelect' || type === 'multiTreeSelect', [type]);
   const isTree = useMemo(() => type === 'treeSelect' || type === 'multiTreeSelect', [type]);
   
   const dataSource = useMemo(() => {
-    return isTree ? options : options.map(opt => ({ title: opt.label, value: opt.value, key: opt.key || opt.value }));
+    return isTree ? options : options?.map(opt => ({ title: opt?.label, value: opt?.value, key: opt?.key || opt?.value }));
   }, [isTree, options]);
 
   const filteredTree = useMemo(() => getFilteredTreeData(dataSource, searchText), [dataSource, searchText]);
@@ -139,12 +142,12 @@ const CapUnifiedSelect = ({
     setTempValue(newValue);
   }, []);
 
-  const handleDropdownVisibilityChange = open => {
-    if (!open) {
+  const handleDropdownVisibilityChange = useCallback(open => {
+    if (open === false) {
       setTempValue(value);
     }
     setDropdownOpen(open);
-  };
+  }, [value]);
 
   const suffix = useMemo(() => {
     const displayValue = dropdownOpen ? tempValue : value;
@@ -161,12 +164,12 @@ const CapUnifiedSelect = ({
     if (isMulti) {
       if (Array.isArray(tempValue) && tempValue?.length > 0) {
         const firstSelectedValue = tempValue[0];
-        const firstSelectedOption = options.find(opt => opt.value === firstSelectedValue);
+        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);
+        const firstSelectedOption = options?.find(opt => opt?.value === firstSelectedValue);
         return firstSelectedOption?.label || null;
       }
     }
@@ -194,15 +197,15 @@ const CapUnifiedSelect = ({
     );
   }, [headerLabel, tooltip, bylineText, disabled]);
 
-  const renderDropdown = () => {
+  const renderDropdown = useMemo(() => {
     const currentItems = filteredTree;
     const selectedCount = Array.isArray(tempValue) 
       ? isTree 
-        ? tempValue.filter(val => leafValues.includes(val)).length 
-        : tempValue.length 
+        ? tempValue?.filter(val => leafValues?.includes(val))?.length || 0
+        : tempValue?.length || 0 
       : (tempValue ? 1 : 0);
 
-    const renderCustomDropdown = menu => {
+    const renderCustomDropdown = useCallback(menu => {
       if (!customPopupRender) return menu;
 
       return (
@@ -236,7 +239,7 @@ const CapUnifiedSelect = ({
             </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")} showUpload={showUpload} options={options}/> : menu}
 
           {currentItems.length > 0 && isMulti && (
            <div className="cap-unified-select-confirm-container">
@@ -266,7 +269,7 @@ const CapUnifiedSelect = ({
           )}
         </div>
       );
-    };
+    }, [customPopupRender, popupClassName, type, showSearch, searchText, isMulti, showUpload, currentItems?.length, allSelected, className, noResultCustomText, onUpload, handleSelectAll, handleConfirm, handleCancel]);
 
     return (
       <>
@@ -282,14 +285,13 @@ const CapUnifiedSelect = ({
           maxTagPlaceholder={() => null}
           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}
-          treeDefaultExpandAll={true}
           onOpenChange={handleDropdownVisibilityChange}
           showCheckedStrategy={TreeSelect.SHOW_PARENT}
           virtual
@@ -301,7 +303,7 @@ const CapUnifiedSelect = ({
         {isError && <CapLabel className={classnames("cap-unified-select-status")} style={{ color: 'red' }}>{errorMessage}</CapLabel>}
       </>
     );
-  };
+  }, [filteredTree, tempValue, value, prefix, suffix, className, style, isError, errorMessage, allowClear, isMulti, dropdownOpen, customPopupRender, handleTempChange, onChange, disabled, handleDropdownVisibilityChange, treeSelectVirtualizationProps]);
 
   return (
     <SelectWrapper className={classnames(className, 'cap-unified-select-container')}>
@@ -348,8 +350,12 @@ CapUnifiedSelect.defaultProps = {
   disabled: false,
   showUpload: false,
   isError: false,
-  noResultText: 'No results found',
-  onUpload: () => {}
+  noResultCustomText: 'No results found',
+  noResultCustomIcon: 'warning',
+  onUpload: () => {},
+  onChange: () => {},
+  onConfirm: () => {},
+  onCancel: () => {}
 };
 
 export default withStyles(CapUnifiedSelect, selectStyles);

package/CapUnifiedSelect/styles.js

@@ -97,121 +97,134 @@ 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 !important;
+      background-color: #42b040;
     }
     .ant-tree-select-dropdown{
-      padding: 0px !important;
+      padding: 0px;
     }
-    .cap-unified-tree-select{
-      height: 40px !important;
-      width: 340px !important;
+    .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-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;
-      padding-left: 15px !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 !important;
-        color: #2466EA !important;
+        margin-left: 12px;
+        color: #2466EA;
       }
     }
     .cap-unified-select-select-all-container{
-      padding: 9px 9px !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;
+      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 !important;
+      left: 13px;
     }
     .ant-select-tree {
       .ant-select-tree-node-content-wrapper{
-        background-color: transparent !important;
+        background-color: transparent;
       }
       .ant-select-tree-node-content-wrapper:hover {
-        background-color: transparent !important;
+        background-color: transparent;
       }
     }
     .ant-select-tree .ant-select-tree-switcher:not(.ant-select-tree-switcher-noop):hover:before{
-      background-color: transparent !important;
+      background-color: transparent;
     }
     .ant-select-selection-item{
-      background: transparent !important;
+      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 !important;
+      border: 1px solid #7A869A;
     }
     .cap-unified-tree-select .cap-unified-select-select-all-checkbox{
-      height: 18px !important;
-      width: 18px !important;
-      border-color: #B3BAC5 !important;
-      border-radius: 2px !important;
+      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;
     }
     .cap-unified-tree-select .multiSelect-popup-container .ant-select-tree-treenode{
-      padding-left: 15px !important;
+      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 !important;
-        width: 18px !important;
-        border: 2px solid #B3BAC5 !important;
+        height: 18px;
+        width: 18px;
+        border: 2px solid #B3BAC5;
       }
       &:hover{
-        background-color: #FFFBE6 !important;
-        border-radius: 4px !important;
+        background-color: #FFFBE6;
+        border-radius: 4px;
       }
       &:not(.ant-select-tree-treenode-disabled) .ant-select-tree-node-content-wrapper:hover{
-        background-color: none !important;
+        background-color: none;
       }
     }
     .ant-tree-select-dropdown .ant-select-tree .ant-select-tree-node-content-wrapper{
-      border-radius: 0px !important;
-      padding-left: 12px !important;
+      border-radius: 0px;
+      padding-left: 12px;
     }
     .ant-select-tree-treenode.ant-select-tree-treenode-selected{
-      background-color: #E9F0FE !important;
-      color: #2466EA !important;
+      background-color: #E9F0FE;
+      color: #2466EA;
     }
     .cap-unified-select-no-result{
       display: flex;
@@ -231,24 +244,24 @@ 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;
+      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 !important;
+        padding-left: 8px;
       }
     }
     .cap-unified-select-upload-button{
-      border: none !important;
-      padding-left: 15px !important;
+      border: none;
+      padding-left: 15px;
     }
     .cap-unified-select-confirm-container {
       display: flex;
@@ -267,42 +280,42 @@ export const selectStyles = css`
         width: 94px;
       }
       .cap-unified-select-confirm-button{
-        background-color: #6ebd6e !important;
+        background-color: #6ebd6e;
       }
       .cap-unified-select-cancel-button{
-        border: transparent !important;
-        box-shadow: none !important;
+        border: transparent;
+        box-shadow: none;
       }
     }
     .cap-unified-select-selected-count {
       display: flex;
-      margin-left: auto !important; /* pushes to far right */
-      font-size: 12px !important;
-      font-weight: 400 !important;
-      line-height: 16px !important;
-      color: #5E6C84 !important;
+      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 !important;
-        box-shadow: none !important;
-        border-radius: 0 !important;
+        border: none;
+        box-shadow: none;
+        border-radius: 0;
       }
 
       .ant-input-affix-wrapper:hover {
-        border: none !important;
-        box-shadow: none !important;
-        border-bottom: 1px solid #EBECF0 !important;
+        border: none;
+        box-shadow: none;
+        border-bottom: 1px solid #EBECF0;
       }
 
       .ant-input-affix-wrapper:focus-within {
-        border: none !important;
-        box-shadow: none !important;
-        border-bottom: 1px solid #091E42 !important;
-        outline: none !important;
+        border: none;
+        box-shadow: none;
+        border-bottom: 1px solid #091E42;
+        outline: none;
       }
 
       .ant-input {

package/package.json

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