@zohodesk/components 1.0.0-temp-256.1 → 1.0.0-temp-257.1

package/es/v1/Button/Button.js

@@ -6,31 +6,32 @@ import React, { forwardRef, memo, useMemo } from 'react';
 import { withComponentRegistrar } from '@zohodesk/dotkit/es/react/ComponentRegistry';
 import Icon from '@zohodesk/icons/es/Icon';
 import Flex from '@zohodesk/layout/es/Flex/Flex';
-import Typography from "../../Typography/Typography";
 import { isRenderable } from '@zohodesk/utils/es/renderNode';
 import renderNode from '@zohodesk/utils/es/renderNode';
-import propTypes from "./props/propTypes";
-import defaultProps from "./props/defaultProps";
 import { DUMMY_OBJECT } from '@zohodesk/dotkit/es/utils/constants';
 import { ICON_PLACEMENT, LOADER_PLACEMENT, STATUS, TYPOGRAPHY_SIZE_MAP, VARIANT } from "./constants";
+import Typography from "../../Typography/Typography";
 import Loader from "../shared/Loader/Loader";
 import SuccessTick from "../shared/SuccessTick/SuccessTick";
 import cssJSLogic from "./css/cssJSLogic";
+import propTypes from "./props/propTypes";
+import defaultProps from "./props/defaultProps";
 
 const getTypographySize = size => TYPOGRAPHY_SIZE_MAP[size] || '13';
 
