iglooform 2.4.35 → 2.5.2

package/es/input/amount.js

@@ -47,8 +47,15 @@ var Amount = function Amount(_ref) {
   var handleOnBlur = function handleOnBlur(e) {
     var onChange = rest.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -75,7 +82,11 @@ Amount.formItemPropsHandler = function (_ref2) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(seperator, '').replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return str;
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     },
     rules: [{

package/es/input/input-number.js

@@ -17,8 +17,15 @@ var IglooInputNumber = function IglooInputNumber(props) {
     var value = props.value,
         onChange = props.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -36,7 +43,11 @@ IglooInputNumber.formItemPropsHandler = function (config) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return parseInt(str);
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     }
   };

package/es/media/media.js

@@ -1,7 +1,7 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import PDF from '@mikecousins/react-pdf';
+import { Document, Page } from 'react-pdf/dist/esm/entry.webpack';
 
 var MediaItem = function MediaItem(_ref) {
   var type = _ref.type,
@@ -25,9 +25,12 @@ var MediaItem = function MediaItem(_ref) {
           maxHeight: 80,
           position: 'absolute'
         },
-        children: _jsx(PDF, {
+        children: _jsx(Document, {
           file: src,
-          scale: 0.1
+          children: _jsx(Page, {
+            pageNumber: 1,
+            scale: 0.1
+          })
         })
       });
 

package/es/media/preview.js

@@ -18,7 +18,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useState } from 'react';
-import PDF from '@mikecousins/react-pdf';
+import { Document, Page } from 'react-pdf/dist/esm/entry.webpack';
 
 var PdfViewer = function PdfViewer(_ref) {
   var src = _ref.src,
@@ -41,17 +41,6 @@ var PdfViewer = function PdfViewer(_ref) {
     }
   };
 
-  var pages = [];
-
-  for (var i = 1; i <= pageSize; i++) {
-    pages.push(_jsx(PDF, {
-      file: src,
-      page: i,
-      onDocumentLoadSuccess: handlePageInit,
-      scale: scale
-    }, i));
-  }
-
   return _jsx("div", {
     style: {
       display: 'flex',
@@ -61,7 +50,18 @@ var PdfViewer = function PdfViewer(_ref) {
       transform: "translate(".concat(left, "px, ").concat(top, "px)"),
       position: 'absolute'
     },
-    children: pages
+    children: _jsx(Document, {
+      file: src,
+      onLoadSuccess: handlePageInit,
+      children: Array.from({
+        length: pageSize
+      }).map(function (_, index) {
+        return _jsx(Page, {
+          pageNumber: index + 1,
+          scale: scale
+        }, index);
+      })
+    })
   });
 };
 

package/es/select/attached-select.js

@@ -1,7 +1,7 @@
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options"],
-    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children", "clearWhenOptionsUpdated"];
+var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options", "clearWhenOptionsUpdated"],
+    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -56,6 +56,25 @@ var Option = _Select.Option,
     OptGroup = _Select.OptGroup;
 export { Option, OptGroup };
 
+var compareOptions = function compareOptions(newOptions, oldOptions) {
+  if ((oldOptions === null || oldOptions === void 0 ? void 0 : oldOptions.length) !== newOptions.length) {
+    return true;
+  }
+
+  if (Array.isArray(oldOptions)) {
+    for (var i = 0; i < oldOptions.length; i++) {
+      var newOption = oldOptions[i];
+      var originOption = newOptions[i];
+
+      if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+};
+
 var IglooSelect = function IglooSelect(_ref) {
   var valueProp = _ref.value,
       className = _ref.className,
@@ -68,6 +87,8 @@ var IglooSelect = function IglooSelect(_ref) {
       multiple = _ref.multiple,
       _ref$options = _ref.options,
       options = _ref$options === void 0 ? [] : _ref$options,
+      _ref$clearWhenOptions = _ref.clearWhenOptionsUpdated,
+      clearWhenOptionsUpdated = _ref$clearWhenOptions === void 0 ? false : _ref$clearWhenOptions,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var _useContext = useContext(LocaleContext),
@@ -88,6 +109,11 @@ var IglooSelect = function IglooSelect(_ref) {
       displayOptions = _useState6[0],
       setDisplay = _useState6[1];
 
+  var _useState7 = useState(options),
+      _useState8 = _slicedToArray(_useState7, 2),
+      originOptions = _useState8[0],
+      setOrigin = _useState8[1];
+
   useEffect(function () {
     typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
   }, [selected]);
@@ -96,22 +122,30 @@ var IglooSelect = function IglooSelect(_ref) {
   }, [valueProp]);
   useEffect(function () {
     setDisplay(options);
+    setOrigin(options);
   }, [options]);
+  useEffect(function () {
+    var setFieldValue = rest.setFieldValue;
+
+    if (clearWhenOptionsUpdated && compareOptions(options, originOptions)) {
+      typeof setFieldValue === 'function' && setFieldValue();
+    }
+  }, [options, originOptions]);
   useEffect(function () {
     var setFieldValue = rest.setFieldValue;
     var foundValue = options.find(function (option) {
       return Array.isArray(valueProp) ? valueProp.includes(option.value) : option.value === valueProp;
     });
 
-    if (!foundValue) {
+    if (!foundValue && valueProp !== undefined) {
       typeof setFieldValue === 'function' && setFieldValue();
     }
   }, [valueProp, options]);
 
-  var _useState7 = useState(false),
-      _useState8 = _slicedToArray(_useState7, 2),
-      dropVisible = _useState8[0],
-      setDropVisible = _useState8[1];
+  var _useState9 = useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      dropVisible = _useState10[0],
+      setDropVisible = _useState10[1];
 
   var handleDropDownVisibleChange = function handleDropDownVisibleChange(open) {
     typeof onDropdownVisibleChange === 'function' && onDropdownVisibleChange(open);
@@ -309,14 +343,12 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       datasourceKey = _ref11.datasourceKey,
       dependField = _ref11.dependField,
       children = _ref11.children,
-      _ref11$clearWhenOptio = _ref11.clearWhenOptionsUpdated,
-      clearWhenOptionsUpdated = _ref11$clearWhenOptio === void 0 ? false : _ref11$clearWhenOptio,
       rest = _objectWithoutProperties(_ref11, _excluded2);
 
-  var _useState9 = useState(options || []),
-      _useState10 = _slicedToArray(_useState9, 2),
-      _options = _useState10[0],
-      setOptions = _useState10[1];
+  var _useState11 = useState(),
+      _useState12 = _slicedToArray(_useState11, 2),
+      _options = _useState12[0],
+      setOptions = _useState12[1];
 
   var _useContext2 = useContext(FormContext),
       selectDatasourceApi = _useContext2.selectDatasourceApi;
@@ -434,36 +466,15 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       };
     }();
 
-    var compareOptions = function compareOptions(newOptions) {
-      var updateOptions = _options.length !== newOptions.length;
-
-      if (!updateOptions) {
-        for (var i = 0; i < _options.length; i++) {
-          var newOption = _options[i];
-          var originOption = newOptions[i];
-
-          if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
-            updateOptions = true;
-            break;
-          }
-        }
-      }
-
-      if (updateOptions) {
+    calcOptions().then(function (newOptions) {
+      if (compareOptions(newOptions, _options || [])) {
         setOptions(newOptions);
-        var setFieldValue = rest.setFieldValue;
-
-        if (clearWhenOptionsUpdated) {
-          typeof setFieldValue === 'function' && setFieldValue();
-        }
       }
-    };
-
-    calcOptions().then(compareOptions);
-  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions]);
-  return _jsx(IglooSelect, _objectSpread({
+    });
+  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions, _options]);
+  return _options ? _jsx(IglooSelect, _objectSpread({
     options: _options
-  }, rest));
+  }, rest)) : null;
 };
 
 AttachedSelect.formItemPropsHandler = function (config) {

package/es/upload-photo/index.js

@@ -112,6 +112,7 @@ var UploadPhoto = function UploadPhoto(props) {
 
   var limitNumError = useRef();
   var DomRef = useRef();
+  var dataUrlRef = useRef([]);
 
   var _useContext = useContext(FormContext),
       uploadApi = _useContext.uploadApi;
@@ -244,12 +245,11 @@ var UploadPhoto = function UploadPhoto(props) {
   var uploadIndex = useRef((value === null || value === void 0 ? void 0 : value.length) ? value.length : 0);
   useEffect(function () {
     return function () {
-      files.forEach(function (_ref4) {
-        var dataUrl = _ref4.dataUrl;
+      dataUrlRef.current.forEach(function (dataUrl) {
         URL.revokeObjectURL(dataUrl);
       });
     };
-  }, [files]);
+  }, []);
   useEffect(function () {
     var removeLimitMsg = function removeLimitMsg(e) {
       if (DomRef.current && !DomRef.current.contains(e.target) && limitNumError.current) {
@@ -315,7 +315,7 @@ var UploadPhoto = function UploadPhoto(props) {
   };
 
   var uploadFile = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
       var uid, dataUrl, name, size, mimeType, type, errorMsg, _errorMsg;
 
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -324,11 +324,12 @@ var UploadPhoto = function UploadPhoto(props) {
             case 0:
               uid = ++uploadIndex.current;
               dataUrl = URL.createObjectURL(file);
+              dataUrlRef.current.push(dataUrl);
               name = file.name, size = file.size, mimeType = file.type;
               type = classifyType(mimeType);
 
               if (!(type === 'unknown')) {
-                _context4.next = 9;
+                _context4.next = 10;
                 break;
               }
 
@@ -339,9 +340,9 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(errorMsg);
               return _context4.abrupt("return", Promise.reject(errorMsg));
 
-            case 9:
+            case 10:
               if (!(limit && currentIndex > limit)) {
-                _context4.next = 14;
+                _context4.next = 15;
                 break;
               }
 
@@ -355,7 +356,7 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(_errorMsg);
               return _context4.abrupt("return", Promise.reject(_errorMsg));
 
-            case 14:
+            case 15:
               limitNumError.current = undefined;
               setFiles(function (files) {
                 return [].concat(_toConsumableArray(files), [{
@@ -429,7 +430,7 @@ var UploadPhoto = function UploadPhoto(props) {
                 typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
-            case 17:
+            case 18:
             case "end":
               return _context4.stop();
           }
@@ -438,12 +439,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function uploadFile(_x5, _x6) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
   var handleUploadPromise = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
       var rst, errorMsg;
       return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
@@ -474,12 +475,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleUploadPromise(_x7, _x8, _x9) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
   var handleDelete = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
       var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
@@ -527,8 +528,8 @@ var UploadPhoto = function UploadPhoto(props) {
               return _context6.abrupt("return", typeof onChange === 'function' && onChange(rst));
 
             case 10:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref8) {
-                var url = _ref8.url;
+              typeof onChange === 'function' && onChange(arr.map(function (_ref7) {
+                var url = _ref7.url;
                 return url;
               }));
 
@@ -541,12 +542,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleDelete(_x10) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
       var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
 
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
@@ -657,7 +658,7 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleReUpload(_x11) {
-      return _ref9.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -669,7 +670,7 @@ var UploadPhoto = function UploadPhoto(props) {
     Modal.noFooter({
       content: _jsx(Preview, {
         src: dataUrl,
-        type: type
+        type: classifyType(type)
       }),
       title: name,
       className: 'igloo-upload-photo-preview-modal',
@@ -750,12 +751,12 @@ var UploadPhoto = function UploadPhoto(props) {
       children: _jsxs(_Row, {
         gutter: [isMobile ? 16 : 32, 16],
         wrap: true,
-        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref10, index) {
+        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref9, index) {
           var _classnames, _classnames2;
 
-          var src = _ref10.src,
-              label = _ref10.label,
-              type = _ref10.type;
+          var src = _ref9.src,
+              label = _ref9.label,
+              type = _ref9.type;
           return _jsxs(_Col, {
             span: sampleSpan,
             children: [_jsx("img", {
@@ -815,13 +816,13 @@ var UploadPhoto = function UploadPhoto(props) {
             children: buttonText || 'Upload'
           })
         })]
-      }), files.map(function (_ref11, index) {
+      }), files.map(function (_ref10, index) {
         var _classnames5;
 
-        var dataUrl = _ref11.dataUrl,
-            status = _ref11.status,
-            type = _ref11.type,
-            uid = _ref11.uid;
+        var dataUrl = _ref10.dataUrl,
+            status = _ref10.status,
+            type = _ref10.type,
+            uid = _ref10.uid;
         return _jsx(_Badge, {
           count: getBadge(status, index, limit),
           children: _jsxs("div", {
@@ -889,10 +890,10 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-UploadPhoto.formItemPropsHandler = function (_ref12) {
-  var limit = _ref12.limit,
-      previewFormater = _ref12.previewFormater,
-      label = _ref12.label;
+UploadPhoto.formItemPropsHandler = function (_ref11) {
+  var limit = _ref11.limit,
+      previewFormater = _ref11.previewFormater,
+      label = _ref11.label;
   return {
     previewFormater: previewFormater || function (value) {
       return _jsx(UploadPreview, {

package/es/upload-photo/media.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import PDF from '@mikecousins/react-pdf';
+import { Document, Page } from 'react-pdf/dist/esm/entry.webpack';
 
 var MediaItem = function MediaItem(_ref) {
   var type = _ref.type,
@@ -21,13 +21,12 @@ var MediaItem = function MediaItem(_ref) {
     case 'pdf':
       return _jsx("div", {
         className: className,
-        children: _jsx(PDF, {
+        children: _jsx(Document, {
           file: src,
-          scale: 0.1,
-          style: {
-            maxWidth: 96,
-            maxHeight: 96
-          }
+          children: _jsx(Page, {
+            pageNumber: 1,
+            height: 96
+          })
         })
       });
 

package/es/upload-preview/media.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useContext } from 'react';
 import Typography from '../typography';
-import PDFPreview from '@mikecousins/react-pdf';
+import { Document, Page } from 'react-pdf/dist/esm/entry.webpack';
 import { ErrorFilled } from 'iglooicon';
 import LocaleContext from '../locale/locale-context';
 import classNames from 'classnames';
@@ -42,20 +42,20 @@ var PDF = function PDF(_ref) {
     }
   };
 
-  var pages = [];
-
-  for (var i = 1; i <= pageSize; i++) {
-    pages.push(_jsx(PDFPreview, {
-      file: src,
-      page: i,
-      onDocumentLoadSuccess: handlePageInit,
-      scale: md ? 1 : 0.5
-    }, i));
-  }
-
   return _jsx("div", {
     className: "igloo-upload-preview-pdf",
-    children: pages
+    children: _jsx(Document, {
+      file: src,
+      onLoadSuccess: handlePageInit,
+      children: Array.from({
+        length: pageSize
+      }).map(function (_, index) {
+        return _jsx(Page, {
+          pageNumber: index + 1,
+          scale: md ? 1 : 0.5
+        }, index);
+      })
+    })
   });
 };
 

package/lib/input/amount.js

@@ -63,8 +63,15 @@ var Amount = function Amount(_ref) {
   var handleOnBlur = function handleOnBlur(e) {
     var onChange = rest.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -91,7 +98,11 @@ Amount.formItemPropsHandler = function (_ref2) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(seperator, '').replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return str;
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     },
     rules: [{

package/lib/input/input-number.js

@@ -30,8 +30,15 @@ var IglooInputNumber = function IglooInputNumber(props) {
     var value = props.value,
         onChange = props.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -49,7 +56,11 @@ IglooInputNumber.formItemPropsHandler = function (config) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return parseInt(str);
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     }
   };

package/lib/media/media.js

@@ -11,7 +11,7 @@ var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-var _reactPdf = _interopRequireDefault(require("@mikecousins/react-pdf"));
+var _entry = require("react-pdf/dist/esm/entry.webpack");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -37,9 +37,12 @@ var MediaItem = function MediaItem(_ref) {
           maxHeight: 80,
           position: 'absolute'
         },
-        children: (0, _jsxRuntime.jsx)(_reactPdf.default, {
+        children: (0, _jsxRuntime.jsx)(_entry.Document, {
           file: src,
-          scale: 0.1
+          children: (0, _jsxRuntime.jsx)(_entry.Page, {
+            pageNumber: 1,
+            scale: 0.1
+          })
         })
       });
 

package/lib/media/preview.js

@@ -9,9 +9,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var _react = require("react");
 
-var _reactPdf = _interopRequireDefault(require("@mikecousins/react-pdf"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _entry = require("react-pdf/dist/esm/entry.webpack");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -52,17 +50,6 @@ var PdfViewer = function PdfViewer(_ref) {
     }
   };
 
-  var pages = [];
-
-  for (var i = 1; i <= pageSize; i++) {
-    pages.push((0, _jsxRuntime.jsx)(_reactPdf.default, {
-      file: src,
-      page: i,
-      onDocumentLoadSuccess: handlePageInit,
-      scale: scale
-    }, i));
-  }
-
   return (0, _jsxRuntime.jsx)("div", {
     style: {
       display: 'flex',
@@ -72,7 +59,18 @@ var PdfViewer = function PdfViewer(_ref) {
       transform: "translate(".concat(left, "px, ").concat(top, "px)"),
       position: 'absolute'
     },
-    children: pages
+    children: (0, _jsxRuntime.jsx)(_entry.Document, {
+      file: src,
+      onLoadSuccess: handlePageInit,
+      children: Array.from({
+        length: pageSize
+      }).map(function (_, index) {
+        return (0, _jsxRuntime.jsx)(_entry.Page, {
+          pageNumber: index + 1,
+          scale: scale
+        }, index);
+      })
+    })
   });
 };
 

package/lib/select/attached-select.js

@@ -35,8 +35,8 @@ require("./style");
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options"],
-    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children", "clearWhenOptionsUpdated"];
+var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options", "clearWhenOptionsUpdated"],
+    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -81,6 +81,25 @@ var Option = _select.default.Option,
 exports.OptGroup = OptGroup;
 exports.Option = Option;
 
+var compareOptions = function compareOptions(newOptions, oldOptions) {
+  if ((oldOptions === null || oldOptions === void 0 ? void 0 : oldOptions.length) !== newOptions.length) {
+    return true;
+  }
+
+  if (Array.isArray(oldOptions)) {
+    for (var i = 0; i < oldOptions.length; i++) {
+      var newOption = oldOptions[i];
+      var originOption = newOptions[i];
+
+      if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+};
+
 var IglooSelect = function IglooSelect(_ref) {
   var valueProp = _ref.value,
       className = _ref.className,
@@ -93,6 +112,8 @@ var IglooSelect = function IglooSelect(_ref) {
       multiple = _ref.multiple,
       _ref$options = _ref.options,
       options = _ref$options === void 0 ? [] : _ref$options,
+      _ref$clearWhenOptions = _ref.clearWhenOptionsUpdated,
+      clearWhenOptionsUpdated = _ref$clearWhenOptions === void 0 ? false : _ref$clearWhenOptions,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var _useContext = (0, _react.useContext)(_localeContext.default),
@@ -113,6 +134,11 @@ var IglooSelect = function IglooSelect(_ref) {
       displayOptions = _useState6[0],
       setDisplay = _useState6[1];
 
+  var _useState7 = (0, _react.useState)(options),
+      _useState8 = _slicedToArray(_useState7, 2),
+      originOptions = _useState8[0],
+      setOrigin = _useState8[1];
+
   (0, _react.useEffect)(function () {
     typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
   }, [selected]);
@@ -121,22 +147,30 @@ var IglooSelect = function IglooSelect(_ref) {
   }, [valueProp]);
   (0, _react.useEffect)(function () {
     setDisplay(options);
+    setOrigin(options);
   }, [options]);
+  (0, _react.useEffect)(function () {
+    var setFieldValue = rest.setFieldValue;
+
+    if (clearWhenOptionsUpdated && compareOptions(options, originOptions)) {
+      typeof setFieldValue === 'function' && setFieldValue();
+    }
+  }, [options, originOptions]);
   (0, _react.useEffect)(function () {
     var setFieldValue = rest.setFieldValue;
     var foundValue = options.find(function (option) {
       return Array.isArray(valueProp) ? valueProp.includes(option.value) : option.value === valueProp;
     });
 
-    if (!foundValue) {
+    if (!foundValue && valueProp !== undefined) {
       typeof setFieldValue === 'function' && setFieldValue();
     }
   }, [valueProp, options]);
 
-  var _useState7 = (0, _react.useState)(false),
-      _useState8 = _slicedToArray(_useState7, 2),
-      dropVisible = _useState8[0],
-      setDropVisible = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      dropVisible = _useState10[0],
+      setDropVisible = _useState10[1];
 
   var handleDropDownVisibleChange = function handleDropDownVisibleChange(open) {
     typeof onDropdownVisibleChange === 'function' && onDropdownVisibleChange(open);
@@ -334,14 +368,12 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       datasourceKey = _ref11.datasourceKey,
       dependField = _ref11.dependField,
       children = _ref11.children,
-      _ref11$clearWhenOptio = _ref11.clearWhenOptionsUpdated,
-      clearWhenOptionsUpdated = _ref11$clearWhenOptio === void 0 ? false : _ref11$clearWhenOptio,
       rest = _objectWithoutProperties(_ref11, _excluded2);
 
-  var _useState9 = (0, _react.useState)(options || []),
-      _useState10 = _slicedToArray(_useState9, 2),
-      _options = _useState10[0],
-      setOptions = _useState10[1];
+  var _useState11 = (0, _react.useState)(),
+      _useState12 = _slicedToArray(_useState11, 2),
+      _options = _useState12[0],
+      setOptions = _useState12[1];
 
   var _useContext2 = (0, _react.useContext)(_formContext.default),
       selectDatasourceApi = _useContext2.selectDatasourceApi;
@@ -459,36 +491,15 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       };
     }();
 
-    var compareOptions = function compareOptions(newOptions) {
-      var updateOptions = _options.length !== newOptions.length;
-
-      if (!updateOptions) {
-        for (var i = 0; i < _options.length; i++) {
-          var newOption = _options[i];
-          var originOption = newOptions[i];
-
-          if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
-            updateOptions = true;
-            break;
-          }
-        }
-      }
-
-      if (updateOptions) {
+    calcOptions().then(function (newOptions) {
+      if (compareOptions(newOptions, _options || [])) {
         setOptions(newOptions);
-        var setFieldValue = rest.setFieldValue;
-
-        if (clearWhenOptionsUpdated) {
-          typeof setFieldValue === 'function' && setFieldValue();
-        }
       }
-    };
-
-    calcOptions().then(compareOptions);
-  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions]);
-  return (0, _jsxRuntime.jsx)(IglooSelect, _objectSpread({
+    });
+  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions, _options]);
+  return _options ? (0, _jsxRuntime.jsx)(IglooSelect, _objectSpread({
     options: _options
-  }, rest));
+  }, rest)) : null;
 };
 
 AttachedSelect.formItemPropsHandler = function (config) {

package/lib/upload-photo/index.js

@@ -145,6 +145,7 @@ var UploadPhoto = function UploadPhoto(props) {
 
   var limitNumError = (0, _react.useRef)();
   var DomRef = (0, _react.useRef)();
+  var dataUrlRef = (0, _react.useRef)([]);
 
   var _useContext = (0, _react.useContext)(_formContext.default),
       uploadApi = _useContext.uploadApi;
@@ -277,12 +278,11 @@ var UploadPhoto = function UploadPhoto(props) {
   var uploadIndex = (0, _react.useRef)((value === null || value === void 0 ? void 0 : value.length) ? value.length : 0);
   (0, _react.useEffect)(function () {
     return function () {
-      files.forEach(function (_ref4) {
-        var dataUrl = _ref4.dataUrl;
+      dataUrlRef.current.forEach(function (dataUrl) {
         URL.revokeObjectURL(dataUrl);
       });
     };
-  }, [files]);
+  }, []);
   (0, _react.useEffect)(function () {
     var removeLimitMsg = function removeLimitMsg(e) {
       if (DomRef.current && !DomRef.current.contains(e.target) && limitNumError.current) {
@@ -348,7 +348,7 @@ var UploadPhoto = function UploadPhoto(props) {
   };
 
   var uploadFile = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(file, currentIndex) {
       var uid, dataUrl, name, size, mimeType, type, errorMsg, _errorMsg;
 
       return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -357,11 +357,12 @@ var UploadPhoto = function UploadPhoto(props) {
             case 0:
               uid = ++uploadIndex.current;
               dataUrl = URL.createObjectURL(file);
+              dataUrlRef.current.push(dataUrl);
               name = file.name, size = file.size, mimeType = file.type;
               type = (0, _tools.classifyType)(mimeType);
 
               if (!(type === 'unknown')) {
-                _context4.next = 9;
+                _context4.next = 10;
                 break;
               }
 
@@ -372,9 +373,9 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(errorMsg);
               return _context4.abrupt("return", Promise.reject(errorMsg));
 
-            case 9:
+            case 10:
               if (!(limit && currentIndex > limit)) {
-                _context4.next = 14;
+                _context4.next = 15;
                 break;
               }
 
@@ -388,7 +389,7 @@ var UploadPhoto = function UploadPhoto(props) {
               setFieldError && setFieldError(_errorMsg);
               return _context4.abrupt("return", Promise.reject(_errorMsg));
 
-            case 14:
+            case 15:
               limitNumError.current = undefined;
               setFiles(function (files) {
                 return [].concat(_toConsumableArray(files), [{
@@ -462,7 +463,7 @@ var UploadPhoto = function UploadPhoto(props) {
                 typeof onChange === 'function' && onChange(fileListWithError);
               }));
 
-            case 17:
+            case 18:
             case "end":
               return _context4.stop();
           }
@@ -471,12 +472,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function uploadFile(_x5, _x6) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
   var handleUploadPromise = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(file, onSuccess, onFailed) {
       var rst, errorMsg;
       return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
@@ -507,12 +508,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleUploadPromise(_x7, _x8, _x9) {
-      return _ref6.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
   var handleDelete = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(index) {
       var arr, hasError, rst;
       return regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
@@ -560,8 +561,8 @@ var UploadPhoto = function UploadPhoto(props) {
               return _context6.abrupt("return", typeof onChange === 'function' && onChange(rst));
 
             case 10:
-              typeof onChange === 'function' && onChange(arr.map(function (_ref8) {
-                var url = _ref8.url;
+              typeof onChange === 'function' && onChange(arr.map(function (_ref7) {
+                var url = _ref7.url;
                 return url;
               }));
 
@@ -574,12 +575,12 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleDelete(_x10) {
-      return _ref7.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(index) {
       var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
 
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
@@ -690,7 +691,7 @@ var UploadPhoto = function UploadPhoto(props) {
     }));
 
     return function handleReUpload(_x11) {
-      return _ref9.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -703,7 +704,7 @@ var UploadPhoto = function UploadPhoto(props) {
     _modal.default.noFooter({
       content: (0, _jsxRuntime.jsx)(_media.default, {
         src: dataUrl,
-        type: type
+        type: (0, _tools.classifyType)(type)
       }),
       title: name,
       className: 'igloo-upload-photo-preview-modal',
@@ -784,12 +785,12 @@ var UploadPhoto = function UploadPhoto(props) {
       children: (0, _jsxRuntime.jsxs)(_row.default, {
         gutter: [isMobile ? 16 : 32, 16],
         wrap: true,
-        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref10, index) {
+        children: [Boolean(samples === null || samples === void 0 ? void 0 : samples.length) && samples.map(function (_ref9, index) {
           var _classnames, _classnames2;
 
-          var src = _ref10.src,
-              label = _ref10.label,
-              type = _ref10.type;
+          var src = _ref9.src,
+              label = _ref9.label,
+              type = _ref9.type;
           return (0, _jsxRuntime.jsxs)(_col.default, {
             span: sampleSpan,
             children: [(0, _jsxRuntime.jsx)("img", {
@@ -849,13 +850,13 @@ var UploadPhoto = function UploadPhoto(props) {
             children: buttonText || 'Upload'
           })
         })]
-      }), files.map(function (_ref11, index) {
+      }), files.map(function (_ref10, index) {
         var _classnames5;
 
-        var dataUrl = _ref11.dataUrl,
-            status = _ref11.status,
-            type = _ref11.type,
-            uid = _ref11.uid;
+        var dataUrl = _ref10.dataUrl,
+            status = _ref10.status,
+            type = _ref10.type,
+            uid = _ref10.uid;
         return (0, _jsxRuntime.jsx)(_badge.default, {
           count: getBadge(status, index, limit),
           children: (0, _jsxRuntime.jsxs)("div", {
@@ -923,10 +924,10 @@ function checkFileList(value) {
   return Promise.resolve();
 }
 
-UploadPhoto.formItemPropsHandler = function (_ref12) {
-  var limit = _ref12.limit,
-      previewFormater = _ref12.previewFormater,
-      label = _ref12.label;
+UploadPhoto.formItemPropsHandler = function (_ref11) {
+  var limit = _ref11.limit,
+      previewFormater = _ref11.previewFormater,
+      label = _ref11.label;
   return {
     previewFormater: previewFormater || function (value) {
       return (0, _jsxRuntime.jsx)(_uploadPreview.default, {

package/lib/upload-photo/media.js

@@ -7,9 +7,7 @@ exports.default = void 0;
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-var _reactPdf = _interopRequireDefault(require("@mikecousins/react-pdf"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _entry = require("react-pdf/dist/esm/entry.webpack");
 
 var MediaItem = function MediaItem(_ref) {
   var type = _ref.type,
@@ -31,13 +29,12 @@ var MediaItem = function MediaItem(_ref) {
     case 'pdf':
       return (0, _jsxRuntime.jsx)("div", {
         className: className,
-        children: (0, _jsxRuntime.jsx)(_reactPdf.default, {
+        children: (0, _jsxRuntime.jsx)(_entry.Document, {
           file: src,
-          scale: 0.1,
-          style: {
-            maxWidth: 96,
-            maxHeight: 96
-          }
+          children: (0, _jsxRuntime.jsx)(_entry.Page, {
+            pageNumber: 1,
+            height: 96
+          })
         })
       });
 

package/lib/upload-preview/media.js

@@ -15,7 +15,7 @@ var _react = require("react");
 
 var _typography = _interopRequireDefault(require("../typography"));
 
-var _reactPdf = _interopRequireDefault(require("@mikecousins/react-pdf"));
+var _entry = require("react-pdf/dist/esm/entry.webpack");
 
 var _iglooicon = require("iglooicon");
 
@@ -59,20 +59,20 @@ var PDF = function PDF(_ref) {
     }
   };
 
-  var pages = [];
-
-  for (var i = 1; i <= pageSize; i++) {
-    pages.push((0, _jsxRuntime.jsx)(_reactPdf.default, {
-      file: src,
-      page: i,
-      onDocumentLoadSuccess: handlePageInit,
-      scale: md ? 1 : 0.5
-    }, i));
-  }
-
   return (0, _jsxRuntime.jsx)("div", {
     className: "igloo-upload-preview-pdf",
-    children: pages
+    children: (0, _jsxRuntime.jsx)(_entry.Document, {
+      file: src,
+      onLoadSuccess: handlePageInit,
+      children: Array.from({
+        length: pageSize
+      }).map(function (_, index) {
+        return (0, _jsxRuntime.jsx)(_entry.Page, {
+          pageNumber: index + 1,
+          scale: md ? 1 : 0.5
+        }, index);
+      })
+    })
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.4.35",
+  "version": "2.5.2",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",
@@ -34,7 +34,6 @@
     ]
   },
   "dependencies": {
-    "@mikecousins/react-pdf": "^5.5.1",
     "@umijs/hooks": "^1.9.3",
     "aws-sdk": "^2.966.0",
     "classnames": "^2.2.6",
@@ -44,7 +43,8 @@
     "lodash.debounce": "^4.0.8",
     "omit.js": "^2.0.2",
     "react": "^16.12.0",
-    "react-json-view": "^1.19.1"
+    "react-json-view": "^1.19.1",
+    "react-pdf": "^5.7.2"
   },
   "devDependencies": {
     "@formatjs/cli": "^4.2.8",
@@ -52,6 +52,7 @@
     "@types/classnames": "^2.2.11",
     "@types/invariant": "^2.2.34",
     "@types/lodash.debounce": "^4.0.6",
+    "@types/react-pdf": "^5.0.9",
     "@types/vfile-message": "^2.0.0",
     "@umijs/plugin-antd": "^0.8.0",
     "@umijs/plugin-esbuild": "^1.3.1",