@dxc-technology/halstack-react 0.0.0-9bd9511 → 0.0.0-9c20370

package/toggle-group/ToggleGroup.js

@@ -1,79 +1,107 @@
 "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");
+
 var _useTheme = _interopRequireDefault(require("../useTheme"));
+
+var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
+
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+
 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 DxcToggleGroup = function DxcToggleGroup(_ref) {
   var label = _ref.label,
-    helperText = _ref.helperText,
-    defaultValue = _ref.defaultValue,
-    value = _ref.value,
-    onChange = _ref.onChange,
-    _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-    options = _ref.options,
-    margin = _ref.margin,
-    _ref$multiple = _ref.multiple,
-    multiple = _ref$multiple === void 0 ? false : _ref$multiple,
-    _ref$tabIndex = _ref.tabIndex,
-    tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
+      helperText = _ref.helperText,
+      defaultValue = _ref.defaultValue,
+      value = _ref.value,
+      onChange = _ref.onChange,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      options = _ref.options,
+      margin = _ref.margin,
+      _ref$multiple = _ref.multiple,
+      multiple = _ref$multiple === void 0 ? false : _ref$multiple,
+      _ref$tabIndex = _ref.tabIndex,
+      tabIndex = _ref$tabIndex === void 0 ? 0 : _ref$tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
+
   var _useState = (0, _react.useState)(defaultValue !== null && defaultValue !== void 0 ? defaultValue : multiple ? [] : -1),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    selectedValue = _useState2[0],
-    setSelectedValue = _useState2[1];
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      selectedValue = _useState2[0],
+      setSelectedValue = _useState2[1];
+
   var _useState3 = (0, _react.useState)("toggle-group-".concat((0, _uuid.v4)())),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
-    toggleGroupId = _useState4[0];
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
+      toggleGroupId = _useState4[0];
+
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+
   var handleToggleChange = function handleToggleChange(selectedOption) {
     var newSelectedOptions;
+
     if (value == null) {
       if (multiple && Array.isArray(selectedValue)) {
         newSelectedOptions = selectedValue.map(function (value) {
           return value;
         });
+
         if (newSelectedOptions.includes(selectedOption)) {
           var index = newSelectedOptions.indexOf(selectedOption);
           newSelectedOptions.splice(index, 1);
         } else {
           newSelectedOptions.push(selectedOption);
         }
+
         setSelectedValue(newSelectedOptions);
       } else setSelectedValue(selectedOption === selectedValue ? null : selectedOption);
     } else if (multiple) {
       newSelectedOptions = Array.isArray(value) ? value.map(function (v) {
         return v;
       }) : value;
+
       if (newSelectedOptions.includes(selectedOption)) {
         var _index = newSelectedOptions.indexOf(selectedOption);
+
         newSelectedOptions.splice(_index, 1);
       } else newSelectedOptions.push(selectedOption);
     }
+
     onChange === null || onChange === void 0 ? void 0 : onChange(multiple ? newSelectedOptions : selectedOption);
   };
+
   var handleKeyPress = function handleKeyPress(event, optionValue) {
     event.preventDefault();
     if (!disabled && (event.nativeEvent.code === "Enter" || event.nativeEvent.code === "Space")) handleToggleChange(optionValue);
   };
+
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
-    theme: colorsTheme["toggleGroup"]
+    theme: colorsTheme.toggleGroup
   }, /*#__PURE__*/_react["default"].createElement(ToggleGroup, {
-    margin: margin,
-    disabled: disabled
+    margin: margin
   }, /*#__PURE__*/_react["default"].createElement(Label, {
     htmlFor: toggleGroupId,
     disabled: disabled
@@ -86,12 +114,12 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
     return /*#__PURE__*/_react["default"].createElement(ToggleContainer, {
       selected: multiple ? value ? Array.isArray(value) && value.includes(option.value) : Array.isArray(selectedValue) && selectedValue.includes(option.value) : value ? option.value === value : option.value === selectedValue,
       role: multiple ? "switch" : "radio",
+      backgroundType: backgroundType,
       "aria-checked": multiple ? value ? Array.isArray(value) && value.includes(option.value) : Array.isArray(selectedValue) && selectedValue.includes(option.value) : value ? option.value === value : option.value === selectedValue,
       tabIndex: !disabled ? tabIndex : -1,
       onClick: function onClick() {
         return !disabled && handleToggleChange(option.value);
       },
-      isFirst: i === 0,
       isLast: i === options.length - 1,
       isIcon: option.icon,
       optionLabel: option.label,
@@ -107,6 +135,7 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
     }) : option.icon), option.label && /*#__PURE__*/_react["default"].createElement(LabelContainer, null, option.label)));
   }))));
 };
