@capillarytech/blaze-ui 0.1.6-alpha.53 → 0.1.6-alpha.54

package/CapUnifiedSelect/CapUnifiedSelect.js

@@ -41,117 +41,194 @@ const CapUnifiedSelect = ({
   noResultCustomIcon = 'warning',
   ...rest
 }) => {
-
   const [searchText, setSearchText] = useState('');
   const [tempValue, setTempValue] = useState(value);
-  const [allSelected, setAllSelected] = useState(false);
   const [dropdownOpen, setDropdownOpen] = useState(false);
 
-
   useEffect(() => {
     setTempValue(value);
   }, [value]);
 
-  const treeSelectVirtualizationProps = useMemo(() => ({
-      listHeight: 256,
+  const treeSelectVirtualizationProps = {
+    listHeight: 256,
     listItemHeight: 32,
-  }), []);
+  };
 
-  const NoResult = memo(({ noResultCustomText, className, showUpload, options }) => (
-    <CapRow 
-      className={classnames(className, "cap-unified-select-no-result")} 
-      align="middle" 
+  const NoResult = ({ noResultCustomText, className, showUpload, options }) => (
+    <CapRow
+      className={classnames(className, 'cap-unified-select-no-result')}
+      align="middle"
       gap={8}
     >
       <CapIcon type={noResultCustomIcon} size="m" />
-      <CapLabel className="cap-unified-select-no-result-text">{showUpload && options?.length === 0 ? noResultCustomText : 'No results found'}</CapLabel>
+      <CapLabel className="cap-unified-select-no-result-text">
+        {showUpload && options?.length === 0
+          ? noResultCustomText
+          : 'No results found'}
+      </CapLabel>
     </CapRow>
-  ));
+  );
 
-  const getFilteredTreeData = useCallback((data, search) => {
-    if (!search) return data;
+  const getFilteredTreeData = useCallback(
+    (data, search) => {
+      if (!search || !data || data.length === 0) return data;
+      const searchLower = search.toLowerCase();
+
+      const filterNode = (node) => {
+        if (!node) return false;
+        
+        let textToSearch = '';
+        
+        if (searchBasedOn === 'value') {
+          textToSearch = String(node.value || '').toLowerCase();
+        } else if (searchBasedOn === 'key') {
+          textToSearch = String(node.key || '').toLowerCase();
+        } else {
+          textToSearch = String(node.label || node.title || '').toLowerCase();
+        }
+        
+        return textToSearch.includes(searchLower);
+      };
+
+      const loop = (data) => {
+        if (!data) return [];
+        
+        return data
+          .map((item) => {
+            if (!item) return null;
+            
+            const children = item.children && item.children.length > 0 
+              ? loop(item.children) 
+              : [];
+              
+            if (filterNode(item) || children.length > 0) {
+              return { ...item, children };
+            }
+            return null;
+          })
+          .filter(Boolean);
+      };
+      
+      return loop(data);
+    },
+    [searchBasedOn],
+  );
 
-    const filterNode = node => {
-      if (!node) return false;
-      if (searchBasedOn === 'value') {
-        const valueText = String(node?.value || '').toLowerCase();
-        return valueText.includes(search.toLowerCase());
-      } else if (searchBasedOn === 'key') {
-        const keyText = String(node?.key || '').toLowerCase();
-        return keyText.includes(search.toLowerCase());
-      } else {
-        const labelText = node?.label?.toLowerCase() || '';
-        return labelText.includes(search.toLowerCase());
-      }
+  const processTreeData = useCallback((nodes, selectedValues = null) => {
+    const result = {
+      leafValues: [],
+      parentChildMap: {},
+      nodeMap: {},
+      selectedCount: 0
     };
-
-    const loop = data =>
-      data.map(item => {
-        const children = item.children ? loop(item.children) : [];
-        if (filterNode(item) || children.length) {
-          return { ...item, children };
+    
+    if (!nodes) return result;
+
+    const traverse = (items) => {
+      items.forEach((item) => {
+        result.nodeMap[item.value] = item;
+        
+        if (item.children && item.children.length > 0) {
+          result.parentChildMap[item.value] = item.children.map(
+            (child) => child.value
+          );
+          traverse(item.children);
+        } else {
+          result.leafValues.push(item.value);
         }
-        return null;
-      }).filter(Boolean);
-
-    return loop(data);
-  }, [searchBasedOn]);
+      });
+    };
+    traverse(nodes);
+    
+    if (selectedValues && Array.isArray(selectedValues) && selectedValues.length > 0) {
+      const expandedSet = new Set(selectedValues);
+      
+      const processNode = (value) => {
+        const children = result.parentChildMap[value];
+        if (!children) return;
+        
+        children.forEach((childValue) => {
+          expandedSet.add(childValue);
+          processNode(childValue);
+        });
+      };
+      
+      selectedValues.forEach(processNode);
+      
+      result.leafValues.forEach((value) => {
+        if (expandedSet.has(value)) result.selectedCount++;
+      });
+    }
+    
+    return result;
+  }, []);
 
-  const flattenLeafValues = useCallback(nodes =>
-    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 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 }));
+    // Skip transformation if options is empty or undefined
+    if (!options || options.length === 0) return [];
+    
+    // Only transform if not a tree select
+    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]);
-  const leafValues = useMemo(() => flattenLeafValues(filteredTree), [filteredTree]);
-
-  const handleSelectAll = useCallback(() => {
-    const availableValues = leafValues;
-    if (allSelected) {
-      setTempValue([]);
-      setAllSelected(false);
-    } else {
-      setTempValue(availableValues);
-      setAllSelected(true);
-    }
-  }, [allSelected, leafValues]);
-
-  useEffect(() => {
-    if (isMulti && Array.isArray(tempValue)) {
-      const allItemsSelected = tempValue.length > 0 && leafValues.length > 0 && tempValue.length === leafValues.length;
-      setAllSelected(allItemsSelected);
-    }
-  }, [tempValue, leafValues, isMulti]);
+  const filteredTree = useMemo(
+    () => {
+      // Skip filtering if search text is empty
+      if (!searchText) return dataSource;
+      
+      return getFilteredTreeData(dataSource, searchText);
+    },
+    [dataSource, searchText, getFilteredTreeData],
+  );
 
   const handleConfirm = useCallback(() => {
     if (onChange) onChange(tempValue);
     setDropdownOpen(false);
-  }, [onChange, tempValue]);
+    if (onConfirm) onConfirm(tempValue);
+  }, [onChange, onConfirm, tempValue]);
 
   const handleCancel = useCallback(() => {
     setTempValue(value);
     setDropdownOpen(false);
-  }, [value]);
+    if (onCancel) onCancel();
+  }, [value, onCancel]);
 
