@zohodesk/components 1.0.0-temp-260 → 1.0.0-temp-259.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/assets/Appearance/dark/mode/Component_v1_DarkMode.module.css +5 -20
  3. package/assets/Appearance/light/mode/Component_v1_LightMode.module.css +5 -20
  4. package/assets/Appearance/pureDark/mode/Component_v1_PureDarkMode.module.css +5 -20
  5. package/es/v1/Button/Button.js +160 -107
  6. package/es/v1/Button/README.md +106 -42
  7. package/es/v1/Button/__tests__/Button.spec.js +138 -47
  8. package/es/v1/Button/__tests__/__snapshots__/Button.spec.js.snap +1105 -332
  9. package/es/v1/Button/constants/index.js +26 -20
  10. package/es/v1/Button/constants/presets.js +149 -0
  11. package/es/v1/Button/css/Button_v1.module.css +33 -16
  12. package/es/v1/Button/css/cssJSLogic.js +56 -28
  13. package/es/v1/Button/props/defaultProps.js +2 -6
  14. package/es/v1/Button/props/propTypes.js +26 -8
  15. package/es/v1/helpers/colorHelpers/__tests__/colorHelper.spec.js +357 -0
  16. package/es/v1/helpers/colorHelpers/background/backgroundColor.module.css +40 -40
  17. package/es/v1/helpers/colorHelpers/border/borderColor.module.css +25 -25
  18. package/es/v1/helpers/colorHelpers/colorHelper.js +117 -139
  19. package/es/v1/helpers/colorHelpers/constants/index.js +45 -4
  20. package/es/v1/helpers/colorHelpers/index.js +0 -1
  21. package/es/v1/helpers/colorHelpers/text/textColor.module.css +35 -35
  22. package/lib/v1/Button/Button.js +179 -119
  23. package/lib/v1/Button/README.md +106 -42
  24. package/lib/v1/Button/__tests__/Button.spec.js +194 -87
  25. package/lib/v1/Button/__tests__/__snapshots__/Button.spec.js.snap +1105 -332
  26. package/lib/v1/Button/constants/index.js +31 -28
  27. package/lib/v1/Button/constants/presets.js +167 -0
  28. package/lib/v1/Button/css/Button_v1.module.css +33 -16
  29. package/lib/v1/Button/css/cssJSLogic.js +42 -19
  30. package/lib/v1/Button/props/defaultProps.js +1 -5
  31. package/lib/v1/Button/props/propTypes.js +41 -7
  32. package/lib/v1/helpers/colorHelpers/__tests__/colorHelper.spec.js +363 -0
  33. package/lib/v1/helpers/colorHelpers/background/backgroundColor.module.css +40 -40
  34. package/lib/v1/helpers/colorHelpers/border/borderColor.module.css +25 -25
  35. package/lib/v1/helpers/colorHelpers/colorHelper.js +127 -153
  36. package/lib/v1/helpers/colorHelpers/constants/index.js +45 -4
  37. package/lib/v1/helpers/colorHelpers/index.js +2 -24
  38. package/lib/v1/helpers/colorHelpers/text/textColor.module.css +35 -35
  39. package/package.json +4 -4
  40. package/es/AdvancedPopup/AdvancedPopup.js +0 -105
  41. package/lib/AdvancedPopup/AdvancedPopup.js +0 -122
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ## 1.6.26
4
+
5
+ - **v1/Button** — Removed the `bgAppearance`, `borderAppearance`, `paletteShade`, and `isReadOnly` props. Use the `appearance`, `hoverAppearance`, and `selectedAppearance` objects instead. Added new `*Lighter` palette variants to support lighter button appearances.
6
+
3
7
  ## 1.6.25
4
8
 
5
9
  - **v1/shared** - `Loader` component renamed to `Spinner`