+
 var Label = _styledComponents["default"].label(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), function (props) {
   return props.disabled ? props.theme.disabledLabelFontColor : props.theme.labelFontColor;
 }, function (props) {
@@ -120,6 +149,7 @@ var Label = _styledComponents["default"].label(_templateObject || (_templateObje
 }, function (props) {
   return props.theme.labelLineHeight;
 });
+
 var HelperText = _styledComponents["default"].span(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), function (props) {
   return props.disabled ? props.theme.disabledHelperTextFontcolor : props.theme.helperTextFontColor;
 }, function (props) {
@@ -133,6 +163,7 @@ var HelperText = _styledComponents["default"].span(_templateObject2 || (_templat
 }, function (props) {
   return props.theme.helperTextLineHeight;
 });
+
 var ToggleGroup = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: inline-flex;\n  flex-direction: column;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
 }, function (props) {
@@ -144,6 +175,7 @@ var ToggleGroup = _styledComponents["default"].div(_templateObject3 || (_templat
 }, function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) === "object" && props.margin.left ? _variables.spaces[props.margin.left] : "";
 });
+
 var OptionsContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  width: max-content;\n  opacity: 1;\n  height: calc(48px - 4px - 4px);\n  border-width: ", ";\n  border-style: ", ";\n  border-radius: ", ";\n  border-color: ", ";\n  background-color: ", ";\n  padding: 4px;\n  margin-top: ", ";\n"])), function (props) {
   return props.theme.containerBorderThickness;
 }, function (props) {
@@ -157,11 +189,13 @@ var OptionsContainer = _styledComponents["default"].div(_templateObject4 || (_te
 }, function (props) {
   return props.theme.containerMarginTop;
 });
+
 var ToggleContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  margin-right: ", ";\n\n  ", "\n"])), function (props) {
   return !props.isLast && "4px";
 }, function (props) {
   return "\n    background-color: ".concat(props.selected ? props.disabled ? props.theme.selectedDisabledBackgroundColor : props.theme.selectedBackgroundColor : props.disabled ? props.theme.unselectedDisabledBackgroundColor : props.theme.unselectedBackgroundColor, ";\n    border-width: ").concat(props.theme.optionBorderThickness, ";\n    border-style: ").concat(props.theme.optionBorderStyle, ";\n    border-radius: ").concat(props.theme.optionBorderRadius, ";\n    padding-left: ").concat(props.optionLabel && props.isIcon || props.optionLabel && !props.isIcon ? props.theme.labelPaddingLeft : props.theme.iconPaddingLeft, ";\n    padding-right: ").concat(props.optionLabel && props.isIcon || props.optionLabel && !props.isIcon ? props.theme.labelPaddingRight : props.theme.iconPaddingRight, ";\n    ").concat(!props.disabled ? ":hover {\n          background-color: ".concat(props.selected ? props.theme.selectedHoverBackgroundColor : props.theme.unselectedHoverBackgroundColor, ";\n        }\n        :active {\n          background-color: ").concat(props.selected ? props.theme.selectedActiveBackgroundColor : props.theme.unselectedActiveBackgroundColor, ";\n          color: #ffffff;\n        }        \n        :focus {\n          border-color: transparent;\n          box-shadow: 0 0 0 ").concat(props.theme.optionFocusBorderThickness, " ").concat(props.backgroundType === "dark" ? props.theme.focusColorOnDark : props.theme.focusColor, ";\n        }\n        &:focus-visible {\n          outline: none;\n        }\n        cursor: pointer;\n        color: ").concat(props.selected ? props.theme.selectedFontColor : props.theme.unselectedFontColor, ";\n") : "color: ".concat(props.selected ? props.theme.selectedDisabledFontColor : props.theme.unselectedDisabledFontColor, ";\n        cursor: not-allowed;"), "\n  ");
 });
