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

package/nav-tabs/NavTabs.stories.tsx

@@ -176,6 +176,20 @@ export const Chromatic = () => (
         </DxcNavTabs.Tab>
       </DxcNavTabs>
     </ExampleContainer>
+    <ExampleContainer>
+      <Title title="With long label and left icon alignment" theme="light" level={4} />
+      <DxcNavTabs iconPosition="left">
+        <DxcNavTabs.Tab href="#" active>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG} disabled notificationNumber={3}>
+          Tab 2
+        </DxcNavTabs.Tab>
+        <DxcNavTabs.Tab href="#" icon={iconSVG}>
+          Tab 3
+        </DxcNavTabs.Tab>
+      </DxcNavTabs>
+    </ExampleContainer>
     <Title title="Opinionated theme" theme="light" level={2} />
     <ExampleContainer>
       <Title title="Only label" theme="light" level={4} />

package/nav-tabs/NavTabs.test.js

@@ -1,23 +1,28 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _react = _interopRequireDefault(require("react"));
+
 var _react2 = require("@testing-library/react");
-var _NavTabs = _interopRequireDefault(require("./NavTabs"));
+
+var _NavTabs = _interopRequireDefault(require("./NavTabs.tsx"));
+
 describe("Tabs component tests", function () {
   test("Tabs render with correct labels and attributes", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_NavTabs["default"], null, /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test1",
-        active: true
-      }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test2",
-        disabled: true
-      }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test3"
-      }, "Tab 3"))),
-      getByText = _render.getByText,
-      getAllByRole = _render.getAllByRole,
-      getByRole = _render.getByRole;
+      href: "/test1",
+      active: true
+    }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test2",
+      disabled: true
+    }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test3"
+    }, "Tab 3"))),
+        getByText = _render.getByText,
+        getAllByRole = _render.getAllByRole,
+        getByRole = _render.getByRole;
+
     expect(getByRole("tablist")).toBeTruthy();
     expect(getByRole("tablist").getAttribute("aria-label")).toBe("Navigation tabs");
     expect(getByText("Tab 1")).toBeTruthy();
@@ -36,20 +41,21 @@ describe("Tabs component tests", function () {
   });
   test("Tabs render with correct labels, badges and icons", function () {
     var _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_NavTabs["default"], null, /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test1",
-        active: true,
-        notificationNumber: 10
-      }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test2",
-        disabled: true,
-        notificationNumber: 20
-      }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test3",
-        notificationNumber: 1000,
-        icon: "/testIcon.png"
-      }, "Tab 3"))),
-      getByText = _render2.getByText,
-      getByRole = _render2.getByRole;
+      href: "/test1",
+      active: true,
+      notificationNumber: 10
+    }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test2",
+      disabled: true,
+      notificationNumber: 20
+    }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test3",
+      notificationNumber: 1000,
+      icon: "/testIcon.png"
+    }, "Tab 3"))),
+        getByText = _render2.getByText,
+        getByRole = _render2.getByRole;
+
     expect(getByText("10")).toBeTruthy();
     expect(getByText("20")).toBeTruthy();
     expect(getByText("+99")).toBeTruthy();
@@ -57,17 +63,18 @@ describe("Tabs component tests", function () {
   });
   test("Tabs render with correct tab index", function () {
     var _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_NavTabs["default"], {
-        tabIndex: 3
-      }, /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test1"
-      }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test2",
-        disabled: true
-      }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
-        href: "/test3",
-        active: true
-      }, "Tab 3"))),
-      getAllByRole = _render3.getAllByRole;
+      tabIndex: 3
+    }, /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test1"
+    }, "Tab 1"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test2",
+      disabled: true
+    }, "Tab 2"), /*#__PURE__*/_react["default"].createElement(_NavTabs["default"].Tab, {
+      href: "/test3",
+      active: true
+    }, "Tab 3"))),
+        getAllByRole = _render3.getAllByRole;
+
     var tabs = getAllByRole("link");
     expect(tabs[0].getAttribute("tabindex")).toBe("-1");
     expect(tabs[1].getAttribute("tabindex")).toBe("3");

package/nav-tabs/Tab.js

@@ -1,72 +1,95 @@
 "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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _styledComponents = _interopRequireDefault(require("styled-components"));
+
 var _Badge = _interopRequireDefault(require("../badge/Badge"));
+
+var _Flex = _interopRequireDefault(require("../flex/Flex"));
+
 var _NavTabs = require("./NavTabs");
