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

package/CapUnifiedSelect/CapUnifiedSelect.js

@@ -36,6 +36,7 @@ const CapUnifiedSelect = ({
   searchBasedOn = 'label',
   onConfirm,
   onCancel,
+  size = 'm',
   noResultCustomText = 'No results found',
   noResultCustomIcon = 'warning',
   ...rest
@@ -51,19 +52,19 @@ const CapUnifiedSelect = ({
     setTempValue(value);
   }, [value]);
 
-  const treeSelectVirtualizationProps = {
-    listHeight: 256,
+  const treeSelectVirtualizationProps = useMemo(() => ({
+      listHeight: 256,
     listItemHeight: 32,
-  };
+  }), []);
 
-  const NoResult = memo(({ noResultCustomText, className }) => (
+  const NoResult = memo(({ 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>
   ));
 
@@ -71,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());
       }
     };
@@ -96,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]);
@@ -140,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;
@@ -162,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;
       }
     }
@@ -195,15 +197,15 @@ const CapUnifiedSelect = ({
     );
   }, [headerLabel, tooltip, bylineText, disabled]);
 
-  const renderDropdown = () => {
+  const renderDropdown = useCallback(() => {
     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 (
@@ -237,7 +239,7 @@ const CapUnifiedSelect = ({
             </CapRow>
           )}
 
-          {currentItems.length === 0 ? <NoResult noResultCustomText={noResultCustomText} 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">
@@ -267,7 +269,7 @@ const CapUnifiedSelect = ({
           )}
         </div>
       );
-    };
+    }, [customPopupRender, popupClassName, type, showSearch, searchText, isMulti, showUpload, currentItems?.length, allSelected, className, noResultCustomText, onUpload, handleSelectAll, handleConfirm, handleCancel]);
 
     return (
       <>
@@ -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/package.json

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