-const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
+export const ButtonPresentational = /*#__PURE__*/forwardRef(function ButtonPresentational(props, ref) {
   const {
-    palette,
-    bgAppearance,
-    borderAppearance,
+    isLoading,
+    isSuccess,
+    isDisabled,
+    isDisabledState,
+    overlayActive,
     variant,
-    status,
+    iconPlacement,
     loaderPlacement,
     size,
     iconName,
     iconSize,
-    iconPlacement,
     renderIcon,
     renderBefore,
     renderAfter,
@@ -38,104 +39,88 @@ const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
     renderSuccess,
     children,
     type,
-    onClick,
-    isDisabled,
     isReadOnly,
     isSelected,
-    shape,
-    paletteShade,
-    disabledAppearance,
     title,
     customProps,
     customAttributes,
     a11yAttributes,
     customId,
-    testId
+    testId,
+    dataSelectorId,
+    handleClick,
+    classNames
   } = props;
-  const isLoading = status === STATUS.LOADING;
-  const isSuccess = status === STATUS.SUCCESS;
-  const isDisabledState = isDisabled || isLoading;
-  const isInteractionDisabled = isDisabledState || isReadOnly;
-  const overlayActive = (isLoading || isSuccess) && loaderPlacement === LOADER_PLACEMENT.OVERLAY;
-  const {
-    text: contentProps = DUMMY_OBJECT,
-    icon: iconProps = DUMMY_OBJECT
-  } = customProps;
-  const iconTagAttributes = useMemo(() => ({ ...(iconProps.tagAttributes || DUMMY_OBJECT),
-    'data-test-id': testId ? `${testId}_icon` : undefined
-  }), [iconProps.tagAttributes, testId]);
-  const classes = useMemo(() => cssJSLogic({
-    props
-  }), [palette, bgAppearance, borderAppearance, paletteShade, size, variant, status, isDisabled, isReadOnly, isSelected, shape, loaderPlacement, disabledAppearance, props.customClass]);
   const {
     loaderOverlayClass,
     successOverlayClass,
     contentWrapperClass,
     textClassName,
     buttonClassName,
-    iconClassName
-  } = classes;
-  const showIcon = variant !== VARIANT.TEXT && (renderIcon || iconName);
-
-  const _handleClick = event => {
-    if (isInteractionDisabled) {
-      return;
-    }
-
-    onClick(event);
+    iconClassName,
+    loaderClassName,
+    successClassName
+  } = classNames;
+  const {
+    text: contentProps = DUMMY_OBJECT,
+    icon: iconProps = DUMMY_OBJECT
+  } = customProps || DUMMY_OBJECT;
+  const {
+    button: buttonAttributes = DUMMY_OBJECT,
+    contentWrapper: contentWrapperAttributes = DUMMY_OBJECT,
+    loader: loaderAttributes = DUMMY_OBJECT,
+    success: successAttributes = DUMMY_OBJECT,
+    icon: iconAttributes = DUMMY_OBJECT,
+    text: textAttributes = DUMMY_OBJECT
+  } = customAttributes || DUMMY_OBJECT;
+  const iconTagAttributes = { ...iconAttributes,
+    'data-test-id': testId ? `${testId}_icon` : undefined
   };
+  const showIcon = variant !== VARIANT.TEXT && (renderIcon || iconName);
 
   const _renderLoader = () => {
-    if (!isLoading) {
-      return null;
-    }
-
-    if (isRenderable(renderLoader)) {
-      return renderNode(renderLoader, {
-        status
-      });
-    }
-
-    const loaderClassName = loaderPlacement === LOADER_PLACEMENT.OVERLAY ? loaderOverlayClass : '';
-    return /*#__PURE__*/React.createElement(Flex, {
+    if (!isLoading) return null;
+    const isOverlay = loaderPlacement === LOADER_PLACEMENT.OVERLAY;
+    const hasCustomLoader = isRenderable(renderLoader);
+    if (hasCustomLoader && !isOverlay) return renderNode(renderLoader, {
+      status: STATUS.LOADING
+    });
+    return /*#__PURE__*/React.createElement(Flex, _extends({
       $ui_displayMode: "flex",
       $ui_alignItems: "center",
       $ui_justifyContent: "center",
-      $ui_className: loaderClassName,
+      $ui_className: isOverlay ? loaderOverlayClass : '',
       testId: testId ? `${testId}_loader` : undefined
-    }, /*#__PURE__*/React.createElement(Loader, null));
+    }, hasCustomLoader ? undefined : loaderAttributes), hasCustomLoader ? renderNode(renderLoader, {
+      status: STATUS.LOADING
+    }) : /*#__PURE__*/React.createElement(Loader, {
+      customClass: loaderClassName
+    }));
   };
 
   const _renderSuccess = () => {
-    if (!isSuccess) {
-      return null;
-    }
-
-    if (isRenderable(renderSuccess)) {
-      return renderNode(renderSuccess, {
-        status
-      });
-    }
-
-    const successClassName = loaderPlacement === LOADER_PLACEMENT.OVERLAY ? successOverlayClass : '';
-    return /*#__PURE__*/React.createElement(Flex, {
+    if (!isSuccess) return null;
+    const isOverlay = loaderPlacement === LOADER_PLACEMENT.OVERLAY;
+    const hasCustomSuccess = isRenderable(renderSuccess);
+    if (hasCustomSuccess && !isOverlay) return renderNode(renderSuccess, {
+      status: STATUS.SUCCESS
+    });
+    return /*#__PURE__*/React.createElement(Flex, _extends({
       $ui_displayMode: "flex",
       $ui_alignItems: "center",
       $ui_justifyContent: "center",
-      $ui_className: successClassName,
+      $ui_className: isOverlay ? successOverlayClass : '',
       testId: testId ? `${testId}_success` : undefined
-    }, /*#__PURE__*/React.createElement(SuccessTick, null));
+    }, hasCustomSuccess ? undefined : successAttributes), hasCustomSuccess ? renderNode(renderSuccess, {
+      status: STATUS.SUCCESS
+    }) : /*#__PURE__*/React.createElement(SuccessTick, {
+      customClass: successClassName
+    }));
   };
 
   const _renderIconNode = () => {
-    if (!showIcon) {
-      return null;
-    }
-
-    if (isRenderable(renderIcon)) {
-      return renderNode(renderIcon);
-    }
-
+    if (!showIcon) return null;
+    if (isRenderable(renderIcon)) return renderNode(renderIcon);
     return /*#__PURE__*/React.createElement(Icon, _extends({}, iconProps, {
       iconClass: iconClassName,
       name: iconName,
@@ -145,58 +130,130 @@ const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
     }));
   };
 
-  const _renderBeforeNode = () => {
-    if (!isRenderable(renderBefore)) {
-      return null;
-    }
-
-    return renderNode(renderBefore, props);
-  };
-
-  const _renderAfterNode = () => {
-    if (!isRenderable(renderAfter)) {
-      return null;
-    }
-
-    return renderNode(renderAfter, props);
-  };
-
   const _renderContent = () => {
-    const shouldShowText = variant !== VARIANT.ICON && children !== undefined && children !== null;
+    const shouldShowText = variant !== VARIANT.ICON && children != null && (typeof children !== 'string' || children.trim() !== '');
     const showLoaderStart = isLoading && loaderPlacement === LOADER_PLACEMENT.START;
     const showLoaderAfter = isLoading && loaderPlacement === LOADER_PLACEMENT.END;
     const showSuccessStart = isSuccess && loaderPlacement === LOADER_PLACEMENT.START;
     const showSuccessAfter = isSuccess && loaderPlacement === LOADER_PLACEMENT.END;
-    return /*#__PURE__*/React.createElement(Flex, {
+    return /*#__PURE__*/React.createElement(Flex, _extends({
       $ui_displayMode: "flex",
       $ui_direction: "row",
       $flag_shrink: true,
       $ui_alignItems: "center",
       $ui_justifyContent: "center",
       $ui_className: contentWrapperClass
-    }, showLoaderStart ? _renderLoader() : null, showSuccessStart ? _renderSuccess() : null, _renderBeforeNode(), iconPlacement === ICON_PLACEMENT.LEFT ? _renderIconNode() : null, shouldShowText ? /*#__PURE__*/React.createElement(Typography, _extends({}, contentProps, {
+    }, contentWrapperAttributes), showLoaderStart ? _renderLoader() : null, showSuccessStart ? _renderSuccess() : null, isRenderable(renderBefore) ? renderNode(renderBefore, props) : null, iconPlacement === ICON_PLACEMENT.LEFT ? _renderIconNode() : null, shouldShowText ? typeof children === 'string' ? /*#__PURE__*/React.createElement(Typography, _extends({
+      $ui_size: getTypographySize(size)
+    }, contentProps, {
+      tagAttributes: textAttributes,
       $ui_className: textClassName,
-      $ui_size: getTypographySize(size),
       $flag_dotted: variant !== VARIANT.ICON
-    }), children) : null, iconPlacement === ICON_PLACEMENT.RIGHT ? _renderIconNode() : null, _renderAfterNode(), showLoaderAfter ? _renderLoader() : null, showSuccessAfter ? _renderSuccess() : null);
+    }), children) : children : null, iconPlacement === ICON_PLACEMENT.RIGHT ? _renderIconNode() : null, isRenderable(renderAfter) ? renderNode(renderAfter, props) : null, showLoaderAfter ? _renderLoader() : null, showSuccessAfter ? _renderSuccess() : null);
   };
 
-  const containerAttributes = { ...customAttributes,
-    'data-id': customId,
-    'data-test-id': testId,
+  const containerAttributes = { ...buttonAttributes,
+    'data-id': isDisabled ? `${customId}_disabled` : customId,
+    'data-test-id': isDisabled ? `${testId}_disabled` : testId,
+    'data-selector-id': dataSelectorId,
     'data-title': title
   };
-  return /*#__PURE__*/React.createElement("button", _extends({}, containerAttributes, a11yAttributes, {
+  return /*#__PURE__*/React.createElement("button", _extends({}, containerAttributes, {
+    "aria-busy": isLoading,
+    disabled: isDisabledState,
+    "aria-readonly": isReadOnly,
+    "aria-pressed": isSelected
+  }, a11yAttributes, {
     ref: ref,
     type: type,
     className: cn(buttonClassName),
-    "aria-busy": isLoading,
-    "aria-disabled": isDisabledState,
-    "aria-readonly": isReadOnly,
-    "aria-pressed": isSelected,
-    onClick: _handleClick
+    onClick: handleClick
   }), _renderContent(), overlayActive ? isLoading ? _renderLoader() : _renderSuccess() : null);
 });
+ButtonPresentational.displayName = 'ButtonPresentational';
+const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
+  const {
+    palette,
+    bgAppearance,
+    borderAppearance,
+    variant,
+    status,
+    loaderPlacement,
+    size,
+    iconName,
+    iconSize,
+    iconPlacement,
+    renderIcon,
+    renderBefore,
+    renderAfter,
+    renderLoader,
+    renderSuccess,
+    children,
+    type,
+    onClick,
+    isDisabled,
+    isReadOnly,
+    isSelected,
+    shape,
+    paletteShade,
+    disabledAppearance,
+    title,
+    customProps,
+    customAttributes,
+    a11yAttributes,
+    customId,
+    testId,
+    dataSelectorId
+  } = props;
+  const isLoading = status === STATUS.LOADING;
+  const isSuccess = status === STATUS.SUCCESS;
+  const isDisabledState = isDisabled || isLoading;
+  const isInteractionDisabled = isDisabledState || isReadOnly;
+  const overlayActive = (isLoading || isSuccess) && loaderPlacement === LOADER_PLACEMENT.OVERLAY;
+  const classNames = useMemo(() => cssJSLogic({
+    props
+  }), [palette, bgAppearance, borderAppearance, paletteShade, size, variant, status, isDisabled, isReadOnly, isSelected, shape, loaderPlacement, disabledAppearance, props.customClass]);
+
+  const handleClick = event => {
+    if (isInteractionDisabled) return;
+    onClick(event);
+  };
+
+  const essentials = {
+    isLoading,
+    isSuccess,
+    isDisabled,
+    isDisabledState,
+    overlayActive,
+    variant,
+    iconPlacement,
+    loaderPlacement,
+    size,
+    iconName,
+    iconSize,
+    renderIcon,
+    renderBefore,
+    renderAfter,
+    renderLoader,
+    renderSuccess,
+    children,
+    type,
+    isReadOnly,
+    isSelected,
+    title,
+    customProps,
+    customAttributes,
+    a11yAttributes,
+    customId,
+    testId,
+    dataSelectorId,
+    handleClick
+  };
+  return /*#__PURE__*/React.createElement(ButtonPresentational, _extends({}, essentials, {
+    classNames: classNames,
+    ref: ref
+  }));
+});
 Button.propTypes = propTypes;
 Button.defaultProps = defaultProps;
 Button.displayName = 'Button';

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,8 @@
 }
 
 .loading {
-    cursor: progress;
+    --local-button-cursor: progress;
+    composes: disabledOpac;
 }
 
 .sizeSmall {
@@ -68,6 +72,18 @@
     --local-button-width: 100%;
 }
 
+.variantText {
+    --local-button-min-width: var(--zd_size90);
+}
+
+.variantIcon {
+    --local-button-min-width: var(--zd_size28);
+}
+
+.variantIconWithText {
+    --local-button-min-width: var(--zd_size118);
+}
+
 .shapeRoundedRectangle {
     --local-button-radius: 4px;
 }
@@ -80,9 +96,11 @@
     --local-button-radius: 0;
 }
 