-var _Typography = _interopRequireDefault(require("../typography/Typography"));
+
+var _BaseTypography = _interopRequireDefault(require("../utils/BaseTypography"));
+
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+
+var _templateObject, _templateObject2, _templateObject3;
+
 var _excluded = ["href", "active", "icon", "disabled", "notificationNumber", "children"];
+
 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 DxcTab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, _ref2) {
   var href = _ref.href,
-    _ref$active = _ref.active,
-    active = _ref$active === void 0 ? false : _ref$active,
-    icon = _ref.icon,
-    _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-    _ref$notificationNumb = _ref.notificationNumber,
-    notificationNumber = _ref$notificationNumb === void 0 ? false : _ref$notificationNumb,
-    children = _ref.children,
-    otherProps = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  var tabRef = /*#__PURE__*/(0, _react.createRef)();
-  var _useContext = (0, _react.useContext)(_NavTabs.NavTabsContext),
-    iconPosition = _useContext.iconPosition,
-    tabIndex = _useContext.tabIndex,
-    hasIcons = _useContext.hasIcons,
-    focusedLabel = _useContext.focusedLabel;
+      _ref$active = _ref.active,
+      active = _ref$active === void 0 ? false : _ref$active,
+      icon = _ref.icon,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      _ref$notificationNumb = _ref.notificationNumber,
+      notificationNumber = _ref$notificationNumb === void 0 ? false : _ref$notificationNumb,
+      children = _ref.children,
+      otherProps = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  var tabRef = (0, _react.useRef)();
   var colorsTheme = (0, _useTheme["default"])();
-  (0, _react.useLayoutEffect)(function () {
+
+  var _useContext = (0, _react.useContext)(_NavTabs.NavTabsContext),
+      iconPosition = _useContext.iconPosition,
+      tabIndex = _useContext.tabIndex,
+      focusedLabel = _useContext.focusedLabel;
+
+  (0, _react.useEffect)(function () {
     var _tabRef$current;
+
     focusedLabel === children.toString() && (tabRef === null || tabRef === void 0 ? void 0 : (_tabRef$current = tabRef.current) === null || _tabRef$current === void 0 ? void 0 : _tabRef$current.focus());
   }, [focusedLabel]);
+
   var handleOnKeyDown = function handleOnKeyDown(event) {
     var _tabRef$current2;
+
     switch (event.key) {
       case " ":
       case "Enter":
-        tabRef === null || tabRef === void 0 ? void 0 : (_tabRef$current2 = tabRef.current) === null || _tabRef$current2 === void 0 ? void 0 : _tabRef$current2.click();
         event.preventDefault();
+        tabRef === null || tabRef === void 0 ? void 0 : (_tabRef$current2 = tabRef.current) === null || _tabRef$current2 === void 0 ? void 0 : _tabRef$current2.click();
         break;
     }
   };
+
   return /*#__PURE__*/_react["default"].createElement(TabContainer, {
     active: active,
     role: "tab",
     "aria-selected": active,
     "aria-disabled": disabled
   }, /*#__PURE__*/_react["default"].createElement(Tab, (0, _extends2["default"])({
-    href: !disabled && href ? href : undefined,
+    href: !disabled ? href : undefined,
     disabled: disabled,
+    active: active,
     iconPosition: iconPosition,
-    hasIcon: hasIcons,
+    hasIcon: icon != null ? true : false,
     ref: function ref(anchorRef) {
       tabRef.current = anchorRef;
+
       if (_ref2) {
-        if (typeof _ref2 === "function") _ref2(anchorRef);else {
-          _ref2.current = anchorRef;
-        }
+        if (typeof _ref2 === "function") _ref2(anchorRef);else _ref2.current = anchorRef;
       }
     },
     onKeyDown: handleOnKeyDown,
@@ -75,21 +98,25 @@ var DxcTab = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, _ref2) {
     iconPosition: iconPosition
   }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("img", {
     src: icon
-  }) : icon), /*#__PURE__*/_react["default"].createElement(LabelContainer, null, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
-    color: disabled ? colorsTheme["navTabs"].disabledFontColor : active ? colorsTheme["navTabs"].selectedFontColor : colorsTheme["navTabs"].unselectedFontColor,
-    fontFamily: colorsTheme["navTabs"].fontFamily,
-    fontSize: colorsTheme["navTabs"].fontSize,
-    fontStyle: colorsTheme["navTabs"].fontStyle,
-    fontWeight: colorsTheme["navTabs"].fontWeight,
+  }) : icon), /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
+    alignItems: "center",
+    gap: "0.5rem"
+  }, /*#__PURE__*/_react["default"].createElement(_BaseTypography["default"], {
+    color: disabled ? colorsTheme.navTabs.disabledFontColor : active ? colorsTheme.navTabs.selectedFontColor : colorsTheme.navTabs.unselectedFontColor,
+    fontFamily: colorsTheme.navTabs.fontFamily,
+    fontSize: colorsTheme.navTabs.fontSize,
+    fontStyle: colorsTheme.navTabs.fontStyle,
+    fontWeight: colorsTheme.navTabs.fontWeight,
     textAlign: "center",
     letterSpacing: "0.025em",
     lineHeight: "1.715em"
-  }, children), notificationNumber && /*#__PURE__*/_react["default"].createElement(BadgeContainer, null, /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
-    notificationText: notificationNumber > 99 ? "+99" : notificationNumber,
+  }, children), notificationNumber && /*#__PURE__*/_react["default"].createElement(_Badge["default"], {
+    notificationText: typeof notificationNumber === "number" && notificationNumber > 99 ? "+99" : notificationNumber,
     disabled: disabled
-  })))));
+  }))));
 });
