@dxc-technology/halstack-react 0.0.0-5a1e592 → 0.0.0-5a7a613

package/checkbox/Checkbox.js

@@ -1,93 +1,64 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
 var _variables = require("../common/variables");
-
 var _utils = require("../common/utils");
-
-var _uuid = require("uuid");
-
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
-
-var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
-
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-
-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); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var checkedIcon = /*#__PURE__*/_react["default"].createElement("svg", {
   fill: "currentColor",
   focusable: "false",
-  "aria-hidden": "true",
   viewBox: "0 0 24 24"
 }, /*#__PURE__*/_react["default"].createElement("path", {
   d: "M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
 }));
-
 var DxcCheckbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var checked = _ref.checked,
-      _ref$defaultChecked = _ref.defaultChecked,
-      defaultChecked = _ref$defaultChecked === void 0 ? false : _ref$defaultChecked,
-      value = _ref.value,
-      _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
-      _ref$labelPosition = _ref.labelPosition,
-      labelPosition = _ref$labelPosition === void 0 ? "before" : _ref$labelPosition,
-      _ref$name = _ref.name,
-      name = _ref$name === void 0 ? "" : _ref$name,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      _ref$optional = _ref.optional,
-      optional = _ref$optional === void 0 ? false : _ref$optional,
-      _ref$readOnly = _ref.readOnly,
-      readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
-      onChange = _ref.onChange,
-      margin = _ref.margin,
-      _ref$size = _ref.size,
-      size = _ref$size === void 0 ? "fitContent" : _ref$size,
-      _ref$tabIndex = _ref.tabIndex,
-      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
-
-  var _useState = (0, _react.useState)("label-checkbox-".concat((0, _uuid.v4)())),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
-      labelId = _useState2[0];
-
-  var _useState3 = (0, _react.useState)(defaultChecked),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      innerChecked = _useState4[0],
-      setInnerChecked = _useState4[1];
-
+    _ref$defaultChecked = _ref.defaultChecked,
+    defaultChecked = _ref$defaultChecked === void 0 ? false : _ref$defaultChecked,
+    value = _ref.value,
+    _ref$label = _ref.label,
+    label = _ref$label === void 0 ? "" : _ref$label,
+    _ref$labelPosition = _ref.labelPosition,
+    labelPosition = _ref$labelPosition === void 0 ? "before" : _ref$labelPosition,
+    _ref$name = _ref.name,
+    name = _ref$name === void 0 ? "" : _ref$name,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$optional = _ref.optional,
+    optional = _ref$optional === void 0 ? false : _ref$optional,
+    _ref$readOnly = _ref.readOnly,
+    readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
+    onChange = _ref.onChange,
+    margin = _ref.margin,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? "fitContent" : _ref$size,
+    _ref$tabIndex = _ref.tabIndex,
+    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+  var labelId = "label-checkbox-".concat((0, _react.useId)());
+  var _useState = (0, _react.useState)(defaultChecked),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    innerChecked = _useState2[0],
+    setInnerChecked = _useState2[1];
   var checkboxRef = (0, _react.useRef)(null);
   var colorsTheme = (0, _useTheme["default"])();
-  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
   var translatedLabels = (0, _useTranslatedLabels["default"])();
-
   var handleCheckboxChange = function handleCheckboxChange() {
     if (!disabled && !readOnly) {
       var _checkboxRef$current;
-
       document.activeElement !== (checkboxRef === null || checkboxRef === void 0 ? void 0 : checkboxRef.current) && (checkboxRef === null || checkboxRef === void 0 ? void 0 : (_checkboxRef$current = checkboxRef.current) === null || _checkboxRef$current === void 0 ? void 0 : _checkboxRef$current.focus());
       var newChecked = checked !== null && checked !== void 0 ? checked : innerChecked;
       checked !== null && checked !== void 0 ? checked : setInnerChecked(function (innerChecked) {
@@ -96,7 +67,6 @@ var DxcCheckbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
       onChange === null || onChange === void 0 ? void 0 : onChange(!newChecked);
     }
   };
-
   var handleKeyboard = function handleKeyboard(event) {
     switch (event.key) {
       case " ":
@@ -104,7 +74,6 @@ var DxcCheckbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
         handleCheckboxChange();
     }
   };
-
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.checkbox
   }, /*#__PURE__*/_react["default"].createElement(MainContainer, {
@@ -114,18 +83,16 @@ var DxcCheckbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
     margin: margin,
     size: size,
     checked: checked !== null && checked !== void 0 ? checked : innerChecked,
-    backgroundType: backgroundType,
     ref: ref
   }, label && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
     id: labelId,
     disabled: disabled,
-    backgroundType: backgroundType,
-    labelPosition: labelPosition
+    labelPosition: labelPosition,
+    "aria-label": label
   }, label, optional && " ".concat(translatedLabels.formFields.optionalLabel)), /*#__PURE__*/_react["default"].createElement(ValueInput, {
     type: "checkbox",
     checked: checked !== null && checked !== void 0 ? checked : innerChecked,
     name: name,
-    "aria-hidden": "true",
     value: value,
     disabled: disabled,
     readOnly: true
@@ -137,15 +104,14 @@ var DxcCheckbox = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
     "aria-disabled": disabled,
     "aria-readonly": readOnly,
     "aria-required": !disabled && !optional,
-    "aria-labelledby": labelId,
-    backgroundType: backgroundType,
+    "aria-labelledby": label ? labelId : undefined,
+    "aria-label": label ? undefined : "Checkbox",
     checked: checked !== null && checked !== void 0 ? checked : innerChecked,
     disabled: disabled,
     readOnly: readOnly,
     ref: checkboxRef
   }, (checked !== null && checked !== void 0 ? checked : innerChecked) && checkedIcon))));
 });
