@dxc-technology/halstack-react 0.0.0-7ffdc43 → 0.0.0-816f33d

package/file-input/FileItem.d.ts

@@ -1,14 +1,4 @@
-/// <reference types="react" />
-declare const FileItem: ({ mode, multiple, name, error, showPreview, preview, type, numFiles, onDelete, tabIndex, }: {
-    mode: any;
-    multiple: any;
-    name?: string;
-    error?: string;
-    showPreview: any;
-    preview: any;
-    type: any;
-    numFiles: any;
-    onDelete: any;
-    tabIndex: any;
-}) => JSX.Element;
-export default FileItem;
+import React from "react";
+import { FileItemProps } from "./types";
+declare const _default: React.MemoExoticComponent<({ fileName, error, singleFileMode, showPreview, preview, type, onDelete, tabIndex, }: FileItemProps) => JSX.Element>;
+export default _default;

package/file-input/FileItem.js

@@ -1,149 +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 _react = _interopRequireDefault(require("react"));
-
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
+var _Flex = _interopRequireDefault(require("../flex/Flex"));
 var _useTheme = _interopRequireDefault(require("../useTheme"));
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
-
-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 deleteIcon = /*#__PURE__*/_react["default"].createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  width: "24",
-  height: "24",
-  viewBox: "0 0 24 24",
-  fill: "currentColor"
-}, /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M0 0h24v24H0V0z",
-  fill: "none"
-}), /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"
-}));
-
-var errorIcon = /*#__PURE__*/_react["default"].createElement("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  height: "24px",
-  viewBox: "0 0 24 24",
-  width: "24px",
-  fill: "currentColor"
-}, /*#__PURE__*/_react["default"].createElement("path", {
-  d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"
-}));
-
+var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
+var _Icon = _interopRequireDefault(require("../icon/Icon"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
+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 && {}.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 FileItem = function FileItem(_ref) {
-  var mode = _ref.mode,
-      multiple = _ref.multiple,
-      _ref$name = _ref.name,
-      name = _ref$name === void 0 ? "" : _ref$name,
-      _ref$error = _ref.error,
-      error = _ref$error === void 0 ? "" : _ref$error,
-      showPreview = _ref.showPreview,
-      preview = _ref.preview,
-      type = _ref.type,
-      numFiles = _ref.numFiles,
-      onDelete = _ref.onDelete,
-      tabIndex = _ref.tabIndex;
+  var _ref$fileName = _ref.fileName,
+    fileName = _ref$fileName === void 0 ? "" : _ref$fileName,
+    _ref$error = _ref.error,
+    error = _ref$error === void 0 ? "" : _ref$error,
+    singleFileMode = _ref.singleFileMode,
+    showPreview = _ref.showPreview,
+    preview = _ref.preview,
+    type = _ref.type,
+    onDelete = _ref.onDelete,
+    tabIndex = _ref.tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
-  var isImage = type.includes("image");
-
+  var translatedLabels = (0, _useTranslatedLabels["default"])();
   var getIconAriaLabel = function getIconAriaLabel() {
-    if (type.includes("video")) {
-      return "video";
-    }
-
-    if (type.includes("audio")) {
-      return "audio";
-    }
-
-    return "file";
+    if (type.includes("video")) return "video";else if (type.includes("audio")) return "audio";else return "file";
   };
-
   return /*#__PURE__*/_react["default"].createElement(_styledComponents.ThemeProvider, {
     theme: colorsTheme.fileInput
-  }, /*#__PURE__*/_react["default"].createElement(Container, {
-    mode: mode,
-    multiple: multiple,
+  }, /*#__PURE__*/_react["default"].createElement(MainContainer, {
     error: error,
-    showPreview: showPreview,
-    numFiles: numFiles
-  }, showPreview && (isImage ? /*#__PURE__*/_react["default"].createElement(ImagePreview, {
+    singleFileMode: singleFileMode,
+    showPreview: showPreview
+  }, showPreview && (type.includes("image") ? /*#__PURE__*/_react["default"].createElement(ImagePreview, {
     src: preview,
-    alt: name
-  }) : /*#__PURE__*/_react["default"].createElement(IconPreviewContainer, {
+    alt: fileName
+  }) : /*#__PURE__*/_react["default"].createElement(IconPreview, {
     error: error,
+    role: "document",
     "aria-label": getIconAriaLabel()
-  }, /*#__PURE__*/_react["default"].createElement(IconPreview, {
-    error: error
-  }, preview))), /*#__PURE__*/_react["default"].createElement(FileItemContent, null, /*#__PURE__*/_react["default"].createElement(FileItemContainer, null, /*#__PURE__*/_react["default"].createElement(FileName, {
-    mode: mode,
-    multiple: multiple,
-    error: error,
-    showPreview: showPreview,
-    numFiles: numFiles
-  }, name), error && /*#__PURE__*/_react["default"].createElement(ErrorIcon, {
-    "aria-label": "Error"
-  }, errorIcon), /*#__PURE__*/_react["default"].createElement(DeleteIcon, {
-    error: error,
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: preview
+  }))), /*#__PURE__*/_react["default"].createElement(FileItemContent, null, /*#__PURE__*/_react["default"].createElement(FileName, null, fileName), /*#__PURE__*/_react["default"].createElement(_Flex["default"], {
+    gap: "0.25rem"
+  }, error && /*#__PURE__*/_react["default"].createElement(ErrorIcon, null, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "filled_error"
+  })), /*#__PURE__*/_react["default"].createElement(DeleteFileAction, {
     onClick: function onClick() {
-      return onDelete(name);
+      onDelete(fileName);
     },
-    "aria-label": "Remove ".concat(name),
+    type: "button",
+    title: translatedLabels.fileInput.deleteFileActionTitle,
+    "aria-label": translatedLabels.fileInput.deleteFileActionTitle,
     tabIndex: tabIndex
-  }, deleteIcon)), error && (multiple || numFiles > 1) && /*#__PURE__*/_react["default"].createElement(ErrorMessage, null, error))));
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+    icon: "close"
+  }))), error && !singleFileMode && /*#__PURE__*/_react["default"].createElement(ErrorMessage, {
+    role: "alert",
+    "aria-live": "assertive"
+  }, error))));
 };