-var TabContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  border-bottom: 2px solid ", ";\n  svg {\n    color: ", ";\n  }\n\n  &[aria-selected=\"true\"] {\n    svg {\n      color: ", ";\n    }\n  }\n\n  &[aria-disabled=\"true\"] {\n    svg {\n      color: ", ";\n    }\n  }\n"])), function (props) {
+
+var TabContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  align-items: stretch;\n  border-bottom: 2px solid ", ";\n  padding: 0.5rem;\n\n  svg {\n    color: ", ";\n  }\n  &[aria-selected=\"true\"] {\n    svg {\n      color: ", ";\n    }\n  }\n  &[aria-disabled=\"true\"] {\n    svg {\n      color: ", ";\n    }\n  }\n"])), function (props) {
   return props.active ? props.theme.selectedUnderlineColor : props.theme.dividerColor;
 }, function (props) {
   return props.theme.unselectedIconColor;
@@ -98,23 +125,22 @@ var TabContainer = _styledComponents["default"].div(_templateObject || (_templat
 }, function (props) {
   return props.theme.disabledIconColor;
 });
-var Tab = _styledComponents["default"].a(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: ", ";\n  justify-content: center;\n  align-items: center;\n\n  text-decoration-color: transparent;\n  cursor: ", ";\n  background: ", ";\n\n  height: ", ";\n  min-width: 164px;\n  margin: 0.5rem;\n  padding: 0.375rem;\n\n  border-radius: 4px;\n\n  ", "\n"])), function (props) {
+
+var Tab = _styledComponents["default"].a(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: ", ";\n  justify-content: center;\n  align-items: center;\n  gap: ", ";\n  height: ", ";\n  min-width: 176px;\n  min-height: 44px;\n  padding: 0.375rem;\n  border-radius: 4px;\n  background: ", ";\n  text-decoration-color: transparent;\n  cursor: ", ";\n\n  ", "\n"])), function (props) {
   return props.hasIcon && props.iconPosition === "top" ? "column" : "row";
 }, function (props) {
-  return props.disabled ? "not-allowed" : "pointer";
+  return props.hasIcon && props.iconPosition === "top" ? "0.375rem" : "0.625rem";
 }, function (props) {
-  return props.theme.selectedBackgroundColor;
+  return props.hasIcon && props.iconPosition === "top" ? "78px" : "100%";
 }, function (props) {
-  return props.hasIcon && props.iconPosition === "top" ? "66px" : "32px";
+  return props.active ? props.theme.selectedBackgroundColor : props.theme.unselectedBackgroundColor;
 }, function (props) {
-  return !props.disabled && ":hover {\n    background: ".concat(props.theme.hoverBackgroundColor, ";\n  }\n\n  :focus {\n    outline: 2px solid ").concat(props.theme.focusOutline, ";\n  }\n\n  :active {\n    background: ").concat(props.theme.pressedBackgroundColor, ";\n    outline: 2px solid #33aaff};\n  }");
-});
-var TabIconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  margin-bottom: ", ";\n  margin-right: ", ";\n\n  img,\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n"])), function (props) {
-  return props.iconPosition === "top" && "0.375rem";
+  return props.disabled ? "not-allowed" : "pointer";
 }, function (props) {
-  return props.iconPosition === "left" && "0.625rem";
+  return !props.disabled && "\n      :hover {\n        background: ".concat(props.theme.hoverBackgroundColor, ";\n      }\n      :focus {\n        outline: 2px solid ").concat(props.theme.focusOutline, ";\n      }\n      :active {\n        background: ").concat(props.theme.pressedBackgroundColor, ";\n        outline: 2px solid #33aaff};\n      }\n  ");
 });
