@dxc-technology/halstack-react 0.0.0-f46d22a → 0.0.0-f4bae62

package/dist/wizard/Wizard.js

@@ -25,16 +25,22 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _variables = require("../common/variables.js");
 
-var _utils = require("../common/utils.js");
-
 var _useTheme = _interopRequireDefault(require("../useTheme.js"));
 
-var _valid_icon = _interopRequireDefault(require("./valid_icon.svg"));
+var _Icons = require("./Icons");
+
+function _templateObject14() {
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  ", "\n  border: ", ";\n  opacity: 1;\n  flex-grow: 1;\n"]);
+
+  _templateObject14 = function _templateObject14() {
+    return data;
+  };
 
-var _invalid_icon = _interopRequireDefault(require("./invalid_icon.svg"));
+  return data;
+}
 
 function _templateObject13() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  ", "\n  border: ", ";\n  opacity: 1;\n  flex-grow: 1;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-align: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  text-transform: ", ";\n  ", ";\n  margin: 0;\n"]);
 
   _templateObject13 = function _templateObject13() {
     return data;
@@ -44,7 +50,7 @@ function _templateObject13() {
 }
 
 function _templateObject12() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-align: left;\n  font: Lighter 12px/17px Open Sans;\n  letter-spacing: 0.58px;\n  color: inherit;\n  margin: 0;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-align: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  ", ";\n  text-transform: ", ";\n  margin: 0;\n"]);
 
   _templateObject12 = function _templateObject12() {
     return data;
@@ -54,7 +60,7 @@ function _templateObject12() {
 }
 
 function _templateObject11() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  text-align: left;\n  font: Normal 16px/22px Open Sans;\n  letter-spacing: 0.77px;\n  color: inherit;\n  margin: 0;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 12px;\n"]);
 
   _templateObject11 = function _templateObject11() {
     return data;
@@ -64,7 +70,7 @@ function _templateObject11() {
 }
 
 function _templateObject10() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 10px;\n  color: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 18px;\n  height: 18px;\n  position: absolute;\n  top: 22.5px;\n  left: 22.5px;\n"]);
 
   _templateObject10 = function _templateObject10() {
     return data;
@@ -74,7 +80,7 @@ function _templateObject10() {
 }
 
 function _templateObject9() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 18px;\n  height: 18px;\n  position: absolute;\n  bottom: 0px;\n  right: 0px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font-size: ", ";\n  font-family: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  opacity: 1;\n  margin: 0px 0px 0px 1px;\n"]);
 
   _templateObject9 = function _templateObject9() {
     return data;
@@ -84,7 +90,7 @@ function _templateObject9() {
 }
 
 function _templateObject8() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  font: Normal 16px/22px Open Sans;\n  letter-spacing: 0.77px;\n  color: ", ";\n  opacity: 1;\n  margin: 0;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  background-color: ", ";\n  mask: url(", ") no-repeat center;\n  mask-size: ", ";\n  height: ", ";\n  width: ", ";\n"]);
 
   _templateObject8 = function _templateObject8() {
     return data;
@@ -94,7 +100,7 @@ function _templateObject8() {
 }
 
 function _templateObject7() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 19px;\n  height: 19px;\n  overflow: hidden;\n  color: ", ";\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n  overflow: hidden;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"]);
 
   _templateObject7 = function _templateObject7() {
     return data;
@@ -104,7 +110,7 @@ function _templateObject7() {
 }
 
 function _templateObject6() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: 19px;\n  height: 19px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n"]);
 
   _templateObject6 = function _templateObject6() {
     return data;
@@ -114,7 +120,7 @@ function _templateObject6() {
 }
 
 function _templateObject5() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n\n  ", "\n\n  border-radius: 45px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  width: ", ";\n  height: ", ";\n\n  ", "\n  ", ";\n\n  border-radius: ", ";\n  display: flex;\n  justify-content: center;\n  align-items: center;\n"]);
 
   _templateObject5 = function _templateObject5() {
     return data;
@@ -124,7 +130,7 @@ function _templateObject5() {
 }
 
 function _templateObject4() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  display: inline-flex;\n  padding-bottom: 3px;\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  position: relative;\n  display: inline-flex;\n  padding-bottom: 4px;\n"]);
 
   _templateObject4 = function _templateObject4() {
     return data;
@@ -134,7 +140,7 @@ function _templateObject4() {
 }
 
 function _templateObject3() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  border: none;\n  background: inherit;\n  display: flex;\n  justify-content: flex-start;\n  align-items: center;\n  margin: ", ";\n\n  padding: 0px;\n  ", ";\n\n  &:focus {\n    outline: none;\n  }\n\n  &:hover {\n    ", ";\n  }\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  border: none;\n  background: inherit;\n  display: flex;\n  justify-content: flex-start;\n  align-items: center;\n  margin: ", ";\n\n  padding: 0px;\n  ", ";\n\n  &:hover {\n    ", ";\n  }\n  &:focus {\n    outline: ", " auto 1px;\n  }\n"]);
 
   _templateObject3 = function _templateObject3() {
     return data;
@@ -154,7 +160,7 @@ function _templateObject2() {
 }
 
 function _templateObject() {
-  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  justify-content: \"center\";\n  ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
+  var data = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: ", ";\n  justify-content: \"center\";\n  ", ";\n  font-family: ", ";\n\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"]);
 
   _templateObject = function _templateObject() {
     return data;
@@ -169,12 +175,14 @@ var DxcWizard = function DxcWizard(_ref) {
       currentStep = _ref.currentStep,
       onStepClick = _ref.onStepClick,
       steps = _ref.steps,
-      margin = _ref.margin;
+      margin = _ref.margin,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
 
-  var _React$useState = _react["default"].useState(currentStep || 0),
-      _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
-      innerCurrent = _React$useState2[0],
-      setInnerCurrentStep = _React$useState2[1];
+  var _useState = (0, _react.useState)(currentStep || 0),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      innerCurrent = _useState2[0],
+      setInnerCurrentStep = _useState2[1];
 
   var renderedCurrent = currentStep == null ? innerCurrent : currentStep;
   var colorsTheme = (0, _useTheme["default"])();
@@ -190,7 +198,7 @@ var DxcWizard = function DxcWizard(_ref) {
   };
 
   return _react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme
+    theme: colorsTheme.wizard
   }, _react["default"].createElement(StepsContainer, {
     mode: mode,
     margin: margin
@@ -200,6 +208,7 @@ var DxcWizard = function DxcWizard(_ref) {
       mode: mode,
       lastStep: i === steps.length - 1
     }, _react["default"].createElement(Step, {
+      tabIndex: tabIndex,
       onClick: function onClick() {
         return handleStepClick(i);
       },
@@ -213,19 +222,21 @@ var DxcWizard = function DxcWizard(_ref) {
       disabled: step.disabled
     }, step.icon ? _react["default"].createElement(StepIconContainer, {
       disabled: step.disabled
-    }, (0, _typeof2["default"])(step.icon) === "object" ? step.icon : _react["default"].createElement(step.icon)) : step.iconSrc ? _react["default"].createElement(Icon, {
+    }, (0, _typeof2["default"])(step.icon) === "object" ? step.icon.type === "img" ? _react["default"].createElement(ImgContainer, {
+      current: i === renderedCurrent,
+      img: step.icon.props.src
+    }) : step.icon : _react["default"].createElement(step.icon)) : step.iconSrc ? _react["default"].createElement(Icon, {
       src: step.iconSrc
     }) : _react["default"].createElement(Number, {
       disabled: step.disabled,
       current: i === renderedCurrent
-    }, i + 1)), step.valid !== undefined ? step.valid ? _react["default"].createElement(ValidityIcon, {
-      src: _valid_icon["default"]
-    }) : _react["default"].createElement(ValidityIcon, {
-      src: _invalid_icon["default"]
-    }) : ""), step.label || step.description ? _react["default"].createElement(InfoContainer, {
-      active: i <= innerCurrent,
-      disabled: step.disabled
-    }, step.label ? _react["default"].createElement(Label, null, step.label) : "", step.description ? _react["default"].createElement(Description, null, step.description) : "") : ""), i === steps.length - 1 ? "" : _react["default"].createElement(StepSeparator, {
+    }, i + 1)), step.valid !== undefined ? step.valid ? _react["default"].createElement(ValidityIconContainer, null, _Icons.validIcon) : _react["default"].createElement(ValidityIconContainer, null, _Icons.invalidIcon) : ""), step.label || step.description ? _react["default"].createElement(InfoContainer, null, step.label ? _react["default"].createElement(Label, {
+      disabled: step.disabled,
+      visited: i <= innerCurrent
+    }, step.label) : "", step.description ? _react["default"].createElement(Description, {
+      disabled: step.disabled,
+      visited: i <= innerCurrent
+    }, step.description) : "") : ""), i === steps.length - 1 ? "" : _react["default"].createElement(StepSeparator, {
       mode: mode
     }));
   })));
@@ -235,6 +246,8 @@ var StepsContainer = _styledComponents["default"].div(_templateObject(), functio
   return props.mode === "vertical" ? "column" : "row";
 }, function (props) {
   return props.mode === "vertical" ? "height: 500px" : "width: 100%";
+}, function (props) {
+  return props.theme.fontFamily;
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -258,51 +271,114 @@ var StepContainer = _styledComponents["default"].div(_templateObject2(), functio
 });
 
 var Step = _styledComponents["default"].button(_templateObject3(), function (props) {
-  return props.first ? props.mode === "vertical" ? "0 0 25px 0" : "0 25px 0 0" : props.last ? props.mode === "vertical" ? "25px 0 0 0" : "0 0 0 25px" : props.mode === "vertical" ? "25px 0" : "0 25px";
+  return props.first ? props.mode === "vertical" ? "0 0 24px 0" : "0 24px 0 0" : props.last ? props.mode === "vertical" ? "24px 0 0 0" : "0 0 0 24px" : props.mode === "vertical" ? "24px 0" : "0 24px";
 }, function (props) {
   return props.disabled ? "cursor: not-allowed" : "";
 }, function (props) {
   return props.disabled ? "" : "cursor: pointer";
+}, function (props) {
+  return props.theme.focusColor;
 });
 
 var StepHeader = _styledComponents["default"].div(_templateObject4());
 
 var IconContainer = _styledComponents["default"].div(_templateObject5(), function (props) {
-  return !props.current && !props.disabled ? "32px" : "36px";
+  return props.disabled ? props.theme.disabledCircleWidth : props.current ? props.theme.selectedCircleWidth : props.theme.circleWidth;
 }, function (props) {
-  return !props.current && !props.disabled ? "32px" : "36px";
+  return props.disabled ? props.theme.disabledCircleHeight : props.current ? props.theme.selectedCircleHeight : props.theme.circleHeight;
 }, function (props) {
-  return "\n    ".concat(!props.current && !props.disabled ? "border: 2px solid ".concat(props.theme.wizard.borderColor, ";") : "", "\n    background: ").concat(props.disabled ? "".concat(props.theme.wizard.disabledBackground) : props.current ? "".concat(props.theme.wizard.selectedBackgroundColor) : "", ";\n    ").concat(props.current ? "color: ".concat(props.theme.wizard.selectedFont, ";") : "", "\n  ");
+  return "\n    ".concat(!props.current && !props.disabled ? "border: ".concat(props.theme.circleBorderThickness, " ").concat(props.theme.circleBorderStyle, " ").concat(props.theme.circleBorderColor, ";") : props.current ? "border: ".concat(props.theme.selectedCircleBorderThickness, " ").concat(props.theme.selectedCircleBorderStyle, " ").concat(props.theme.selectedCircleBorderColor, ";") : props.disabled ? "border: ".concat(props.theme.disabledCircleBorderThickness, " ").concat(props.theme.disabledCircleBorderStyle, " ").concat(props.theme.disabledCircleBorderColor, ";") : "", "\n    background: ").concat(props.disabled ? "".concat(props.theme.disabledBackgroundColor) : props.current ? "".concat(props.theme.stepContainerSelectedBackgroundColor) : "".concat(props.theme.stepContainerBackgroundColor), ";\n  ");
+}, function (props) {
+  return props.disabled ? "color: ".concat(props.theme.disabledFontColor, ";") : "color: ".concat(props.current ? props.theme.stepContainerSelectedFontColor : props.theme.stepContainerFontColor, ";");
+}, function (props) {
+  return !props.current && !props.disabled ? props.theme.circleBorderRadius : props.current ? props.theme.selectedCircleBorderRadius : props.disabled ? props.theme.disabledCircleBorderRadius : "";
 });
 
-var Icon = _styledComponents["default"].img(_templateObject6());
+var Icon = _styledComponents["default"].img(_templateObject6(), function (props) {
+  return props.theme.stepContainerIconSize;
+}, function (props) {
+  return props.theme.stepContainerIconSize;
+});
 
 var StepIconContainer = _styledComponents["default"].div(_templateObject7(), function (props) {
-  return props.disabled ? "".concat(props.theme.wizard.disabledFont) : "".concat(props.theme.wizard.fontColor);
+  return props.theme.stepContainerIconSize;
+}, function (props) {
+  return props.theme.stepContainerIconSize;
+});
+
+var ImgContainer = _styledComponents["default"].div(_templateObject8(), function (props) {
+  return props.current ? props.theme.stepContainerSelectedFontColor : props.theme.stepContainerFontColor;
+}, function (_ref2) {
+  var img = _ref2.img;
+  return img;
+}, function (props) {
+  return "".concat(props.theme.stepContainerIconSize, " ").concat(props.theme.stepContainerIconSize);
+}, function (props) {
+  return props.theme.stepContainerIconSize;
+}, function (props) {
+  return props.theme.stepContainerIconSize;
 });
 
-var Number = _styledComponents["default"].p(_templateObject8(), function (props) {
-  return props.disabled ? "".concat(props.theme.wizard.disabledFont) : "".concat(props.theme.wizard.fontColor);
+var Number = _styledComponents["default"].p(_templateObject9(), function (props) {
+  return props.theme.stepContainerFontSize;
+}, function (props) {
+  return props.theme.stepContainerFontFamily;
+}, function (props) {
+  return props.theme.stepContainerFontStyle;
+}, function (props) {
+  return props.theme.stepContainerFontWeight;
+}, function (props) {
+  return props.theme.stepContainerLetterSpacing;
 });
 
-var ValidityIcon = _styledComponents["default"].img(_templateObject9());
+var ValidityIconContainer = _styledComponents["default"].div(_templateObject10());
 
-var InfoContainer = _styledComponents["default"].div(_templateObject10(), function (props) {
-  return props.disabled ? "".concat(props.theme.wizard.disabledFont) : "".concat(props.theme.wizard.fontColor);
-});
+var InfoContainer = _styledComponents["default"].div(_templateObject11());
 
-var Label = _styledComponents["default"].p(_templateObject11());
+var Label = _styledComponents["default"].p(_templateObject12(), function (props) {
+  return props.theme.labelTextAlign;
+}, function (props) {
+  return props.theme.labelFontFamily;
+}, function (props) {
+  return props.theme.labelFontSize;
+}, function (props) {
+  return props.theme.labelFontStyle;
+}, function (props) {
+  return props.theme.labelFontWeight;
+}, function (props) {
+  return props.theme.labelLetterSpacing;
+}, function (props) {
+  return props.disabled ? "color: ".concat(props.theme.disabledFontColor, ";") : "color: ".concat(props.visited ? props.theme.visitedLabelFontColor : props.theme.labelFontColor, ";");
+}, function (props) {
+  return props.theme.labelFontTextTransform;
+});
 
-var Description = _styledComponents["default"].p(_templateObject12());
+var Description = _styledComponents["default"].p(_templateObject13(), function (props) {
+  return props.theme.descriptionTextAlign;
+}, function (props) {
+  return props.theme.descriptionFontFamily;
+}, function (props) {
+  return props.theme.descriptionFontSize;
+}, function (props) {
+  return props.theme.descriptionFontStyle;
+}, function (props) {
+  return props.theme.descriptionFontWeight;
+}, function (props) {
+  return props.theme.descriptionLetterSpacing;
+}, function (props) {
+  return props.theme.descriptionFontTextTransform;
+}, function (props) {
+  return props.disabled ? "color: ".concat(props.theme.disabledFontColor, ";") : "color: ".concat(props.visited ? props.theme.visitedDescriptionFontColor : props.theme.descriptionFontColor, ";");
+});
 
-var StepSeparator = _styledComponents["default"].div(_templateObject13(), function (props) {
+var StepSeparator = _styledComponents["default"].div(_templateObject14(), function (props) {
   return props.mode === "horizontal" ? "" : "0";
 }, function (props) {
   return props.mode === "horizontal" ? "0" : "";
 }, function (props) {
   return props.mode === "vertical" ? "margin: 0 18px;" : "";
 }, function (props) {
-  return "solid 1px ".concat(props.theme.wizard.lineColor);
+  return "".concat(props.theme.separatorBorderStyle, " ").concat(props.theme.separatorBorderThickness, " ").concat(props.theme.separatorColor);
 });
 
 DxcWizard.propTypes = {
@@ -322,7 +398,8 @@ DxcWizard.propTypes = {
     bottom: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     left: _propTypes["default"].oneOf(Object.keys(_variables.spaces)),
     right: _propTypes["default"].oneOf(Object.keys(_variables.spaces))
-  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))])
+  }), _propTypes["default"].oneOf((0, _toConsumableArray2["default"])(Object.keys(_variables.spaces)))]),
+  tabIndex: _propTypes["default"].number
 };
 var _default = DxcWizard;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxc-technology/halstack-react",
-  "version": "0.0.0-f46d22a",
+  "version": "0.0.0-f4bae62",
   "description": "DXC Halstack React components library",
   "repository": "dxc-technology/halstack-react",
   "homepage": "http://developer.dxc.com/tools/react",
@@ -11,6 +11,7 @@
     "url": "https://dxc.com"
   },
   "main": "./dist/main.js",