-
 var sizes = {
   small: "120px",
   medium: "240px",
@@ -153,72 +119,55 @@ var sizes = {
   fillParent: "100%",
   fitContent: "fit-content"
 };
-
 var calculateWidth = function calculateWidth(margin, size) {
   return size === "fillParent" ? "calc(".concat(sizes[size], " - ").concat((0, _utils.getMargin)(margin, "left"), " - ").concat((0, _utils.getMargin)(margin, "right"), ")") : sizes[size];
 };
-
-var getDisabledColor = function getDisabledColor(props, element) {
+var getDisabledColor = function getDisabledColor(theme, element) {
   switch (element) {
     case "check":
-      return props.backgroundType === "dark" ? props.theme.disabledCheckColorOnDark : props.theme.disabledCheckColor;
-
+      return theme.disabledCheckColor;
     case "background":
-      return props.backgroundType === "dark" ? props.theme.disabledBackgroundColorCheckedOnDark : props.theme.disabledBackgroundColorChecked;
-
+      return theme.disabledBackgroundColorChecked;
     case "border":
-      return props.backgroundType === "dark" ? props.theme.disabledBorderColorOnDark : props.theme.disabledBorderColor;
-
+      return theme.disabledBorderColor;
     case "label":
-      return props.backgroundType === "dark" ? props.theme.disabledFontColorOnDark : props.theme.disabledFontColor;
+      return theme.disabledFontColor;
   }
 };
-
-var getReadOnlyColor = function getReadOnlyColor(props, element) {
+var getReadOnlyColor = function getReadOnlyColor(theme, element) {
   switch (element) {
     case "check":
-      return props.theme.readOnlyCheckColor;
-
+      return theme.readOnlyCheckColor;
     case "background":
-      return props.theme.readOnlyBackgroundColorChecked;
-
+      return theme.readOnlyBackgroundColorChecked;
     case "hoverBackground":
-      return props.theme.hoverReadOnlyBackgroundColorChecked;
-
+      return theme.hoverReadOnlyBackgroundColorChecked;
     case "border":
-      return props.theme.readOnlyBorderColor;
-
+      return theme.readOnlyBorderColor;
     case "hoverBorder":
-      return props.theme.hoverReadOnlyBorderColor;
+      return theme.hoverReadOnlyBorderColor;
   }
 };
-
-var getEnabledColor = function getEnabledColor(props, element) {
+var getEnabledColor = function getEnabledColor(theme, element) {
   switch (element) {
     case "check":
-      return props.backgroundType === "dark" ? props.theme.checkColorOnDark : props.theme.checkColor;
-
+      return theme.checkColor;
     case "background":
-      return props.backgroundType === "dark" ? props.theme.backgroundColorCheckedOnDark : props.theme.backgroundColorChecked;
-
+      return theme.backgroundColorChecked;
     case "hoverBackground":
-      return props.backgroundType === "dark" ? props.theme.hoverBackgroundColorCheckedOnDark : props.theme.hoverBackgroundColorChecked;
-
+      return theme.hoverBackgroundColorChecked;
     case "border":
-      return props.backgroundType === "dark" ? props.theme.borderColorOnDark : props.theme.borderColor;
-
+      return theme.borderColor;
     case "hoverBorder":
-      return props.backgroundType === "dark" ? props.theme.hoverBorderColorOnDark : props.theme.hoverBorderColor;
-
+      return theme.hoverBorderColor;
     case "label":
-      return props.backgroundType === "dark" ? props.theme.fontColorOnDark : props.theme.fontColor;
+      return theme.fontColor;
   }
 };
-
 var LabelContainer = _styledComponents["default"].span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  order: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"])), function (props) {
   return props.labelPosition === "before" ? 0 : 1;
 }, function (props) {
-  return props.disabled ? getDisabledColor(props, "label") : getEnabledColor(props, "label");
+  return props.disabled ? getDisabledColor(props.theme, "label") : getEnabledColor(props.theme, "label");
 }, function (props) {
   return props.theme.fontFamily;
 }, function (props) {
@@ -226,23 +175,19 @@ var LabelContainer = _styledComponents["default"].span(_templateObject || (_temp
 }, function (props) {
   return props.theme.fontWeight;
 });
-
 var ValueInput = _styledComponents["default"].input(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));
-
 var CheckboxContainer = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 24px;\n  width: 24px;\n"])));
-
-var Checkbox = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 18px;\n  width: 18px;\n  border: 2px solid\n    ", ";\n  border-radius: 2px;\n  background-color: ", ";\n  color: ", ";\n\n  &:focus {\n    outline: 2px solid\n      ", ";\n    outline-offset: 2px;\n  }\n  svg {\n    position: absolute;\n    width: 22px;\n    height: 22px;\n  }\n  ", "\n"])), function (props) {
-  return props.disabled ? getDisabledColor(props, "border") : props.readOnly ? getReadOnlyColor(props, "border") : getEnabledColor(props, "border");
+var Checkbox = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  height: 18px;\n  width: 18px;\n  border: 2px solid\n    ", ";\n  border-radius: 2px;\n  background-color: ", ";\n  color: ", ";\n\n  &:focus {\n    outline: 2px solid ", ";\n    outline-offset: 2px;\n  }\n  svg {\n    position: absolute;\n    width: 22px;\n    height: 22px;\n  }\n  ", "\n"])), function (props) {
+  return props.disabled ? getDisabledColor(props.theme, "border") : props.readOnly ? getReadOnlyColor(props.theme, "border") : getEnabledColor(props.theme, "border");
 }, function (props) {
-  return props.checked ? props.disabled ? getDisabledColor(props, "check") : props.readOnly ? getReadOnlyColor(props, "check") : getEnabledColor(props, "check") : "transparent";
+  return props.checked ? props.disabled ? getDisabledColor(props.theme, "check") : props.readOnly ? getReadOnlyColor(props.theme, "check") : getEnabledColor(props.theme, "check") : "transparent";
 }, function (props) {
-  return props.disabled ? getDisabledColor(props, "background") : props.readOnly ? getReadOnlyColor(props, "background") : getEnabledColor(props, "background");
+  return props.disabled ? getDisabledColor(props.theme, "background") : props.readOnly ? getReadOnlyColor(props.theme, "background") : getEnabledColor(props.theme, "background");
 }, function (props) {
-  return props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor;
+  return props.theme.focusColor;
 }, function (props) {
   return props.disabled && "pointer-events: none;";
 });
-
 var MainContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  gap: ", ";\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  cursor: ", ";\n\n  &:hover ", " {\n    border: 2px solid\n      ", ";\n    color: ", ";\n  }\n"])), function (props) {
   return props.theme.checkLabelSpacing;
 }, function (props) {
@@ -260,10 +205,8 @@ var MainContainer = _styledComponents["default"].div(_templateObject5 || (_templ
 }, function (props) {
   return props.disabled ? "not-allowed" : props.readOnly ? "default" : "pointer";
 }, Checkbox, function (props) {
-  if (!props.disabled) return props.readOnly ? getReadOnlyColor(props, "hoverBorder") : getEnabledColor(props, "hoverBorder");
+  if (!props.disabled) return props.readOnly ? getReadOnlyColor(props.theme, "hoverBorder") : getEnabledColor(props.theme, "hoverBorder");
 }, function (props) {
-  if (!props.disabled) return props.readOnly ? getReadOnlyColor(props, "hoverBackground") : getEnabledColor(props, "hoverBackground");
+  if (!props.disabled) return props.readOnly ? getReadOnlyColor(props.theme, "hoverBackground") : getEnabledColor(props.theme, "hoverBackground");
 });
-
-var _default = DxcCheckbox;
-exports["default"] = _default;
+var _default = exports["default"] = DxcCheckbox;

package/checkbox/Checkbox.stories.tsx

@@ -1,9 +1,7 @@
 import React from "react";
 import DxcCheckbox from "./Checkbox";
-import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import DarkContainer from "../../.storybook/components/DarkSection";
 import styled from "styled-components";
 import { HalstackProvider } from "../HalstackContext";
 
@@ -86,58 +84,6 @@ const Checkbox = () => (
       <Title title="Disabled and optional with label after" theme="light" level={4} />
       <DxcCheckbox label="Checkbox" disabled labelPosition="after" optional />
     </ExampleContainer>
-    <BackgroundColorProvider color="#333333">
-      <DarkContainer>
-        <ExampleContainer>
-          <Title title="Default" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Checked" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" defaultChecked />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled, checked and optional" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled defaultChecked optional />
-        </ExampleContainer>
-        <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="Optional" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" optional />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Label after" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" labelPosition="after" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Checked with label after" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" defaultChecked labelPosition="after" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Optional with label after" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" optional labelPosition="after" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled and optional with label after" theme="dark" level={4} />
-          <DxcCheckbox label="Checkbox" disabled labelPosition="after" optional />
-        </ExampleContainer>
-      </DarkContainer>
-    </BackgroundColorProvider>
     <Title title="Sizes" theme="light" level={2} />
     <ExampleContainer>
       <DxcCheckbox label="Small" size="small" />

package/checkbox/Checkbox.test.d.ts

@@ -0,0 +1 @@
+export {};