@dxc-technology/halstack-react 0.0.0-9179a3a → 0.0.0-918d2c8

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"));
@@ -23,7 +23,7 @@ var _utils = require("../common/utils.js");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -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("img", {
+    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,28 +69,13 @@ 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("img", {
+    src: suffixIcon
+  }) : suffixIcon)));
 };
 
 var getCursor = function getCursor(interactuable, disabled) {
-  if (disabled) {
-    return "cursor:not-allowed;";
-  }
-
-  if (interactuable) {
-    return "cursor:pointer;";
-  }
-
-  return "cursor:default; outline:none;";
+  if (disabled) return "cursor: not-allowed;";else if (interactuable) return "cursor: pointer;";else return "cursor: default; outline:none;";
 };
 
 var StyledDxcChip = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  min-height: 40px;\n  max-width: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n"])), function (_ref2) {
@@ -155,44 +129,26 @@ 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";
+var IconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  ", "\n  color: ", ";\n  ", "\n\n  &:hover {\n    color: ", ";\n  }\n  &:focus {\n    outline-color: ", ";\n    outline-width: ", ";\n    ", "\n  }\n  &:active {\n    color: ", ";\n  }\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
+  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 props.theme.iconSize;
-}, function (props) {
-  return props.theme.iconSize;
-});
-
-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";
+  return !props.disabled && props.theme.hoverIconColor;
 }, function (props) {
-  return props.theme.iconSize;
+  return !props.disabled && props.theme.focusColor;
 }, function (props) {
-  return props.theme.iconSize;
-});
-
-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;
+  return !props.disabled && props.theme.focusBorderThickness;
 }, 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.disabled && "outline: none;";
 }, function (props) {
-  return getCursor(props.interactuable, props.disabled);
+  return !props.disabled && props.theme.activeIconColor;
 }, function (props) {
   return props.theme.iconSize;
 }, function (props) {
   return props.theme.iconSize;
-}, function (props) {
-  return props.theme.focusColor;
-}, function (props) {
-  return props.disabled && "outline: none;";
 });
 
 var _default = DxcChip;

package/chip/Chip.stories.tsx

@@ -3,19 +3,49 @@ import { userEvent, within } from "@storybook/testing-library";
 import DxcChip from "./Chip";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Chip",
   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
