@dxc-technology/halstack-react 0.0.0-4e1277a → 0.0.0-4e3dbad

package/typography/Typography.accessibility.test.js

@@ -0,0 +1,339 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _axeHelper = require("../../test/accessibility/axe-helper.js");
+var _Typography = _interopRequireDefault(require("./Typography"));
+var _Flex = _interopRequireDefault(require("../flex/Flex"));
+describe("Typography component accessibility tests", function () {
+  it("Should not have basic accessibility issues for different font sizes", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _render, container, results;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "3.75rem"
+          }, "3.75rem."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "3rem"
+          }, "3rem."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "2rem"
+          }, "2rem."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "1.5rem"
+          }, "1.5rem."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "1.25rem"
+          }, "1.25rem."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "1rem"
+          }, "1rem."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "0.875rem"
+          }, "0.875rem."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontSize: "0.75rem"
+          }, "0.75rem."))), container = _render.container;
+          _context.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it("Should not have basic accessibility issues for different letter spacings", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _render2, container, results;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            letterSpacing: "-0.025em"
+          }, "-0.025em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            letterSpacing: "-0.0125em"
+          }, "-0.0125em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            letterSpacing: "0em"
+          }, "0em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            letterSpacing: "0.025em"
+          }, "0.025em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            letterSpacing: "0.05em"
+          }, "0.05em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            letterSpacing: "0.1em"
+          }, "0.1em."))), container = _render2.container;
+          _context2.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context2.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it("Should not have basic accessibility issues for different line heights", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var _render3, container, results;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            lineHeight: "1em"
+          }, "1em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            lineHeight: "1.25em"
+          }, "1.25em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            lineHeight: "1.365em"
+          }, "1.365em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            lineHeight: "1.5em"
+          }, "1.5em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            lineHeight: "1.715em"
+          }, "1.715em."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            lineHeight: "2em"
+          }, "2em."))), container = _render3.container;
+          _context3.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context3.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it("Should not have basic accessibility issues for different font weights", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    var _render4, container, results;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _render4 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontWeight: "300"
+          }, "300."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontWeight: "400"
+          }, "400."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontWeight: "600"
+          }, "600."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontWeight: "700"
+          }, "700."))), container = _render4.container;
+          _context4.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context4.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+  it("Should not have basic accessibility issues for different text decorations", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+    var _render5, container, results;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _render5 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textDecoration: "underline"
+          }, "Underline."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textDecoration: "line-through"
+          }, "Line-through."))), container = _render5.container;
+          _context5.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context5.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  })));
+  it("Should not have basic accessibility issues for different font families", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+    var _render6, container, results;
+    return _regenerator["default"].wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _render6 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontFamily: "Open Sans, sans-serif"
+          }, "Open Sans, sans-serif."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontFamily: "Source Code Pro, monospace"
+          }, "Source Code Pro, monospace."))), container = _render6.container;
+          _context6.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context6.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  })));
+  it("Should not have basic accessibility issues for different font styles", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+    var _render7, container, results;
+    return _regenerator["default"].wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          _render7 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontStyle: "italic"
+          }, "Italic."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            fontStyle: "normal"
+          }, "Normal."))), container = _render7.container;
+          _context7.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context7.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  })));
+  it("Should not have basic accessibility issues for different text alignments", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+    var _render8, container, results;
+    return _regenerator["default"].wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          _render8 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textAlign: "left"
+          }, "Left."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textAlign: "center"
+          }, "Center."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textAlign: "right"
+          }, "Right."))), container = _render8.container;
+          _context8.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context8.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context8.stop();
+      }
+    }, _callee8);
+  })));
+  it("Should not have basic accessibility issues for different white-spaces", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
+    var _render9, container, results;
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          _render9 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            fontSize: "2rem"
+          }, "                  ", " Normal: A bunch of words you see."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            whiteSpace: "nowrap",
+            fontSize: "2rem"
+          }, "                  ", "No-wrap: A bunch of words you see."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            whiteSpace: "pre",
+            fontSize: "2rem"
+          }, "                  ", " pre: A bunch of words you see."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            whiteSpace: "pre-line",
+            fontSize: "2rem"
+          }, "                  ", "pre-line: A bunch of words you see."), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            whiteSpace: "pre-wrap",
+            fontSize: "2rem"
+          }, "                  ", " pre-wrap: A bunch of words you see."))), container = _render9.container;
+          _context9.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context9.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  })));
+  it("Should not have basic accessibility issues for different displays", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
+    var _render10, container, results;
+    return _regenerator["default"].wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
+        case 0:
+          _render10 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textAlign: "left"
+          }, "Display Block.", /*#__PURE__*/_react["default"].createElement(_Typography["default"], null, "A different text.")), /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "inline",
+            textAlign: "left"
+          }, "Display Inline.", /*#__PURE__*/_react["default"].createElement(_Typography["default"], null, "A different text.")))), container = _render10.container;
+          _context10.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context10.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context10.stop();
+      }
+    }, _callee10);
+  })));
+  it("Should not have basic accessibility issues for different text overflows", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
+    var _render11, container, results;
+    return _regenerator["default"].wrap(function _callee11$(_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
+        case 0:
+          _render11 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Flex["default"], null, /*#__PURE__*/_react["default"].createElement("div", {
+            style: {
+              width: "75px"
+            }
+          }, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textOverflow: "clip"
+          }, "Overflow clip.")), /*#__PURE__*/_react["default"].createElement("div", {
+            style: {
+              width: "75px"
+            }
+          }, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textOverflow: "ellipsis"
+          }, "Overflow ellipsis.")), /*#__PURE__*/_react["default"].createElement("div", {
+            style: {
+              width: "75px"
+            }
+          }, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+            display: "block",
+            textOverflow: "unset"
+          }, "Overflow unset.")))), container = _render11.container;
+          _context11.next = 3;
+          return (0, _axeHelper.axe)(container);
+        case 3:
+          results = _context11.sent;
+          expect(results).toHaveNoViolations();
+        case 5:
+        case "end":
+          return _context11.stop();
+      }
+    }, _callee11);
+  })));
+});

