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

package/CapTooltipWithInfo/CapTooltipWithInfo.js

@@ -0,0 +1,82 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { CapTooltip, CapIcon } from '../';
+import withStyles from '../utils/withStyles';
+import { tooltipWithInfoStyles } from './styles';
+
+/**
+ * CapTooltipWithInfo - A component that combines an info icon with a tooltip
+ * for displaying additional information on hover or other trigger events.
+ */
+const CapTooltipWithInfo = ({
+  title,
+  iconSize = 's',
+  iconType = 'info-circle',
+  placement = 'top',
+  trigger = 'hover',
+  className = '',
+  tooltipProps = {},
+  iconProps = {},
+  ...rest
+}) => {
+  return (
+    <span 
+      className={classnames('cap-tooltip-with-info', className)} 
+      {...rest}
+    >
+      <CapTooltip
+        title={title}
+        placement={placement}
+        trigger={trigger}
+        {...tooltipProps}
+      >
+        <span className="cap-tooltip-with-info-icon">
+          <CapIcon 
+            type={iconType}
+            size={iconSize}
+            {...iconProps}
+          />
+        </span>
+      </CapTooltip>
+    </span>
+  );
+};
+
+CapTooltipWithInfo.propTypes = {
+  /** Content to display in the tooltip */
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
+  /** Size of the info icon */
+  iconSize: PropTypes.oneOf(['xs', 's', 'm', 'l']),
+  /** Type of icon to display */
+  iconType: PropTypes.string,
+  /** Placement of the tooltip relative to the icon */
+  placement: PropTypes.oneOf([
+    'top', 'left', 'right', 'bottom',
+    'topLeft', 'topRight', 'bottomLeft', 'bottomRight',
+    'leftTop', 'leftBottom', 'rightTop', 'rightBottom',
+  ]),
+  /** How the tooltip is triggered */
+  trigger: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.arrayOf(PropTypes.string),
+  ]),
+  /** Additional class name */
+  className: PropTypes.string,
+  /** Additional props passed to the CapTooltip component */
+  tooltipProps: PropTypes.object,
+  /** Additional props passed to the CapIcon component */
+  iconProps: PropTypes.object,
+};
+
+CapTooltipWithInfo.defaultProps = {
+  iconSize: 's',
+  iconType: 'info-circle',
+  placement: 'top',
+  trigger: 'hover',
+  className: '',
+  tooltipProps: {},
+  iconProps: {},
+};
+
+export default withStyles(CapTooltipWithInfo, tooltipWithInfoStyles);

package/CapTooltipWithInfo/index.js

@@ -0,0 +1,3 @@
+import CapTooltipWithInfo from './CapTooltipWithInfo';
+
+export default CapTooltipWithInfo;

package/CapTooltipWithInfo/styles.js

@@ -0,0 +1,22 @@
+import { css } from 'styled-components';
+import * as styledVars from '../styled/variables';
+
+export const tooltipWithInfoStyles = css`
+  &.cap-tooltip-with-info {
+    display: inline-flex;
+    align-items: center;
+    cursor: default;
+    
+    .cap-tooltip-with-info-icon {
+      color: ${styledVars.CAP_G06};
+      margin-left: 4px;
+      cursor: help;
+      
+      &:hover {
+        color: ${styledVars.CAP_G07};
+      }
+    }
+  }
+`;
+
+export default tooltipWithInfoStyles;

package/CapUnifiedSelect/CapUnifiedSelect.js

@@ -5,9 +5,9 @@ import classnames from 'classnames';
 import { TreeSelect, Input, Button } from 'antd-v5';
 import styled from 'styled-components';
 import * as styledVars from '../styled/variables';
-import { CapLabel, CapTooltip, CapRow, CapIcon } from '../';
+import { CapLabel, CapTooltipWithInfo, CapRow, CapIcon } from '../';
 import withStyles from '../utils/withStyles';