-
-var Container = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  padding: ", ";\n  background-color: ", ";\n  border-radius: ", ";\n  width: ", ";\n  min-height: ", ";\n  border-color: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  display: flex;\n  justify-content: center;\n"])), function (props) {
-  return props.showPreview ? "calc(8px - ".concat(props.theme.fileItemBorderThickness, ") 8px") : "calc(8px - ".concat(props.theme.fileItemBorderThickness, ") 8px calc(8px - ").concat(props.theme.fileItemBorderThickness, ") 16px");
+var MainContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  justify-content: center;\n  gap: 0.75rem;\n  width: ", ";\n  padding: ", ";\n  ", ";\n  border-color: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-radius: ", ";\n"])), function (props) {
+  return props.singleFileMode ? "230px" : "320px";
 }, function (props) {
-  return props.error && props.theme.errorFileItemBackgroundColor;
+  return props.showPreview ? "calc(8px - ".concat(props.theme.fileItemBorderThickness, ")") : "calc(8px - ".concat(props.theme.fileItemBorderThickness, ") calc(8px - ").concat(props.theme.fileItemBorderThickness, ") calc(8px - ").concat(props.theme.fileItemBorderThickness, ") 16px");
 }, function (props) {
-  return props.theme.fileItemBorderRadius;
-}, function (props) {
-  return props.mode === "file" && !props.multiple && props.numFiles === 1 ? "calc(230px - 26px)" : !props.showPreview ? "calc(320px - 26px)" : props.showPreview && "calc(320px - 18px)";
-}, function (props) {
-  return props.mode === "file" && !props.multiple && props.numFiles === 1 || !props.showPreview && !props.error ? "calc(40px - 18px)" : !props.showPreview && props.error ? "calc(59px - 18px)" : "calc(64px - 18px)";
+  return props.error ? "background-color: ".concat(props.theme.errorFileItemBackgroundColor, ";") : "";
 }, function (props) {
   return props.error ? props.theme.errorFileItemBorderColor : props.theme.fileItemBorderColor;
 }, function (props) {
   return props.theme.fileItemBorderThickness;
 }, function (props) {
   return props.theme.fileItemBorderStyle;
+}, function (props) {
+  return props.theme.fileItemBorderRadius;
 });
