@dxc-technology/halstack-react 0.0.0-4a5e7d8 → 0.0.0-4a67e25

package/chip/Chip.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
@@ -33,9 +33,7 @@ var DxcChip = function DxcChip(_ref) {
   var label = _ref.label,
       suffixIcon = _ref.suffixIcon,
       prefixIcon = _ref.prefixIcon,
-      suffixIconSrc = _ref.suffixIconSrc,
       onClickSuffix = _ref.onClickSuffix,
-      prefixIconSrc = _ref.prefixIconSrc,
       onClickPrefix = _ref.onClickPrefix,
       disabled = _ref.disabled,
       margin = _ref.margin,
@@ -47,7 +45,7 @@ var DxcChip = function DxcChip(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(StyledDxcChip, {
     disabled: disabled,
     margin: margin
-  }, prefixIcon ? /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, prefixIcon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     disabled: disabled,
     prefixIcon: true,
     label: label,
@@ -57,20 +55,11 @@ var DxcChip = function DxcChip(_ref) {
       return onClickPrefix && !disabled && onClickPrefix();
     },
     interactuable: typeof onClickPrefix === "function" && !disabled
-  }, (0, _typeof2["default"])(prefixIcon) === "object" ? prefixIcon : /*#__PURE__*/_react["default"].createElement(prefixIcon)) : prefixIconSrc && /*#__PURE__*/_react["default"].createElement(PrefixIconContainer, {
-    disabled: disabled,
-    src: prefixIconSrc,
-    label: label,
-    tabIndex: typeof onClickPrefix === "function" && !disabled ? tabIndex : -1,
-    onClick: function onClick() {
-      return onClickPrefix && !disabled && onClickPrefix();
-    },
-    interactuable: typeof onClickPrefix === "function" && !disabled
-  }), label && /*#__PURE__*/_react["default"].createElement(ChipTextContainer, {
-    disabled: disabled,
-    prefixIconSrc: prefixIconSrc,
-    suffixIconSrc: suffixIconSrc
-  }, label), suffixIcon ? /*#__PURE__*/_react["default"].createElement(IconContainer, {
+  }, typeof prefixIcon === "string" ? /*#__PURE__*/_react["default"].createElement(PrefixIconContainer, {
+    src: prefixIcon
+  }) : prefixIcon), label && /*#__PURE__*/_react["default"].createElement(ChipTextContainer, {
+    disabled: disabled
+  }, label), suffixIcon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
     disabled: disabled,
     suffixIcon: true,
     mode: "suffix",
@@ -80,16 +69,9 @@ var DxcChip = function DxcChip(_ref) {
       return onClickSuffix && !disabled && onClickSuffix();
     },
     interactuable: typeof onClickSuffix === "function" && !disabled
-  }, (0, _typeof2["default"])(suffixIcon) === "object" ? suffixIcon : /*#__PURE__*/_react["default"].createElement(suffixIcon)) : suffixIconSrc && /*#__PURE__*/_react["default"].createElement(SuffixIconContainer, {
-    disabled: disabled,
-    src: suffixIconSrc,
-    label: label,
-    tabIndex: typeof onClickSuffix === "function" && !disabled ? tabIndex : -1,
-    onClick: function onClick() {
-      return onClickSuffix && !disabled && onClickSuffix();
-    },
-    interactuable: typeof onClickSuffix === "function" && !disabled
-  })));
+  }, typeof suffixIcon === "string" ? /*#__PURE__*/_react["default"].createElement(SuffixIconContainer, {
+    src: suffixIcon
+  }) : suffixIcon)));
 };
 
 var getCursor = function getCursor(interactuable, disabled) {
@@ -155,34 +137,14 @@ var ChipTextContainer = _styledComponents["default"].span(_templateObject2 || (_
   return disabled && "not-allowed" || "default";
 });
 
-var SuffixIconContainer = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  margin-left: ", ";\n  width: ", ";\n  height: ", ";\n"])), function (props) {
-  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
-}, function (props) {
-  return getCursor(props.interactuable, props.disabled);
-}, function (props) {
-  return (props.label || props.suffixIconSrc) && props.theme.iconSpacing || props.prefixIconSrc && "5px";
-}, function (props) {
-  return props.theme.iconSize;
-}, function (props) {
-  return props.theme.iconSize;
-});
+var SuffixIconContainer = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])([""])));
 