+
 var LabelContainer = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n"])), function (props) {
   return props.theme.optionLabelFontFamily;
 }, function (props) {
@@ -171,10 +205,14 @@ var LabelContainer = _styledComponents["default"].span(_templateObject6 || (_tem
 }, function (props) {
   return props.theme.optionLabelFontWeight;
 });
+
 var OptionContent = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n"])));
+
 var Icon = _styledComponents["default"].img(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])([""])));
+
 var IconContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-right: ", ";\n  height: 24px;\n  width: 24px;\n  overflow: hidden;\n  display: flex;\n  img,\n  svg {\n    height: 100%;\n    width: 100%;\n  }\n"])), function (props) {
   return props.optionLabel && props.theme.iconMarginRight;
 });
+
 var _default = DxcToggleGroup;
 exports["default"] = _default;

package/toggle-group/ToggleGroup.test.js

@@ -1,9 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _react = _interopRequireDefault(require("react"));
+
 var _react2 = require("@testing-library/react");
-var _ToggleGroup = _interopRequireDefault(require("./ToggleGroup"));
+
+var _ToggleGroup = _interopRequireDefault(require("./ToggleGroup.tsx"));
+
 var options = [{
   value: 1,
   label: "Amazon"
@@ -20,11 +24,12 @@ var options = [{
 describe("Toggle group component tests", function () {
   test("Toggle group renders with correct labels", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        label: "Toggle group label",
-        helperText: "Toggle group helper text",
-        options: options
-      })),
-      getByText = _render.getByText;
+      label: "Toggle group label",
+      helperText: "Toggle group helper text",
+      options: options
+    })),
+        getByText = _render.getByText;
+
     expect(getByText("Toggle group label")).toBeTruthy();
     expect(getByText("Toggle group helper text")).toBeTruthy();
     expect(getByText("Amazon")).toBeTruthy();
@@ -34,52 +39,71 @@ describe("Toggle group component tests", function () {
   });
   test("Uncontrolled toggle group calls correct function on change with value", function () {
     var onChange = jest.fn();
+
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        options: options,
-        onChange: onChange
-      })),
-      getByText = _render2.getByText;
+      options: options,
+      onChange: onChange
+    })),
+        getByText = _render2.getByText;
+
     var option = getByText("Ebay");
+
     _react2.fireEvent.click(option);
+
     expect(onChange).toHaveBeenCalledWith(2);
   });
   test("Controlled toggle group calls correct function on change with value", function () {
     var onChange = jest.fn();
+
     var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        options: options,
-        onChange: onChange,
-        value: 1
-      })),
-      getByText = _render3.getByText;
+      options: options,
+      onChange: onChange,
+      value: 1
+    })),
+        getByText = _render3.getByText;
+
     var option = getByText("Ebay");
+
     _react2.fireEvent.click(option);
+
     expect(onChange).toHaveBeenCalledWith(2);
   });
   test("Function on change is not called when disable", function () {
     var onChange = jest.fn();
+
     var _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        options: options,
-        onChange: onChange,
-        disabled: true
-      })),
-      getByText = _render4.getByText;
+      options: options,
+      onChange: onChange,
+      disabled: true
+    })),
+        getByText = _render4.getByText;
+
     var option = getByText("Ebay");
+
     _react2.fireEvent.click(option);
+
     expect(onChange).toHaveBeenCalledTimes(0);
   });
   test("Uncontrolled multiple toggle group calls correct function on change with value when is multiple", function () {
     var onChange = jest.fn();
+
     var _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        options: options,
-        onChange: onChange,
-        multiple: true
-      })),
-      getAllByRole = _render5.getAllByRole;
+      options: options,
+      onChange: onChange,
+      multiple: true
+    })),
+        getAllByRole = _render5.getAllByRole;
+
     var toggleOptions = getAllByRole("switch");