-
-var FileItemContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n"])));
-
-var FileItemContainer = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n"])));
-
-var ImagePreview = _styledComponents["default"].img(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 48px;\n  height: 48px;\n  object-fit: contain;\n  margin-right: 12px;\n  border-radius: 2px;\n"])));
-
-var IconPreviewContainer = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  margin-right: 12px;\n  background-color: ", ";\n  width: 48px;\n  height: 48px;\n  border-radius: 2px;\n  color: ", ";\n"])), function (props) {
+var ImagePreview = _styledComponents["default"].img(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  width: 48px;\n  height: 48px;\n  border-radius: 2px;\n  object-fit: contain;\n"])));
+var IconPreview = _styledComponents["default"].span(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  width: 48px;\n  height: 48px;\n  padding: 15px;\n  border-radius: 2px;\n  color: ", ";\n  font-size: 18px;\n  svg {\n    height: 18px;\n    width: 18px;\n  }\n"])), function (props) {
   return props.error ? props.theme.errorFilePreviewBackgroundColor : props.theme.filePreviewBackgroundColor;
 }, function (props) {
   return props.error ? props.theme.errorFilePreviewIconColor : props.theme.filePreviewIconColor;
 });
-
-var IconPreview = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])([""])));
-
-var FileName = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  width: ", ";\n  text-overflow: ellipsis;\n  overflow: hidden;\n  white-space: nowrap;\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), function (props) {
+var FileItemContent = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  flex-grow: 1;\n  display: grid;\n  grid-template-columns: auto min-content;\n  grid-template-rows: min-content auto;\n  column-gap: 0.25rem;\n"])));
+var FileName = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  align-self: center;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n"])), function (props) {
   return props.theme.fileNameFontColor;
-}, function (props) {
-  return props.mode === "file" && !props.multiple && props.error && props.numFiles === 1 ? "calc(230px - 76px)" : props.mode === "file" && !props.multiple && !props.error && props.numFiles === 1 ? "calc(230px - 50px)" : !props.showPreview && !props.error ? "calc(320px - 52px)" : !props.showPreview && props.error ? "calc(320px - 76px)" : props.showPreview && props.error ? "calc(320px - 128px)" : props.showPreview && !props.error && "calc(320px - 102px)";
 }, function (props) {
   return props.theme.fileItemFontFamily;
 }, function (props) {
@@ -153,10 +99,8 @@ var FileName = _styledComponents["default"].span(_templateObject7 || (_templateO
 }, function (props) {
   return props.theme.fileItemLineHeight;
 });
-
-var ErrorIcon = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  color: #d0011b;\n"])));
-
-var DeleteIcon = _styledComponents["default"].button(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  border-radius: 2px;\n  margin-left: 4px;\n  background-color: transparent;\n  box-shadow: 0 0 0 2px transparent;\n  padding: 3px;\n  cursor: pointer;\n  color: ", ";\n  svg {\n    line-height: 18px;\n  }\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
+var ErrorIcon = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  padding: 3px;\n  height: 18px;\n  width: 18px;\n  font-size: 18px;\n  color: #d0011b;\n"])));
+var DeleteFileAction = _styledComponents["default"].button(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-wrap: wrap;\n  align-content: center;\n  height: 24px;\n  width: 24px;\n  font-size: 1rem;\n  font-family: ", ";\n  border: 1px solid transparent;\n  border-radius: 2px;\n  background-color: transparent;\n  box-shadow: 0 0 0 2px transparent;\n  padding: 3px;\n  cursor: pointer;\n  color: ", ";\n  font-size: 18px;\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus,\n  &:focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
   return props.theme.fontFamily;
 }, function (props) {
   return props.theme.deleteFileItemColor;
@@ -164,13 +108,10 @@ var DeleteIcon = _styledComponents["default"].button(_templateObject9 || (_templ
   return props.theme.hoverDeleteFileItemBackgroundColor;
 }, function (props) {
   return props.theme.focusDeleteFileItemBorderColor;
-}, function (props) {
-  return props.theme.focusDeleteFileItemBorderColor;
 }, function (props) {
   return props.theme.activeDeleteFileItemBackgroundColor;
 });
-
-var ErrorMessage = _styledComponents["default"].span(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), function (props) {
+var ErrorMessage = _styledComponents["default"].span(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n"])), function (props) {
   return props.theme.errorMessageFontColor;
 }, function (props) {
   return props.theme.errorMessageFontFamily;
@@ -181,6 +122,4 @@ var ErrorMessage = _styledComponents["default"].span(_templateObject10 || (_temp
 }, function (props) {
   return props.theme.errorMessageLineHeight;
 });
-
-var _default = FileItem;
-exports["default"] = _default;
+var _default = exports["default"] = /*#__PURE__*/_react["default"].memo(FileItem);

package/file-input/types.d.ts

@@ -1,11 +1,11 @@
-declare type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
-declare type Margin = {
+type Space = "xxsmall" | "xsmall" | "small" | "medium" | "large" | "xlarge" | "xxlarge";
+type Margin = {
     top?: Space;
     bottom?: Space;
     left?: Space;
     right?: Space;
 };
-declare type FileData = {
+export type FileData = {
     /**
      * Selected file.
      */
@@ -19,9 +19,9 @@ declare type FileData = {
      */
     preview?: string;
 };
-declare type CommonProps = {
+type CommonProps = {
     /**
-     * Name attribute.
+     * @deprecated Name attribute.
      */
     name?: string;
     /**
@@ -80,7 +80,7 @@ declare type CommonProps = {
      */
     tabIndex?: number;
 };
-declare type DropModeProps = CommonProps & {
+type DropModeProps = CommonProps & {
     /**
      * Uses one of the available file input modes:
      *    'file': Files are selected by clicking the button and selecting it through the file explorer.
@@ -94,7 +94,7 @@ declare type DropModeProps = CommonProps & {
      */
     dropAreaLabel?: string;
 };
-declare type FileModeProps = CommonProps & {
+type FileModeProps = CommonProps & {
     /**
      * Uses one of the available file input modes:
      *    'file': Files are selected by clicking the button and selecting it through the file explorer.
@@ -108,5 +108,22 @@ declare type FileModeProps = CommonProps & {
      */
     dropAreaLabel?: never;
 };
-declare type Props = DropModeProps | FileModeProps;
+/**
+ * Reference to the component.
+ */
+export type RefType = HTMLDivElement;
+type Props = DropModeProps | FileModeProps;
+/**
+ * Single file item preview.
+ */
+export type FileItemProps = {
+    fileName?: string;
+    error?: string;
+    showPreview: boolean;
+    singleFileMode: boolean;
+    preview: string;
+    type: string;
+    onDelete: (fileName: string) => void;
+    tabIndex: number;
+};
 export default Props;

package/flex/Flex.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import FlexPropsType from "./types";
-declare const DxcFlex: ({ children, ...props }: FlexPropsType) => JSX.Element;
+declare const DxcFlex: ({ direction, wrap, gap, order, grow, shrink, basis, children, ...props }: FlexPropsType) => JSX.Element;
 export default DxcFlex;

package/flex/Flex.js

@@ -1,57 +1,57 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-
 var _templateObject;
-
-var _excluded = ["children"];
-
+var _excluded = ["direction", "wrap", "gap", "order", "grow", "shrink", "basis", "children"],
+  _excluded2 = ["justifyContent", "alignItems", "alignContent", "alignSelf"];
 var DxcFlex = function DxcFlex(_ref) {
-  var children = _ref.children,
-      props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  return /*#__PURE__*/_react["default"].createElement(Flex, props, children);
+  var _ref$direction = _ref.direction,
+    direction = _ref$direction === void 0 ? "row" : _ref$direction,
+    _ref$wrap = _ref.wrap,
+    wrap = _ref$wrap === void 0 ? "nowrap" : _ref$wrap,
+    _ref$gap = _ref.gap,
+    gap = _ref$gap === void 0 ? "0rem" : _ref$gap,
+    _ref$order = _ref.order,
+    order = _ref$order === void 0 ? 0 : _ref$order,
+    _ref$grow = _ref.grow,
+    grow = _ref$grow === void 0 ? 0 : _ref$grow,
+    _ref$shrink = _ref.shrink,
+    shrink = _ref$shrink === void 0 ? 1 : _ref$shrink,
+    _ref$basis = _ref.basis,
+    basis = _ref$basis === void 0 ? "auto" : _ref$basis,
+    children = _ref.children,
+    props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  return /*#__PURE__*/_react["default"].createElement(Flex, (0, _extends2["default"])({
+    $direction: direction,
+    $wrap: wrap,
+    $order: order,
+    $grow: grow,
+    $shrink: shrink,
+    $basis: basis,
+    $gap: gap
+  }, props), children);
 };
-
 var Flex = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  ", "\n"])), function (_ref2) {
-  var _ref2$direction = _ref2.direction,
-      direction = _ref2$direction === void 0 ? "row" : _ref2$direction,
-      _ref2$wrap = _ref2.wrap,
-      wrap = _ref2$wrap === void 0 ? "nowrap" : _ref2$wrap,
-      _ref2$justifyContent = _ref2.justifyContent,
-      justifyContent = _ref2$justifyContent === void 0 ? "flex-start" : _ref2$justifyContent,
-      _ref2$alignItems = _ref2.alignItems,
-      alignItems = _ref2$alignItems === void 0 ? "stretch" : _ref2$alignItems,
-      _ref2$alignContent = _ref2.alignContent,
-      alignContent = _ref2$alignContent === void 0 ? "normal" : _ref2$alignContent,
-      _ref2$alignSelf = _ref2.alignSelf,
-      alignSelf = _ref2$alignSelf === void 0 ? "auto" : _ref2$alignSelf,
-      _ref2$gap = _ref2.gap,
-      gap = _ref2$gap === void 0 ? "0" : _ref2$gap,
-      _ref2$order = _ref2.order,
-      order = _ref2$order === void 0 ? 0 : _ref2$order,
-      _ref2$grow = _ref2.grow,
-      grow = _ref2$grow === void 0 ? 0 : _ref2$grow,
-      _ref2$shrink = _ref2.shrink,
-      shrink = _ref2$shrink === void 0 ? 1 : _ref2$shrink,
-      _ref2$basis = _ref2.basis,
-      basis = _ref2$basis === void 0 ? "auto" : _ref2$basis;
-  return "\n    flex-direction: ".concat(direction, "; \n    flex-wrap: ").concat(wrap, "; \n    justify-content: ").concat(justifyContent, "; \n    align-items: ").concat(alignItems, ";\n    align-content: ").concat(alignContent, ";\n    gap: ").concat((0, _typeof2["default"])(gap) === "object" ? "".concat(gap.rowGap, " ").concat(gap.columnGap) : gap, ";\n    order: ").concat(order, ";\n    flex-grow: ").concat(grow, ";\n    flex-shrink: ").concat(shrink, ";\n    flex-basis: ").concat(basis, ";\n    align-self: ").concat(alignSelf, ";\n  ");
+  var _props$$gap, _props$$gap$rowGap, _props$$gap$columnGap;
+  var _ref2$justifyContent = _ref2.justifyContent,
+    justifyContent = _ref2$justifyContent === void 0 ? "flex-start" : _ref2$justifyContent,
+    _ref2$alignItems = _ref2.alignItems,
+    alignItems = _ref2$alignItems === void 0 ? "stretch" : _ref2$alignItems,
+    _ref2$alignContent = _ref2.alignContent,
+    alignContent = _ref2$alignContent === void 0 ? "normal" : _ref2$alignContent,
+    _ref2$alignSelf = _ref2.alignSelf,
+    alignSelf = _ref2$alignSelf === void 0 ? "auto" : _ref2$alignSelf,
+    props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded2);
+  return "\n    flex-direction: ".concat(props.$direction, "; \n    flex-wrap: ").concat(props.$wrap, "; \n    justify-content: ").concat(justifyContent, "; \n    align-items: ").concat(alignItems, ";\n    align-content: ").concat(alignContent, ";\n    align-self: ").concat(alignSelf, ";\n    gap: ").concat(props.$gap != null && typeof props.$gap === "string" ? (_props$$gap = props.$gap) !== null && _props$$gap !== void 0 ? _props$$gap : "" : "", "}\n    row-gap: ").concat(props.$gap != null && (0, _typeof2["default"])(props.$gap) === "object" ? (_props$$gap$rowGap = props.$gap.rowGap) !== null && _props$$gap$rowGap !== void 0 ? _props$$gap$rowGap : "" : "", "}\n    column-gap: ").concat(props.$gap != null && (0, _typeof2["default"])(props.$gap) === "object" ? (_props$$gap$columnGap = props.$gap.columnGap) !== null && _props$$gap$columnGap !== void 0 ? _props$$gap$columnGap : "" : "", "}\n    order: ").concat(props.$order, ";\n    flex-grow: ").concat(props.$grow, ";\n    flex-shrink: ").concat(props.$shrink, ";\n    flex-basis: ").concat(props.$basis, ";\n  ");
 });
-
-var _default = DxcFlex;
-exports["default"] = _default;
+var _default = exports["default"] = DxcFlex;

package/flex/Flex.stories.tsx

@@ -14,36 +14,36 @@ export const Chromatic = () => (
     <Container>
       <DxcFlex>
         <Placeholder />
-        <Placeholder width="50px" />
+        <Placeholder minWidth="50px" />
         <Placeholder />
-        <Placeholder width="50px" />
-        <Placeholder width="50px" />
+        <Placeholder minWidth="50px" />
+        <Placeholder minWidth="50px" />
       </DxcFlex>
     </Container>
     <Title title="Direction column, wrap, justify content end, align items center and gap" level={4} />
     <Container>
-      <DxcFlex direction="column" wrap="wrap" justifyContent="end" alignItems="center" gap="20px">
+      <DxcFlex direction="column" wrap="wrap" justifyContent="end" alignItems="center" gap="1.5rem">
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
       </DxcFlex>
     </Container>
     <Title title="Wrap with align content space between, row and column gaps, and as a span" level={4} />
     <Container height="250px">
-      <DxcFlex wrap="wrap" alignContent="space-between" as="span" gap={{ rowGap: "10px", columnGap: "20px" }}>
+      <DxcFlex wrap="wrap" alignContent="space-between" as="span" gap={{ rowGap: "0.5rem", columnGap: "1.5rem" }}>
         <Placeholder />
         <Placeholder />
         <Placeholder />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
         <Placeholder />
-        <Placeholder width="100px" />
+        <Placeholder minWidth="100px" />
         <Placeholder />
       </DxcFlex>
     </Container>
@@ -51,16 +51,24 @@ export const Chromatic = () => (
     <Container height="75px">
       <DxcFlex basis="100%">
         <DxcFlex order={3} grow={1} alignSelf="flex-end">
-          <PlaceholderGrowAndShrink>order 3, grow 1, align self end</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order 3, grow 1, align self end
+          </Placeholder>
         </DxcFlex>
         <DxcFlex order={-1} grow={4}>
-          <PlaceholderGrowAndShrink>order -1, grow 4</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order -1, grow 4
+          </Placeholder>
         </DxcFlex>
         <DxcFlex order={5} grow={1}>
-          <PlaceholderGrowAndShrink>order 5, grow 1</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order 5, grow 1
+          </Placeholder>
         </DxcFlex>
         <DxcFlex order={2} grow={2}>
-          <PlaceholderGrowAndShrink>order 2. grow 2</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            order 2. grow 2
+          </Placeholder>
         </DxcFlex>
       </DxcFlex>
     </Container>
@@ -68,13 +76,19 @@ export const Chromatic = () => (
     <Container>
       <DxcFlex basis="600px">
         <DxcFlex shrink={4} basis="400px">
-          <PlaceholderGrowAndShrink>shrink 4</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            shrink 4
+          </Placeholder>
         </DxcFlex>
         <DxcFlex shrink={2} basis="400px">
-          <PlaceholderGrowAndShrink>shrink 2</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            shrink 2
+          </Placeholder>
         </DxcFlex>
         <DxcFlex shrink={1} basis="400px">
-          <PlaceholderGrowAndShrink>shrink 1</PlaceholderGrowAndShrink>
+          <Placeholder width="100%" minWidth="0">
+            shrink 1
+          </Placeholder>
         </DxcFlex>
       </DxcFlex>
     </Container>
@@ -88,16 +102,11 @@ const Container = styled.div<{ height?: string }>`
   ${({ height }) => (height ? `height: ${height}` : "max-height: 150px")};
 `;
 
-const Placeholder = styled.div<{ width?: string }>`
+const Placeholder = styled.div<{ minWidth?: string; width?: string }>`
   height: 40px;
-  min-width: ${({ width }) => width || "200px"};
-  border: 1px solid #a46ede;
-  background-color: #e5d5f6;
-`;
-
-const PlaceholderGrowAndShrink = styled.div`
-  height: 40px;
-  width: 100%;
+  min-width: ${({ minWidth }) => minWidth ?? "200px"};
+  width: ${({ width }) => width};
   border: 1px solid #a46ede;
+  border-radius: 0.5rem;
   background-color: #e5d5f6;
 `;