@capillarytech/blaze-ui 0.1.6-alpha.4 → 0.1.6-alpha.40

package/CapInput/CapInput.js

@@ -1,6 +1,6 @@
 import React, { useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Input } from 'antd';
+import { Input } from 'antd-v5';
 import { WarningOutlined, CheckCircleOutlined } from '@ant-design/icons';
 import styled from 'styled-components';
 import * as styledVars from '../styled/variables';

package/CapInput/Number.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { InputNumber } from 'antd';
+import { InputNumber } from 'antd-v5';
 
 const CapInputNumber = React.forwardRef((props, ref) => {
   const { size = 'large', ...rest } = props;

package/CapInput/Search.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Input } from 'antd';
+import { Input } from 'antd-v5';
 
 const { Search } = Input;
 

package/CapInput/TextArea.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Input } from 'antd';
+import { Input } from 'antd-v5';
 
 const { TextArea } = Input;
 

package/CapSkeleton/CapSkeleton.js

@@ -0,0 +1,17 @@
+/**
+ * CapSkeleton - Migrated to Ant Design v5
+ */
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Skeleton } from 'antd-v5';
+
+const CapSkeleton = ({ className, ...rest }) => {
+  const combinedClassName = `cap-skeleton-v2 ${className || ''}`.trim();
+  return <Skeleton className={combinedClassName} {...rest} />;
+};
+
+CapSkeleton.propTypes = {
+  className: PropTypes.string
+};
+
+export default CapSkeleton; 

package/CapSkeleton/index.js

@@ -0,0 +1 @@
+export { default } from './CapSkeleton';

package/CapSpin/CapSpin.js

@@ -0,0 +1,23 @@
+/**
+ * CapSpin - Migrated to Ant Design v5
+ */
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Spin } from 'antd-v5';
+
+const CapSpin = ({ className, ...rest }) => (
+  <Spin className={className} {...rest} />
+);
+
+CapSpin.propTypes = {
+  className: PropTypes.string,
+  size: PropTypes.oneOf(['small', 'default', 'large']),
+  spinning: PropTypes.bool,
+  tip: PropTypes.string,
+  delay: PropTypes.number,
+  indicator: PropTypes.node,
+  fullscreen: PropTypes.bool,
+  wrapperClassName: PropTypes.string
+};
+
+export default CapSpin; 

package/CapSpin/index.js

@@ -0,0 +1 @@
+export { default } from './CapSpin';

package/CapTable/loadable.js

@@ -1,12 +1,12 @@
-import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
+import CapSkeleton from '../CapSkeleton';
 import { loadable } from '@capillarytech/cap-ui-utils';
 import React, { Suspense } from 'react';
 
 const LoadableComponent = loadable(() => import('./CapTable'));
 
-const CapTableLoadable = () => (
-  <Suspense fallback={<CapSpin />}>
-    <LoadableComponent />
+const CapTableLoadable = (props) => (
+  <Suspense fallback={<CapSkeleton />}>
+    <LoadableComponent {...props} />
   </Suspense>
 );
 

package/CapTable/styles.js

@@ -1,4 +1,4 @@
-import { Table } from 'antd';
+import { Table } from 'antd-v5';
 import styled from 'styled-components';
 import * as styledVars from '../styled/variables';
 

package/CapTestSelect/CapTestSelect.js

@@ -0,0 +1,47 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Select } from 'antd-v5';
+
+/**
+ * Test component to verify Ant Design v5 Select integration
+ * This is a simple wrapper for testing purposes only
+ */
+const CapTestSelect = (props) => {
+  return <Select {...props} />;
+};
+
+CapTestSelect.propTypes = {
+  // Common Select props from antd
+  allowClear: PropTypes.bool,
+  defaultValue: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+    PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))
+  ]),
+  disabled: PropTypes.bool,
+  loading: PropTypes.bool,
+  mode: PropTypes.oneOf(['multiple', 'tags']),
+  placeholder: PropTypes.string,
+  showSearch: PropTypes.bool,
+  value: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+    PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))
+  ]),
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      label: PropTypes.node,
+      value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+      disabled: PropTypes.bool
+    })
+  )
+};
+
+CapTestSelect.defaultProps = {
+  allowClear: false,
+  disabled: false,
+  loading: false,
+  showSearch: false
+};
+
+export default CapTestSelect; 