+
     _react2.fireEvent.click(toggleOptions[0]);
+
     expect(onChange).toHaveBeenCalledWith([1]);
+
     _react2.fireEvent.click(toggleOptions[1]);
+
     _react2.fireEvent.click(toggleOptions[3]);
+
     expect(onChange).toHaveBeenCalledWith([1, 2, 4]);
     expect(toggleOptions[0].getAttribute("aria-checked")).toBe("true");
     expect(toggleOptions[1].getAttribute("aria-checked")).toBe("true");
@@ -87,36 +111,44 @@ describe("Toggle group component tests", function () {
   });
   test("Controlled multiple toggle returns always same values", function () {
     var onChange = jest.fn();
+
     var _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        options: options,
-        onChange: onChange,
-        value: [1],
-        multiple: true
-      })),
-      getByText = _render6.getByText;
+      options: options,
+      onChange: onChange,
+      value: [1],
+      multiple: true
+    })),
+        getByText = _render6.getByText;
+
     var option = getByText("Ebay");
+
     _react2.fireEvent.click(option);
+
     expect(onChange).toHaveBeenCalledWith([1, 2]);
     var option2 = getByText("Google");
+
     _react2.fireEvent.click(option2);
+
     expect(onChange).toHaveBeenNthCalledWith(2, [1, 4]);
   });
   test("Single selection: Renders with correct default value", function () {
     var _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        options: options,
-        defaultValue: 2
-      })),
-      getAllByRole = _render7.getAllByRole;
+      options: options,
+      defaultValue: 2
+    })),
+        getAllByRole = _render7.getAllByRole;
+
     var toggleOptions = getAllByRole("radio");
     expect(toggleOptions[1].getAttribute("aria-checked")).toBe("true");
   });
   test("Multiple selection: Renders with correct default value", function () {
     var _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_ToggleGroup["default"], {
-        options: options,
-        defaultValue: [2, 4],
-        multiple: true
-      })),
-      getAllByRole = _render8.getAllByRole;
+      options: options,
+      defaultValue: [2, 4],
+      multiple: true
+    })),
+        getAllByRole = _render8.getAllByRole;
+
     var toggleOptions = getAllByRole("switch");
     expect(toggleOptions[1].getAttribute("aria-checked")).toBe("true");
     expect(toggleOptions[3].getAttribute("aria-checked")).toBe("true");

package/toggle-group/types.d.ts

@@ -1,19 +1,19 @@
 /// <reference types="react" />
