@dxc-technology/halstack-react 0.0.0-74ba970 → 0.0.0-74dd241

package/switch/Switch.js

@@ -1,84 +1,57 @@
 "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 _uuid = require("uuid");
-
-var _variables = require("../common/variables.js");
-
-var _utils = require("../common/utils.js");
-
+var _variables = require("../common/variables");
+var _utils = require("../common/utils");
 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; }
-
-var DxcSwitch = function DxcSwitch(_ref) {
+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 DxcSwitch = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var defaultChecked = _ref.defaultChecked,
-      checked = _ref.checked,
-      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,
-      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)("switch-".concat((0, _uuid.v4)())),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
-      switchId = _useState2[0];
-
+    checked = _ref.checked,
+    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,
+    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 switchId = "switch-".concat((0, _react.useId)());
   var labelId = "label-".concat(switchId);
-
-  var _useState3 = (0, _react.useState)(defaultChecked !== null && defaultChecked !== void 0 ? defaultChecked : false),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      innerChecked = _useState4[0],
-      setInnerChecked = _useState4[1];
-
+  var _useState = (0, _react.useState)(defaultChecked !== null && defaultChecked !== void 0 ? defaultChecked : false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    innerChecked = _useState2[0],
+    setInnerChecked = _useState2[1];
   var colorsTheme = (0, _useTheme["default"])();
   var translatedLabels = (0, _useTranslatedLabels["default"])();
-  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
   var refTrack = (0, _react.useRef)(null);
-
   var handleOnKeyDown = function handleOnKeyDown(event) {
     switch (event.key) {
       case "Enter":
       case " ":
-        //Space
+        // Space
         event.preventDefault();
         refTrack.current.focus();
         var isChecked = !(checked !== null && checked !== void 0 ? checked : innerChecked);
@@ -87,14 +60,12 @@ var DxcSwitch = function DxcSwitch(_ref) {
         break;
     }
   };
-
   var handlerSwitchChange = function handlerSwitchChange(event) {
     checked !== null && checked !== void 0 ? checked : setInnerChecked(function (innerChecked) {
       return !innerChecked;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(checked ? !checked : !innerChecked);
   };
-
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme["switch"]
   }, /*#__PURE__*/_react["default"].createElement(SwitchContainer, {
@@ -102,12 +73,12 @@ var DxcSwitch = function DxcSwitch(_ref) {
     size: size,
     onKeyDown: handleOnKeyDown,
     disabled: disabled,
-    onClick: !disabled ? handlerSwitchChange : undefined
+    onClick: !disabled ? handlerSwitchChange : undefined,
+    ref: ref
   }, labelPosition === "before" && label && /*#__PURE__*/_react["default"].createElement(LabelContainer, {
     id: labelId,
     labelPosition: labelPosition,
     disabled: disabled,
-    backgroundType: backgroundType,
     label: label
   }, label, " ", optional && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, translatedLabels.formFields.optionalLabel)), /*#__PURE__*/_react["default"].createElement(ValueInput, {
     type: "checkbox",
@@ -119,7 +90,6 @@ var DxcSwitch = function DxcSwitch(_ref) {
     readOnly: true
   }), /*#__PURE__*/_react["default"].createElement(SwitchBase, null, /*#__PURE__*/_react["default"].createElement(SwitchTrack, {
     role: "switch",
-    backgroundType: backgroundType,
     "aria-checked": checked !== null && checked !== void 0 ? checked : innerChecked,
     "aria-disabled": disabled,
     disabled: disabled,
@@ -130,11 +100,9 @@ var DxcSwitch = function DxcSwitch(_ref) {
     id: labelId,
     labelPosition: labelPosition,
     disabled: disabled,
-    backgroundType: backgroundType,
     label: label
   }, optional && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, translatedLabels.formFields.optionalLabel), " ", label)));
-};
-
+});
 var sizes = {
   small: "60px",
   medium: "240px",
@@ -142,61 +110,49 @@ 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, subelement) {
+var getDisabledColor = function getDisabledColor(theme, element, subElement) {
   switch (element) {
     case "track":
-      switch (subelement) {
+      switch (subElement) {
         case "check":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledCheckedTrackBackgroundColorOnDark : props.theme.disabledCheckedTrackBackgroundColor;
-
+          return theme.disabledCheckedTrackBackgroundColor;
         case "uncheck":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledUncheckedTrackBackgroundColorOnDark : props.theme.disabledUncheckedTrackBackgroundColor;
+          return theme.disabledUncheckedTrackBackgroundColor;
       }
-
     case "thumb":
-      switch (subelement) {
+      switch (subElement) {
         case "check":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledCheckedThumbBackgroundColorOnDark : props.theme.disabledCheckedThumbBackgroundColor;
-
+          return theme.disabledCheckedThumbBackgroundColor;
         case "uncheck":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledUncheckedThumbBackgroundColorOnDark : props.theme.disabledUncheckedThumbBackgroundColor;
+          return theme.disabledUncheckedThumbBackgroundColor;
       }
-
     case "label":
-      return props.backgroundType && props.backgroundType === "dark" ? props.theme.disabledLabelFontColorOnDark : props.theme.disabledLabelFontColor;
+      return theme.disabledLabelFontColor;
   }
 };
-
-var getNotDisabledColor = function getNotDisabledColor(props, element, subelement) {
+var getNotDisabledColor = function getNotDisabledColor(theme, element, subElement) {
   switch (element) {
     case "track":
-      switch (subelement) {
+      switch (subElement) {
         case "check":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.checkedTrackBackgroundColorOnDark : props.theme.checkedTrackBackgroundColor;
-
+          return theme.checkedTrackBackgroundColor;
         case "uncheck":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.uncheckedTrackBackgroundColorOnDark : props.theme.uncheckedTrackBackgroundColor;
+          return theme.uncheckedTrackBackgroundColor;
       }
-
     case "thumb":
-      switch (subelement) {
+      switch (subElement) {
         case "check":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.checkedThumbBackgroundColorOnDark : props.theme.checkedThumbBackgroundColor;
-
+          return theme.checkedThumbBackgroundColor;
         case "uncheck":
-          return props.backgroundType && props.backgroundType === "dark" ? props.theme.uncheckedThumbBackgroundColorOnDark : props.theme.uncheckedThumbBackgroundColor;
+          return theme.uncheckedThumbBackgroundColor;
       }
-
     case "label":
-      return props.backgroundType && props.backgroundType === "dark" ? props.theme.labelFontColorOnDark : props.theme.labelFontColor;
+      return theme.labelFontColor;
   }
 };
-
 var SwitchContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  align-items: center;\n  width: ", ";\n  height: 40px;\n  cursor: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return calculateWidth(props.margin, props.size);
 }, function (props) {
@@ -212,9 +168,8 @@ var SwitchContainer = _styledComponents["default"].div(_templateObject || (_temp
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
-
 var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  color: ", ";\n  opacity: 1;\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n\n  ", ";\n\n  ", "\n"])), function (props) {
-  return props.disabled ? getDisabledColor(props, "label") : getNotDisabledColor(props, "label");
+  return props.disabled ? getDisabledColor(props.theme, "label") : getNotDisabledColor(props.theme, "label");
 }, function (props) {
   return props.theme.labelFontFamily;
 }, function (props) {
@@ -228,34 +183,29 @@ var LabelContainer = _styledComponents["default"].span(_templateObject2 || (_tem
 }, function (props) {
   return props.labelPosition === "before" && "order: -1";
 });
-
 var SwitchBase = _styledComponents["default"].label(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  cursor: pointer;\n  margin: 0px 12px;\n"])));
-
 var ValueInput = _styledComponents["default"].input(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));
-
-var SwitchTrack = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  border-radius: 15px;\n  width: ", ";\n  height: ", ";\n  position: relative;\n  cursor: ", ";\n\n  &:focus-visible {\n    outline: none;\n    ::before {\n      outline: ", ";\n      outline-offset: 6px;\n    }\n  }\n\n  /* Thumb element */\n  ::before {\n    content: \"\";\n    transform: initial;\n    position: absolute;\n    width: ", ";\n    height: ", ";\n    border-radius: 50%;\n    z-index: 1;\n    box-shadow: 0px 2px 1px -1px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%);\n    bottom: -6px;\n    left: -4px;\n    transform: translateX(0px);\n    background-color: ", ";\n  }\n\n  /* Unchecked */\n  background-color: ", ";\n\n  /* Checked */\n  &[aria-checked=\"true\"] {\n    background-color: ", ";\n    ::before {\n      transform: translateX(", ");\n      background-color: ", ";\n    }\n  }\n"])), function (props) {
+var SwitchTrack = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  border-radius: 15px;\n  width: ", ";\n  height: ", ";\n  position: relative;\n  cursor: ", ";\n\n  &:focus-visible {\n    outline: none;\n    ::before {\n      outline: ", ";\n      outline-offset: 6px;\n    }\n  }\n\n  /* Thumb element */\n  ::before {\n    content: \"\";\n    transform: initial;\n    position: absolute;\n    width: ", ";\n    height: ", ";\n    border-radius: 50%;\n    box-shadow: 0px 2px 1px -1px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%);\n    bottom: -6px;\n    left: -4px;\n    transform: translateX(0px);\n    background-color: ", ";\n  }\n\n  /* Unchecked */\n  background-color: ", ";\n\n  /* Checked */\n  &[aria-checked=\"true\"] {\n    background-color: ", ";\n    ::before {\n      transform: translateX(", ");\n      background-color: ", ";\n    }\n  }\n"])), function (props) {
   return props.theme.trackWidth;
 }, function (props) {
   return props.theme.trackHeight;
 }, function (props) {
   return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
-  return "".concat(props.backgroundType === "dark" ? props.theme.thumbFocusColorOnDark : props.theme.thumbFocusColor, " solid 2px");
+  return "".concat(props.theme.thumbFocusColor, " solid 2px");
 }, function (props) {
   return props.theme.thumbWidth;
 }, function (props) {
   return props.theme.thumbHeight;
 }, function (props) {
-  return props.disabled ? getDisabledColor(props, "thumb", "uncheck") : getNotDisabledColor(props, "thumb", "uncheck");
+  return props.disabled ? getDisabledColor(props.theme, "thumb", "uncheck") : getNotDisabledColor(props.theme, "thumb", "uncheck");
 }, function (props) {
-  return props.disabled ? getDisabledColor(props, "track", "uncheck") : getNotDisabledColor(props, "track", "uncheck");
+  return props.disabled ? getDisabledColor(props.theme, "track", "uncheck") : getNotDisabledColor(props.theme, "track", "uncheck");
 }, function (props) {
-  return props.disabled ? getDisabledColor(props, "track", "check") : getNotDisabledColor(props, "track", "check");
+  return props.disabled ? getDisabledColor(props.theme, "track", "check") : getNotDisabledColor(props.theme, "track", "check");
 }, function (props) {
   return props.theme.thumbShift;
 }, function (props) {
-  return props.disabled ? getDisabledColor(props, "thumb", "check") : getNotDisabledColor(props, "thumb", "check");
+  return props.disabled ? getDisabledColor(props.theme, "thumb", "check") : getNotDisabledColor(props.theme, "thumb", "check");
 });
-
-var _default = DxcSwitch;
-exports["default"] = _default;
+var _default = exports["default"] = DxcSwitch;

package/switch/Switch.stories.tsx

@@ -1,13 +1,31 @@
 import React from "react";
 import DxcSwitch from "./Switch";
-import { BackgroundColorProvider } from "../BackgroundColorContext";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
-import DarkContainer from "../../.storybook/components/DarkSection";
+import { HalstackProvider } from "../HalstackContext";
+import { disabledRules } from "../../test/accessibility/rules/specific/switch/disabledRules";
+import preview from "../../.storybook/preview";
 
 export default {
   title: "Switch",
   component: DxcSwitch,
+  parameters: {
+    a11y: {
+      config: {
+        rules: [
+          ...disabledRules.map((ruleId) => ({ id: ruleId, enabled: false })),
+          ...preview?.parameters?.a11y?.config?.rules,
+        ],
+      },
+    },
+  },
+};
+
+const opinionatedTheme = {
+  switch: {
+    checkedBaseColor: "#5f249f",
+    fontColor: "#000000",
+  },
 };
 
 export const Chromatic = () => (
@@ -44,38 +62,6 @@ export const Chromatic = () => (
       <Title title="Disabled checked" theme="light" level={4} />
       <DxcSwitch label="Switch" disabled defaultChecked labelPosition="after" />
     </ExampleContainer>
-    <BackgroundColorProvider color="#333333">
-      <DarkContainer>
-        <ExampleContainer>
-          <Title title="With label" theme="dark" level={4} />
-          <DxcSwitch label="Switch" />
-        </ExampleContainer>
-        <ExampleContainer pseudoState="pseudo-focus-visible">
-          <Title title="Focused" theme="dark" level={4} />
-          <DxcSwitch label="Switch" labelPosition="after" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Checked" theme="dark" level={4} />
-          <DxcSwitch label="Switch" defaultChecked />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Optional" theme="dark" level={4} />
-          <DxcSwitch label="Switch" optional />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled" theme="dark" level={4} />
-          <DxcSwitch label="Switch" disabled />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled optional" theme="dark" level={4} />
-          <DxcSwitch label="Switch" disabled optional labelPosition="after" />
-        </ExampleContainer>
-        <ExampleContainer>
-          <Title title="Disabled checked" theme="dark" level={4} />
-          <DxcSwitch label="Switch" disabled defaultChecked labelPosition="after" />
-        </ExampleContainer>
-      </DarkContainer>
-    </BackgroundColorProvider>
     <Title title="Margins" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Xxsmall margin" theme="light" level={4} />
@@ -134,5 +120,30 @@ export const Chromatic = () => (
       <Title title="FitContent size" theme="light" level={4} />
       <DxcSwitch label="FitContent" size="fitContent" />
     </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <Title title="Checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Default" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" disabled />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Disabled checked" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcSwitch label="Switch" disabled defaultChecked />
+      </HalstackProvider>
+    </ExampleContainer>
   </>
 );

package/switch/Switch.test.d.ts

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