@capillarytech/blaze-ui 0.1.6-alpha.28 → 0.1.6-alpha.3

package/CapTable/loadable.js

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

package/CapTooltip/CapTooltip.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Tooltip } from 'antd';
+import classNames from 'classnames';
+import { TooltipWrapper } from './styles';
+
+const CapTooltip = ({ overlayClassName, children, ...rest }) => {
+  return (
+    <TooltipWrapper>
+      <Tooltip
+        overlayClassName={classNames('cap-tooltip', overlayClassName)}
+        {...rest}
+      >
+        {children}
+      </Tooltip>
+    </TooltipWrapper>
+  );
+};
+
+/*
+  NOTE:
+    While using a disabled button with tooltip, wrap the button with an element with className "button-disabled-tooltip-wrapper".
+
+    <CapTooltip title="disabled button with tooltip">
+      <span className="button-disabled-tooltip-wrapper">
+        <CapButton disabled>Button</CapButton>
+      </span>
+    </CapTooltip>
+*/
+
+CapTooltip.propTypes = {
+  overlayClassName: PropTypes.string,
+  children: PropTypes.node,
+};
+
+export default CapTooltip;

package/CapTooltip/index.js

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

package/CapTooltip/styles.js

@@ -0,0 +1,42 @@
+import styled from 'styled-components';
+import * as styledVars from '../styled/variables';
+
+export const TooltipWrapper = styled.span`
+  .cap-tooltip {
+    max-width: 324px;
+
+    .ant-tooltip-inner {
+      background-color: ${styledVars.FONT_COLOR_01};
+      font-size: ${styledVars.FONT_SIZE_M};
+      font-weight: ${styledVars.FONT_WEIGHT_MEDIUM};
+      padding: 6px 8px;
+      min-height: 32px;
+      border-radius: ${styledVars.RADIUS_04};
+    }
+
+    &.cap-bgcolor-tooltip {
+      .ant-tooltip-inner {
+        background-color: ${styledVars.FONT_COLOR_05};
+      }
+    }
+
+    &.hide-tooltip-pointer {
+      .ant-tooltip-arrow {
+        display: none;
+      }
+    }
+  }
+
+  .button-disabled-tooltip-wrapper {
+    display: inline-flex;
+    cursor: not-allowed;
+
+    .cap-button.ant-btn[disabled] {
+      pointer-events: none;
+      & > * {
+        pointer-events: auto;
+        cursor: not-allowed;
+      }
+    }
+  }
+`;

package/CapUnifiedSelect/CapUnifiedSelect.js

@@ -1,14 +1,12 @@
-// Enhanced CapUnifiedSelect supporting 4 scenarios with advanced features
-import React, { useState, useEffect } from 'react';
+// CapUnifiedSelect component using Ant Design v5 Select and TreeSelect directly
+import React from 'react';
 import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { Select, TreeSelect, Tooltip, Input, Button } from 'antd';
-import { InfoCircleOutlined, SearchOutlined, WarningFilled, DownOutlined } from '@ant-design/icons';
-import { SelectWrapper, HeaderWrapper, selectStyles } from './styles';
-import withStyles from '../../utils/withStyles';
-import styled from 'styled-components';
+import { Select, TreeSelect } from 'antd';
+import { SelectWrapper, HeaderWrapper, StyledInfoIcon } from './styles';
+import CapLabel from '../CapLabel';
+import CapTooltip from '../CapTooltip';
 