package/typography/Typography.stories.tsx

@@ -140,9 +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 fontSize="2rem">
-          {"                  "} Normal: A bunch of words you see.
-        </DxcTypography>
+        <DxcTypography fontSize="2rem">{"                  "} Normal: A bunch of words you see.</DxcTypography>
       </div>
       <div style={{ margin: "50px", border: "1px solid red", width: "125px" }}>
         <DxcTypography whiteSpace="nowrap" fontSize="2rem">

package/typography/Typography.test.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@testing-library/react");
+var _Typography = _interopRequireDefault(require("./Typography"));
+describe("Typography component tests", function () {
+  test("Renders as the selected component", function () {
+    var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+        as: "h1"
+      }, "Test H1 Text")),
+      container = _render.container;
+    expect(container.querySelector('h1')).not.toBeNull();
+  });
+  test("Renders as span if it receives invalid tag", function () {
+    var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
+        as: "br"
+      }, "Test BR Text")),
+      container = _render2.container;
+    expect(container.querySelector('br')).toBeNull();
+    expect(container.querySelector('span')).not.toBeNull();
+  });
+});

package/useTheme.d.ts

@@ -217,6 +217,29 @@ declare const useTheme: () => {
         focusBorderThickness: string;
         focusBorderRadius: string;
     }>;