-var LabelContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n"])));
-var BadgeContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  margin-left: 0.5rem;\n"])));
+
+var TabIconContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n\n  img,\n  svg {\n    height: 24px;\n    width: 24px;\n  }\n"])));
+
 var _default = DxcTab;
 exports["default"] = _default;

package/nav-tabs/types.d.ts

@@ -1,6 +1,11 @@
 /// <reference types="react" />
-type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
-export type TabProps = {
+declare type SVG = React.ReactNode & React.SVGProps<SVGSVGElement>;
+export declare type NavTabsContextProps = {
+    iconPosition: "top" | "left";
+    tabIndex: number;
+    focusedLabel: string;
+};
+export declare type TabProps = {
     /**
      * Whether the tab is active or not.
      */
@@ -26,11 +31,11 @@ export type TabProps = {
      */
     notificationNumber?: boolean | number;
     /**
-     * Content of the tab.
+     * Contains one or more DxcNavTabs.Tab.
      */
     children: string;
 };
-export type NavTabsProps = {
+declare type Props = {
     /**
      * Whether the icon should appear above or to the left of the label.
      */
@@ -44,10 +49,4 @@ export type NavTabsProps = {
      */
     children: React.ReactNode;
 };
-export type NavTabsContextProps = {
-    iconPosition: "top" | "left";
-    tabIndex: number;
-    hasIcons: boolean;
-    focusedLabel: string;
-};
-export {};
+export default Props;

package/number-input/NumberInput.js

@@ -1,38 +1,46 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+
 var _react = _interopRequireDefault(require("react"));
+
 var _styledComponents = _interopRequireDefault(require("styled-components"));
+
 var _TextInput = _interopRequireDefault(require("../text-input/TextInput"));
+
 var _NumberInputContext = _interopRequireDefault(require("./NumberInputContext"));
+
 var _templateObject;
+
 var DxcNumberInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var label = _ref.label,
-    name = _ref.name,
-    defaultValue = _ref.defaultValue,
-    value = _ref.value,
-    helperText = _ref.helperText,
-    placeholder = _ref.placeholder,
-    disabled = _ref.disabled,
-    optional = _ref.optional,
-    prefix = _ref.prefix,
-    suffix = _ref.suffix,
-    min = _ref.min,
-    max = _ref.max,
-    _ref$step = _ref.step,
-    step = _ref$step === void 0 ? 1 : _ref$step,
-    onChange = _ref.onChange,
-    onBlur = _ref.onBlur,
-    error = _ref.error,
-    autocomplete = _ref.autocomplete,
-    margin = _ref.margin,
-    size = _ref.size,
-    tabIndex = _ref.tabIndex;
+      name = _ref.name,
+      defaultValue = _ref.defaultValue,
+      value = _ref.value,
+      helperText = _ref.helperText,
+      placeholder = _ref.placeholder,
+      disabled = _ref.disabled,
+      optional = _ref.optional,
+      prefix = _ref.prefix,
+      suffix = _ref.suffix,
+      min = _ref.min,
+      max = _ref.max,
+      _ref$step = _ref.step,
+      step = _ref$step === void 0 ? 1 : _ref$step,
+      onChange = _ref.onChange,
+      onBlur = _ref.onBlur,
+      error = _ref.error,
+      autocomplete = _ref.autocomplete,
+      margin = _ref.margin,
+      size = _ref.size,
+      tabIndex = _ref.tabIndex;
   return /*#__PURE__*/_react["default"].createElement(_NumberInputContext["default"].Provider, {
     value: {
       typeNumber: "number",
@@ -61,6 +69,8 @@ var DxcNumberInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, r
     ref: ref
   })));
 });
+
 var NumberInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  // Chrome, Safari, Edge, Opera\n  input::-webkit-outer-spin-button,\n  input::-webkit-inner-spin-button {\n    -webkit-appearance: none;\n    margin: 0;\n  }\n\n  // Firefox\n  input[type=\"number\"] {\n    -moz-appearance: textfield;\n  }\n"])));
+
 var _default = DxcNumberInput;
 exports["default"] = _default;