@dxc-technology/halstack-react 0.0.0-dddc3c4 → 0.0.0-de7c6b0

package/checkbox/Checkbox.stories.tsx

@@ -4,42 +4,55 @@ import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import DarkContainer from "../../.storybook/components/DarkSection";
-import { userEvent } from "@storybook/testing-library";
+import styled from "styled-components";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "Checkbox",
   component: DxcCheckbox,
 };
 
+const opinionatedTheme = {
+  checkbox: {
+    baseColor: "#0067b3",
+    checkColor: "#ffffff",
+    fontColor: "#000000",
+  },
+};
+
 const Checkbox = () => (
   <>
     <ExampleContainer>
       <Title title="Default" theme="light" level={4} />
       <DxcCheckbox label="Checkbox" />
     </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Focused" theme="light" level={4} />
-      <DxcCheckbox label="Focused" />
-    </ExampleContainer>
     <ExampleContainer>
       <Title title="Checked" theme="light" level={4} />
       <DxcCheckbox label="Checkbox" defaultChecked />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Optional" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" optional />
+      <Title title="Disabled" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Disabled and checked" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled defaultChecked />
+      <Title title="Disabled, checked and optional" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" disabled defaultChecked optional />
     </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Disabled and optional" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled optional />
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <DxcCheckbox label="Focused" />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <DxcCheckbox label="Hovered" />
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered and checked" theme="light" level={4} />
+      <DxcCheckbox label="Hovered" defaultChecked />
     </ExampleContainer>
     <ExampleContainer>
-      <Title title="Disabled, optional and checked" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled optional defaultChecked />
+      <Title title="Optional" theme="light" level={4} />
+      <DxcCheckbox label="Checkbox" optional />
     </ExampleContainer>
     <ExampleContainer>
       <Title title="Label after" theme="light" level={4} />
@@ -53,25 +66,9 @@ const Checkbox = () => (
       <Title title="Optional with label after" theme="light" level={4} />
       <DxcCheckbox label="Checkbox" optional labelPosition="after" />
     </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Disabled and checked with label after" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled defaultChecked labelPosition="after" />
-    </ExampleContainer>
     <ExampleContainer>
       <Title title="Disabled and optional with label after" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled optional labelPosition="after" />
-    </ExampleContainer>
-    <ExampleContainer>
-      <Title title="Disabled, optional and checked with label after" theme="light" level={4} />
-      <DxcCheckbox label="Checkbox" disabled optional defaultChecked labelPosition="after" />
-    </ExampleContainer>
-    <ExampleContainer pseudoState="pseudo-hover">
-      <Title title="Hovered" theme="light" level={4} />
-      <DxcCheckbox label="Hovered" />
-    </ExampleContainer>
-    <ExampleContainer pseudoState="pseudo-hover">
-      <Title title="Hovered and checked" theme="light" level={4} />
-      <DxcCheckbox label="Hovered" defaultChecked />
+      <DxcCheckbox label="Checkbox" disabled labelPosition="after" optional />
     </ExampleContainer>
     <BackgroundColorProvider color="#333333">
       <DarkContainer>
@@ -84,20 +81,28 @@ const Checkbox = () => (
           <DxcCheckbox label="Checkbox" defaultChecked />
         </ExampleContainer>
         <ExampleContainer>
-          <Title title="Optional" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" optional />
+          <Title title="Disabled" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled />
         </ExampleContainer>
         <ExampleContainer>
-          <Title title="Disabled and checked" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled defaultChecked />
+          <Title title="Disabled, checked and optional" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" disabled defaultChecked optional />
         </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled and optional" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled optional />
+        <ExampleContainer pseudoState="pseudo-focus">
+          <Title title="Focused" theme="dark" level={4} />
+          <DxcCheckbox label="Focused" />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-hover">
+          <Title title="Hovered" theme="dark" level={4} />
+          <DxcCheckbox label="Hovered" />
+        </ExampleContainer>
+        <ExampleContainer pseudoState="pseudo-hover">
+          <Title title="Hovered and checked" theme="dark" level={4} />
+          <DxcCheckbox label="Hovered" defaultChecked />
         </ExampleContainer>
         <ExampleContainer>
-          <Title title="Disabled, optional and checked" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled optional defaultChecked />
+          <Title title="Optional" theme="dark" level={4} />
+          <DxcCheckbox label="Checkbox" optional />
         </ExampleContainer>
         <ExampleContainer>
           <Title title="Label after" theme="dark" level={4} />
@@ -111,25 +116,9 @@ const Checkbox = () => (
           <Title title="Optional with label after" theme="dark" level={4} />
           <DxcCheckbox label="Checkbox" optional labelPosition="after" />
         </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled and checked with label after" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled defaultChecked labelPosition="after" />
-        </ExampleContainer>
         <ExampleContainer>
           <Title title="Disabled and optional with label after" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled optional labelPosition="after" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled, optional and checked with label after" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled optional defaultChecked labelPosition="after" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-hover">
-          <Title title="Hovered" theme="dark" level={4} />
-          <DxcCheckbox label="Hovered" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-hover">
-          <Title title="Hovered and checked" theme="dark" level={4} />
-          <DxcCheckbox label="Hovered" defaultChecked />
+          <DxcCheckbox label="Checkbox" disabled labelPosition="after" optional />
         </ExampleContainer>
       </DarkContainer>
     </BackgroundColorProvider>
@@ -178,11 +167,94 @@ const Checkbox = () => (
       <Title title="Xxlarge" theme="light" level={4} />
       <DxcCheckbox label="Xxlarge" margin="xxlarge" />
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Overflow container" theme="light" level={4} />
+      <ScrollableContainer id="scroll-container">
+        <DxcCheckbox label="Checkbox" defaultChecked />
+        <DxcCheckbox label="Checkbox" defaultChecked />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" defaultChecked />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" />
+        <DxcCheckbox label="Checkbox" defaultChecked />
+      </ScrollableContainer>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Label overflow" theme="light" level={4} />
+      <SmallContainer>
+        <DxcCheckbox label="Very long label to check its overflowing" defaultChecked />
+        <DxcCheckbox label="Very long label to check its overflowing" labelPosition="after" />
+      </SmallContainer>
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Default" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Checkbox" defaultChecked disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-focus">
+      <Title title="Focused" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Focused" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Hovered" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer pseudoState="pseudo-hover">
+      <Title title="Hovered and checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcCheckbox label="Hovered" defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );
 
 export const Chromatic = Checkbox.bind({});
+
 Chromatic.play = async () => {
-  await userEvent.tab();
-  await userEvent.tab();
+  const listEl = document.getElementById("scroll-container");
+  listEl?.scrollTo?.({ top: 50 });
 };
+
+const ScrollableContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+  width: 200px;
+  height: 200px;
+  border: 1px solid #000;
+  padding: 14px;
+  overflow: auto;
+`;
+
+const SmallContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+  width: 150px;
+  height: 150px;
+`;

package/checkbox/Checkbox.test.js

@@ -6,25 +6,39 @@ var _react = _interopRequireDefault(require("react"));
 
 var _react2 = require("@testing-library/react");
 
-var _Checkbox = _interopRequireDefault(require("./Checkbox"));
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+
+var _Checkbox = _interopRequireDefault(require("./Checkbox.tsx"));
 
 describe("Checkbox component tests", function () {
-  test("Checkbox renders with correct text", function () {
+  test("Checkbox renders with correct aria-labelledby and aria-required", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox"
     })),
-        getByText = _render.getByText;
+        getByText = _render.getByText,
+        getByRole = _render.getByRole;
 
-    expect(getByText("Checkbox")).toBeTruthy();
+    var labelId = getByText("Checkbox").getAttribute("id");
+    expect(getByRole("checkbox").getAttribute("aria-labelledby")).toBe(labelId);
+    expect(getByRole("checkbox").getAttribute("aria-required")).toBe("true");
+  });
+  test("Optional checkbox renders with correct aria-required", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      optional: true
+    })),
+        getByRole = _render2.getByRole;
+
+    expect(getByRole("checkbox").getAttribute("aria-required")).toBe("false");
   });
   test("Calls correct function on click", function () {
     var onChange = jest.fn();
 
-    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox",
       onChange: onChange
     })),