+    contextualMenu?: Partial<{
+        fontFamily: string;
+        backgroundColor: string;
+        borderColor: string;
+        menuItemFontColor: string;
+        menuItemFontSize: string;
+        menuItemFontStyle: string;
+        menuItemFontWeight: string;
+        menuItemLineHeight: string;
+        hoverMenuItemBackgroundColor: string;
+        activeMenuItemBackgroundColor: string;
+        selectedMenuItemBackgroundColor: string;
+        hoverSelectedMenuItemBackgroundColor: string;
+        activeSelectedMenuItemBackgroundColor: string;
+        selectedMenuItemFontWeight: string;
+        sectionTitleFontColor: string;
+        sectionTitleFontSize: string;
+        sectionTitleFontStyle: string;
+        sectionTitleFontWeight: string;
+        sectionTitleLineHeight: string;
+        iconColor: string;
+        iconSize: string;
+    }>;
     dateInput?: Partial<{
         pickerBackgroundColor: string;
         pickerFontColor: string;
@@ -251,8 +274,7 @@ declare const useTheme: () => {
     dialog?: Partial<{
         overlayColor: string;
         backgroundColor: string;
-        closeIconWidth: string;
-        closeIconHeight: string;
+        closeIconSize: string;
         closeIconTopPosition: string;
         closeIconRightPosition: string;
         closeIconBackgroundColor: string;
@@ -290,7 +312,6 @@ declare const useTheme: () => {
         disabledColor: string;
         disabledButtonBackgroundColor: string;
         disabledButtonBorderColor: string;
-        disabledBorderColor: string;
         optionBackgroundColor: string;
         hoverOptionBackgroundColor: string;
         activeOptionBackgroundColor: string;
@@ -330,7 +351,6 @@ declare const useTheme: () => {
         focusDropBorderColor: string;
         disabledDropBorderColor: string;
         dragoverDropBackgroundColor: string;
-        activeFileItemIconBackgrounColor: string;
         errorFileItemBorderColor: string;
         errorFileItemBackgroundColor: string;
         errorFilePreviewBackgroundColor: string;
@@ -531,8 +551,8 @@ declare const useTheme: () => {
         totalItemsContainerMarginLeft: string;
     }>;
     paragraph?: Partial<{
-        fontColor: string;
         display: string;
+        fontColor: string;
         fontSize: string;
         fontWeight: string;
     }>;
@@ -1000,7 +1020,13 @@ declare const useTheme: () => {
         helperTextLineHeight: string;
         disabledHelperTextFontColor: string;
         prefixColor: string;
+        prefixDividerBorderWidth: string;
+        prefixDividerBorderStyle: string;
+        prefixDividerPaddingRight: string;
         suffixColor: string;
+        suffixDividerBorderStyle: string;
+        suffixDividerBorderWidth: string;
+        suffixDividerPaddingLeft: string;
         disabledPrefixColor: string;
         disabledSuffixColor: string;
         placeholderFontColor: string;

package/useTranslatedLabels.d.ts

@@ -16,6 +16,17 @@ declare const useTranslatedLabels: () => {
         warningTitleText: string;
         errorTitleText: string;
     }>;
+    barChart?: Partial<{
+        ariaLabel: string;
+        filterLabel: string;
+        filterPlaceholder: string;
+        loadingDataMessage: string;
+        noDataMessageBody: string;
+        noDataMessageTitle: string;
+        noMatchesMessageBody: string;
+        noMatchesMessageTitle: string;
+        retryButtonLabel: string;
+    }>;
     dateInput?: Partial<{
         invalidDateErrorMessage: string;
     }>;

package/utils/BaseTypography.js

@@ -11,8 +11,12 @@ var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _templateObject;
 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" != _typeof(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 && Object.prototype.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; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(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 TypographyContext = /*#__PURE__*/_react["default"].createContext(null);
+var ValidTypographyTags = ["a", "blockquote", "cite", "code", "div", "em", "figcaption", "h1", "h2", "h3", "h4", "h5", "h6", "p", "pre", "small", "span", "strong"];
+var isValidTypography = function isValidTypography(tag) {
+  return ValidTypographyTags.includes(tag);
+};
 var BaseTypography = function BaseTypography(_ref) {
   var as = _ref.as,
     display = _ref.display,
@@ -30,65 +34,65 @@ var BaseTypography = function BaseTypography(_ref) {
     children = _ref.children;
   var componentContext = (0, _react.useContext)(TypographyContext);
   var contextValue = (0, _react.useMemo)(function () {
-    var _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _ref14;
+    var _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _ref10, _ref11, _ref12, _ref13;
     return {
-      as: (_ref2 = as !== null && as !== void 0 ? as : componentContext === null || componentContext === void 0 ? void 0 : componentContext.as) !== null && _ref2 !== void 0 ? _ref2 : "span",
-      display: (_ref3 = display !== null && display !== void 0 ? display : componentContext === null || componentContext === void 0 ? void 0 : componentContext.display) !== null && _ref3 !== void 0 ? _ref3 : "inline",
-      fontFamily: (_ref4 = fontFamily !== null && fontFamily !== void 0 ? fontFamily : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontFamily) !== null && _ref4 !== void 0 ? _ref4 : "Open Sans, sans-serif",
-      fontSize: (_ref5 = fontSize !== null && fontSize !== void 0 ? fontSize : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontSize) !== null && _ref5 !== void 0 ? _ref5 : "1rem",
-      fontStyle: (_ref6 = fontStyle !== null && fontStyle !== void 0 ? fontStyle : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontStyle) !== null && _ref6 !== void 0 ? _ref6 : "normal",
-      fontWeight: (_ref7 = fontWeight !== null && fontWeight !== void 0 ? fontWeight : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontWeight) !== null && _ref7 !== void 0 ? _ref7 : "400",
-      letterSpacing: (_ref8 = letterSpacing !== null && letterSpacing !== void 0 ? letterSpacing : componentContext === null || componentContext === void 0 ? void 0 : componentContext.letterSpacing) !== null && _ref8 !== void 0 ? _ref8 : "0em",
-      lineHeight: (_ref9 = lineHeight !== null && lineHeight !== void 0 ? lineHeight : componentContext === null || componentContext === void 0 ? void 0 : componentContext.lineHeight) !== null && _ref9 !== void 0 ? _ref9 : "1.5em",
-      textAlign: (_ref10 = textAlign !== null && textAlign !== void 0 ? textAlign : componentContext === null || componentContext === void 0 ? void 0 : componentContext.textAlign) !== null && _ref10 !== void 0 ? _ref10 : "left",
-      color: (_ref11 = color !== null && color !== void 0 ? color : componentContext === null || componentContext === void 0 ? void 0 : componentContext.color) !== null && _ref11 !== void 0 ? _ref11 : "#000000",
-      textDecoration: (_ref12 = textDecoration !== null && textDecoration !== void 0 ? textDecoration : componentContext === null || componentContext === void 0 ? void 0 : componentContext.textDecoration) !== null && _ref12 !== void 0 ? _ref12 : "none",
-      textOverflow: (_ref13 = textOverflow !== null && textOverflow !== void 0 ? textOverflow : componentContext === null || componentContext === void 0 ? void 0 : componentContext.textOverflow) !== null && _ref13 !== void 0 ? _ref13 : "unset",
-      whiteSpace: (_ref14 = whiteSpace !== null && whiteSpace !== void 0 ? whiteSpace : componentContext === null || componentContext === void 0 ? void 0 : componentContext.whiteSpace) !== null && _ref14 !== void 0 ? _ref14 : "normal"
+      as: isValidTypography(as) ? as : isValidTypography(componentContext === null || componentContext === void 0 ? void 0 : componentContext.as) ? componentContext === null || componentContext === void 0 ? void 0 : componentContext.as : "span",
+      display: (_ref2 = display !== null && display !== void 0 ? display : componentContext === null || componentContext === void 0 ? void 0 : componentContext.display) !== null && _ref2 !== void 0 ? _ref2 : "inline",
+      fontFamily: (_ref3 = fontFamily !== null && fontFamily !== void 0 ? fontFamily : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontFamily) !== null && _ref3 !== void 0 ? _ref3 : "Open Sans, sans-serif",
+      fontSize: (_ref4 = fontSize !== null && fontSize !== void 0 ? fontSize : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontSize) !== null && _ref4 !== void 0 ? _ref4 : "1rem",
+      fontStyle: (_ref5 = fontStyle !== null && fontStyle !== void 0 ? fontStyle : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontStyle) !== null && _ref5 !== void 0 ? _ref5 : "normal",
+      fontWeight: (_ref6 = fontWeight !== null && fontWeight !== void 0 ? fontWeight : componentContext === null || componentContext === void 0 ? void 0 : componentContext.fontWeight) !== null && _ref6 !== void 0 ? _ref6 : "400",
+      letterSpacing: (_ref7 = letterSpacing !== null && letterSpacing !== void 0 ? letterSpacing : componentContext === null || componentContext === void 0 ? void 0 : componentContext.letterSpacing) !== null && _ref7 !== void 0 ? _ref7 : "0em",
+      lineHeight: (_ref8 = lineHeight !== null && lineHeight !== void 0 ? lineHeight : componentContext === null || componentContext === void 0 ? void 0 : componentContext.lineHeight) !== null && _ref8 !== void 0 ? _ref8 : "1.5em",
+      textAlign: (_ref9 = textAlign !== null && textAlign !== void 0 ? textAlign : componentContext === null || componentContext === void 0 ? void 0 : componentContext.textAlign) !== null && _ref9 !== void 0 ? _ref9 : "left",
+      color: (_ref10 = color !== null && color !== void 0 ? color : componentContext === null || componentContext === void 0 ? void 0 : componentContext.color) !== null && _ref10 !== void 0 ? _ref10 : "#000000",
+      textDecoration: (_ref11 = textDecoration !== null && textDecoration !== void 0 ? textDecoration : componentContext === null || componentContext === void 0 ? void 0 : componentContext.textDecoration) !== null && _ref11 !== void 0 ? _ref11 : "none",
+      textOverflow: (_ref12 = textOverflow !== null && textOverflow !== void 0 ? textOverflow : componentContext === null || componentContext === void 0 ? void 0 : componentContext.textOverflow) !== null && _ref12 !== void 0 ? _ref12 : "unset",
+      whiteSpace: (_ref13 = whiteSpace !== null && whiteSpace !== void 0 ? whiteSpace : componentContext === null || componentContext === void 0 ? void 0 : componentContext.whiteSpace) !== null && _ref13 !== void 0 ? _ref13 : "normal"
     };
   }, [as, display, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign, color, textDecoration, textOverflow, whiteSpace]);
   return /*#__PURE__*/_react["default"].createElement(TypographyContext.Provider, {
     value: contextValue
   }, /*#__PURE__*/_react["default"].createElement(StyledTypography, contextValue, children));
 };
-var StyledTypography = _styledComponents["default"].span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  line-height: ", ";\n  text-align: ", ";\n  text-decoration: ", ";\n  text-overflow: ", ";\n  white-space: ", ";\n  overflow: ", ";\n  margin: 0;\n"])), function (_ref15) {
-  var display = _ref15.display;
+var StyledTypography = _styledComponents["default"].span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: ", ";\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-style: ", ";\n  font-weight: ", ";\n  letter-spacing: ", ";\n  line-height: ", ";\n  text-align: ", ";\n  text-decoration: ", ";\n  text-overflow: ", ";\n  white-space: ", ";\n  overflow: ", ";\n  margin: 0;\n"])), function (_ref14) {
+  var display = _ref14.display;
   return display;
-}, function (_ref16) {
-  var color = _ref16.color;
+}, function (_ref15) {
+  var color = _ref15.color;
   return color;
-}, function (_ref17) {
-  var fontFamily = _ref17.fontFamily;
+}, function (_ref16) {
+  var fontFamily = _ref16.fontFamily;
   return fontFamily;
-}, function (_ref18) {
-  var fontSize = _ref18.fontSize;
+}, function (_ref17) {
+  var fontSize = _ref17.fontSize;
   return fontSize;
-}, function (_ref19) {
-  var fontStyle = _ref19.fontStyle;
+}, function (_ref18) {
+  var fontStyle = _ref18.fontStyle;
   return fontStyle;
-}, function (_ref20) {
-  var fontWeight = _ref20.fontWeight;
+}, function (_ref19) {
+  var fontWeight = _ref19.fontWeight;
   return fontWeight;
-}, function (_ref21) {
-  var letterSpacing = _ref21.letterSpacing;
+}, function (_ref20) {
+  var letterSpacing = _ref20.letterSpacing;
   return letterSpacing;
-}, function (_ref22) {
-  var lineHeight = _ref22.lineHeight;
+}, function (_ref21) {
+  var lineHeight = _ref21.lineHeight;
   return lineHeight;
-}, function (_ref23) {
-  var textAlign = _ref23.textAlign;
+}, function (_ref22) {
+  var textAlign = _ref22.textAlign;
   return textAlign;
-}, function (_ref24) {
-  var textDecoration = _ref24.textDecoration;
+}, function (_ref23) {
+  var textDecoration = _ref23.textDecoration;
   return textDecoration;
-}, function (_ref25) {
-  var textOverflow = _ref25.textOverflow;
+}, function (_ref24) {
+  var textOverflow = _ref24.textOverflow;
   return textOverflow;
-}, function (_ref26) {
-  var whiteSpace = _ref26.whiteSpace;
+}, function (_ref25) {
+  var whiteSpace = _ref25.whiteSpace;
   return whiteSpace;
-}, function (_ref27) {
-  var textOverflow = _ref27.textOverflow;
+}, function (_ref26) {
+  var textOverflow = _ref26.textOverflow;
   return textOverflow !== "unset" ? "hidden" : "visible";
 });
 var _default = exports["default"] = BaseTypography;

package/utils/FocusLock.js

@@ -9,7 +9,7 @@ exports["default"] = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 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" != _typeof(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 && Object.prototype.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; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(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 not = {
   negTabIndex: ':not([tabindex^="-"])',
   disabled: ":not(:disabled)"
@@ -95,7 +95,8 @@ var FocusLock = function FocusLock(_ref) {
     });
   }, [focusableElements]);
   var focusLast = function focusLast() {
-    focusableElements.reverse().some(function (element) {
+    var _focusableElements$re;
+    focusableElements === null || focusableElements === void 0 ? void 0 : (_focusableElements$re = focusableElements.reverse()) === null || _focusableElements$re === void 0 ? void 0 : _focusableElements$re.some(function (element) {
       return attemptFocus(element);
     });
   };

package/utils/useWidth.d.ts

@@ -0,0 +1,2 @@
+declare const useWidth: <T extends Element>(target: T) => number;
+export default useWidth;