-  const handleTempChange = useCallback(newValue => {
+  const handleTempChange = useCallback((newValue) => {
     setTempValue(newValue);
   }, []);
 
-  const handleDropdownVisibilityChange = useCallback(open => {
-    if (open === false) {
-      setTempValue(value);
-    }
-    setDropdownOpen(open);
-  }, [value]);
+  const handleDropdownVisibilityChange = useCallback(
+    (open) => {
+      if (open === false && !customPopupRender) {
+        if (onChange) onChange(tempValue);
+      } else if (open === false) {
+        setTempValue(value);
+      }
+      setDropdownOpen(open);
+    },
+    [value, onChange, tempValue, customPopupRender],
+  );
 
   const suffix = useMemo(() => {
     const displayValue = dropdownOpen ? tempValue : value;
-    return isMulti && Array.isArray(displayValue) && displayValue?.length > 1 ? (
+    return isMulti &&
+      Array.isArray(displayValue) &&
+      displayValue?.length > 1 ? (
       <>
         <span>+{displayValue.length - 1} more </span>
         <CapIcon type={`${dropdownOpen ? 'up' : 'down'}`} size="s" />
@@ -165,12 +242,15 @@ 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) {
+      } 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;
       }
     }
@@ -181,110 +261,208 @@ const CapUnifiedSelect = ({
     if (!headerLabel && !tooltip) return null;
     return (
       <>
-      <HeaderWrapper className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header')}>
-        {headerLabel && <CapLabel type="label16" className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-label')}>{headerLabel}</CapLabel>}
-        {tooltip && (
-          <CapTooltipWithInfo 
-            title={tooltip} 
-            className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-tooltip')}
-            iconProps={{ disabled }}
-          />
+        <HeaderWrapper
+          className={classnames(
+            disabled ? 'disabled' : '',
+            'cap-unified-select-header',
+          )}
+        >
+          {headerLabel && (
+            <CapLabel
+              type="label16"
+              className={classnames(
+                disabled ? 'disabled' : '',
+                'cap-unified-select-header-label',
+              )}
+            >
+              {headerLabel}
+            </CapLabel>
+          )}
+          {tooltip && (
+            <CapTooltipWithInfo
+              title={tooltip}
+              className={classnames(
+                disabled ? 'disabled' : '',
+                'cap-unified-select-header-tooltip',
+              )}
+              iconProps={{ disabled }}
+            />
+          )}
+        </HeaderWrapper>
+        {bylineText && (
+          <div className="cap-unified-select-header-byline-text">
+            <CapLabel
+              className={classnames(
+                disabled ? 'disabled' : '',
+                'cap-unified-select-header-byline-text',
+              )}
+            >
+              {bylineText}
+            </CapLabel>
+          </div>
         )}
-      </HeaderWrapper>
-      {bylineText &&
-      <div className="cap-unified-select-header-byline-text">
-         <CapLabel className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-byline-text')}>{bylineText}</CapLabel>
-      </div>
-      }
       </>
     );
   }, [headerLabel, tooltip, bylineText, disabled]);
 
   const renderDropdown = useCallback(() => {
     const currentItems = filteredTree;
-    const selectedCount = Array.isArray(tempValue) 
-      ? isTree 
-        ? tempValue?.filter(val => leafValues?.includes(val))?.length || 0
-        : tempValue?.length || 0 
-      : (tempValue ? 1 : 0);
-
-    const renderCustomDropdown = useCallback(menu => {
-      if (!customPopupRender) return menu;
-
-      return (
-        <div className={classnames(popoverClassName, `${type}-popup-container`)}>
-          {showSearch && (
-            <CapRow className={classnames("cap-unified-select-search-container")} align="middle">
-              <Input
-                prefix={<CapIcon type="search" size="s" style={{ color: styledVars.CAP_G06 }} />}
-                placeholder="Search"
-                variant="borderless"
-                value={searchText}
-                onChange={e => setSearchText(e.target.value)}
-              />
-            </CapRow>
+    const selectedCount = Array.isArray(tempValue)
+      ? isTree
+        ? processTreeData(dataSource, tempValue).selectedCount
+        : tempValue?.length || 0
+      : tempValue
+        ? 1
+        : 0;
+
+    const renderCustomDropdown = useCallback(
+      (menu) => {
+        if (!customPopupRender) return menu;
+
+        return (
+          <div
+            className={classnames(popoverClassName, `${type}-popup-container`)}
+          >
+            {showSearch && (
+              <CapRow
+                className={classnames('cap-unified-select-search-container')}
+                align="middle"
+              >
+                <Input
+                  prefix={
+                    <CapIcon
+                      type="search"
+                      size="s"
+                      style={{ color: styledVars.CAP_G06 }}
+                    />
+                  }
+                  placeholder="Search"
+                  variant="borderless"
+                  value={searchText}
+                  onChange={(e) => setSearchText(e.target.value)}
+                />
+              </CapRow>
             )}
-          {isMulti && showUpload && (
-            <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 && (() => {
-            const totalAvailable = leafValues.length;
-            const selectedInScope = Array.isArray(tempValue)
-              ? tempValue.filter(val => leafValues.includes(val)).length
-              : 0;
-            return (
+            {isMulti && showUpload && (
               <CapRow
-                className={classnames("cap-unified-select-select-all-container")}
+                className={classnames('cap-unified-select-upload-container')}
                 align="middle"
+                onClick={onUpload}
               >
-                <Checkbox
-                  className={classnames("cap-unified-select-select-all-checkbox")}
-                  checked={totalAvailable > 0 && selectedInScope === totalAvailable}
-                  indeterminate={selectedInScope > 0 && selectedInScope < totalAvailable}
-                  onChange={e => {
-                    setTempValue(e.target.checked ? leafValues : []);
-                  }}
+                <CapIcon
+                  type="upload"
+                  size="s"
+                  style={{ color: styledVars.CAP_SECONDARY.base }}
+                />
+                <CapLabel
+                  type="label14"
+                  className={classnames('cap-unified-select-upload-label')}
                 >
-                  <CapLabel type="label14" className={classnames("cap-unified-select-select-all-label")}>Select all</CapLabel>
-                </Checkbox>
+                  Upload
+                </CapLabel>
               </CapRow>
-            );
-          })()}
-
-          {currentItems.length === 0 ? <NoResult noResultCustomText={noResultCustomText} className={classnames(className, "cap-unified-select-no-result")} showUpload={showUpload} options={options}/> : menu}
+            )}
+            {isMulti &&
+              currentItems.length > 0 &&
+              (() => {
+                const { leafValues } = processTreeData(currentItems);
+                const totalAvailable = leafValues.length;
+                const selectedInScope = processTreeData(currentItems, tempValue).selectedCount;
+
+                return (
+                  <CapRow
+                    className={classnames(
+                      'cap-unified-select-select-all-container',
+                    )}
+                    align="middle"
+                  >
+                    <Checkbox
+                      className={classnames(
+                        'cap-unified-select-select-all-checkbox',
+                      )}
+                      checked={
+                        totalAvailable > 0 && selectedInScope === totalAvailable
+                      }
+                      indeterminate={
+                        selectedInScope > 0 && selectedInScope < totalAvailable
+                      }
+                      onChange={(e) => {
+                        setTempValue(e.target.checked ? leafValues : []);
+                      }}
+                    >
+                      <CapLabel
+                        type="label14"
+                        className={classnames(
+                          'cap-unified-select-select-all-label',
+                        )}
+                      >
+                        Select all
+                      </CapLabel>
+                    </Checkbox>
+                  </CapRow>
+                );
+              })()}
+
+            {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">
-           <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>
-      );
-    }, [customPopupRender, popoverClassName, type, showSearch, searchText, isMulti, showUpload, currentItems?.length, allSelected, className, noResultCustomText, onUpload, handleSelectAll, handleConfirm, handleCancel]);
+            {currentItems.length > 0 && isMulti && (
+              <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>
+        );
+      },
+      [
+        customPopupRender,
+        popoverClassName,
+        type,
+        showSearch,
+        searchText,
+        isMulti,
+        showUpload,
+        currentItems,
+        tempValue,
+        className,
+        noResultCustomText,
+        onUpload,
+        handleConfirm,
+        handleCancel,
+        processTreeData,
+      ],
+    );
 
     return (
       <>
@@ -293,14 +471,17 @@ const CapUnifiedSelect = ({
           type={type}
           treeData={filteredTree}
           value={customPopupRender ? tempValue : value}
-          onChange={onChange}
+          onChange={customPopupRender ? handleTempChange : onChange}
           placeholder={placeholder}
           showSearch={false}
           maxTagCount={0}
           maxTagPlaceholder={() => null}
           prefix={tempValue?.length > 0 ? prefix : undefined}
           suffixIcon={suffix}
-          className={classnames(`cap-unified-tree-select cap-unified-tree-select-${size}`, className)}
+          className={classnames(
+            `cap-unified-tree-select cap-unified-tree-select-${size}`,
+            className,
+          )}
           style={style}
           status={isError ? 'error' : ''}
           allowClear={allowClear}
@@ -315,13 +496,44 @@ const CapUnifiedSelect = ({
           {...treeSelectVirtualizationProps}
           popupRender={renderCustomDropdown}
         />
-        {isError && <CapLabel className={classnames("cap-unified-select-status")} style={{ color: 'red' }}>{errorMessage}</CapLabel>}
+        {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]);
+  }, [
+    filteredTree,
+    tempValue,
+    value,
+    prefix,
+    suffix,
+    className,
+    style,
+    isError,
+    errorMessage,
+    allowClear,
+    isMulti,
+    isTree,
+    dropdownOpen,
+    customPopupRender,
+    handleTempChange,
+    onChange,
+    disabled,
+    handleDropdownVisibilityChange,
+    treeSelectVirtualizationProps,
+    dataSource,
+    processTreeData,
+  ]);
 
   return (
-    <SelectWrapper className={classnames(className, 'cap-unified-select-container')}>
+    <SelectWrapper
+      className={classnames(className, 'cap-unified-select-container')}
+    >
       {renderHeader()}
       {renderDropdown()}
     </SelectWrapper>
@@ -329,7 +541,12 @@ const CapUnifiedSelect = ({
 };
 
 CapUnifiedSelect.propTypes = {
-  type: PropTypes.oneOf(['select', 'multiSelect', 'treeSelect', 'multiTreeSelect']),
+  type: PropTypes.oneOf([
+    'select',
+    'multiSelect',
+    'treeSelect',
+    'multiTreeSelect',
+  ]),
   options: PropTypes.array,
   value: PropTypes.any,
   onChange: PropTypes.func,
@@ -372,7 +589,7 @@ CapUnifiedSelect.defaultProps = {
   onUpload: () => {},
   onChange: () => {},
   onConfirm: () => {},
-  onCancel: () => {}
+  onCancel: () => {},
 };
 
 export default withStyles(CapUnifiedSelect, selectStyles);

package/CapUnifiedSelect/styles.js

@@ -243,7 +243,7 @@ export const selectStyles = css`
       margin-top: -8px !important;
       border-radius: 4px;
       box-shadow: 0px 4px 8px -2px #091E4240, 0px 0px 1px 0px #091E424F;
-      max-height: 368px;
+      max-height: 360px;
     }
     .ant-select-prefix{
       font-size: 14px;

package/package.json

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