-        getByText = _render2.getByText;
+        getByText = _render3.getByText;
 
     _react2.fireEvent.click(getByText("Checkbox"));
 
@@ -34,45 +48,108 @@ describe("Checkbox component tests", function () {
     var onChange = jest.fn();
     var component = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox",
-      onChange: onChange
+      onChange: onChange,
+      name: "test"
     }));
     var visibleCheckbox = component.getByText("Checkbox");
     var input = component.getByRole("checkbox");
-    expect(input.checked).toBe(false);
+    var submitInput = component.container.querySelector("input[name=\"test\"]");
+    expect(input.getAttribute("aria-checked")).toBe("false");
+    expect(submitInput.checked).toBe(false);
 
     _react2.fireEvent.click(visibleCheckbox);
 
     expect(onChange).toHaveBeenCalled();
     expect(onChange).toHaveBeenCalledWith(true);
-    expect(input.checked).toBe(true);
+    expect(input.getAttribute("aria-checked")).toBe("true");
+    expect(submitInput.checked).toBe(true);
   });
   test("Controlled checkbox", function () {
     var onChange = jest.fn();
     var component = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Checkbox",
       checked: false,
-      onChange: onChange
+      onChange: onChange,
+      name: "test"
     }));
     var input = component.getByRole("checkbox");
     var visibleCheckbox = component.getByText("Checkbox");
