oa-componentbook 0.18.92 → 0.18.94

package/build/index.js

@@ -221,12 +221,6 @@ Object.defineProperty(exports, "CustomTooltip", {
     return _CustomTooltip.default;
   }
 });
-Object.defineProperty(exports, "DocUploadWidget", {
-  enumerable: true,
-  get: function get() {
-    return _DocUploadWidget.default;
-  }
-});
 Object.defineProperty(exports, "Elevation", {
   enumerable: true,
   get: function get() {
@@ -365,6 +359,12 @@ Object.defineProperty(exports, "UploadDownloadWidget", {
     return _UploadDownloadWidget.default;
   }
 });
+Object.defineProperty(exports, "UploadUploadWidget", {
+  enumerable: true,
+  get: function get() {
+    return _UploadUploadWidget.default;
+  }
+});
 Object.defineProperty(exports, "ViewHistoryWidget", {
   enumerable: true,
   get: function get() {
@@ -403,7 +403,7 @@ Object.defineProperty(exports, "typographyOptions", {
 });
 var _Accordion = _interopRequireDefault(require("./components/oa-component-accordion/Accordion"));
 var _CustomDetails = _interopRequireDefault(require("./widgets/oa-widget-custom-details/CustomDetails"));
-var _DocUploadWidget = _interopRequireDefault(require("./widgets/oa-widget-document-upload/DocUploadWidget"));
+var _UploadUploadWidget = _interopRequireDefault(require("./widgets/oa-widget-document-upload/UploadUploadWidget"));
 var _BarChart = _interopRequireDefault(require("./components/oa-component-bar-chart/BarChart"));
 var _BorderRadiusDemo = _interopRequireDefault(require("./components/oa-component-demo-border-radius/BorderRadiusDemo"));
 var _ColorVariablesDemo = _interopRequireDefault(require("./components/oa-component-demo-color-variables/ColorVariablesDemo"));

package/build/widgets/oa-widget-document-upload/{DocUploadWidget.js → UploadUploadWidget.js}

@@ -1,32 +1,36 @@
 "use strict";
 
+require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.weak-map.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 require("core-js/modules/es.promise.js");
+require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
-var _RemoveRedEye = _interopRequireDefault(require("@material-ui/icons/RemoveRedEye"));
-var _MaterialIcon = _interopRequireDefault(require("../../components/oa-component-icons/MaterialIcon"));
 var _Typography = _interopRequireDefault(require("../../components/oa-component-typography/Typography"));
 var _ColorVariablesMap = _interopRequireDefault(require("../../global-css/ColorVariablesMap"));
 var _styles = require("./styles");
-var _CustomModal = _interopRequireDefault(require("../../components/oa-component-modal/CustomModal"));
-var _CustomLoader = _interopRequireDefault(require("../../components/oa-component-loader/CustomLoader"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const getBase64 = file => new Promise((resolve, reject) => {
   const reader = new FileReader();
   reader.readAsDataURL(file);
   reader.onload = () => resolve(reader.result);
   reader.onerror = error => reject(error);
 });
+const isImageFile = file => file.type.startsWith('image/');
 const downloadFile = (base64String, fileName) => {
   const link = document.createElement('a');
   link.href = base64String;
@@ -38,49 +42,30 @@ function DocumentUpload(props) {
     uploadedDocuments = [],
     onChange,
     subText,
-    heading,
-    formName,
-    getPreview
+    heading
   } = props;
   const [previewOpen, setPreviewOpen] = (0, _react.useState)(false);
-  const [previewImage, setPreviewImage] = (0, _react.useState)(null);
+  const [previewImage, setPreviewImage] = (0, _react.useState)('');
   const [previewTitle, setPreviewTitle] = (0, _react.useState)('');
   const [loading, setLoading] = (0, _react.useState)(false);
   const [fileList, setFileList] = (0, _react.useState)(uploadedDocuments);
   const handleCancel = () => setPreviewOpen(false);
-  function isImageFile(fileName) {
-    var _fileName$split;
-    // Extract the file extension from the file name
-    const fileExtension = fileName === null || fileName === void 0 || (_fileName$split = fileName.split('.')) === null || _fileName$split === void 0 || (_fileName$split = _fileName$split.pop()) === null || _fileName$split === void 0 ? void 0 : _fileName$split.toLowerCase();
-
-    // Define an array of image file extensions
-    const imageFileExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'svg'];
-
-    // Check if the file extension is in the array of image file extensions
-    if (imageFileExtensions.indexOf(fileExtension) !== -1) {
-      return true;
-    }
-    return false;
-  }
   const handlePreview = async file => {
-    if (file !== null && file !== void 0 && file.originFileObj) {
-      if (isImageFile(file === null || file === void 0 ? void 0 : file.name)) {
-        const base64Preview = await getBase64(file.originFileObj);
-        setPreviewImage(base64Preview);
-        setPreviewOpen(true);
-      } else {
-        const base64Preview = await getBase64(file.originFileObj);
-        downloadFile(base64Preview, file === null || file === void 0 ? void 0 : file.name);
+    var _modifiedFile;
+    let modifiedFile = file;
+    if (!file.url && !file.preview) {
+      const base64Preview = await getBase64(file.originFileObj);
+      modifiedFile = _objectSpread(_objectSpread({}, file), {}, {
+        preview: base64Preview
+      });
+      if (!isImageFile(file)) {
+        downloadFile(file.preview, file.name);
+        return;
       }
-    } else if (isImageFile(file === null || file === void 0 ? void 0 : file.name)) {
-      const url = await getPreview();
-      setPreviewOpen(true);
-      setPreviewImage(url);
-    } else {
-      const url = await getPreview();
-      downloadFile(url, file === null || file === void 0 ? void 0 : file.name);
     }
-    setPreviewTitle(file === null || file === void 0 ? void 0 : file.name);
+    setPreviewImage(modifiedFile.url || modifiedFile.preview);
+    setPreviewOpen(true);
+    setPreviewTitle((_modifiedFile = modifiedFile) === null || _modifiedFile === void 0 ? void 0 : _modifiedFile.name);
   };
   const handleChange = async _ref => {
     let {
@@ -91,19 +76,21 @@ function DocumentUpload(props) {
       onChange(null, 'removed');
     }
     const modifiedList = await Promise.all(newFileList.map(async files => {
-      let modifiedFile = files;
+      const modifiedFile = files;
+      // if (file.status === 'uploading') {
       setLoading(true);
       try {
         await onChange(files);
         modifiedFile.status = 'done';
       } catch (error) {
-        modifiedFile = null;
+        console.error('Error during upload:', error);
+        modifiedFile.status = 'error';
       }
       setLoading(false);
+      // }
       return modifiedFile;
     }));
-    const tempList = modifiedList === null || modifiedList === void 0 ? void 0 : modifiedList.filter(Boolean);
-    setFileList(tempList);
+    setFileList(modifiedList);
   };
   const uploadButton = /*#__PURE__*/_react.default.createElement("button", {
     style: {
@@ -137,50 +124,35 @@ function DocumentUpload(props) {
         colorText: _ColorVariablesMap.default['--color-primary']
       }
     }
-  }, /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
-    name: formName
   }, /*#__PURE__*/_react.default.createElement(_antd.Upload, {
     customRequest: () => {},
     listType: "picture-card",
     fileList: fileList,
     onPreview: handlePreview,
-    onChange: handleChange,
-    showUploadList: {
-      showDownloadIcon: false,
-      removeIcon: /*#__PURE__*/_react.default.createElement(_icons.DeleteFilled, null),
-      previewIcon: /*#__PURE__*/_react.default.createElement(_icons.EyeFilled, null)
-    }
-  }, fileList.length >= 1 ? null : uploadButton)))))), /*#__PURE__*/_react.default.createElement(_CustomModal.default, {
+    onChange: handleChange
+  }, fileList.length >= 1 ? null : uploadButton))))), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
     open: previewOpen,
     title: previewTitle,
     footer: null,
     onCancel: handleCancel
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      textAlign: 'center'
-    }
-  }, ' ', previewImage ? /*#__PURE__*/_react.default.createElement("img", {
+  }, /*#__PURE__*/_react.default.createElement("img", {
     alt: "example",
     style: {
       width: '100%'
     },
     src: previewImage
-  }) : /*#__PURE__*/_react.default.createElement(_CustomLoader.default, null))));
+  })));
 }
 DocumentUpload.propTypes = {
   uploadedDocuments: _propTypes.default.array,
   onChange: _propTypes.default.func,
   subText: _propTypes.default.string,
-  heading: _propTypes.default.string,
-  formName: _propTypes.default.string,
-  getPreview: _propTypes.default.func // Define the getPreview prop type
+  heading: _propTypes.default.string
 };
 DocumentUpload.defaultProps = {
   uploadedDocuments: [],
   onChange: () => {},
   subText: '',
-  heading: '',
-  formName: '',
-  getPreview: () => {}
+  heading: ''
 };
 var _default = exports.default = DocumentUpload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oa-componentbook",
-  "version": "0.18.92",
+  "version": "0.18.94",
   "private": false,
   "description": "Reusable components",
   "main": "build/index.js",