-.loaderOverlay {
+.strike::after,
+.loaderOverlay,
+.successOverlay {
     inset: 0 ;
-    composes: posab from '../../../common/common.module.css';
+    position: absolute;
 }
 
 .contentWrapper {
@@ -98,22 +116,16 @@
 
 .strike::after {
     content: '';
-    position: absolute;
-    inset: 0 ;
     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

@@ -16,6 +16,7 @@ export default function cssJSLogic({
     borderAppearance,
     paletteShade,
     size,
+    variant,
     status,
     isDisabled,
     isReadOnly,
@@ -28,11 +29,13 @@ export default function cssJSLogic({
   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 && !isReadOnly && !isLoading;
   const overlayActive = (isLoading || isSuccess) && loaderPlacement === LOADER_PLACEMENT.OVERLAY;
   const {
     bg,
@@ -56,6 +59,7 @@ export default function cssJSLogic({
   });
   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,
@@ -74,6 +78,7 @@ export default function cssJSLogic({
     [activeBorder]: !!activeBorder && isInteractive,
     [sizeClass]: !!sizeClass,
     [shapeClass]: !!shapeClass,
+    [variantClass]: !!variantClass,
     [style.disabledOpac]: isReadOnly || isDisabled && disabledAppearance === DISABLED_APPEARANCE.DULL,
     [style.disabledPointer]: isReadOnly || isDisabled,
     [style.loading]: isLoading,
@@ -89,9 +94,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/propTypes.js

@@ -29,15 +29,26 @@ const propTypes = {
   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;