-type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-type Margin = {
+declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+declare type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
-type OptionCommons = {
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+declare type OptionCommons = {
     /**
      * Number with the option inner value.
      */
     value: number;
 };
-type OptionIcon = OptionCommons & {
+declare type OptionIcon = OptionCommons & {
     /**
      * String with the option display value.
      */
@@ -23,7 +23,7 @@ type OptionIcon = OptionCommons & {
      */
     icon: string | SVG;
 };
-type OptionLabel = OptionCommons & {
+export declare type OptionLabel = OptionCommons & {
     /**
      * String with the option display value.
      */
@@ -33,8 +33,8 @@ type OptionLabel = OptionCommons & {
      */
     icon?: string | SVG;
 };
-type Option = OptionIcon | OptionLabel;
-type CommonProps = {
+declare type Option = OptionIcon | OptionLabel;
+declare type CommonProps = {
     /**
      * Text to be placed above the component.
      */
@@ -61,7 +61,7 @@ type CommonProps = {
      */
     tabIndex?: number;
 };
-type SingleSelectionToggle = CommonProps & {
+declare type SingleSelectionToggle = CommonProps & {
     /**
      * If true, the toggle group will support multiple selection. In that case, value must be an array of numbers with the keys of the selected values.
      */
@@ -81,7 +81,7 @@ type SingleSelectionToggle = CommonProps & {
      */
     onChange?: (optionIndex: number) => void;
 };
-type MultipleSelectionToggle = CommonProps & {
+declare type MultipleSelectionToggle = CommonProps & {
     /**
      * If true, the toggle group will support multiple selection. In that case, value must be an array of numbers with the keys of the selected values.
      */
@@ -101,5 +101,5 @@ type MultipleSelectionToggle = CommonProps & {
      */
     onChange?: (optionIndex: number[]) => void;
 };
-type Props = SingleSelectionToggle | MultipleSelectionToggle;
+declare type Props = SingleSelectionToggle | MultipleSelectionToggle;
 export default Props;

package/typography/Typography.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import TypographyPropsTypes from "./types";
-declare const Typography: ({ as, display, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign, color, textDecoration, textOverflow, whiteSpace, children, }: TypographyPropsTypes) => JSX.Element;
-export default Typography;
+declare const DxcTypography: ({ textOverflow, whiteSpace, children, ...props }: TypographyPropsTypes) => JSX.Element;
+export default DxcTypography;

package/typography/Typography.js

@@ -1,119 +1,32 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
-var _react = _interopRequireWildcard(require("react"));
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-var _templateObject;
-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 || _typeof(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 TypographyContext = /*#__PURE__*/_react["default"].createContext(null);
-var Typography = function Typography(_ref) {
-  var as = _ref.as,
-    display = _ref.display,
-    fontFamily = _ref.fontFamily,
-    fontSize = _ref.fontSize,
-    fontStyle = _ref.fontStyle,
-    fontWeight = _ref.fontWeight,
-    letterSpacing = _ref.letterSpacing,
-    lineHeight = _ref.lineHeight,
-    textAlign = _ref.textAlign,
-    color = _ref.color,
-    textDecoration = _ref.textDecoration,
-    textOverflow = _ref.textOverflow,
-    whiteSpace = _ref.whiteSpace,
-    children = _ref.children;
-  var componentContext = (0, _react.useContext)(TypographyContext);
-  var asValue = as !== null && as !== void 0 ? as : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.as) || "span";
-  var displayValue = display !== null && display !== void 0 ? display : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.display) || "inline";
-  var fontFamilyValue = fontFamily !== null && fontFamily !== void 0 ? fontFamily : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontFamily) || "Open Sans, sans-serif";
-  var fontSizeValue = fontSize !== null && fontSize !== void 0 ? fontSize : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontSize) || "1rem";
-  var fontStyleValue = fontStyle !== null && fontStyle !== void 0 ? fontStyle : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontStyle) || "normal";
-  var fontWeightValue = fontWeight !== null && fontWeight !== void 0 ? fontWeight : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontWeight) || "400";
-  var letterSpacingValue = letterSpacing !== null && letterSpacing !== void 0 ? letterSpacing : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.letterSpacing) || "0em";
-  var lineHeightValue = lineHeight !== null && lineHeight !== void 0 ? lineHeight : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.lineHeight) || "1.5em";
-  var textAlignValue = textAlign !== null && textAlign !== void 0 ? textAlign : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.textAlign) || "left";
-  var colorValue = color !== null && color !== void 0 ? color : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.color) || "#000000";
-  var textDecorationValue = textDecoration !== null && textDecoration !== void 0 ? textDecoration : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.textDecoration) || "none";
-  var textOverflowValue = textOverflow !== null && textOverflow !== void 0 ? textOverflow : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.textOverflow) || "unset";
-  var whiteSpaceValue = whiteSpace !== null && whiteSpace !== void 0 ? whiteSpace : (componentContext === null || componentContext === void 0 ? void 0 : componentContext.whiteSpace) || "normal";
-  return /*#__PURE__*/_react["default"].createElement(TypographyContext.Provider, {
-    value: {
-      as: asValue,
-      display: displayValue,
-      fontFamily: fontFamilyValue,
-      fontSize: fontSizeValue,
-      fontStyle: fontStyleValue,
-      fontWeight: fontWeightValue,
-      letterSpacing: letterSpacingValue,
-      lineHeight: lineHeightValue,
-      textAlign: textAlignValue,
-      color: colorValue,
-      textDecoration: textDecorationValue,
-      textOverflow: textOverflowValue,
-      whiteSpace: whiteSpaceValue
-    }
-  }, /*#__PURE__*/_react["default"].createElement(StyledTypography, {
-    as: asValue,
-    display: displayValue,
-    fontFamily: fontFamilyValue,
-    fontSize: fontSizeValue,
-    fontStyle: fontStyleValue,
-    fontWeight: fontWeightValue,
-    letterSpacing: letterSpacingValue,
-    lineHeight: lineHeightValue,
-    textAlign: textAlignValue,
-    color: colorValue,
-    textDecoration: textDecorationValue,
-    textOverflow: textOverflowValue,
-    whiteSpace: whiteSpaceValue
-  }, children));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
+
+var _excluded = ["textOverflow", "whiteSpace", "children"];
+
+var DxcTypography = function DxcTypography(_ref) {
+  var textOverflow = _ref.textOverflow,
+      whiteSpace = _ref.whiteSpace,
+      children = _ref.children,
+      props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  return /*#__PURE__*/_react["default"].createElement(_BaseTypography["default"], (0, _extends2["default"])({
+    textOverflow: textOverflow,
+    whiteSpace: whiteSpace == null && textOverflow != null && textOverflow !== "unset" ? "nowrap" : whiteSpace
+  }, props), children);
 };
-var StyledTypography = _styledComponents["default"].span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  margin: 0px;\n  display: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  text-align: ", ";\n  line-height: ", ";\n  text-decoration: ", ";\n  text-overflow: ", ";\n  white-space: ", ";\n  overflow: ", ";\n"])), function (_ref2) {
-  var display = _ref2.display;
-  return display;
-}, function (_ref3) {
-  var color = _ref3.color;
-  return color;
-}, function (_ref4) {
-  var fontFamily = _ref4.fontFamily;
-  return fontFamily;
-}, function (_ref5) {
-  var fontSize = _ref5.fontSize;
-  return fontSize;
-}, function (_ref6) {
-  var fontStyle = _ref6.fontStyle;
-  return fontStyle;
-}, function (_ref7) {
-  var fontWeight = _ref7.fontWeight;
-  return fontWeight;
-}, function (_ref8) {
-  var letterSpacing = _ref8.letterSpacing;
-  return letterSpacing;
-}, function (_ref9) {
-  var textAlign = _ref9.textAlign;
-  return textAlign;
-}, function (_ref10) {
-  var lineHeight = _ref10.lineHeight;
-  return lineHeight;
-}, function (_ref11) {
-  var textDecoration = _ref11.textDecoration;
-  return textDecoration;
-}, function (_ref12) {
-  var textOverflow = _ref12.textOverflow;
-  return textOverflow;
-}, function (_ref13) {
-  var whiteSpace = _ref13.whiteSpace,
-    textOverflow = _ref13.textOverflow;
-  return whiteSpace !== "normal" ? whiteSpace : textOverflow !== "unset" ? "nowrap" : "normal";
-}, function (_ref14) {
-  var textOverflow = _ref14.textOverflow;
-  return textOverflow !== "unset" ? "hidden" : "visible";
-});
-var _default = Typography;
+
+var _default = DxcTypography;
 exports["default"] = _default;

package/typography/Typography.stories.tsx

@@ -140,7 +140,7 @@ export const Chromatic = () => (
     <ExampleContainer>
       <Title title="Typography whitespace" theme="light" level={4} />
       <div style={{ margin: "50px", border: "1px solid red", width: "125px" }}>
-        <DxcTypography whiteSpace="normal" fontSize="2rem">
+        <DxcTypography fontSize="2rem">
           {"                  "} Normal: A bunch of words you see.
         </DxcTypography>
       </div>

package/typography/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-type Props = {
+declare type Props = {
     as?: keyof HTMLElementTagNameMap;
     display?: "inline" | "block";
     fontFamily?: "Open Sans, sans-serif" | "Source Code Pro, monospace";