@dxc-technology/halstack-react 0.0.0-c18d61a → 0.0.0-c1a6e05

package/file-input/FileInput.js

@@ -29,7 +29,7 @@ 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"));
 
@@ -39,7 +39,7 @@ var _Button = _interopRequireDefault(require("../button/Button"));
 
 var _FileItem = _interopRequireDefault(require("./FileItem"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11;
 
 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); }
 
@@ -99,7 +99,7 @@ var getFilePreview = function getFilePreview(file) {
   });else return fileIcon;
 };
 
-var DxcFileInput = function DxcFileInput(_ref) {
+var DxcFileInput = /*#__PURE__*/_react["default"].forwardRef(function (_ref, ref) {
   var _ref$name = _ref.name,
       name = _ref$name === void 0 ? "" : _ref$name,
       _ref$mode = _ref.mode,
@@ -250,6 +250,7 @@ var DxcFileInput = function DxcFileInput(_ref) {
       return selectedFiles[key];
     });
     addFile(filesArray);
+    e.target.value = null;
   };
 
   var onDelete = (0, _react.useCallback)(function (fileName) {
@@ -370,25 +371,22 @@ var DxcFileInput = function DxcFileInput(_ref) {
     theme: colorsTheme.fileInput
   }, /*#__PURE__*/_react["default"].createElement(FileInputContainer, {
     margin: margin,
-    name: name
+    ref: ref
   }, /*#__PURE__*/_react["default"].createElement(Label, {
     htmlFor: fileInputId,
     disabled: disabled
   }, label), /*#__PURE__*/_react["default"].createElement(HelperText, {
     disabled: disabled
   }, helperText), mode === "file" ? /*#__PURE__*/_react["default"].createElement(FileContainer, {
-    multiple: multiple,
-    files: files
+    singleFileMode: !multiple && files.length === 1
   }, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     id: fileInputId,
     type: "file",
     accept: accept,
     multiple: multiple,
     onChange: selectFiles,
-    name: name,
     disabled: disabled,
-    readOnly: true,
-    "aria-hidden": "true"
+    readOnly: true
   }), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
     mode: "secondary",
     label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : multiple ? translatedLabels.fileInput.multipleButtonLabelDefault : translatedLabels.fileInput.singleButtonLabelDefault,
@@ -396,22 +394,17 @@ var DxcFileInput = function DxcFileInput(_ref) {
     disabled: disabled,
     size: "fitContent",
     tabIndex: tabIndex
-  }), /*#__PURE__*/_react["default"].createElement(FileItemListContainer, {
-    mode: mode,
-    multiple: multiple,
-    files: files
-  }, files.map(function (file) {
+  }), files.length > 0 && /*#__PURE__*/_react["default"].createElement(FileItemListContainer, null, files.map(function (file, index) {
     return /*#__PURE__*/_react["default"].createElement(_FileItem["default"], {
-      mode: mode,
-      multiple: multiple,
-      name: file.file.name,
+      fileName: file.file.name,
       error: file.error,
+      singleFileMode: !multiple && files.length === 1,
       showPreview: mode === "file" && !multiple ? false : showPreview,
-      numFiles: files.length,
       preview: file.preview,
       type: file.file.type,
       onDelete: onDelete,
-      tabIndex: tabIndex
+      tabIndex: tabIndex,
+      key: "file-".concat(index)
     });
   }))) : /*#__PURE__*/_react["default"].createElement(Container, null, /*#__PURE__*/_react["default"].createElement(ValueInput, {
     id: fileInputId,
@@ -419,10 +412,8 @@ var DxcFileInput = function DxcFileInput(_ref) {
     accept: accept,
     multiple: multiple,
     onChange: selectFiles,
-    name: name,
     disabled: disabled,
-    readOnly: true,
-    "aria-hidden": "true"
+    readOnly: true
   }), /*#__PURE__*/_react["default"].createElement(DragDropArea, {
     isDragging: isDragging,
     disabled: disabled,
@@ -431,39 +422,30 @@ var DxcFileInput = function DxcFileInput(_ref) {
     onDragEnter: handleDragIn,
     onDragOver: handleDrag,
     onDragLeave: handleDragOut
-  }, /*#__PURE__*/_react["default"].createElement(ButtonContainer, {
-    mode: mode
   }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
     mode: "secondary",
     label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : translatedLabels.fileInput.dropAreaButtonLabelDefault,
     onClick: handleClick,
     disabled: disabled,
     size: "fitContent"
-  })), mode === "dropzone" ? /*#__PURE__*/_react["default"].createElement(DropzoneLabel, {
+  }), mode === "dropzone" ? /*#__PURE__*/_react["default"].createElement(DropzoneLabel, {
     disabled: disabled
   }, dropAreaLabel !== null && dropAreaLabel !== void 0 ? dropAreaLabel : multiple ? translatedLabels.fileInput.multipleDropAreaLabelDefault : translatedLabels.fileInput.singleDropAreaLabelDefault) : /*#__PURE__*/_react["default"].createElement(FiledropLabel, {
     disabled: disabled
-  }, dropAreaLabel !== null && dropAreaLabel !== void 0 ? dropAreaLabel : multiple ? translatedLabels.fileInput.multipleDropAreaLabelDefault : translatedLabels.fileInput.singleDropAreaLabelDefault)), /*#__PURE__*/_react["default"].createElement(FileItemListContainer, {
-    mode: mode,
-    multiple: multiple,
-    files: files
-  }, files.map(function (file) {
+  }, dropAreaLabel !== null && dropAreaLabel !== void 0 ? dropAreaLabel : multiple ? translatedLabels.fileInput.multipleDropAreaLabelDefault : translatedLabels.fileInput.singleDropAreaLabelDefault)), files.length > 0 && /*#__PURE__*/_react["default"].createElement(FileItemListContainer, null, files.map(function (file, index) {
     return /*#__PURE__*/_react["default"].createElement(_FileItem["default"], {
-      mode: mode,
-      multiple: multiple,
-      name: file.file.name,
+      fileName: file.file.name,
       error: file.error,
+      singleFileMode: false,
       showPreview: showPreview,
-      numFiles: files.length,
       preview: file.preview,
       type: file.file.type,
       onDelete: onDelete,
-      tabIndex: tabIndex
+      tabIndex: tabIndex,
+      key: "file-".concat(index)
     });
-  }))), files.length === 1 && files.map(function (file) {
-    return file.error && mode === "file" && !multiple && /*#__PURE__*/_react["default"].createElement(ErrorMessage, null, file.error);
-  })));
-};
+  }))), mode === "file" && !multiple && files.length === 1 && files[0].error && /*#__PURE__*/_react["default"].createElement(ErrorMessage, null, files[0].error)));
+});
 
 var FileInputContainer = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  margin: ", ";\n  margin-top: ", ";\n  margin-right: ", ";\n  margin-bottom: ", ";\n  margin-left: ", ";\n  width: fit-content;\n"])), function (props) {
   return props.margin && (0, _typeof2["default"])(props.margin) !== "object" ? _variables.spaces[props.margin] : "0px";