package/CapTestSelect/index.js

@@ -0,0 +1 @@
+export { default } from './CapTestSelect'; 

package/CapUnifiedSelect/CapUnifiedSelect.js

@@ -1,121 +1,311 @@
-// CapUnifiedSelect component using Ant Design v5 Select and TreeSelect directly
-import React from 'react';
+// Enhanced CapUnifiedSelect supporting 4 scenarios with advanced features in a single TreeSelect
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Select, TreeSelect } from 'antd';
-import { SelectWrapper, HeaderWrapper, StyledInfoIcon } from './styles';
-import CapLabel from '../CapLabel';
-import CapTooltip from '../CapTooltip';
+import classnames from 'classnames';
+import { TreeSelect, Tooltip, Input, Button } from 'antd-v5';
+import styled from 'styled-components';
+import uploadIcon from '../assets/upload.svg';
 
-function CapUnifiedSelect({
+import { InfoCircleOutlined, SearchOutlined, WarningFilled, DownOutlined } from '@ant-design/icons';
+
+import withStyles from '../utils/withStyles';
+import { SelectWrapper, HeaderWrapper, selectStyles } from './styles';
+
+const StyledTreeSelect = styled(TreeSelect)`
+  ${selectStyles}
+`;
+
+const CapUnifiedSelect = ({
   type,
   options = [],
-  treeData,
   value,
   onChange,
   placeholder = 'Select an option',
   className,
   style,
+  isError = false,
+  errorMessage,
+  popupClassName,
   allowClear = false,
-  showSearch = false,
-  label,
+  headerLabel,
   tooltip,
+  bylineText,
   disabled = false,
-}) {
-  const selectVirtualizationProps = {
-    listHeight: 256,
-  };
+  showUpload = false,
+  customPopupRender = true,
+  showSearch = true,
+  searchBasedOn = 'label',
+  onConfirm,
+  onCancel,
+  noResultText = 'No results found',
+  ...rest
+}) => {
+
+  const [searchText, setSearchText] = useState('');
+  const [tempValue, setTempValue] = useState(value);
+  const [allSelected, setAllSelected] = useState(false);
+
+
+  useEffect(() => {
+    setTempValue(value);
+  }, [value]);
 
   const treeSelectVirtualizationProps = {
     listHeight: 256,
     listItemHeight: 32,
   };
 
+  const NoResult = ({ noResultText, className }) => (
+    <div className={classnames(className, "cap-unified-select-no-result")}>
+      <WarningFilled className="cap-unified-select-no-result-icon" />
+      <div className="cap-unified-select-no-result-text">{noResultText}</div>
+    </div>
+  );
+
+  const getFilteredTreeData = (data, search) => {
+    if (!search) return data;
+
+    const filterNode = node => {
+      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 {
+        // Default case, fall back to label
+        const labelText = node.label?.toLowerCase() || '';
+        return labelText.includes(search.toLowerCase());
+      }
+    };
+
+    const loop = data =>
+      data.map(item => {
+        const children = item.children ? loop(item.children) : [];
+        if (filterNode(item) || children.length) {
+          return { ...item, children };
+        }
+        return null;
+      }).filter(Boolean);
+
+    return loop(data);
+  };
+
+  const flattenLeafValues = nodes =>
+    nodes?.flatMap(node => node.children ? flattenLeafValues(node.children) : [node.value]) || [];
+
+  const isMulti = type === 'multiSelect' || type === 'multiTreeSelect';
+  const isTree = type === 'treeSelect' || type === 'multiTreeSelect';
+  
+  const dataSource = isTree ? options : options.map(opt => ({ title: opt.label, value: opt.value, key: opt.key || opt.value }));
+
+  const filteredTree = getFilteredTreeData(dataSource, searchText);
+  const leafValues = flattenLeafValues(filteredTree);
+
+  const handleSelectAll = () => {
+    const availableValues = leafValues;
+    if (allSelected) {
+      // If currently all selected, then unselect all
+      setTempValue([]);
+      setAllSelected(false);
+    } else {
+      // Otherwise select all available options
+      setTempValue(availableValues);
+      setAllSelected(true);
+    }
+  };
+
+  useEffect(() => {
+    if (isMulti && Array.isArray(tempValue)) {
+      setAllSelected(tempValue.length > 0 && tempValue.length === leafValues.length);
+    }
+  }, [tempValue, leafValues, isMulti]);
+
+  const handleConfirm = () => {
+    console.log('Confirm clicked');
+    if (onChange) onChange(tempValue);
+  };
+
+  const handleCancel = () => {
+    console.log('Cancel clicked');
+    setTempValue(value);
+  };
+
+  const handleTempChange = newValue => {
+    setTempValue(newValue);
+  };
+
+  const suffix = isMulti && Array.isArray(value) && value?.length > 1 ? (
+    <>
+      <span>+{value.length - 1} more <DownOutlined /></span>
+    </>
+  ) : (
+    <DownOutlined />
+  );
+
+  const prefix = () => {
+    if (isMulti && Array.isArray(value) && value?.length > 0) {
+      const selectedLabels = options.filter(opt => value.includes(opt.value)).map(opt => opt.label);
+      return selectedLabels[0];
+    }
+    return null;
+  };
+
   const renderHeader = () => {
-    if (!label && !tooltip) return null;
-    
+    if (!headerLabel && !tooltip) return null;
     return (
-      <HeaderWrapper className={disabled ? 'disabled' : ''}>
-        {label && (
-          <CapLabel type="label16" className={disabled ? 'disabled' : ''}>
-            {label}
-          </CapLabel>
-        )}
+      <>
+      <HeaderWrapper className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header')}>
+        {headerLabel && <label type="label16" className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-label')}>{headerLabel}</label>}
         {tooltip && (
-          <CapTooltip title={tooltip}>
-            <StyledInfoIcon className={disabled ? 'disabled' : ''} />
-          </CapTooltip>
+          <Tooltip title={tooltip} rootClassName="cap-unified-tooltip" className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-tooltip')}>
+            <InfoCircleOutlined />
+          </Tooltip>
         )}
       </HeaderWrapper>
+      <div className="cap-unified-select-header-byline-text">
+        {bylineText && <label className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-byline-text')}>{bylineText}</label>}
+      </div>
+      </>
     );
   };
 
   const renderDropdown = () => {
-    if (type === 'treeSelect' || type === 'multiTreeSelect') {
+    const currentItems = filteredTree;
+    const selectedCount = Array.isArray(tempValue) 
+      ? isTree 
+        ? tempValue.filter(val => leafValues.includes(val)).length 
+        : tempValue.length 
+      : (tempValue ? 1 : 0);
+
+    const renderCustomDropdown = menu => {
+      if (!customPopupRender) return menu;
+
       return (
-        <TreeSelect
-          treeData={treeData || options}
-          value={value}
-          onChange={onChange}
+        <div className={classnames(popupClassName, `${type}-popup-container`)}>
+          {showSearch && (
+            <div style={{ borderBottom: '1px solid #f0f0f0' }}>
+              <Input
+                prefix={<SearchOutlined style={{ color: '#B3BAC5' }} />}
+                placeholder="Search"
+                variant="borderless"
+                value={searchText}
+                onChange={e => setSearchText(e.target.value)}
+                onKeyDown={e => e.stopPropagation()}
+              />
+            </div>
+            )}
+          {isMulti && showUpload && (
+            <div style={{ cursor: 'pointer', display: 'flex', alignItems: 'center', borderBottom: '1px solid #f0f0f0' , height: '36px'}}>
+             <Button
+              type="link"
+              icon={<img src={uploadIcon} alt="upload" style={{ width: "16px", height: "20px" }} />}
+              onClick={() => {}}
+              style={{
+                color: '#2466EA', // AntD primary blue
+                display: 'flex',
+                alignItems: 'center',
+                fontSize: '14px',
+                fontWeight: '400',
+                lineHeight: '20px',
+              }}
+            >
+              Upload
+            </Button>
+            </div>
+          )}
+          {isMulti && currentItems.length > 0 && (
+            <div style={{ padding: '8px 12px', cursor: 'pointer', display: 'flex', alignItems: 'center', borderBottom: '1px solid #f0f0f0' }} onClick={e => { e.stopPropagation(); handleSelectAll(); }}>
+                              <input type="checkbox" checked={allSelected} readOnly style={{ cursor: 'pointer' }} onClick={e => e.stopPropagation()} />
+              <label style={{ marginLeft: 8, cursor: 'pointer' }}>Select all</label>
+            </div>
+          )}
+
+          {currentItems.length === 0 ? <NoResult noResultText={noResultText} className={classnames(className, "cap-unified-select-no-result")}/> : menu}
+
+          {currentItems.length > 0 && isMulti && (
+            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', padding: '8px 12px', borderTop: '1px solid #f0f0f0' }}>
+              <div>
+                <Button type="primary" size="small" style={{ marginRight: 8 }} onClick={e => { e.stopPropagation(); handleConfirm(); }}>Confirm</Button>
+                <Button type="text" size="small" onClick={e => { e.stopPropagation(); handleCancel(); }}>Cancel</Button>
+              </div>
+              {selectedCount > 0 && <span style={{ color: '#8c8c8c', fontSize: '14px' }}>{selectedCount} selected</span>}
+            </div>
+          )}
+        </div>
+      );
+    };
+
+    return (
+      <>
+        <StyledTreeSelect
+          {...rest}
+          type={type}
+          treeData={filteredTree}
+          value={customPopupRender ? tempValue : value}
+          onChange={customPopupRender ? handleTempChange : onChange}
           placeholder={placeholder}
-          className={className}
+          maxTagCount={0}
+          maxTagPlaceholder={() => null}
+          prefix={isMulti && value.length > 0 && prefix()}
+          suffixIcon={suffix}
+          className={classnames(`cap-unified-tree-select ${className || ''}`)}
           style={style}
+          status={isError ? 'error' : ''}
           allowClear={allowClear}
-          showSearch={showSearch}
-          multiple={type === 'multiTreeSelect' ? true : false}
+          multiple={isMulti}
+          treeCheckable={isMulti}
+          showCheckedStrategy={TreeSelect.SHOW_PARENT}
           virtual
-          treeDefaultExpandAll
           disabled={disabled}
+          filterTreeNode={false}
           {...treeSelectVirtualizationProps}
+          popupRender={renderCustomDropdown}
         />
-      );
-    }
-
-    return (
-      <Select
-        value={value}
-        onChange={onChange}
-        placeholder={placeholder}
-        className={className}
-        style={style}
-        allowClear={allowClear}
-        showSearch={showSearch}
-        options={options}
-        mode={type === 'multiSelect' ? 'multiple' : undefined}
-        virtual
-        disabled={disabled}
-        {...selectVirtualizationProps}
-      />
+        {isError && <div style={{ color: '#E83135' }} className="cap-unified-select-status">{errorMessage}</div>}
+      </>
     );
   };
 
   return (
-    <SelectWrapper>
+    <SelectWrapper className={classnames(className, 'cap-unified-select-container')}>
       {renderHeader()}
       {renderDropdown()}
     </SelectWrapper>
   );
-}
+};
 
 CapUnifiedSelect.propTypes = {
   type: PropTypes.oneOf(['select', 'multiSelect', 'treeSelect', 'multiTreeSelect']),
   options: PropTypes.array,
-  treeData: PropTypes.array,
   value: PropTypes.any,
   onChange: PropTypes.func,
   placeholder: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   className: PropTypes.string,
   style: PropTypes.object,
   allowClear: PropTypes.bool,
-  showSearch: PropTypes.bool,
-  label: PropTypes.string,
+  headerLabel: PropTypes.string,
   tooltip: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   disabled: PropTypes.bool,
+  customPopupRender: PropTypes.bool,
+  showSearch: PropTypes.bool,
+  searchBasedOn: PropTypes.oneOf(['label', 'value', 'key']),
+  onConfirm: PropTypes.func,
+  onCancel: PropTypes.func,
+  isError: PropTypes.bool,
+  errorMessage: PropTypes.string,
+  popupClassName: PropTypes.string,
+  showUpload: PropTypes.bool,
 };
 
 CapUnifiedSelect.defaultProps = {
   type: 'select',
   allowClear: false,
-  showSearch: false,
+  customPopupRender: false,
+  showSearch: true,
+  searchBasedOn: 'label',
+  className: '',
+  popupClassName: '',
 };
 
-export default CapUnifiedSelect;
+export default withStyles(CapUnifiedSelect, selectStyles);

package/CapUnifiedSelect/index.js

@@ -1,4 +1 @@
-import CapUnifiedSelect from './CapUnifiedSelect';
-import CapUnifiedSelectLoadable from './loadable';
-
-export default CapUnifiedSelectLoadable; 
+export { default } from './CapUnifiedSelect';