@zohodesk/components 1.6.24 → 1.6.26

package/es/v1/Button/constants/index.js

@@ -1,19 +1,21 @@
 export const PALETTE = {
-  DEFAULT: 'default',
-  PRIMARY: 'primary',
+  BRAND: 'brand',
+  BRAND_LIGHTER: 'brandLighter',
+  INFO: 'info',
+  INFO_LIGHTER: 'infoLighter',
   SECONDARY: 'secondary',
+  SECONDARY_LIGHTER: 'secondaryLighter',
   DANGER: 'danger',
-  SUCCESS: 'success'
-};
-export const BG_APPEARANCE = {
-  DEFAULT: 'default',
-  ON_HOVER: 'onHover',
-  NONE: 'none'
+  DANGER_LIGHTER: 'dangerLighter',
+  SUCCESS: 'success',
+  SUCCESS_LIGHTER: 'successLighter',
+  WARNING: 'warning',
+  WARNING_LIGHTER: 'warningLighter'
 };
-export const BORDER_APPEARANCE = {
-  DEFAULT: 'default',
-  ON_HOVER: 'onHover',
-  NONE: 'none'
+export const APPEARANCE = {
+  BORDER: 'border',
+  TEXT: 'text',
+  BG: 'bg'
 };
 export const VARIANT = {
   TEXT: 'text',
@@ -37,12 +39,8 @@ export const LOADER_PLACEMENT = {
   OVERLAY: 'overlay'
 };
 export const ICON_PLACEMENT = {
-  LEFT: 'left',
-  RIGHT: 'right'
-};
-export const PALETTE_SHADE = {
-  DEFAULT: 'default',
-  LIGHTER: 'lighter'
+  START: 'start',
+  END: 'end'
 };
 export const SHAPE = {
   PILL: 'pill',
@@ -67,16 +65,24 @@ export const TYPOGRAPHY_SIZE_MAP = {
 };
 /** Default values referenced by both defaultProps and cssJSLogic */
 
-export const DEFAULT_PALETTE = PALETTE.DEFAULT;
-export const DEFAULT_BG_APPEARANCE = BG_APPEARANCE.DEFAULT;
-export const DEFAULT_BORDER_APPEARANCE = BORDER_APPEARANCE.DEFAULT;
+export const DEFAULT_APPEARANCE = {
+  bg: true,
+  text: true
+};
+export const DEFAULT_HOVER_APPEARANCE = {
+  bg: true,
+  text: true
+};
+export const DEFAULT_SELECTED_APPEARANCE = {
+  bg: true,
+  text: true
+};
 export const DEFAULT_VARIANT = VARIANT.TEXT;
 export const DEFAULT_SIZE = SIZE.MEDIUM;
 export const DEFAULT_STATUS = STATUS.DEFAULT;
 export const DEFAULT_LOADER_PLACEMENT = LOADER_PLACEMENT.OVERLAY;
-export const DEFAULT_ICON_PLACEMENT = ICON_PLACEMENT.LEFT;
+export const DEFAULT_ICON_PLACEMENT = ICON_PLACEMENT.START;
 export const DEFAULT_ICON_SIZE = 16;
-export const DEFAULT_PALETTE_SHADE = PALETTE_SHADE.DEFAULT;
 export const DEFAULT_SHAPE = SHAPE.ROUNDED_RECTANGLE;
 export const DEFAULT_DISABLED_APPEARANCE = DISABLED_APPEARANCE.DULL;
 export const DEFAULT_BUTTON_TYPE = BUTTON_TYPE.BUTTON;

package/es/v1/Button/constants/presets.js

@@ -0,0 +1,160 @@
+/** Button appearance presets */
+export const BRAND_GHOST = {
+  palette: 'brand',
+  appearance: {
+    bg: false,
+    border: true
+  },
+  hoverAppearance: {
+    bg: false,
+    border: true
+  },
+  selectedAppearance: {
+    bg: false,
+    border: true
+  }
+};
+export const BRAND_TEXT_ONLY = {
+  palette: 'brand',
+  appearance: {
+    bg: false
+  },
+  hoverAppearance: {
+    bg: false
+  },
+  selectedAppearance: {
+    bg: false
+  }
+};
+export const BRAND_TINTED_OUTLINE = {
+  palette: 'brandLighter',
+  appearance: {
+    border: true
+  },
+  hoverAppearance: {
+    border: true
+  },
+  selectedAppearance: {
+    border: true
+  }
+};
+export const SUCCESS_GHOST = {
+  palette: 'success',
+  appearance: {
+    bg: false,
+    border: true
+  },
+  hoverAppearance: {
+    bg: false,
+    border: true
+  },
+  selectedAppearance: {
+    bg: false,
+    border: true
+  }
+};
+export const SUCCESS_TEXT_ONLY = {
+  palette: 'success',
+  appearance: {
+    bg: false
+  },
+  hoverAppearance: {
+    bg: false
+  },
+  selectedAppearance: {
+    bg: false
+  }
+};
+export const SUCCESS_TINTED_OUTLINE = {
+  palette: 'successLighter',
+  appearance: {
+    border: true
+  },
+  hoverAppearance: {
+    border: true
+  },
+  selectedAppearance: {
+    border: true
+  }
+};
+export const SECONDARY_GHOST_BRAND_TINTED_ONSELECT = {
+  palette: 'secondary',
+  appearance: {
+    bg: false,
+    border: true,
+    text: 'black'
+  },
+  hoverAppearance: {
+    bg: false,
+    border: true,
+    text: 'black'
+  },
+  selectedAppearance: {
+    bg: 'brandLighter',
+    border: 'brandLighter',
+    text: 'black'
+  }
+};
+export const SECONDARY_GHOST_CANCEL = {
+  palette: 'secondary',
+  appearance: {
+    bg: false,
+    border: true
+  },
+  hoverAppearance: {
+    bg: false,
+    border: true
+  }
+};
+export const BLACK_TEXT_BRAND_ONHOVER = {
+  palette: 'brand',
+  appearance: {
+    bg: false,
+    text: 'black'
+  },
+  hoverAppearance: {
+    bg: false
+  },
+  selectedAppearance: {
+    bg: false
+  }
+};
+export const BRAND_BG_ONSELECT = {
+  palette: 'brand',
+  appearance: {
+    bg: false,
+    border: true
+  },
+  hoverAppearance: {
+    bg: false,
+    border: true
+  }
+};
+export const BRAND_TEXT_TINTED_HOVER = {
+  palette: 'brandLighter',
+  appearance: {
+    bg: false
+  },
+  hoverAppearance: {
+    bg: true
+  },
+  selectedAppearance: {
+    border: true,
+    bg: true
+  }
+};
+export const BRAND_TEXT_TINTED_DANGER_HOVER = {
+  palette: 'brandLighter',
+  appearance: {
+    bg: false
+  },
+  hoverAppearance: {
+    bg: 'dangerLighter',
+    text: 'danger'
+  },
+  selectedAppearance: {
+    border: 'dangerLighter',
+    text: 'danger',
+    bg: 'dangerLighter'
+  }
+};

package/es/v1/Button/css/Button_v1.module.css

@@ -5,13 +5,15 @@
     --local-button-gap: var(--zd_size8);
     --local-button-padding-block: var(--zd_size6);
     --local-button-padding-inline: var(--zd_size15);
-    --local-button-font-size: var(--zd_font_size13);
     --local-loader-size: 16px;
     --local-tick-size: 16px;
     --local-button-height: auto;
     --local-button-width: auto;
-    --local-button-overlay-opacity: 0.48;
-    --local-button-transition-duration: var(--zd_transition3);
+    --local-button-min-width: var(--zd_size90);
+    --local-button-overlay-opacity: 0.4;
+    --local-button-transition-duration: var(--zd_transition2);
+    --local-button-cursor: pointer;
+    --local-button-strike-color: currentColor;
 }
 
 .button {
@@ -19,19 +21,20 @@
     composes: posrel pointer from '../../../common/common.module.css';
     padding-block: var(--local-button-padding-block);
     padding-inline: var(--local-button-padding-inline);
-    font-size: var(--local-button-font-size);
     height: var(--local-button-height);
     width: var(--local-button-width);
+    min-width: var(--local-button-min-width);
     border-radius: var(--local-button-radius);
     border-style: var(--local-button-border-style);
     border-width: var(--local-button-border-width);
     transition-duration: var(--local-button-transition-duration);
     transition-timing-function: ease;
+    cursor: var(--local-button-cursor);
     background-image: none;
 }
 
 .disabledPointer {
-    cursor: not-allowed;
+    --local-button-cursor: not-allowed;
 }
 
 .disabledOpac {
@@ -39,7 +42,16 @@
 }
 
 .loading {
-    cursor: progress;
+    --local-button-cursor: progress;
+    composes: disabledOpac;
+}
+
+.variantIcon {
+    --local-button-min-width: var(--zd_size28);
+}
+
+.variantIconWithText {
+    --local-button-min-width: var(--zd_size118);
 }
 
 .sizeSmall {
@@ -68,6 +80,14 @@
     --local-button-width: 100%;
 }
 
+.sizeSmall.variantText {
+    --local-button-min-width: var(--zd_size50);
+}
+
+.sizeSmall.variantIconWithText {
+    --local-button-min-width: var(--zd_size78);
+}
+
 .shapeRoundedRectangle {
     --local-button-radius: 4px;
 }
@@ -80,9 +100,11 @@
     --local-button-radius: 0;
 }
 
-.loaderOverlay {
+.strike::after,
+.loaderOverlay,
+.successOverlay {
     inset: 0 ;
-    composes: posab from '../../../common/common.module.css';
+    position: absolute;
 }
 
 .contentWrapper {
@@ -98,22 +120,17 @@
 
 .strike::after {
     content: '';
-    position: absolute;
-    inset: 0 ;
+    opacity: var(--local-button-overlay-opacity);
     pointer-events: none;
     border-radius: var(--local-button-radius);
 }
 
 [dir=ltr] .strike::after {
-    background-image: repeating-linear-gradient(120deg, currentColor 0 1px, var(--dot_mirror) 1px 8px);
+    background-image: repeating-linear-gradient(120deg, var(--local-button-strike-color) 0 1px, var(--zd-bg-transparent) 1px 8px);
 }
 
 [dir=rtl] .strike::after {
-    background-image: repeating-linear-gradient(-120deg, currentColor 0 1px, var(--dot_mirror) 1px 8px);
+    background-image: repeating-linear-gradient(-120deg, var(--local-button-strike-color) 0 1px, var(--zd-bg-transparent) 1px 8px);
 }
 
-.successOverlay {
-    inset: 0 ;
-    composes: posab from '../../../common/common.module.css';
-}
 

package/es/v1/Button/css/cssJSLogic.js

@@ -1,9 +1,8 @@
-import style from "./Button_v1.module.css";
 import compileClassNames from '@zohodesk/utils/es/compileClassNames';
+import { DISABLED_APPEARANCE, LOADER_PLACEMENT, STATUS, DEFAULT_APPEARANCE, DEFAULT_HOVER_APPEARANCE, DEFAULT_SELECTED_APPEARANCE } from "../constants";
 import buttonResetStyle from "../../../semantic/Button/semanticButton.module.css";
 import getPaletteClasses from "../../helpers/colorHelpers/colorHelper";
-import { DUMMY_OBJECT } from '@zohodesk/dotkit/es/utils/constants';
-import { DISABLED_APPEARANCE, LOADER_PLACEMENT, SHAPE, SIZE, STATUS } from "../constants";
+import style from "./Button_v1.module.css";
 
 const capitalize = (value = '') => value.charAt(0).toUpperCase() + value.slice(1);
 
@@ -12,70 +11,88 @@ export default function cssJSLogic({
 }) {
   const {
     palette,
-    bgAppearance,
-    borderAppearance,
-    paletteShade,
+    appearance,
+    hoverAppearance,
+    selectedAppearance,
     size,
+    variant,
     status,
     isDisabled,
-    isReadOnly,
     isSelected,
     shape,
     loaderPlacement,
     disabledAppearance,
-    customClass = DUMMY_OBJECT
+    customClass
   } = props;
   const {
     wrapper: wrapperClass = '',
     text: textClassCustom = '',
-    icon: iconClassCustom = ''
+    icon: iconClassCustom = '',
+    loader: loaderClassCustom = '',
+    success: successClassCustom = ''
   } = customClass;
   const isLoading = status === STATUS.LOADING;
   const isSuccess = status === STATUS.SUCCESS;
-  const isInteractive = !isDisabled && !isReadOnly;
+  const isInteractive = !isDisabled && !isLoading;
   const overlayActive = (isLoading || isSuccess) && loaderPlacement === LOADER_PLACEMENT.OVERLAY;
+  const mergedAppearance = { ...DEFAULT_APPEARANCE,
+    ...appearance
+  };
+  const mergedHoverAppearance = { ...DEFAULT_HOVER_APPEARANCE,
+    ...hoverAppearance
+  };
+  const mergedSelectedAppearance = { ...DEFAULT_SELECTED_APPEARANCE,
+    ...selectedAppearance
+  };
   const {
     bg,
+    selectedBg,
     hoverBg,
     focusBg,
     activeBg,
     text,
+    selectedText,
     hoverText,
     focusText,
     activeText,
     border,
+    selectedBorder,
     hoverBorder,
     focusBorder,
     activeBorder
   } = getPaletteClasses({
     palette,
-    bgAppearance,
-    borderAppearance,
-    paletteShade,
-    isSelected
+    appearance: mergedAppearance,
+    hoverAppearance: mergedHoverAppearance,
+    selectedAppearance: mergedSelectedAppearance
   });
   const sizeClass = size ? style[`size${capitalize(size)}`] : '';
   const shapeClass = shape ? style[`shape${capitalize(shape)}`] : '';
+  const variantClass = variant ? style[`variant${capitalize(variant)}`] : '';
   const shouldStrike = disabledAppearance === DISABLED_APPEARANCE.STRIKE && isDisabled;
   const buttonClassName = compileClassNames({
     [buttonResetStyle.buttonReset]: true,
     [style.button]: true,
-    [bg]: !!bg,
-    [hoverBg]: !!hoverBg && isInteractive,
-    [focusBg]: !!focusBg && isInteractive,
-    [activeBg]: !!activeBg && isInteractive,
-    [text]: !!text,
-    [hoverText]: !!hoverText && isInteractive,
-    [focusText]: !!focusText && isInteractive,
-    [activeText]: !!activeText && isInteractive,
-    [border]: !!border,
-    [hoverBorder]: !!hoverBorder && isInteractive,
-    [focusBorder]: !!focusBorder && isInteractive,
-    [activeBorder]: !!activeBorder && isInteractive,
+    [bg]: !!bg && !(isSelected && !!selectedBg),
+    [selectedBg]: !!selectedBg && isSelected,
+    [hoverBg]: !!hoverBg && isInteractive && !isSelected,
+    [focusBg]: !!focusBg && isInteractive && !isSelected,
+    [activeBg]: !!activeBg && isInteractive && !isSelected,
+    [text]: !!text && !(isSelected && !!selectedText),
+    [selectedText]: !!selectedText && isSelected,
+    [hoverText]: !!hoverText && isInteractive && !isSelected,
+    [focusText]: !!focusText && isInteractive && !isSelected,
+    [activeText]: !!activeText && isInteractive && !isSelected,
+    [border]: !!border && !(isSelected && !!selectedBorder),
+    [selectedBorder]: !!selectedBorder && isSelected,
+    [hoverBorder]: !!hoverBorder && isInteractive && !isSelected,
+    [focusBorder]: !!focusBorder && isInteractive && !isSelected,
+    [activeBorder]: !!activeBorder && isInteractive && !isSelected,
     [sizeClass]: !!sizeClass,
     [shapeClass]: !!shapeClass,
-    [style.disabledOpac]: isReadOnly || isDisabled && disabledAppearance === DISABLED_APPEARANCE.DULL,
-    [style.disabledPointer]: isReadOnly || isDisabled,
+    [variantClass]: !!variantClass,
+    [style.disabledOpac]: isDisabled && disabledAppearance === DISABLED_APPEARANCE.DULL,
+    [style.disabledPointer]: isDisabled,
     [style.loading]: isLoading,
     [style.strike]: shouldStrike,
     [wrapperClass]: !!wrapperClass
@@ -89,9 +106,19 @@ export default function cssJSLogic({
   return {
     buttonClassName,
     textClassName,
+    iconClassName,
     contentWrapperClass: overlayActive ? style.overlayHidden : style.contentWrapper,
     loaderOverlayClass: style.loaderOverlay,
     successOverlayClass: style.successOverlay,
-    iconClassName
+    loaderClassName: {
+      wrapper: compileClassNames({
+        [loaderClassCustom]: !!loaderClassCustom
+      })
+    },
+    successClassName: {
+      wrapper: compileClassNames({
+        [successClassCustom]: !!successClassCustom
+      })
+    }
   };
 }

package/es/v1/Button/props/defaultProps.js

@@ -1,19 +1,18 @@
 import { DUMMY_FUNCTION, DUMMY_OBJECT } from '@zohodesk/dotkit/es/utils/constants';
-import { DEFAULT_PALETTE, DEFAULT_BG_APPEARANCE, DEFAULT_BORDER_APPEARANCE, DEFAULT_VARIANT, DEFAULT_SIZE, DEFAULT_STATUS, DEFAULT_LOADER_PLACEMENT, DEFAULT_ICON_PLACEMENT, DEFAULT_ICON_SIZE, DEFAULT_PALETTE_SHADE, DEFAULT_SHAPE, DEFAULT_DISABLED_APPEARANCE, DEFAULT_BUTTON_TYPE } from "../constants";
+import { DEFAULT_VARIANT, DEFAULT_SIZE, DEFAULT_STATUS, DEFAULT_LOADER_PLACEMENT, DEFAULT_ICON_PLACEMENT, DEFAULT_ICON_SIZE, DEFAULT_SHAPE, DEFAULT_DISABLED_APPEARANCE, DEFAULT_BUTTON_TYPE } from "../constants";
 const defaultProps = {
-  palette: DEFAULT_PALETTE,
-  bgAppearance: DEFAULT_BG_APPEARANCE,
-  borderAppearance: DEFAULT_BORDER_APPEARANCE,
+  palette: '',
+  appearance: DUMMY_OBJECT,
+  hoverAppearance: DUMMY_OBJECT,
+  selectedAppearance: DUMMY_OBJECT,
   variant: DEFAULT_VARIANT,
   size: DEFAULT_SIZE,
   status: DEFAULT_STATUS,
   loaderPlacement: DEFAULT_LOADER_PLACEMENT,
   iconPlacement: DEFAULT_ICON_PLACEMENT,
   iconSize: DEFAULT_ICON_SIZE,
-  paletteShade: DEFAULT_PALETTE_SHADE,
   disabledAppearance: DEFAULT_DISABLED_APPEARANCE,
   isDisabled: false,
-  isReadOnly: false,
   isSelected: false,
   shape: DEFAULT_SHAPE,
   type: DEFAULT_BUTTON_TYPE,

package/es/v1/Button/props/propTypes.js

@@ -1,10 +1,19 @@
 import PropTypes from 'prop-types';
-import { PALETTE, BG_APPEARANCE, BORDER_APPEARANCE, VARIANT, SIZE, STATUS, LOADER_PLACEMENT, ICON_PLACEMENT, PALETTE_SHADE, SHAPE, DISABLED_APPEARANCE, BUTTON_TYPE } from "../constants";
+import { PALETTE, VARIANT, SIZE, STATUS, LOADER_PLACEMENT, ICON_PLACEMENT, SHAPE, DISABLED_APPEARANCE, BUTTON_TYPE } from "../constants";
 const renderSlotType = PropTypes.oneOfType([PropTypes.node, PropTypes.func]);
+const paletteNames = Object.values(PALETTE);
+const bgBorderValueType = PropTypes.oneOfType([PropTypes.oneOf([...paletteNames, 'transparent']), PropTypes.bool]);
+const textValueType = PropTypes.oneOfType([PropTypes.oneOf([...paletteNames, 'black', 'white']), PropTypes.bool]);
+const appearanceType = PropTypes.shape({
+  bg: bgBorderValueType,
+  border: bgBorderValueType,
+  text: textValueType
+});
 const propTypes = {
   palette: PropTypes.oneOf(Object.values(PALETTE)),
-  bgAppearance: PropTypes.oneOf(Object.values(BG_APPEARANCE)),
-  borderAppearance: PropTypes.oneOf(Object.values(BORDER_APPEARANCE)),
+  appearance: appearanceType,
+  hoverAppearance: appearanceType,
+  selectedAppearance: appearanceType,
   variant: PropTypes.oneOf(Object.values(VARIANT)),
   size: PropTypes.oneOf(Object.values(SIZE)),
   status: PropTypes.oneOf(Object.values(STATUS)),
@@ -12,7 +21,6 @@ const propTypes = {
   iconName: PropTypes.string,
   iconSize: PropTypes.number,
   iconPlacement: PropTypes.oneOf(Object.values(ICON_PLACEMENT)),
-  paletteShade: PropTypes.oneOf(Object.values(PALETTE_SHADE)),
   disabledAppearance: PropTypes.oneOf(Object.values(DISABLED_APPEARANCE)),
   renderIcon: renderSlotType,
   renderBefore: renderSlotType,
@@ -23,21 +31,31 @@ const propTypes = {
   type: PropTypes.oneOf(Object.values(BUTTON_TYPE)),
   onClick: PropTypes.func,
   isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
   isSelected: PropTypes.bool,
   shape: PropTypes.oneOf(Object.values(SHAPE)),
   title: PropTypes.string,
   customClass: PropTypes.shape({
     wrapper: PropTypes.string,
-    text: PropTypes.string
+    text: PropTypes.string,
+    icon: PropTypes.string,
+    loader: PropTypes.string,
+    success: PropTypes.string
   }),
   customProps: PropTypes.shape({
     text: PropTypes.object,
     icon: PropTypes.object
   }),
-  customAttributes: PropTypes.object,
+  customAttributes: PropTypes.shape({
+    button: PropTypes.object,
+    contentWrapper: PropTypes.object,
+    loader: PropTypes.object,
+    success: PropTypes.object,
+    icon: PropTypes.object,
+    text: PropTypes.object
+  }),
   a11yAttributes: PropTypes.object,
   customId: PropTypes.string,
-  testId: PropTypes.string
+  testId: PropTypes.string,
+  dataSelectorId: PropTypes.string
 };
 export default propTypes;