-const CapUnifiedSelect = ({
+function CapUnifiedSelect({
   type,
   options = [],
   treeData,
@@ -17,33 +15,12 @@ const CapUnifiedSelect = ({
   placeholder = 'Select an option',
   className,
   style,
-  status,
-  statusMessage,
   allowClear = false,
+  showSearch = false,
   label,
   tooltip,
   disabled = false,
-  treeCheckable = false,
-  customPopupRender = false,
-  onConfirm,
-  onCancel
-}) => {
-  const StyledSelect = styled(Select)`
-    ${selectStyles}
-  `;
-  const StyledTreeSelect = styled(TreeSelect)`
-    ${selectStyles}
-  `;
-
-  const [searchText, setSearchText] = useState('');
-  const [tempValue, setTempValue] = useState(value);
-  const [allSelected, setAllSelected] = useState(false);
-  
-  // Update tempValue when value changes
-  useEffect(() => {
-    setTempValue(value);
-  }, [value]);
- 
+}) {
   const selectVirtualizationProps = {
     listHeight: 256,
   };
@@ -53,296 +30,71 @@ const CapUnifiedSelect = ({
     listItemHeight: 32,
   };
 
-  // No results component
-  const NoResult = () => (
-    <div style={{
-      display: 'flex', 
-      flexDirection: 'column', 
-      alignItems: 'center', 
-      justifyContent: 'center',
-      height: 200, 
-      color: '#8c8c8c', 
-      fontSize: 14
-    }}>
-      <WarningFilled style={{ fontSize: 36, marginBottom: 8, color: '#bfbfbf' }} />
-      <div style={{ fontWeight: 500 }}>No results found</div>
-    </div>
-  );
-
-  // Filter tree data based on search text
-  const getFilteredTreeData = (data, search) => {
-    if (!search) return data;
-    
-    const filterNode = node => {
-      const titleText = node.title?.toLowerCase() || '';
-      const labelText = node.label?.toLowerCase() || '';
-      return titleText.includes(search.toLowerCase()) || 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);
-  };
-
-  // Get all leaf node values from tree data
-  const flattenedLeafValues = (nodes) =>
-    nodes?.flatMap((node) =>
-      node.children ? flattenedLeafValues(node.children) : [node.value]
-    ) || [];
-
-  const filteredTree = getFilteredTreeData(treeData || options, searchText);
-  const filteredOptions = !searchText ? options : options.filter(opt => 
-    opt.label?.toLowerCase().includes(searchText.toLowerCase())
-  );
-  
-  // All available leaf values for the current filtered tree data
-  const leafValues = flattenedLeafValues(filteredTree);
-
-  // Handles select all checkbox click
-  const handleSelectAll = (isTree = false) => {
-    const availableValues = isTree ? leafValues : filteredOptions.map(opt => opt.value);
-    
-    if (allSelected) {
-      setTempValue([]);
-    } else {
-      setTempValue(availableValues);
-    }
-    
-    setAllSelected(!allSelected);
-  };
-  
-  // Update allSelected state when value changes
-  useEffect(() => {
-    const isMultipleMode = type === 'multiSelect' || type === 'multiTreeSelect';
-    if (isMultipleMode && Array.isArray(tempValue)) {
-      const availableValues = type.includes('tree') ? leafValues : filteredOptions.map(opt => opt.value);
-      setAllSelected(tempValue.length > 0 && tempValue.length === availableValues.length);
-    }
-  }, [tempValue, filteredOptions, leafValues, type]);
-  
-  // Handle confirmation
-  const handleConfirm = () => {
-    if (onConfirm) {
-      onConfirm(tempValue);
-    } else {
-      onChange(tempValue);
-    }
-    setSearchText('');
-  };
-  
-  // Handle cancellation
-  const handleCancel = () => {
-    if (onCancel) {
-      onCancel();
-    }
-    setTempValue(value);
-    setSearchText('');
-  };
-  
-  // Handle temporary value change
-  const handleTempChange = (newValue) => {
-    setTempValue(newValue);
-  };
-
-  const suffix =
-  (type === "multiTreeSelect" || type === "multiSelect") && Array.isArray(value) && value.length > 1 ? (
-    <>
-      <span>
-        +{value.length - 1} more
-        <DownOutlined />
-      </span>
-    </>
-  ) : (
-    <DownOutlined />
-  );
-
-  const prefix = () => {
-    if((type === "multiTreeSelect" || type === "multiSelect") && Array.isArray(value) && value.length > 0) {
-      const selectedLabels = options
-      .filter((opt) => value.includes(opt.value))
-      .map((opt) => opt.label);
-
-      return selectedLabels[0];
-    } else {
-      return null;
-    }
-  }
-
   const renderHeader = () => {
     if (!label && !tooltip) return null;
+    
     return (
       <HeaderWrapper className={disabled ? 'disabled' : ''}>
-        {label && <label type="label16" className={disabled ? 'disabled' : ''}>{label}</label>}
+        {label && (
+          <CapLabel type="label16" className={disabled ? 'disabled' : ''}>
+            {label}
+          </CapLabel>
+        )}
         {tooltip && (
-          <Tooltip title={tooltip}>
-            <InfoCircleOutlined className={disabled ? 'disabled' : ''} style={{ color: '#B3BAC5' }}/>
-          </Tooltip>
+          <CapTooltip title={tooltip}>
+            <StyledInfoIcon className={disabled ? 'disabled' : ''} />
+          </CapTooltip>
         )}
       </HeaderWrapper>
     );
   };
 
   const renderDropdown = () => {
-    const isMultipleSelect = type === 'multiSelect' || type === 'multiTreeSelect';
-    const isTreeMode = type === 'treeSelect' || type === 'multiTreeSelect';
-    const currentItems = isTreeMode ? filteredTree : filteredOptions;
-    const selectedCount = Array.isArray(tempValue) ? tempValue.length : (tempValue ? 1 : 0);
-    
-    // Custom dropdown render for both Select and TreeSelect
-    const renderCustomDropdown = (menu) => {
-      if (!customPopupRender) return menu;
-      
-      return (
-        <>
-          <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>
-          
-          {isMultipleSelect && currentItems.length > 0 && (
-            <div style={{
-              padding: '8px 12px',
-              cursor: 'pointer',
-              display: 'flex',
-              alignItems: 'center',
-              borderBottom: '1px solid #f0f0f0'
-            }} 
-            onClick={(e) => {
-              // Prevent event propagation to keep dropdown open
-              e.stopPropagation();
-              handleSelectAll(isTreeMode);
-            }}>
-              <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 /> : menu}
-          
-          {currentItems.length > 0 && isMultipleSelect && (
-            <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>
-          )}
-        </>
-      );
-    };
-
     if (type === 'treeSelect' || type === 'multiTreeSelect') {
       return (
-        <>
-          <StyledTreeSelect
-            treeData={filteredTree}
-            value={customPopupRender ? tempValue : value}
-            onChange={customPopupRender ? handleTempChange : onChange}
-            placeholder={placeholder}
-            maxTagCount={0}
-            maxTagPlaceholder={() => null} 
-            prefix={type === "multiTreeSelect" && value.length > 0 && prefix()}
-            suffixIcon={suffix}
-            className={classnames(`cap-unified-tree-select ${className || ''}`)}
-            style={style}
-            status={status}
-            allowClear={allowClear}
-            showSearch={false}
-            multiple={type === 'multiTreeSelect'}
-            treeCheckable={treeCheckable}
-            showCheckedStrategy={TreeSelect.SHOW_PARENT}
-            virtual
-            disabled={disabled}
-            filterTreeNode={false}
-            {...treeSelectVirtualizationProps}
-            popupRender={renderCustomDropdown}
-            />
-            {status === 'error' && <div style={{ color: '#E83135' }} className="cap-unified-select-status">{statusMessage}</div>}
-        </>
-      );
-    }
-
-    return (
-      <>
-        <StyledSelect
-          options={filteredOptions}
-          value={customPopupRender ? tempValue : value}
-          onChange={customPopupRender ? handleTempChange : onChange}
+        <TreeSelect
+          treeData={treeData || options}
+          value={value}
+          onChange={onChange}
           placeholder={placeholder}
-          maxTagCount={0}
-          maxTagPlaceholder={() => null} 
-          prefix={type === "multiSelect" && value.length > 0 && prefix()}
-          suffixIcon={suffix}
-          className={classnames('cap-unified-select', className)}
+          className={className}
           style={style}
           allowClear={allowClear}
-          showSearch={false}
-          mode={type === 'multiSelect' ? 'multiple' : undefined}
+          showSearch={showSearch}
+          multiple={type === 'multiTreeSelect' ? true : false}
           virtual
+          treeDefaultExpandAll
           disabled={disabled}
-          status={status}
-          {...selectVirtualizationProps}
-          popupRender={renderCustomDropdown}
+          {...treeSelectVirtualizationProps}
         />
-        {status === 'error' && <div style={{ color: '#E83135' }} className="cap-unified-select-status">{statusMessage}</div>}
-      </>
+      );
+    }
+
+    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}
+      />
     );
-  }; 
+  };
 
   return (
-    <SelectWrapper className={classnames(`cap-unified-select-container ${className || ''}`)}>
+    <SelectWrapper>
       {renderHeader()}
       {renderDropdown()}
     </SelectWrapper>
   );
-};
+}
 
 CapUnifiedSelect.propTypes = {
   type: PropTypes.oneOf(['select', 'multiSelect', 'treeSelect', 'multiTreeSelect']),
@@ -354,21 +106,16 @@ CapUnifiedSelect.propTypes = {
   className: PropTypes.string,
   style: PropTypes.object,
   allowClear: PropTypes.bool,
+  showSearch: PropTypes.bool,
   label: PropTypes.string,
   tooltip: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   disabled: PropTypes.bool,
-  treeCheckable: PropTypes.bool,
-  customPopupRender: PropTypes.bool,
-  onConfirm: PropTypes.func,
-  onCancel: PropTypes.func,
 };
 
 CapUnifiedSelect.defaultProps = {
   type: 'select',
   allowClear: false,
-  customPopupRender: false,
-  treeCheckable: false,
-  className: '',
+  showSearch: false,
 };
 
-export default withStyles(CapUnifiedSelect, selectStyles);
+export default CapUnifiedSelect;

package/CapUnifiedSelect/index.js

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

package/CapUnifiedSelect/loadable.js

@@ -0,0 +1,3 @@
+import loadable from '@loadable/component';
+
+export default loadable(() => import('./CapUnifiedSelect'));