+    version="1.1"
+    id="Capa_1"
+    x="0px"
+    y="0px"
+    width="438.536px"
+    height="438.536px"
+    viewBox="0 0 438.536 438.536"
+    fill="currentColor"
+  >
+    <g>
+      <path
+        d="M414.41,24.123C398.333,8.042,378.963,0,356.315,0H82.228C59.58,0,40.21,8.042,24.126,24.123
+C8.045,40.207,0.003,59.576,0.003,82.225v274.084c0,22.647,8.042,42.018,24.123,58.102c16.084,16.084,35.454,24.126,58.102,24.126
+h274.084c22.648,0,42.018-8.042,58.095-24.126c16.084-16.084,24.126-35.454,24.126-58.102V82.225
+C438.532,59.576,430.49,40.204,414.41,24.123z M373.155,225.548h-49.963V406.84h-74.802V225.548H210.99V163.02h37.401v-37.402
+c0-26.838,6.283-47.107,18.843-60.813c12.559-13.706,33.304-20.555,62.242-20.555h49.963v62.526h-31.401
+c-10.663,0-17.467,1.853-20.417,5.568c-2.949,3.711-4.428,10.23-4.428,19.558v31.119h56.534L373.155,225.548z"
+      />
+    </g>
+  </svg>
+);
+
+const smallIconSVG = (
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" height="20" width="20">
+    <path d="m10 17-1.042-.938q-2.083-1.854-3.437-3.177-1.354-1.323-2.136-2.354Q2.604 9.5 2.302 8.646 2 7.792 2 6.896q0-1.854 1.271-3.125T6.396 2.5q1.021 0 1.979.438.958.437 1.625 1.229.667-.792 1.625-1.229.958-.438 1.979-.438 1.854 0 3.125 1.271T18 6.896q0 .896-.292 1.729-.291.833-1.073 1.854-.781 1.021-2.145 2.365-1.365 1.344-3.49 3.26Zm0-2.021q1.938-1.729 3.188-2.948 1.25-1.219 1.989-2.125.74-.906 1.031-1.614.292-.709.292-1.396 0-1.229-.833-2.063Q14.833 4 13.604 4q-.729 0-1.364.302-.636.302-1.094.844L10.417 6h-.834l-.729-.854q-.458-.542-1.114-.844Q7.083 4 6.396 4q-1.229 0-2.063.833-.833.834-.833 2.063 0 .687.271 1.364.271.678.989 1.573.719.896 1.98 2.125Q8 13.188 10 14.979Zm0-5.5Z" />
+  </svg>
+);
+
+const opinionatedTheme = {
+  chip: {
+    baseColor: "#e6e6e6",
+    fontColor: "#000000",
+    iconColor: "#4d4d4d",
+  },
 };
 
 export const Chromatic = () => (
@@ -25,20 +55,29 @@ export const Chromatic = () => (
       <DxcChip label="Default Chip" />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Chip with prefix" theme="light" level={4} />
-      <DxcChip label="Chip with prefix" prefixIcon={iconSVG} />
+      <Title title="Chip with prefix SVG (small icon)" theme="light" level={4} />
+      <DxcChip label="Chip with prefix" prefixIcon={smallIconSVG} />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Chip with suffix" theme="light" level={4} />
+      <Title title="Chip with suffix SVG (large icon)" theme="light" level={4} />
       <DxcChip label="Chip with suffix" suffixIcon={iconSVG} />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Chip with prefix and suffix" theme="light" level={4} />
-      <DxcChip label="Chip with prefix and suffix" prefixIcon={iconSVG} suffixIcon={iconSVG} />
+      <Title title="Chip with prefix (SVG) and suffix (URL)" theme="light" level={4} />
+      <DxcChip
+        label="Chip with prefix and suffix"
+        prefixIcon={iconSVG}
+        suffixIcon="https://upload.wikimedia.org/wikipedia/commons/e/e0/Check_green_icon.svg"
+      />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled chip" theme="light" level={4} />
-      <DxcChip label="Disabled" disabled prefixIcon={iconSVG} suffixIcon={iconSVG} />
+      <DxcChip
+        label="Disabled"
+        disabled
+        prefixIcon={iconSVG}
+        suffixIcon="https://upload.wikimedia.org/wikipedia/commons/e/e0/Check_green_icon.svg"
+      />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Chip with ellipsis" theme="light" level={4} />
@@ -95,6 +134,52 @@ export const Chromatic = () => (
       <Title title="Xxlarge margin" theme="light" level={4} />
       <DxcChip label="xxlarge" margin="xxlarge" />
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Chip with prefix and suffix" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcChip
+          label="Chip"
+          prefixIcon={iconSVG}
+          suffixIcon="https://upload.wikimedia.org/wikipedia/commons/e/e0/Check_green_icon.svg"
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Chip with prefix and suffix" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcChip
+          label="Chip"
+          disabled
+          prefixIcon={iconSVG}
+          suffixIcon="https://upload.wikimedia.org/wikipedia/commons/e/e0/Check_green_icon.svg"
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcChip
+          label="Chip"
+          prefixIcon={iconSVG}
+          suffixIcon={iconSVG}
+          onClickPrefix={() => {}}
+          onClickSuffix={() => {}}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-active">
+      <Title title="Actived" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcChip
+          label="Chip"
+          prefixIcon={iconSVG}
+          suffixIcon={iconSVG}
+          onClickPrefix={() => {}}
+          onClickSuffix={() => {}}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 const ChipPrefixFocused = () => (

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.
      */