-import { SelectWrapper, selectStyles } from './styles';
+import { SelectWrapper, HeaderWrapper, selectStyles } from './styles';
 
 const StyledTreeSelect = styled(TreeSelect)`
   ${selectStyles}
@@ -26,6 +26,7 @@ const CapUnifiedSelect = ({
   popupClassName,
   allowClear = false,
   headerLabel,
+  onUpload,
   tooltip,
   bylineText,
   disabled = false,
@@ -42,6 +43,7 @@ const CapUnifiedSelect = ({
   const [searchText, setSearchText] = useState('');
   const [tempValue, setTempValue] = useState(value);
   const [allSelected, setAllSelected] = useState(false);
+  const [dropdownOpen, setDropdownOpen] = useState(false);
 
 
   useEffect(() => {
@@ -59,7 +61,7 @@ const CapUnifiedSelect = ({
       align="middle" 
       gap={8}
     >
-      <CapIcon type="warning" size="s" />
+      <CapIcon type="warning" size="m" />
       <CapLabel className="cap-unified-select-no-result-text">{noResultText}</CapLabel>
     </CapRow>
   ));
@@ -125,50 +127,66 @@ const CapUnifiedSelect = ({
 
   const handleConfirm = useCallback(() => {
     if (onChange) onChange(tempValue);
+    setDropdownOpen(false);
   }, [onChange, tempValue]);
 
   const handleCancel = useCallback(() => {
     setTempValue(value);
+    setDropdownOpen(false);
   }, [value]);
 
   const handleTempChange = useCallback(newValue => {
     setTempValue(newValue);
   }, []);
 
+  const handleDropdownVisibilityChange = open => {
+    if (!open) {
+      setTempValue(value);
+    }
+    setDropdownOpen(open);
+  };
+
   const suffix = useMemo(() => {
-    return isMulti && Array.isArray(value) && value?.length > 1 ? (
+    const displayValue = dropdownOpen ? tempValue : value;
+    return isMulti && Array.isArray(displayValue) && displayValue?.length > 1 ? (
       <>
-        <span>+{value.length - 1} more <CapIcon type="down" size="s" /></span>
+        <span>+{displayValue.length - 1} more <CapIcon type="down" size="s" /></span>
       </>
     ) : (
       <CapIcon type="down" size="s" />
     );
-  }, [isMulti, value]);
+  }, [isMulti, value, tempValue, dropdownOpen]);
 
   const prefix = useMemo(() => {
-    if (isMulti && Array.isArray(value) && value?.length > 0) {
-      const selectedLabels = options.filter(opt => value.includes(opt.value)).map(opt => opt.label);
-      return selectedLabels[0];
+    if (isMulti) {
+      if (Array.isArray(tempValue) && tempValue?.length > 0) {
+        const firstSelectedValue = tempValue[0];
+        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);
+        return firstSelectedOption?.label || null;
+      }
     }
     return null;
-  }, [isMulti, value, options]);
+  }, [isMulti, value, tempValue, options]);
 
   const renderHeader = useCallback(() => {
     if (!headerLabel && !tooltip) return null;
     return (
       <>
-      <CapRow 
-        className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header')}
-        align="middle"
-        gap={8}
-      >
+      <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 && (
-          <CapTooltip title={tooltip} className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-tooltip')}>
-            <CapIcon type="info-circle" size="s" />
-          </CapTooltip>
+          <CapTooltipWithInfo 
+            title={tooltip} 
+            className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-tooltip')}
+            iconProps={{ disabled }}
+          />
         )}
-      </CapRow>
+      </HeaderWrapper>
       <div className="cap-unified-select-header-byline-text">
         {bylineText && <CapLabel className={classnames(disabled ? 'disabled' : '', 'cap-unified-select-header-byline-text')}>{bylineText}</CapLabel>}
       </div>
@@ -197,48 +215,54 @@ const CapUnifiedSelect = ({
                 variant="borderless"
                 value={searchText}
                 onChange={e => setSearchText(e.target.value)}
-                onKeyDown={e => e.stopPropagation()}
               />
             </CapRow>
             )}
           {isMulti && showUpload && (
-            <CapRow className={classnames("cap-unified-select-upload-container")} align="middle">
-             <Button
-              type="link"
-              icon={<CapIcon type="upload" size="s" />}
-              onClick={() => {}}
-              className={classnames("cap-unified-select-upload-button")}
-            >
-              Upload
-            </Button>
+            <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 && (
             <CapRow 
               className={classnames("cap-unified-select-select-all-container")} 
-              onClick={e => { e.stopPropagation(); handleSelectAll(); }}
+              onClick={handleSelectAll}
               align="middle"
-              gap={8}
+              gap={7}
             >
-              <input type="checkbox" checked={allSelected} className={classnames("cap-unified-select-select-all-checkbox")} onClick={e => e.stopPropagation()} />
-              <CapLabel className={classnames("cap-unified-select-select-all-label")}>Select all</CapLabel>
+              <input readOnly type="checkbox" checked={allSelected} className={classnames("cap-unified-select-select-all-checkbox")} onClick={handleSelectAll} />
+              <CapLabel type="label14" className={classnames("cap-unified-select-select-all-label")}>Select all</CapLabel>
             </CapRow>
           )}
 
           {currentItems.length === 0 ? <NoResult noResultText={noResultText} className={classnames(className, "cap-unified-select-no-result")}/> : menu}
 
           {currentItems.length > 0 && isMulti && (
-            <CapRow 
-              className={classnames("cap-unified-select-confirm-container")} 
-              justify="space-between" 
-              align="middle"
-            >
-              <CapRow gap={8}>
-                <Button type="primary" size="small" className={classnames("cap-unified-select-confirm-button")} onClick={e => { e.stopPropagation(); handleConfirm(); }}>Confirm</Button>
-                <Button type="text" size="small" onClick={e => { e.stopPropagation(); handleCancel(); }}>Cancel</Button>
-              </CapRow>
-              {selectedCount > 0 && <CapLabel className={classnames("cap-unified-select-selected-count")}>{selectedCount} selected</CapLabel>}
-            </CapRow>
+           <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>
       );
@@ -256,7 +280,7 @@ const CapUnifiedSelect = ({
           showSearch={false}
           maxTagCount={0}
           maxTagPlaceholder={() => null}
-          prefix={isMulti && value.length > 0 && prefix}
+          prefix={tempValue?.length > 0 ? prefix : undefined}
           suffixIcon={suffix}
           className={classnames(`cap-unified-tree-select ${className || ''}`)}
           style={style}
@@ -264,6 +288,9 @@ const CapUnifiedSelect = ({
           allowClear={allowClear}
           multiple={isMulti}
           treeCheckable={isMulti}
+          open={dropdownOpen}
+          treeDefaultExpandAll={true}
+          onOpenChange={handleDropdownVisibilityChange}
           showCheckedStrategy={TreeSelect.SHOW_PARENT}
           virtual
           disabled={disabled}
@@ -305,6 +332,7 @@ CapUnifiedSelect.propTypes = {
   errorMessage: PropTypes.string,
   popupClassName: PropTypes.string,
   showUpload: PropTypes.bool,
+  onUpload: PropTypes.func,
 };
 
 CapUnifiedSelect.defaultProps = {
@@ -320,7 +348,8 @@ CapUnifiedSelect.defaultProps = {
   disabled: false,
   showUpload: false,
   isError: false,
-  noResultText: 'No results found'
+  noResultText: 'No results found',
+  onUpload: () => {}
 };
 
 export default withStyles(CapUnifiedSelect, selectStyles);

package/CapUnifiedSelect/styles.js

@@ -95,6 +95,10 @@ export const StyledInfoIcon = styled.span`
 
 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;