@@ -16,30 +16,15 @@
16
16
  --zdt_v1_label_secondary_text: hsla(217, calc(var(--zd-saturation, 1) * 13.73%), calc(70.00% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
17
17
 
18
18
  /* palette - universal color tokens */
19
- --zdt_v1_palette_brand_filled_text: var(--zdt_cta_secondary_text);
20
- --zdt_v1_palette_brand_bg: var(--zdt_cta_primary_bg);
21
- --zdt_v1_palette_brand_text: var(--zdt_cta_primary_text);
22
- --zdt_v1_palette_brand_border: var(--zdt_cta_primary_border);
23
- --zdt_v1_palette_brand_hover_bg: var(--zdt_cta_primary_hover_bg);
24
- --zdt_v1_palette_brand_hover_text: var(--zdt_cta_primary_hover_text);
25
- --zdt_v1_palette_brand_hover_border: var(--zdt_cta_primary_hover_border);
26
- --zdt_v1_palette_brand_light_bg: var(--zdt_cta_primary_light_bg);
27
- --zdt_v1_palette_brand_light_hover_bg: var(--zdt_cta_primary_light_hover_bg);
28
- --zdt_v1_palette_brand_light_border: var(--zdt_cta_primary_light_border);
29
- --zdt_v1_palette_grey_light_bg: hsla(217, calc(var(--zd-saturation, 1) * 23.23%), calc(19.41% + var(--zdc_darker_lowest)), calc(1 + var(--zdc_alpha_high)));
30
- --zdt_v1_palette_grey_light_border: hsla(218, calc(var(--zd-saturation, 1) * 23.08%), calc(22.94% + var(--zdc_default_inverse_medium)), calc(1 + var(--zdc_alpha_low)));
31
- --zdt_v1_palette_grey_light_hover_bg: hsla(218, calc(var(--zd-saturation, 1) * 23.08%), calc(22.94% + var(--zdc_darker_lowest)), calc(1 + var(--zdc_alpha_high)));
19
+ --zdt_v1_palette_brand_border: var(--zdt_cta_alpha_border);
20
+ --zdt_v1_palette_brand_hover_text: var(--zdt_cta_alpha_hover_text);
21
+ --zdt_v1_palette_brand_hover_border: var(--zdt_cta_alpha_hover_border);
22
+ --zdt_v1_palette_brand_light_border: var(--zdt_cta_secondary_light_border);
23
+ --zdt_v1_palette_grey_light_hover_bg: var(--zdt_cta_grey_20_bg);
32
24
  --zdt_v1_palette_grey_bg: hsla(217, calc(var(--zd-saturation, 1) * 13.73%), calc(70.00% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
33
- --zdt_v1_palette_grey_text: hsla(217, calc(var(--zd-saturation, 1) * 13.73%), calc(70.00% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
34
- --zdt_v1_palette_grey_border: hsla(217, calc(var(--zd-saturation, 1) * 13.73%), calc(70.00% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
35
25
  --zdt_v1_palette_grey_hover_bg: hsla(217, calc(var(--zd-saturation, 1) * 7.76%), calc(54.51% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
36
26
  --zdt_v1_palette_grey_hover_text: hsla(217, calc(var(--zd-saturation, 1) * 13.73%), calc(70.00% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
37
- --zdt_v1_palette_grey_hover_border: hsla(217, calc(var(--zd-saturation, 1) * 7.76%), calc(54.51% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
38
- --zdt_v1_palette_blue_bg: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(63.92% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
39
- --zdt_v1_palette_blue_text: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(63.92% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
40
- --zdt_v1_palette_blue_border: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(63.92% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
41
27
  --zdt_v1_palette_blue_hover_bg: hsla(213, calc(var(--zd-saturation, 1) * 85.45%), calc(43.14% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
42
- --zdt_v1_palette_blue_hover_text: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(71.57% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
43
28
  --zdt_v1_palette_blue_hover_border: hsla(213, calc(var(--zd-saturation, 1) * 85.45%), calc(43.14% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
44
29
  --zdt_v1_palette_blue_light_bg: hsla(213, calc(var(--zd-saturation, 1) * 27.27%), calc(23.73% + var(--zdc_default_inverse_lower)), calc(1 + var(--zdc_alpha_low)));
45
30
  --zdt_v1_palette_blue_light_border: hsla(208, calc(var(--zd-saturation, 1) * 85.19%), calc(73.53% + var(--zdc_default_inverse_medium)), calc(1 + var(--zdc_alpha_low)));
@@ -16,30 +16,15 @@
16
16
  --zdt_v1_label_secondary_text: hsla(220, calc(var(--zd-saturation, 1) * 10.45%), calc(39.41% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
17
17
 
18
18
  /* palette - universal color tokens */
19
- --zdt_v1_palette_brand_filled_text: var(--zdt_cta_secondary_text);
20
- --zdt_v1_palette_brand_bg: var(--zdt_cta_primary_bg);
21
- --zdt_v1_palette_brand_text: var(--zdt_cta_primary_text);
22
- --zdt_v1_palette_brand_border: var(--zdt_cta_primary_border);
23
- --zdt_v1_palette_brand_hover_bg: var(--zdt_cta_primary_hover_bg);
24
- --zdt_v1_palette_brand_hover_text: var(--zdt_cta_primary_hover_text);
25
- --zdt_v1_palette_brand_hover_border: var(--zdt_cta_primary_hover_border);
26
- --zdt_v1_palette_brand_light_bg: var(--zdt_cta_primary_light_bg);
27
- --zdt_v1_palette_brand_light_hover_bg: var(--zdt_cta_primary_light_hover_bg);
28
- --zdt_v1_palette_brand_light_border: var(--zdt_cta_primary_light_border);
29
- --zdt_v1_palette_grey_light_bg: hsla(216, calc(var(--zd-saturation, 1) * 38.46%), calc(97.45% + var(--zdc_darker_lowest)), calc(1 + var(--zdc_alpha_high)));
30
- --zdt_v1_palette_grey_light_border: hsla(210, calc(var(--zd-saturation, 1) * 33.33%), calc(94.12% + var(--zdc_default_inverse_medium)), calc(1 + var(--zdc_alpha_low)));
31
- --zdt_v1_palette_grey_light_hover_bg: hsla(210, calc(var(--zd-saturation, 1) * 33.33%), calc(94.12% + var(--zdc_darker_lowest)), calc(1 + var(--zdc_alpha_high)));
19
+ --zdt_v1_palette_brand_border: var(--zdt_cta_alpha_border);
20
+ --zdt_v1_palette_brand_hover_text: var(--zdt_cta_alpha_hover_text);
21
+ --zdt_v1_palette_brand_hover_border: var(--zdt_cta_alpha_hover_border);
22
+ --zdt_v1_palette_brand_light_border: var(--zdt_cta_secondary_light_border);
23
+ --zdt_v1_palette_grey_light_hover_bg: var(--zdt_cta_grey_20_bg);
32
24
  --zdt_v1_palette_grey_bg: hsla(220, calc(var(--zd-saturation, 1) * 10.45%), calc(39.41% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
33
- --zdt_v1_palette_grey_text: hsla(220, calc(var(--zd-saturation, 1) * 10.45%), calc(39.41% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
34
- --zdt_v1_palette_grey_border: hsla(220, calc(var(--zd-saturation, 1) * 10.45%), calc(39.41% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
35
25
  --zdt_v1_palette_grey_hover_bg: hsla(218, calc(var(--zd-saturation, 1) * 9.76%), calc(51.76% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
36
26
  --zdt_v1_palette_grey_hover_text: hsla(0, calc(var(--zd-saturation, 1) * 0.00%), calc(0.00% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
37
- --zdt_v1_palette_grey_hover_border: hsla(218, calc(var(--zd-saturation, 1) * 9.76%), calc(51.76% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
38
- --zdt_v1_palette_blue_bg: hsla(212, calc(var(--zd-saturation, 1) * 91.84%), calc(48.04% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
39
- --zdt_v1_palette_blue_text: hsla(212, calc(var(--zd-saturation, 1) * 91.84%), calc(48.04% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
40
- --zdt_v1_palette_blue_border: hsla(212, calc(var(--zd-saturation, 1) * 91.84%), calc(48.04% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
41
27
  --zdt_v1_palette_blue_hover_bg: hsla(213, calc(var(--zd-saturation, 1) * 100.00%), calc(36.08% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
42
- --zdt_v1_palette_blue_hover_text: hsla(213, calc(var(--zd-saturation, 1) * 100.00%), calc(36.08% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
43
28
  --zdt_v1_palette_blue_hover_border: hsla(213, calc(var(--zd-saturation, 1) * 100.00%), calc(36.08% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
44
29
  --zdt_v1_palette_blue_light_bg: hsla(212, calc(var(--zd-saturation, 1) * 86.67%), calc(97.06% + var(--zdc_default_inverse_lower)), calc(1 + var(--zdc_alpha_low)));
45
30
  --zdt_v1_palette_blue_light_border: hsla(208, calc(var(--zd-saturation, 1) * 85.19%), calc(73.53% + var(--zdc_default_inverse_medium)), calc(1 + var(--zdc_alpha_low)));
@@ -16,30 +16,15 @@
16
16
  --zdt_v1_label_secondary_text: hsla(0, calc(var(--zd-saturation, 1) * 0.00%), calc(60.00% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
17
17
 
18
18
  /* palette - universal color tokens */
19
- --zdt_v1_palette_brand_filled_text: var(--zdt_cta_secondary_text);
20
- --zdt_v1_palette_brand_bg: var(--zdt_cta_primary_bg);
21
- --zdt_v1_palette_brand_text: var(--zdt_cta_primary_text);
22
- --zdt_v1_palette_brand_border: var(--zdt_cta_primary_border);
23
- --zdt_v1_palette_brand_hover_bg: var(--zdt_cta_primary_hover_bg);
24
- --zdt_v1_palette_brand_hover_text: var(--zdt_cta_primary_hover_text);
25
- --zdt_v1_palette_brand_hover_border: var(--zdt_cta_primary_hover_border);
26
- --zdt_v1_palette_brand_light_bg: var(--zdt_cta_primary_light_bg);
27
- --zdt_v1_palette_brand_light_hover_bg: var(--zdt_cta_primary_light_hover_bg);
28
- --zdt_v1_palette_brand_light_border: var(--zdt_cta_primary_light_border);
29
- --zdt_v1_palette_grey_light_bg: hsla(0, calc(var(--zd-saturation, 1) * 0.00%), calc(14.90% + var(--zdc_darker_lowest)), calc(1 + var(--zdc_alpha_high)));
30
- --zdt_v1_palette_grey_light_border: hsla(0, calc(var(--zd-saturation, 1) * 2.33%), calc(8.43% + var(--zdc_default_inverse_medium)), calc(1 + var(--zdc_alpha_low)));
31
- --zdt_v1_palette_grey_light_hover_bg: hsla(0, calc(var(--zd-saturation, 1) * 2.33%), calc(8.43% + var(--zdc_darker_lowest)), calc(1 + var(--zdc_alpha_high)));
19
+ --zdt_v1_palette_brand_border: var(--zdt_cta_alpha_border);
20
+ --zdt_v1_palette_brand_hover_text: var(--zdt_cta_alpha_hover_text);
21
+ --zdt_v1_palette_brand_hover_border: var(--zdt_cta_alpha_hover_border);
22
+ --zdt_v1_palette_brand_light_border: var(--zdt_cta_secondary_light_border);
23
+ --zdt_v1_palette_grey_light_hover_bg: var(--zdt_cta_grey_20_bg);
32
24
  --zdt_v1_palette_grey_bg: hsla(0, calc(var(--zd-saturation, 1) * 0.00%), calc(60.00% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
33
- --zdt_v1_palette_grey_text: hsla(0, calc(var(--zd-saturation, 1) * 0.00%), calc(60.00% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
34
- --zdt_v1_palette_grey_border: hsla(0, calc(var(--zd-saturation, 1) * 0.00%), calc(60.00% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
35
25
  --zdt_v1_palette_grey_hover_bg: hsla(217, calc(var(--zd-saturation, 1) * 7.76%), calc(54.51% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
36
26
  --zdt_v1_palette_grey_hover_text: hsla(0, calc(var(--zd-saturation, 1) * 0.00%), calc(60.00% + var(--zdc_default_inverse)), calc(1 + var(--zdc_alpha_high)));
37
- --zdt_v1_palette_grey_hover_border: hsla(217, calc(var(--zd-saturation, 1) * 7.76%), calc(54.51% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
38
- --zdt_v1_palette_blue_bg: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(63.92% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
39
- --zdt_v1_palette_blue_text: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(63.92% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
40
- --zdt_v1_palette_blue_border: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(63.92% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
41
27
  --zdt_v1_palette_blue_hover_bg: hsla(213, calc(var(--zd-saturation, 1) * 85.45%), calc(43.14% + var(--zdc_darker_low)), calc(1 + var(--zdc_alpha_low)));
42
- --zdt_v1_palette_blue_hover_text: hsla(212, calc(var(--zd-saturation, 1) * 100.00%), calc(71.57% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
43
28
  --zdt_v1_palette_blue_hover_border: hsla(213, calc(var(--zd-saturation, 1) * 85.45%), calc(43.14% + var(--zdc_default_inverse_low)), calc(1 + var(--zdc_alpha_low)));
44
29
  --zdt_v1_palette_blue_light_bg: hsla(213, calc(var(--zd-saturation, 1) * 19.57%), calc(18.04% + var(--zdc_default_inverse_lower)), calc(1 + var(--zdc_alpha_low)));
45
30
  --zdt_v1_palette_blue_light_border: hsla(208, calc(var(--zd-saturation, 1) * 85.19%), calc(73.53% + var(--zdc_default_inverse_medium)), calc(1 + var(--zdc_alpha_low)));
@@ -6,31 +6,32 @@ import React, { forwardRef, memo, useMemo } from 'react';
6
6
  import { withComponentRegistrar } from '@zohodesk/dotkit/es/react/ComponentRegistry';
7
7
  import Icon from '@zohodesk/icons/es/Icon';
8
8
  import Flex from '@zohodesk/layout/es/Flex/Flex';
9
- import Typography from "../../Typography/Typography";
10
9
  import { isRenderable } from '@zohodesk/utils/es/renderNode';
11
10
  import renderNode from '@zohodesk/utils/es/renderNode';
12
- import propTypes from "./props/propTypes";
13
- import defaultProps from "./props/defaultProps";
14
11
  import { DUMMY_OBJECT } from '@zohodesk/dotkit/es/utils/constants';
15
12
  import { ICON_PLACEMENT, LOADER_PLACEMENT, STATUS, TYPOGRAPHY_SIZE_MAP, VARIANT } from "./constants";
13
+ import Typography from "../../Typography/Typography";
16
14
  import Spinner from "../shared/Spinner/Spinner";
17
15
  import SuccessTick from "../shared/SuccessTick/SuccessTick";
18
16
  import cssJSLogic from "./css/cssJSLogic";
17
+ import propTypes from "./props/propTypes";
18
+ import defaultProps from "./props/defaultProps";
19
19
 
20
20
  const getTypographySize = size => TYPOGRAPHY_SIZE_MAP[size] || '13';
21
21
 
22
- const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
22
+ export const ButtonPresentational = /*#__PURE__*/forwardRef(function ButtonPresentational(props, ref) {
23
23
  const {
24
- palette,
25
- bgAppearance,
26
- borderAppearance,
24
+ isLoading,
25
+ isSuccess,
26
+ isDisabled,
27
+ isDisabledState,
28
+ overlayActive,
27
29
  variant,
28
- status,
30
+ iconPlacement,
29
31
  loaderPlacement,
30
32
  size,
31
33
  iconName,
32
34
  iconSize,
33
- iconPlacement,
34
35
  renderIcon,
35
36
  renderBefore,
36
37
  renderAfter,
@@ -38,104 +39,87 @@ const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
38
39
  renderSuccess,
39
40
  children,
40
41
  type,
41
- onClick,
42
- isDisabled,
43
- isReadOnly,
44
42
  isSelected,
45
- shape,
46
- paletteShade,
47
- disabledAppearance,
48
43
  title,
49
44
  customProps,
50
45
  customAttributes,
51
46
  a11yAttributes,
52
47
  customId,
53
- testId
48
+ testId,
49
+ dataSelectorId,
50
+ handleClick,
51
+ classNames
54
52
  } = props;
55
- const isLoading = status === STATUS.LOADING;
56
- const isSuccess = status === STATUS.SUCCESS;
57
- const isDisabledState = isDisabled || isLoading;
58
- const isInteractionDisabled = isDisabledState || isReadOnly;
59
- const overlayActive = (isLoading || isSuccess) && loaderPlacement === LOADER_PLACEMENT.OVERLAY;
60
- const {
61
- text: contentProps = DUMMY_OBJECT,
62
- icon: iconProps = DUMMY_OBJECT
63
- } = customProps;
64
- const iconTagAttributes = useMemo(() => ({ ...(iconProps.tagAttributes || DUMMY_OBJECT),
65
- 'data-test-id': testId ? `${testId}_icon` : undefined
66
- }), [iconProps.tagAttributes, testId]);
67
- const classes = useMemo(() => cssJSLogic({
68
- props
69
- }), [palette, bgAppearance, borderAppearance, paletteShade, size, variant, status, isDisabled, isReadOnly, isSelected, shape, loaderPlacement, disabledAppearance, props.customClass]);
70
53
  const {
71
54
  loaderOverlayClass,
72
55
  successOverlayClass,
73
56
  contentWrapperClass,
74
57
  textClassName,
75
58
  buttonClassName,
76
- iconClassName
77
- } = classes;
78
- const showIcon = variant !== VARIANT.TEXT && (renderIcon || iconName);
79
-
80
- const _handleClick = event => {
81
- if (isInteractionDisabled) {
82
- return;
83
- }
84
-
85
- onClick(event);
59
+ iconClassName,
60
+ loaderClassName,
61
+ successClassName
62
+ } = classNames;
63
+ const {
64
+ text: contentProps = DUMMY_OBJECT,
65
+ icon: iconProps = DUMMY_OBJECT
66
+ } = customProps || DUMMY_OBJECT;
67
+ const {
68
+ button: buttonAttributes = DUMMY_OBJECT,
69
+ contentWrapper: contentWrapperAttributes = DUMMY_OBJECT,
70
+ loader: loaderAttributes = DUMMY_OBJECT,
71
+ success: successAttributes = DUMMY_OBJECT,
72
+ icon: iconAttributes = DUMMY_OBJECT,
73
+ text: textAttributes = DUMMY_OBJECT
74
+ } = customAttributes || DUMMY_OBJECT;
75
+ const iconTagAttributes = { ...iconAttributes,
76
+ 'data-test-id': testId ? `${testId}_icon` : undefined
86
77
  };
78
+ const showIcon = variant !== VARIANT.TEXT && (renderIcon || iconName);
87
79
 
88
80
  const _renderLoader = () => {
89
- if (!isLoading) {
90
- return null;
91
- }
92
-
93
- if (isRenderable(renderLoader)) {
94
- return renderNode(renderLoader, {
95
- status
96
- });
97
- }
98
-
99
- const loaderClassName = loaderPlacement === LOADER_PLACEMENT.OVERLAY ? loaderOverlayClass : '';
100
- return /*#__PURE__*/React.createElement(Flex, {
81
+ if (!isLoading) return null;
82
+ const isOverlay = loaderPlacement === LOADER_PLACEMENT.OVERLAY;
83
+ const hasCustomLoader = isRenderable(renderLoader);
84
+ if (hasCustomLoader && !isOverlay) return renderNode(renderLoader, {
85
+ status: STATUS.LOADING
86
+ });
87
+ return /*#__PURE__*/React.createElement(Flex, _extends({
101
88
  $ui_displayMode: "flex",
102
89
  $ui_alignItems: "center",
103
90
  $ui_justifyContent: "center",
104
- $ui_className: loaderClassName,
91
+ $ui_className: isOverlay ? loaderOverlayClass : '',
105
92
  testId: testId ? `${testId}_loader` : undefined
106
- }, /*#__PURE__*/React.createElement(Spinner, null));
93
+ }, hasCustomLoader ? undefined : loaderAttributes), hasCustomLoader ? renderNode(renderLoader, {
94
+ status: STATUS.LOADING
95
+ }) : /*#__PURE__*/React.createElement(Spinner, {
96
+ customClass: loaderClassName
97
+ }));
107
98
  };
108
99
 
109
100
  const _renderSuccess = () => {
110
- if (!isSuccess) {
111
- return null;
112
- }
113
-
114
- if (isRenderable(renderSuccess)) {
115
- return renderNode(renderSuccess, {
116
- status
117
- });
118
- }
119
-
120
- const successClassName = loaderPlacement === LOADER_PLACEMENT.OVERLAY ? successOverlayClass : '';
121
- return /*#__PURE__*/React.createElement(Flex, {
101
+ if (!isSuccess) return null;
102
+ const isOverlay = loaderPlacement === LOADER_PLACEMENT.OVERLAY;
103
+ const hasCustomSuccess = isRenderable(renderSuccess);
104
+ if (hasCustomSuccess && !isOverlay) return renderNode(renderSuccess, {
105
+ status: STATUS.SUCCESS
106
+ });
107
+ return /*#__PURE__*/React.createElement(Flex, _extends({
122
108
  $ui_displayMode: "flex",
123
109
  $ui_alignItems: "center",
124
110
  $ui_justifyContent: "center",
125
- $ui_className: successClassName,
111
+ $ui_className: isOverlay ? successOverlayClass : '',
126
112
  testId: testId ? `${testId}_success` : undefined
127
- }, /*#__PURE__*/React.createElement(SuccessTick, null));
113
+ }, hasCustomSuccess ? undefined : successAttributes), hasCustomSuccess ? renderNode(renderSuccess, {
114
+ status: STATUS.SUCCESS
115
+ }) : /*#__PURE__*/React.createElement(SuccessTick, {
116
+ customClass: successClassName
117
+ }));
128
118
  };
129
119
 
130
120
  const _renderIconNode = () => {
131
- if (!showIcon) {
132
- return null;
133
- }
134
-
135
- if (isRenderable(renderIcon)) {
136
- return renderNode(renderIcon);
137
- }
138
-
121
+ if (!showIcon) return null;
122
+ if (isRenderable(renderIcon)) return renderNode(renderIcon);
139
123
  return /*#__PURE__*/React.createElement(Icon, _extends({}, iconProps, {
140
124
  iconClass: iconClassName,
141
125
  name: iconName,
@@ -145,58 +129,127 @@ const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
145
129
  }));
146
130
  };
147
131
 
148
- const _renderBeforeNode = () => {
149
- if (!isRenderable(renderBefore)) {
150
- return null;
151
- }
152
-
153
- return renderNode(renderBefore, props);
154
- };
155
-
156
- const _renderAfterNode = () => {
157
- if (!isRenderable(renderAfter)) {
158
- return null;
159
- }
160
-
161
- return renderNode(renderAfter, props);
162
- };
163
-
164
132
  const _renderContent = () => {
165
- const shouldShowText = variant !== VARIANT.ICON && children !== undefined && children !== null;
133
+ const shouldShowText = variant !== VARIANT.ICON && children != null && (typeof children !== 'string' || children.trim() !== '');
166
134
  const showLoaderStart = isLoading && loaderPlacement === LOADER_PLACEMENT.START;
167
135
  const showLoaderAfter = isLoading && loaderPlacement === LOADER_PLACEMENT.END;
168
136
  const showSuccessStart = isSuccess && loaderPlacement === LOADER_PLACEMENT.START;
169
137
  const showSuccessAfter = isSuccess && loaderPlacement === LOADER_PLACEMENT.END;
170
- return /*#__PURE__*/React.createElement(Flex, {
138
+ return /*#__PURE__*/React.createElement(Flex, _extends({
171
139
  $ui_displayMode: "flex",
172
140
  $ui_direction: "row",
173
141
  $flag_shrink: true,
174
142
  $ui_alignItems: "center",
175
143
  $ui_justifyContent: "center",
176
144
  $ui_className: contentWrapperClass
177
- }, showLoaderStart ? _renderLoader() : null, showSuccessStart ? _renderSuccess() : null, _renderBeforeNode(), iconPlacement === ICON_PLACEMENT.LEFT ? _renderIconNode() : null, shouldShowText ? /*#__PURE__*/React.createElement(Typography, _extends({}, contentProps, {
145
+ }, 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({
146
+ $ui_size: getTypographySize(size)
147
+ }, contentProps, {
148
+ tagAttributes: textAttributes,
178
149
  $ui_className: textClassName,
179
- $ui_size: getTypographySize(size),
180
150
  $flag_dotted: variant !== VARIANT.ICON
181
- }), children) : null, iconPlacement === ICON_PLACEMENT.RIGHT ? _renderIconNode() : null, _renderAfterNode(), showLoaderAfter ? _renderLoader() : null, showSuccessAfter ? _renderSuccess() : null);
151
+ }), children) : children : null, iconPlacement === ICON_PLACEMENT.RIGHT ? _renderIconNode() : null, isRenderable(renderAfter) ? renderNode(renderAfter, props) : null, showLoaderAfter ? _renderLoader() : null, showSuccessAfter ? _renderSuccess() : null);
182
152
  };
183
153
 
184
- const containerAttributes = { ...customAttributes,
185
- 'data-id': customId,
186
- 'data-test-id': testId,
154
+ const containerAttributes = { ...buttonAttributes,
155
+ 'data-id': isDisabled ? `${customId}_disabled` : customId,
156
+ 'data-test-id': isDisabled ? `${testId}_disabled` : testId,
157
+ 'data-selector-id': dataSelectorId,
187
158
  'data-title': title
188
159
  };
189
- return /*#__PURE__*/React.createElement("button", _extends({}, containerAttributes, a11yAttributes, {
160
+ return /*#__PURE__*/React.createElement("button", _extends({}, containerAttributes, {
161
+ "aria-busy": isLoading,
162
+ disabled: isDisabledState,
163
+ "aria-pressed": isSelected
164
+ }, a11yAttributes, {
190
165
  ref: ref,
191
166
  type: type,
192
167
  className: cn(buttonClassName),
193
- "aria-busy": isLoading,
194
- "aria-disabled": isDisabledState,
195
- "aria-readonly": isReadOnly,
196
- "aria-pressed": isSelected,
197
- onClick: _handleClick
168
+ onClick: handleClick
198
169
  }), _renderContent(), overlayActive ? isLoading ? _renderLoader() : _renderSuccess() : null);
199
170
  });
171
+ ButtonPresentational.displayName = 'ButtonPresentational';
172
+ const Button = /*#__PURE__*/forwardRef(function Button(props, ref) {
173
+ const {
174
+ palette,
175
+ appearance,
176
+ hoverAppearance,
177
+ selectedAppearance,
178
+ variant,
179
+ status,
180
+ loaderPlacement,
181
+ size,
182
+ iconName,
183
+ iconSize,
184
+ iconPlacement,
185
+ renderIcon,
186
+ renderBefore,
187
+ renderAfter,
188
+ renderLoader,
189
+ renderSuccess,
190
+ children,
191
+ type,
192
+ onClick,
193
+ isDisabled,
194
+ isSelected,
195
+ shape,
196
+ disabledAppearance,
197
+ title,
198
+ customProps,
199
+ customAttributes,
200
+ a11yAttributes,
201
+ customId,
202
+ testId,
203
+ dataSelectorId,
204
+ customClass
205
+ } = props;
206
+ const isLoading = status === STATUS.LOADING;
207
+ const isSuccess = status === STATUS.SUCCESS;
208
+ const isDisabledState = isDisabled || isLoading;
209
+ const overlayActive = (isLoading || isSuccess) && loaderPlacement === LOADER_PLACEMENT.OVERLAY;
210
+ const classNames = useMemo(() => cssJSLogic({
211
+ props
212
+ }), [palette, appearance, hoverAppearance, selectedAppearance, size, variant, status, isDisabled, isSelected, shape, loaderPlacement, disabledAppearance, customClass]);
213
+
214
+ const handleClick = event => {
215
+ if (isDisabledState) return;
216
+ onClick(event);
217
+ };
218
+
219
+ const essentials = {
220
+ isLoading,
221
+ isSuccess,
222
+ isDisabled,
223
+ isDisabledState,
224
+ overlayActive,
225
+ variant,
226
+ iconPlacement,
227
+ loaderPlacement,
228
+ size,
229
+ iconName,
230
+ iconSize,
231
+ renderIcon,
232
+ renderBefore,
233
+ renderAfter,
234
+ renderLoader,
235
+ renderSuccess,
236
+ children,
237
+ type,
238
+ isSelected,
239
+ title,
240
+ customProps,
241
+ customAttributes,
242
+ a11yAttributes,
243
+ customId,
244
+ testId,
245
+ dataSelectorId,
246
+ handleClick
247
+ };
248
+ return /*#__PURE__*/React.createElement(ButtonPresentational, _extends({}, essentials, {
249
+ classNames: classNames,
250
+ ref: ref
251
+ }));
252
+ });
200
253
  Button.propTypes = propTypes;
201
254
  Button.defaultProps = defaultProps;
202
255
  Button.displayName = 'Button';