+    var submitInput = component.container.querySelector("input[name=\"test\"]");
 
     _react2.fireEvent.click(visibleCheckbox);
 
     expect(onChange).toHaveBeenCalled();
     expect(onChange).toHaveBeenCalledWith(true);
-    expect(input.checked).toBe(false);
+    expect(input.getAttribute("aria-checked")).toBe("false");
+    expect(submitInput.checked).toBe(false);
   });
   test("Renders with correct initial value and initial state when it is uncontrolled", function () {
-    var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+    var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
       label: "Default label",
       defaultChecked: true,
-      value: "test-defaultChecked"
+      value: "test-defaultChecked",
+      name: "test"
+    })),
+        getByRole = _render4.getByRole,
+        container = _render4.container;
+
+    var checkbox = getByRole("checkbox");
+    var submitInput = container.querySelector("input[name=\"test\"]");
+    expect(submitInput.value).toBe("test-defaultChecked");
+    expect(checkbox.getAttribute("aria-checked")).toBe("true");
+    expect(submitInput.checked).toBe(true);
+  });
+  test("Test disable keyboard and mouse interactions", function () {
+    var onChange = jest.fn();
+
+    var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      onChange: onChange,
+      disabled: true,
+      name: "test"
     })),
-        getByRole = _render3.getByRole;
+        getByRole = _render5.getByRole,
+        getByText = _render5.getByText,
+        container = _render5.container;
 
     var input = getByRole("checkbox");
-    expect(input.checked).toBe(true);
-    expect(input.value).toBe("test-defaultChecked");
-    expect(input.getAttribute("aria-checked")).toBe("true");
+    var visibleCheckbox = getByText("Checkbox");
+    var submitInput = container.querySelector("input[name=\"test\"]");
+
+    _react2.fireEvent.click(visibleCheckbox);
+
+    expect(onChange).toHaveBeenCalledTimes(0);
+    expect(input.getAttribute("aria-checked")).toBe("false");
+    expect(input.getAttribute("aria-disabled")).toBe("true");
+    expect(submitInput.checked).toBe(false);
+
+    _userEvent["default"].tab();
+
+    expect(document.activeElement === input).toBeFalsy();
+  });
+  test("Test keyboard interactions", function () {
+    var onChange = jest.fn();
+
+    var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
+      label: "Checkbox",
+      name: "test",
+      onChange: onChange
+    })),
+        getByRole = _render6.getByRole;
+
+    var checkbox = getByRole("checkbox");
+
+    _userEvent["default"].tab();
+
+    expect(document.activeElement === checkbox).toBeTruthy();
+
+    _react2.fireEvent.keyDown(checkbox, {
+      key: " ",
+      code: "Space",
+      keyCode: 32,
+      charCode: 32
+    });
+
+    expect(onChange).toHaveBeenCalledWith(true);
   });
 });

package/checkbox/types.d.ts

@@ -61,4 +61,8 @@ declare type Props = {
      */
     tabIndex?: number;
 };
+/**
+ * Reference to the component.
+ */
+export declare type RefType = HTMLDivElement;
 export default Props;

package/chip/Chip.js

@@ -17,13 +17,13 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 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); }
 