@@ -502,7 +484,7 @@ var HelperText = _styledComponents["default"].span(_templateObject3 || (_templat
 });
 
 var FileContainer = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  ", "\n  margin-top: 0.25rem;\n"])), function (props) {
-  return props.multiple || props.files.length > 1 ? "flex-direction: column; row-gap: 0.25rem;" : "flex-direction: row; column-gap: 0.25rem;";
+  return props.singleFileMode ? "flex-direction: row; column-gap: 0.25rem;" : "flex-direction: column; row-gap: 0.25rem;";
 });
 
 var ValueInput = _styledComponents["default"].input(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2["default"])(["\n  display: none;\n"])));
@@ -511,12 +493,10 @@ var FileItemListContainer = _styledComponents["default"].div(_templateObject6 ||
 
 var Container = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n  row-gap: 0.25rem;\n  margin-top: 0.25rem;\n"])));
 
-var DragDropArea = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  flex-direction: ", ";\n  ", ";\n  align-items: center;\n  height: ", ";\n  width: 320px;\n  overflow: hidden;\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n\n  ", "\n\n  cursor: ", ";\n"])), function (props) {
-  return props.mode === "filedrop" ? "row" : "column";
-}, function (props) {
-  return props.mode === "dropzone" && "justify-content: center; padding: 1rem;";
+var DragDropArea = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2["default"])(["\n  box-sizing: border-box;\n  display: flex;\n  ", "\n  align-items: center;\n  width: 320px;\n  padding: ", ";\n  overflow: hidden;\n  box-shadow: 0 0 0 2px transparent;\n  border-radius: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-color: ", ";\n  ", "\n  cursor: ", ";\n"])), function (props) {
+  return props.mode === "filedrop" ? "flex-direction: row; column-gap: 0.75rem; height: 48px;" : "justify-content: center; flex-direction: column; row-gap: 0.5rem; height: 160px;";
 }, function (props) {
-  return props.mode === "filedrop" ? "48px" : "160px";
+  return props.mode === "filedrop" ? "calc(4px - ".concat(props.theme.dropBorderThickness, ") 1rem calc(4px - ").concat(props.theme.dropBorderThickness, ") calc(4px - ").concat(props.theme.dropBorderThickness, ")") : "1rem";
 }, function (props) {
   return props.theme.dropBorderRadius;
 }, function (props) {
@@ -531,11 +511,7 @@ var DragDropArea = _styledComponents["default"].div(_templateObject8 || (_templa
   return props.disabled && "not-allowed";
 });
 
-var ButtonContainer = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  ", ";\n"])), function (props) {
-  return props.mode === "filedrop" && "padding: 2px 12px 2px 3px";
-});
-
-var DropzoneLabel = _styledComponents["default"].div(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  -webkit-line-clamp: 3;\n  text-align: center;\n  margin-top: 0.5rem;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"])), function (props) {
+var DropzoneLabel = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2["default"])(["\n  display: -webkit-box;\n  -webkit-box-orient: vertical;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  -webkit-line-clamp: 3;\n  text-align: center;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"])), function (props) {
   return props.disabled ? props.theme.disabledDropLabelFontColor : props.theme.dropLabelFontColor;
 }, function (props) {
   return props.theme.dropLabelFontFamily;
@@ -545,7 +521,7 @@ var DropzoneLabel = _styledComponents["default"].div(_templateObject10 || (_temp
   return props.theme.dropLabelFontWeight;
 });
 
-var FiledropLabel = _styledComponents["default"].span(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  margin-right: 1rem;\n"])), function (props) {
+var FiledropLabel = _styledComponents["default"].span(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2["default"])(["\n  overflow: hidden;\n  white-space: nowrap;\n  text-overflow: ellipsis;\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n"])), function (props) {
   return props.disabled ? props.theme.disabledDropLabelFontColor : props.theme.dropLabelFontColor;
 }, function (props) {
   return props.theme.dropLabelFontFamily;
@@ -555,7 +531,7 @@ var FiledropLabel = _styledComponents["default"].span(_templateObject11 || (_tem
   return props.theme.dropLabelFontWeight;
 });
 
-var ErrorMessage = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-top: 0.25rem;\n"])), function (props) {
+var ErrorMessage = _styledComponents["default"].div(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2["default"])(["\n  color: ", ";\n  font-family: ", ";\n  font-size: ", ";\n  font-weight: ", ";\n  line-height: ", ";\n  margin-top: 0.25rem;\n"])), function (props) {
   return props.theme.errorMessageFontColor;
 }, function (props) {
   return props.theme.errorMessageFontFamily;

package/file-input/FileInput.stories.tsx

@@ -3,14 +3,14 @@ import DxcFileInput from "./FileInput";
 import Title from "../../.storybook/components/Title";
 import ExampleContainer from "../../.storybook/components/ExampleContainer";
 import FileItem from "./FileItem";
+import { HalstackProvider } from "../HalstackContext";
 
 export default {
   title: "File input",
   component: DxcFileInput,
 };
 
-const picPreview =
-  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABmJLR0QA/wD/AP+gvaeTAAAEDklEQVRogdXaXaxcUxQH8J/etloajVT1I9qgCbdIUB8PXPeKBJHgsV5ExAuVivBUgtSDxgNBVMVHxEeRUhIhkpJ40BYhoTShaQglQtA2VR+ttjMe1j45c6cztzNnzszc+09Ocs/Za+39/++zzt5rr7l0D1diA35P14b0bMJgAE+g2uR6FpP7xq4NZCL2YjlOSNdt6VkVj/eNXYu4VhD9G+c3aL8gtVWS7bjEsfhRCFk2ht2yZPNT8hl3WCUIfoZJY9gdhY+T7QM94NUWFmEfDuHCFuyXJNv9OL2LvNrGO2KGn2rD55nks6ErjAog+8B3YXYbfrPwR/Lt+4d/NLYLMrcW8F+efL/DtBJ5tY17EpEvxEbYLgawJfVxXxObRZhbiF2LWCjfE4Y66OeS1Mc/OLnm+Uw8ggP4oYP+j4hHxUy+VEJfL6e+3hTL8/X4RZ7W/FvCGE1xOdZp7wNvhvny9CULtSo+1QMhZWImPpQL+A03YbouCpkqXn8ZqA+jg1iD41P7NF0QMiAy2N0ipDrFWUa/hU9wXp1N6UIuEktsNug3HfY3gD2pr4rYTxrlZ6UJmY3n0mBZ7JYhhDi3ZP1+i6sb2HQsZBJuEEfUqljjV+Ic5QkhzifZylTF+xisae9IyBIRr1nnb+PU1DaoXCHkk5blXfvxGGYoKGQWnhbpdZb/XFNn0w0hGebgBXm4fY/rtClkOn6Wz8j96Vk9uikkw5DRm2JLQrKV4hB2pr+niJznuPI5toRN4rx/u1jZiLfUMqZiBf4Ss7Bb7Bu1WW0v3kgt5mA17i7iPB8vymN1Cy5Obb0W0jFm4Fd5jFbEfjJsggl5UBDeiLvk4bZP/4RcJj76W1p1OE2sXAfFBkgcotYrL0UpghF5BfOkVhzeTQ5rGrRdIXbiVWWxaxNvCG6vHckwq4jsFPXa8YYF8gPYVc2MaisiN/eGVyGsEBy3C86H4d5k8LliFZFeYSq+FlwP218WiJWpIpbY8Y5heeXllNqGdcqriPQKrwrO67MHZwh1ezGvT6SKIKu8VLCYWGareKgPZEZECrS5oP/Dgvtq2Jpuzi6FWmuYh7XyfK5asJ9zk++X5EWARuePsjEZd9SM+afOhBwjz9TtSDeDY3mUgBH526/gFRHnnQhZLD9NejLdvG7sn8yKoj6MtuLSmvaiQibJ8781RNl+V3rwEZaKpGxKQeIZ6sNoD+5s0G87QqYkbksT1yydWpQZDMl/kS16bawb9AN5GK3VfGnvZMwd0qEv+w+ETTgTN4rEcRAninSgVdTP6oE2fFvFf6JIuA1v4XmRkXQVk+UFhGoacKXDJ6eTj72nmGt0DWCbONdkmDBCMgzjK6MrmAtNQCGUvyH2HfXhNmGFZBgRNYD3Ou3ofwlpcfptqgzTAAAAAElFTkSuQmCC";
+const picPreview = "https://cdn.mos.cms.futurecdn.net/CAZ6JXi6huSuN4QGE627NR.jpg";
 
 const file1 = new File(["file1"], "file.pdf", { type: "text/plain" });
 const file2 = new File(["file2"], "file2.mp3", {
@@ -22,7 +22,7 @@ const file3 = new File(["file3"], "file3.png", {
 const file4 = new File(["file4"], "file4file4file4file4file4file4file4file4file4.mp4", {
   type: "video",
 });
-const file5 = new File(["file4"], "file5file5file5file5file5file5file5file5file5.mp4", {
+const file5 = new File(["file5"], "file5file5file5file5file5file5file5file5file5.mp4", {
   type: "video",
 });
 
@@ -54,7 +54,7 @@ const filesExamples = [
     file: file4,
   },
   {
-    error: "Error message error message error message error message",
+    error: "This error message is a multiline paragraph for testing.",
     file: file5,
   },
   {
@@ -64,17 +64,22 @@ const filesExamples = [
   },
 ];
 
+const opinionatedTheme = {
+  fileInput: {
+    fontColor: "#000000",
+  },
+};
+
 export const Chromatic = () => (
   <>
     <Title title="File item states" theme="light" level={2} />
     <ExampleContainer pseudoState="pseudo-hover">
       <Title title="Hovered" theme="light" level={4} />
       <FileItem
-        mode="dropzone"
-        multiple={true}
-        name="file"
+        fileName="file"
+        error=""
+        singleFileMode={false}
         showPreview={false}
-        numFiles={1}
         preview={picPreview}
         type="image/png"
         onDelete={() => {}}
@@ -84,11 +89,10 @@ export const Chromatic = () => (
     <ExampleContainer pseudoState="pseudo-focus">
       <Title title="Focused" theme="light" level={4} />
       <FileItem
-        mode="dropzone"
-        multiple={true}
-        name="file"
+        fileName="file"
+        error=""
+        singleFileMode={false}
         showPreview={false}
-        numFiles={1}
         preview={picPreview}
         type="image/png"
         onDelete={() => {}}
@@ -98,11 +102,10 @@ export const Chromatic = () => (
     <ExampleContainer pseudoState="pseudo-active">
       <Title title="Actived" theme="light" level={4} />
       <FileItem
-        mode="dropzone"
-        multiple={true}
-        name="file"
+        fileName="file"
+        error=""
+        singleFileMode={false}
         showPreview={false}
-        numFiles={1}
         preview={picPreview}
         type="image/png"
         onDelete={() => {}}
@@ -533,7 +536,83 @@ export const Chromatic = () => (
         mode="dropzone"
         margin="xxlarge"
       />
-      <hr />
+    </ExampleContainer>
+    <Title title="Opinionated theme" theme="light" level={2} />
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <Title title="Single file" theme="light" level={4} />
+        <DxcFileInput
+          label="File input"
+          helperText="Please select files"
+          value={fileExample}
+          multiple={false}
+          callbackFile={() => {}}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <HalstackProvider theme={opinionatedTheme}>
+        <Title title="Invalid single file" theme="light" level={4} />
+        <DxcFileInput
+          label="File input"
+          helperText="Please select files"
+          value={fileExampleError}
+          multiple={false}
+          callbackFile={() => {}}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Single file" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcFileInput
+          mode="filedrop"
+          label="File input"
+          helperText="Please select files"
+          value={fileExample}
+          multiple={false}
+          callbackFile={() => {}}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Invalid single file" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcFileInput
+          mode="filedrop"
+          label="File input"
+          helperText="Please select files"
+          value={fileExampleError}
+          multiple={false}
+          callbackFile={() => {}}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Single file" theme="light" level={4} />
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcFileInput
+          label="File input"
+          helperText="Please select files"
+          mode="dropzone"
+          value={fileExample}
+          callbackFile={() => {}}
+          multiple={false}
+        />
+      </HalstackProvider>
+    </ExampleContainer>
+    <ExampleContainer>
+      <Title title="Invalid single file" theme="light" level={4} />{" "}
+      <HalstackProvider theme={opinionatedTheme}>
+        <DxcFileInput
+          label="File input"
+          helperText="Please select files"
+          mode="dropzone"
+          value={fileExampleError}
+          callbackFile={() => {}}
+          multiple={false}
+        />
+      </HalstackProvider>
     </ExampleContainer>
   </>
 );

package/file-input/FileInput.test.js

@@ -12,21 +12,21 @@ var _react2 = require("@testing-library/react");
 
 var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 
-var _FileInput = _interopRequireDefault(require("./FileInput"));
-
+var _FileInput = _interopRequireDefault(require("./FileInput.tsx"));
+
+var file1 = new File(["file1"], "file1.png", {
+  type: "image/png"
+});
+var file2 = new File(["file2"], "file2.txt", {
+  type: "text/plain"
+});
+var allFiles = [{
+  file: file1
+}, {
+  error: "Error message",
+  file: file2
+}];
 describe("FileInput component tests", function () {
-  var file1 = new File(["file1"], "file1.png", {
-    type: "image/png"
-  });
-  var file2 = new File(["file2"], "file2.txt", {
-    type: "text/plain"
-  });
-  var allFiles = [{
-    file: file1
-  }, {
-    error: "Error message",
-    file: file2
-  }];
   test("Renders with correct labels and helper text in file mode", function () {
     var _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_FileInput["default"], {
       label: "File input label",
@@ -454,45 +454,4 @@ describe("FileInput component tests", function () {
       }
     }, _callee6);
   })));
-  test("File input sends value when submitted in a form", function () {
-    var newFile = new File(["newFile"], "newFile.pdf", {
-      type: "pdf"
-    });
-    var handlerOnSubmit = jest.fn(function (e) {
-      e.preventDefault();
-      var formData = new FormData(e.target);
-      var formProps = Object.fromEntries(formData);
-      expect(formProps).toStrictEqual({
-        file: newFile
-      });
-    });
-
-    var _render17 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement("form", {
-      onSubmit: handlerOnSubmit
-    }, /*#__PURE__*/_react["default"].createElement(_FileInput["default"], {
-      label: "File input label",
-      name: "file",
-      helperText: "File input helper text",
-      mode: "filedrop",
-      buttonLabel: "Choose",
-      dropAreaLabel: "(or drop the files)"
-    }), /*#__PURE__*/_react["default"].createElement("button", {
-      type: "submit"
-    }, "Submit"))),
-        getByText = _render17.getByText,
-        getByLabelText = _render17.getByLabelText;
-
-    var inputFile = getByLabelText("File input label", {
-      hidden: true
-    });
-    var submit = getByText("Submit");
-
-    _react2.fireEvent.change(inputFile, {
-      target: {
-        files: [newFile]
-      }
-    });
-
-    _userEvent["default"].click(submit);
-  });
 });

package/file-input/FileItem.d.ts

@@ -1,14 +1,4 @@
 import React from "react";
-declare const _default: React.MemoExoticComponent<({ 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>;
+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

@@ -15,11 +15,13 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
+var _main = require("../main");
+
 var _useTheme = _interopRequireDefault(require("../useTheme"));
 
 var _useTranslatedLabels = _interopRequireDefault(require("../useTranslatedLabels"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
 
 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); }
 
@@ -49,16 +51,14 @@ var errorIcon = /*#__PURE__*/_react["default"].createElement("svg", {
 }));
 
 var FileItem = function FileItem(_ref) {
-  var mode = _ref.mode,
-      multiple = _ref.multiple,
-      _ref$name = _ref.name,
-      name = _ref$name === void 0 ? "" : _ref$name,
+  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,
-      numFiles = _ref.numFiles,
       onDelete = _ref.onDelete,
       tabIndex = _ref.tabIndex;
   var colorsTheme = (0, _useTheme["default"])();
@@ -70,43 +70,35 @@ var FileItem = function FileItem(_ref) {
 
   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
+    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,
     "aria-label": getIconAriaLabel()
-  }, 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, null, errorIcon), /*#__PURE__*/_react["default"].createElement(DeleteFileAction, {
-    error: error,
+  }, preview)), /*#__PURE__*/_react["default"].createElement(FileItemContent, null, /*#__PURE__*/_react["default"].createElement(FileName, null, fileName), /*#__PURE__*/_react["default"].createElement(_main.DxcFlex, {
+    gap: "0.25rem"
+  }, error && /*#__PURE__*/_react["default"].createElement(ErrorIcon, null, errorIcon), /*#__PURE__*/_react["default"].createElement(DeleteFileAction, {
     onClick: function onClick() {
-      onDelete(name);
+      onDelete(fileName);
     },
+    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))));
+  }, deleteIcon)), error && !singleFileMode && /*#__PURE__*/_react["default"].createElement(ErrorMessage, null, error))));
 };
 
-var Container = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: row;\n  justify-content: center;\n  gap: 12px;\n  padding: ", ";\n  width: ", ";\n  min-height: ", ";\n  background-color: ", ";\n  border-color: ", ";\n  border-width: ", ";\n  border-style: ", ";\n  border-radius: ", ";\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");
-}, function (props) {
-  return props.mode === "file" && !props.multiple && props.numFiles === 1 ? "calc(230px - 26px)" : !props.showPreview ? "calc(320px - 26px)" : props.showPreview && "calc(320px - 18px)";
+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.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.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.error && props.theme.errorFileItemBackgroundColor;
+  return props.error ? "background-color: ".concat(props.theme.errorFileItemBackgroundColor, ";") : "";
 }, function (props) {
   return props.error ? props.theme.errorFileItemBorderColor : props.theme.fileItemBorderColor;
 }, function (props) {
@@ -117,22 +109,18 @@ var Container = _styledComponents["default"].div(_templateObject || (_templateOb
   return props.theme.fileItemBorderRadius;
 });
 
-var FileItemContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n  display: flex;\n  flex-direction: column;\n"])));
+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 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  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  background-color: ", ";\n  width: 48px;\n  height: 48px;\n  border-radius: 2px;\n  color: ", ";\n"])), function (props) {
+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\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 FileName = _styledComponents["default"].span(_templateObject6 || (_templateObject6 = (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) {
@@ -143,9 +131,9 @@ var FileName = _styledComponents["default"].span(_templateObject6 || (_templateO
   return props.theme.fileItemLineHeight;
 });
 
-var ErrorIcon = _styledComponents["default"].span(_templateObject7 || (_templateObject7 = (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 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  color: #d0011b;\n"])));
 
-var DeleteFileAction = _styledComponents["default"].button(_templateObject8 || (_templateObject8 = (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\n  svg {\n    line-height: 18px;\n  }\n  &:hover {\n    background-color: ", ";\n  }\n  &:focus, &:focus-visible {\n    outline: none;\n    box-shadow: 0 0 0 2px ", ";\n  }\n  &:active {\n    background-color: ", ";\n  }\n"])), function (props) {
+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\n  svg {\n    line-height: 18px;\n  }\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;
@@ -157,7 +145,7 @@ var DeleteFileAction = _styledComponents["default"].button(_templateObject8 || (
   return props.theme.activeDeleteFileItemBackgroundColor;
 });
 
-var ErrorMessage = _styledComponents["default"].span(_templateObject9 || (_templateObject9 = (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;