+  "types": "./dist/main.d.ts",
   "peerDependencies": {
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
@@ -29,7 +30,8 @@
     "moment": "2.24.0",
     "prop-types": "^15.7.2",
     "react-use-scrollspy": "^2.0.0",
-    "rgb-hex": "^3.0.0"
+    "rgb-hex": "^3.0.0",
+    "uuid": "^8.3.2"
   },
   "scripts": {
     "test": "jest",
@@ -41,8 +43,8 @@
     "@babel/cli": "^7.6.2",
     "@babel/core": "^7.6.2",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-    "@babel/plugin-proposal-optional-chaining": "^7.13.8",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.13.8",
+    "@babel/plugin-proposal-optional-chaining": "7.13.8",
     "@babel/plugin-transform-runtime": "^7.10.1",
     "@babel/preset-env": "^7.6.2",
     "@babel/preset-react": "^7.0.0",

package/test/AccordionGroup.test.js

@@ -27,6 +27,22 @@ describe("Accordion component tests", () => {
     expect(getAllByRole("button")[1].getAttribute("aria-expanded")).toBe("false");
   });
 
+  test("Uncontrolled accordion group renders with only one children", () => {
+    const { getByText, getAllByRole } = render(
+      <DxcAccordionGroup>
+        <DxcAccordionGroup.Accordion label="Accordion1" padding="medium">
+          <div>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse malesuada lacus ex, sit amet blandit
+            leo lobortis eget.
+          </div>
+        </DxcAccordionGroup.Accordion>
+      </DxcAccordionGroup>
+    );
+
+    expect(getByText("Accordion1")).toBeTruthy();
+    expect(getAllByRole("button")[0].getAttribute("aria-expanded")).toBe("false");
+  });
+
   test("Uncontrolled accordion group calls correct function on click", () => {
     const onActiveChange = jest.fn();
     const { getByText, getAllByRole } = render(