+    }
     .ant-tree-select-dropdown{
       padding: 0px !important;
     }
@@ -108,9 +112,15 @@ export const selectStyles = css`
       align-items: center !important;
       border-bottom: 1px solid #f0f0f0 !important;
       height: 40px !important;
+      padding-left: 15px !important;
+
+      .cap-unified-select-upload-label{
+        margin-left: 12px !important;
+        color: #2466EA !important;
+      }
     }
     .cap-unified-select-select-all-container{
-      padding: 8px 12px !important;
+      padding: 9px 9px !important;
       cursor: pointer !important;
       display: flex !important;
       align-items: center !important;
@@ -135,11 +145,6 @@ export const selectStyles = css`
       line-height: 20px !important;
       letter-spacing: 0px !important;
     }
-    .cap-unified-select-header-tooltip{
-      width: 16px !important;
-      height: 16px !important;
-      color: ${styledVars.CAP_G06} !important;
-    }
     .cap-unified-select-header-byline-text{
       font-family: ${styledVars.FONT_FAMILY} !important;
       font-weight: 400 !important;
@@ -148,25 +153,65 @@ export const selectStyles = css`
       letter-spacing: 0px !important;
       color: #97A0AF !important;
     }
+    .ant-input-affix-wrapper .ant-input-prefix{
+      left: 13px !important;
+    }
+    .ant-select-tree {
+      .ant-select-tree-node-content-wrapper{
+        background-color: transparent !important;
+      }
+      .ant-select-tree-node-content-wrapper:hover {
+        background-color: transparent !important;
+      }
+    }
+    .ant-select-tree .ant-select-tree-switcher:not(.ant-select-tree-switcher-noop):hover:before{
+      background-color: transparent !important;
+    }
+    .ant-select-selection-item{
+      background: transparent !important;
+    }
     .cap-unified-tree-select .ant-select-selector:hover{
       border: 1px solid #7A869A !important;
     }
+    .cap-unified-tree-select .ant-select-selector:focus{
+      border: 1px solid #7A869A !important;
+    }
+    .cap-unified-tree-select .cap-unified-select-select-all-checkbox{
+      height: 18px !important;
+      width: 18px !important;
+      border-color: #B3BAC5 !important;
+      border-radius: 2px !important;
+    }
     .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;
     }
-    .ant-tree-select-dropdown .treeSelect-popup-container .ant-select-tree .ant-select-tree-treenode{
-      margin: 0px !important;
+    .cap-unified-tree-select .multiSelect-popup-container .ant-select-tree-treenode{
+      padding-left: 15px !important;
     }
     .ant-tree-select-dropdown .ant-select-tree .ant-select-tree-treenode{
       line-height: 40px !important;
       margin-bottom: 0px !important;
+      .ant-select-tree-checkbox .ant-select-tree-checkbox-inner{
+        height: 18px !important;
+        width: 18px !important;
+        border: 2px solid #B3BAC5 !important;
+      }
+      &:hover{
+        background-color: #FFFBE6 !important;
+        border-radius: 4px !important;
+      }
+      &:not(.ant-select-tree-treenode-disabled) .ant-select-tree-node-content-wrapper:hover{
+        background-color: none !important;
+      }
     }
-    .cap-unified-tree-select .multiSelect-popup-container .ant-tree-select-dropdown .ant-select-tree .ant-select-tree-treenode{
-      margin-left: 10px !important;
+    .ant-tree-select-dropdown .ant-select-tree .ant-select-tree-node-content-wrapper{
+      border-radius: 0px !important;
+      padding-left: 12px !important;
     }
-    .multiSelect-popup-container .ant-select-tree-treenode{
-      margin-left: 10px !important;
+    .ant-select-tree-treenode.ant-select-tree-treenode-selected{
+      background-color: #E9F0FE !important;
+      color: #2466EA !important;
     }
     .cap-unified-select-no-result{
       display: flex;
@@ -192,36 +237,78 @@ export const selectStyles = css`
     .ant-tree-select-open .ant-select-selector {
       border-color: #7A869A !important;
       box-shadow: none !important;
-      outline: none !important; /* remove blue outline */
+      outline: none !important;
     }
     .cap-unified-select-search-container{
       border-bottom: 1px solid #EBECF0 !important;
       line-height: 40px !important;
+      .ant-input-affix-wrapper{
+        padding-left: 8px !important;
+      }
     }
     .cap-unified-select-upload-button{
-      color: ${styledVars.CAP_BLUE01} !important;
-      display: flex !important;
-      align-items: center !important;
-      font-size: 14px !important;
-      font-weight: 400 !important;
-      line-height: 20px !important;
+      border: none !important;
+      padding-left: 15px !important;
     }
-    .cap-unified-select-confirm-container{
-      display: flex !important;
-      justify-content: space-between !important;
-      align-items: center !important;
-      padding: 8px 12px !important;
-      border-top: 1px solid #f0f0f0 !important;
+    .cap-unified-select-confirm-container {
+      display: flex;
+      align-items: center;
+      height: 48px;
+      padding: 7px;
+      border-top: 1px solid #EBECF0;
     }
-    .cap-unified-select-confirm-button{
-      margin-right: 8px !important;
+    .cap-unified-select-confirm-button-group {
+      display: flex;
+      padding-left: 8px;
+      align-items: center;
+      width: 100%; /* so it can push the label */
+      button{
+        height: 32px;
+        width: 94px;
+      }
+      .cap-unified-select-confirm-button{
+        background-color: #6ebd6e !important;
+      }
+      .cap-unified-select-cancel-button{
+        border: transparent !important;
+        box-shadow: none !important;
+      }
     }
-    .cap-unified-select-selected-count{
-      color: ${styledVars.CAP_G05} !important;
-      font-size: 14px !important;
+    .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;
     }
     .cap-unified-select-status{
       color: #E83135 !important;
     }
+    .cap-unified-select-search-container {
+      .ant-input-affix-wrapper {
+        border: none !important;
+        box-shadow: none !important;
+        border-radius: 0 !important;
+      }
+
+      .ant-input-affix-wrapper:hover {
+        border: none !important;
+        box-shadow: none !important;
+        border-bottom: 1px solid #EBECF0 !important;
+      }
+
+      .ant-input-affix-wrapper:focus-within {
+        border: none !important;
+        box-shadow: none !important;
+        border-bottom: 1px solid #091E42 !important;
+        outline: none !important;
+      }
+
+      .ant-input {
+        border: none !important;
+        box-shadow: none !important;
+      }
+    }
   }
 `; 

package/index.js

@@ -7,6 +7,7 @@ export { default as CapSkeleton } from './CapSkeleton';
 export { default as CapSpin } from './CapSpin';
 export { default as CapTable } from './CapTable';
 export { default as CapTooltip } from './CapTooltip';
+export { default as CapTooltipWithInfo } from './CapTooltipWithInfo';
 export { default as CapUnifiedSelect } from './CapUnifiedSelect';
 
 // Export utilities

package/package.json

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