@dxc-technology/halstack-react 9.0.0 → 9.1.0

package/text-input/TextInput.js

@@ -23,9 +23,9 @@ var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 var _BackgroundColorContext = _interopRequireDefault(require("../BackgroundColorContext"));
 
@@ -559,7 +559,7 @@ var DxcTextInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref2, re
   }, error)));
 });
 
-var TextInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
+var TextInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  box-sizing: border-box;\n  width: ", ";\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) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";

package/text-input/TextInput.test.js

@@ -16,7 +16,7 @@ var _react2 = require("@testing-library/react");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
-var _TextInput = _interopRequireDefault(require("./TextInput"));
+var _TextInput = _interopRequireDefault(require("./TextInput.tsx"));
 
 // Mocking DOMRect for Radix Primitive Popover
 global.globalThis = global;
@@ -1193,7 +1193,6 @@ describe("TextInput component synchronous autosuggest tests", function () {
       onChange: onChange
     })),
         getAllByText = _render37.getAllByText,
-        getByText = _render37.getByText,
         getByRole = _render37.getByRole;
 
     var input = getByRole("combobox");

package/textarea/Textarea.js

@@ -19,13 +19,13 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _utils = require("../common/utils.js");
+var _utils = require("../common/utils");
 
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 
-var _variables = require("../common/variables.js");
+var _variables = require("../common/variables");
 
 var _uuid = require("uuid");
 
@@ -171,7 +171,6 @@ var DxcTextarea = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref)
     backgroundType: backgroundType,
     ref: textareaRef,
     tabIndex: tabIndex,
-    "aria-disabled": disabled,
     "aria-invalid": error ? "true" : "false",
     "aria-errormessage": error ? errorId : undefined,
     "aria-required": optional ? "false" : "true"
@@ -193,7 +192,7 @@ 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 TextareaContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n\n  width: ", ";\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n"])), function (props) {
+var TextareaContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  width: ", ";\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) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";

package/textarea/Textarea.test.js

@@ -8,7 +8,7 @@ var _react2 = require("@testing-library/react");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
-var _Textarea = _interopRequireDefault(require("./Textarea"));
+var _Textarea = _interopRequireDefault(require("./Textarea.tsx"));
 
 describe("Textarea component tests", function () {
   test("Renders with correct label", function () {
@@ -85,7 +85,6 @@ describe("Textarea component tests", function () {
         getByLabelText = _render7.getByLabelText;
 
     var textarea = getByLabelText("Example label");
-    expect(textarea.getAttribute("aria-disabled")).toBe("false");
     expect(textarea.getAttribute("aria-invalid")).toBe("false");
     expect(textarea.getAttribute("aria-describedBy")).toBeNull();
     expect(textarea.getAttribute("aria-required")).toBe("true");
@@ -101,7 +100,7 @@ describe("Textarea component tests", function () {
     var textarea = getByLabelText("Example label");
     expect(textarea.value).toBe("Example text");
   });
-  test("Disabled textarea renders with correct aria and can not be modified", function () {
+  test("Disabled textarea can not be modified", function () {
     var onChange = jest.fn();
 
     var _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Textarea["default"], {
@@ -112,7 +111,6 @@ describe("Textarea component tests", function () {
         getByLabelText = _render9.getByLabelText;
 
     var textarea = getByLabelText("Example label");
-    expect(textarea.getAttribute("aria-disabled")).toBe("true");
 
     _userEvent["default"].type(textarea, "Test");
 

package/toggle-group/ToggleGroup.js

@@ -21,10 +21,12 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _uuid = require("uuid");
 
-var _variables = require("../common/variables.js");
+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); }
@@ -56,6 +58,8 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
       toggleGroupId = _useState4[0];
 
+  var backgroundType = (0, _react.useContext)(_BackgroundColorContext["default"]);
+
   var handleToggleChange = function handleToggleChange(selectedOption) {
     var newSelectedOptions;
 
@@ -97,8 +101,7 @@ var DxcToggleGroup = function DxcToggleGroup(_ref) {
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.toggleGroup
   }, /*#__PURE__*/_react["default"].createElement(ToggleGroup, {
-    margin: margin,
-    disabled: disabled
+    margin: margin
   }, /*#__PURE__*/_react["default"].createElement(Label, {
     htmlFor: toggleGroupId,
     disabled: disabled
@@ -111,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,

package/toggle-group/ToggleGroup.test.js

@@ -6,7 +6,7 @@ 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,

package/toggle-group/types.d.ts

@@ -23,7 +23,7 @@ declare type OptionIcon = OptionCommons & {
      */
     icon: string | SVG;
 };
-declare type OptionLabel = OptionCommons & {
+export declare type OptionLabel = OptionCommons & {
     /**
      * String with the option display value.
      */

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

@@ -2,130 +2,31 @@
 
 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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _templateObject;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-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); }
+var _react = _interopRequireDefault(require("react"));
 
-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 _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
 
-var TypographyContext = /*#__PURE__*/_react["default"].createContext(null);
+var _excluded = ["textOverflow", "whiteSpace", "children"];
 
-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,
+var DxcTypography = function DxcTypography(_ref) {
+  var 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));
+      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>