@@ -42,53 +42,42 @@ var DxcChip = function DxcChip(_ref) {
   var colorsTheme = (0, _useTheme["default"])();
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.chip
-  }, /*#__PURE__*/_react["default"].createElement(StyledDxcChip, {
+  }, /*#__PURE__*/_react["default"].createElement(Chip, {
     disabled: disabled,
     margin: margin
   }, prefixIcon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+    role: typeof onClickPrefix === "function" ? "button" : undefined,
     disabled: disabled,
-    prefixIcon: true,
-    label: label,
-    mode: "prefix",
+    interactuable: typeof onClickPrefix === "function" && !disabled,
     tabIndex: typeof onClickPrefix === "function" && !disabled ? tabIndex : -1,
     onClick: function onClick() {
       return onClickPrefix && !disabled && onClickPrefix();
-    },
-    interactuable: typeof onClickPrefix === "function" && !disabled
-  }, typeof prefixIcon === "string" ? /*#__PURE__*/_react["default"].createElement(PrefixIconContainer, {
+    }
+  }, typeof prefixIcon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: prefixIcon
-  }) : prefixIcon), label && /*#__PURE__*/_react["default"].createElement(ChipTextContainer, {
+  }) : prefixIcon), label && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
     disabled: disabled
   }, label), suffixIcon && /*#__PURE__*/_react["default"].createElement(IconContainer, {
+    role: typeof onClickSuffix === "function" ? "button" : undefined,
     disabled: disabled,
-    suffixIcon: true,
-    mode: "suffix",
-    label: label,
+    interactuable: typeof onClickSuffix === "function" && !disabled,
     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, {
+      return !disabled && (onClickSuffix === null || onClickSuffix === void 0 ? void 0 : onClickSuffix());
+    }
+  }, 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;";
+var calculateWidth = function calculateWidth(margin) {
+  return "calc(100% - ".concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
 };
 
-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) {
-  var margin = _ref2.margin;
-  return "calc(100% - 40px - ".concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")");
+var Chip = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: inline-flex;\n  align-items: center;\n  gap: ", ";\n  min-height: 40px;\n  max-width: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n\n  padding-top: ", ";\n  padding-bottom: ", ";\n  padding-left: ", ";\n  padding-right: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n"])), function (props) {
+  return props.theme.iconSpacing;
+}, function (props) {
+  return calculateWidth(props.margin);
 }, function (props) {
   return props.disabled && props.theme.disabledBackgroundColor || props.theme.backgroundColor;
 }, function (props) {
@@ -117,12 +106,12 @@ var StyledDxcChip = _styledComponents["default"].div(_templateObject || (_templa
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.bottom ? _variables.spaces[props.margin.bottom] : "";
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
-}, function (_ref3) {
-  var disabled = _ref3.disabled;
+}, function (_ref2) {
+  var disabled = _ref2.disabled;
   return disabled && "not-allowed";
 });
 
-var ChipTextContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  font-family: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  color: ", ";\n  cursor: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), function (props) {
+var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  font-family: ", ";\n  font-weight: ", ";\n  font-style: ", ";\n  color: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), function (props) {
   return props.theme.fontSize;
 }, function (props) {
   return props.theme.fontFamily;
@@ -132,29 +121,19 @@ var ChipTextContainer = _styledComponents["default"].span(_templateObject2 || (_
   return props.theme.fontStyle;
 }, function (props) {
   return props.disabled ? props.theme.disabledFontColor : props.theme.fontColor;
-}, function (_ref4) {
-  var disabled = _ref4.disabled;
-  return disabled && "not-allowed" || "default";
 });
 
-var SuffixIconContainer = _styledComponents["default"].img(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-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) {
+var IconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  border-radius: 0.25rem;\n  color: ", ";\n  ", "\n\n  ", "\n\n  img,\n  svg {\n    width: ", ";\n    height: ", ";\n  }\n"])), function (props) {
   return props.disabled ? props.theme.disabledIconColor : props.theme.iconColor;
+}, function (_ref3) {
+  var interactuable = _ref3.interactuable;
+  return interactuable && "cursor: pointer;";
 }, 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 getCursor(props.interactuable, props.disabled);
+  return props.interactuable && "\n      &:hover {\n        color: ".concat(props.theme.hoverIconColor, ";\n      }\n      &:focus,\n      &:focus-visible {\n        outline: ").concat(props.theme.focusBorderThickness, " solid ").concat(props.theme.focusColor, ";\n      }\n      &:active {\n        color: ").concat(props.theme.activeIconColor, ";\n      }\n    ");
 }, 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;