-var PrefixIconContainer = _styledComponents["default"].img(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  margin-right: ", ";\n  width: ", ";\n  height: ", ";\n"])), function (props) {
-  return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
-}, function (props) {
-  return getCursor(props.interactuable, props.disabled);
-}, function (props) {
-  return (props.label || props.suffixIconSrc) && props.theme.iconSpacing || props.prefixIconSrc && "5px";
-}, function (props) {
-  return props.theme.iconSize;
-}, function (props) {
-  return props.theme.iconSize;
-});
+var PrefixIconContainer = _styledComponents["default"].img(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])([""])));
 
 var IconContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  ", "\n  ", "\n  width: ", ";\n  height: ", ";\n  overflow: hidden;\n\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n  &:focus {\n    outline-color: ", ";\n    outline-width: 2px;\n    ", "\n  }\n"])), function (props) {
   return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
 }, function (props) {
-  return props.prefixIcon ? "margin-right: ".concat((props.label || props.suffixIcon || props.suffixIconSrc) && props.theme.iconSpacing || (props.prefixIcon || props.prefixIconSrc) && "0", ";") : "margin-left: ".concat((props.label || props.prefixIcon || props.prefixIconSrc) && props.theme.iconSpacing || (props.prefixIcon || props.prefixIconSrc) && "0", ";");
+  return props.prefixIcon ? "margin-right: ".concat((props.label || props.suffixIcon) && props.theme.iconSpacing || props.prefixIcon && "0", ";") : "margin-left: ".concat((props.label || props.prefixIcon) && props.theme.iconSpacing || props.prefixIcon && "0", ";");
 }, function (props) {
   return getCursor(props.interactuable, props.disabled);
 }, function (props) {

package/chip/Chip.stories.tsx

@@ -9,14 +9,12 @@ export default {
   component: DxcChip,
 };
 
-const iconSVG = () => {
-  return (
-    <svg viewBox="0 0 24 24" fill="currentColor">
-      <path d="M0 0h24v24H0z" fill="none" />
-      <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
-    </svg>
-  );
-};
+const iconSVG = (
+  <svg viewBox="0 0 24 24" fill="currentColor">
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
+  </svg>
+);
 
 export const Chromatic = () => (
   <>

package/chip/Chip.test.js

@@ -0,0 +1,56 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+var _Chip = _interopRequireDefault(require("./Chip"));
+
+var _invision = _interopRequireDefault(require("../../app/src/images/invision.svg"));
+
+describe("Chip component tests", function () {
+  test("Chip renders with correct text", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Chip["default"], {
+      label: "Chip"
+    })),
+        getByText = _render.getByText;
+
+    expect(getByText("Chip")).toBeTruthy();
+  });
+  test("Calls correct function when clicking on prefix icon", function () {
+    var onClick = jest.fn();
+
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Chip["default"], {
+      label: "Chip",
+      prefixIcon: _invision["default"],
+      onClickPrefix: onClick
+    })),
+        getByText = _render2.getByText,
+        getByRole = _render2.getByRole;
+
+    expect(getByText("Chip")).toBeTruthy();
+
+    _react2.fireEvent.click(getByRole("img"));
+
+    expect(onClick).toHaveBeenCalled();
+  });
+  test("Calls correct function when clicking on suffix icon", function () {
+    var onClick = jest.fn();
+
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Chip["default"], {
+      label: "Chip",
+      suffixIcon: _invision["default"],
+      onClickSuffix: onClick
+    })),
+        getByText = _render3.getByText,
+        getByRole = _render3.getByRole;
+
+    expect(getByText("Chip")).toBeTruthy();
+
+    _react2.fireEvent.click(getByRole("img"));
+
+    expect(onClick).toHaveBeenCalled();
+  });
+});

package/chip/types.d.ts

@@ -6,32 +6,24 @@ declare type Margin = {
     left?: Space;
     right?: Space;
 };
-declare type SVG = React.SVGProps<SVGSVGElement> | React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
 declare type Props = {
     /**
      * Text to be placed on the chip.
      */
     label?: string;
     /**
-     * Element used as icon to be placed after the chip label.
+     * Element or path used as icon to be placed after the chip label.
      */
-    suffixIcon?: SVG;
+    suffixIcon?: string | SVG;
     /**
-     * Element used as icon to be placed before the chip label.
+     * Element or path used as icon to be placed before the chip label.
      */
-    prefixIcon?: SVG;
-    /**
-     * @deprecated Path of the icon to be placed after the chip label.
-     */
-    suffixIconSrc?: string;
+    prefixIcon?: string | SVG;
     /**
      * This function will be called when the suffix is clicked.
      */
     onClickSuffix?: () => void;
-    /**
-     * @deprecated Path of the icon to be placed before the chip label.
-     */
-    prefixIconSrc?: string;
     /**
      * This function will be called when the prefix is clicked.
      */