rsuite 6.1.3 → 6.2.0

package/cjs/Uploader/Uploader.js

@@ -132,6 +132,7 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
     onError,
     onProgress,
     onReupload,
+    onCompletion,
     ...rest
   } = propsWithDefaults;
   const {
@@ -143,6 +144,11 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
   const rootRef = (0, _react.useRef)(null);
   const xhrs = (0, _react.useRef)({});
   const trigger = (0, _react.useRef)(null);
+  const uploadingCount = (0, _react.useRef)(0);
+  const uploadResults = (0, _react.useRef)({
+    completed: [],
+    failed: []
+  });
   const [fileList, dispatch] = useFileList(fileListProp || defaultFileList);
   (0, _react.useEffect)(() => {
     if (typeof fileListProp !== 'undefined') {
@@ -182,7 +188,16 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
     };
     updateFileStatus(nextFile);
     onSuccess?.(response, nextFile, event, xhr);
-  }, [onSuccess, updateFileStatus]);
+    uploadingCount.current--;
+    uploadResults.current.completed.push(nextFile);
+    if (uploadingCount.current === 0) {
+      onCompletion?.(uploadResults.current.completed, uploadResults.current.failed);
+      uploadResults.current = {
+        completed: [],
+        failed: []
+      };
+    }
+  }, [onCompletion, onSuccess, updateFileStatus]);
 
   /**
    * Callback for file upload error.
@@ -198,7 +213,16 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
     };
     updateFileStatus(nextFile);
     onError?.(status, nextFile, event, xhr);
-  }, [onError, updateFileStatus]);
+    uploadingCount.current--;
+    uploadResults.current.failed.push(nextFile);
+    if (uploadingCount.current === 0) {
+      onCompletion?.(uploadResults.current.completed, uploadResults.current.failed);
+      uploadResults.current = {
+        completed: [],
+        failed: []
+      };
+    }
+  }, [onCompletion, onError, updateFileStatus]);
 
   /**
    * Callback for file upload progress update.
@@ -252,9 +276,19 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
     fileList.current.forEach(file => {
       const checkState = shouldUpload?.(file);
       if (checkState instanceof Promise) {
+        uploadingCount.current++;
         checkState.then(res => {
           if (res) {
             handleUploadFile(file);
+          } else {
+            uploadingCount.current--;
+            if (uploadingCount.current === 0) {
+              onCompletion?.(uploadResults.current.completed, uploadResults.current.failed);
+              uploadResults.current = {
+                completed: [],
+                failed: []
+              };
+            }
           }
         });
         return;
@@ -262,6 +296,7 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
         return;
       }
       if (file.status === 'inited') {
+        uploadingCount.current++;
         handleUploadFile(file);
       }
     });
@@ -308,6 +343,15 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
     const nextFileList = fileList.current.filter(f => f.fileKey !== fileKey);
     if (xhrs.current?.[file.fileKey]?.readyState !== 4) {
       xhrs.current[file.fileKey]?.abort();
+      uploadingCount.current--;
+      uploadResults.current.failed.push(file);
+      if (uploadingCount.current === 0) {
+        onCompletion?.(uploadResults.current.completed, uploadResults.current.failed);
+        uploadResults.current = {
+          completed: [],
+          failed: []
+        };
+      }
     }
     dispatch({
       type: 'remove',
@@ -318,6 +362,7 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
     cleanInputValue();
   });
   const handleReupload = (0, _hooks.useEventCallback)(file => {
+    uploadingCount.current++;
     autoUpload && handleUploadFile(file);
     onReupload?.(file);
   });
@@ -325,6 +370,7 @@ const Uploader = (0, _utils.forwardRef)((props, ref) => {
   // public API
   const start = (0, _react.useCallback)(file => {
     if (file) {
+      uploadingCount.current++;
       handleUploadFile(file);
       return;
     }

package/cjs/internals/Picker/PickerIndicator.js

@@ -36,21 +36,23 @@ const PickerIndicator = ({
         size: size === 'xs' ? 'xs' : 'sm'
       });
     }
-    if (showCleanButton && !disabled) {
-      return /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
-        className: prefix('clean'),
-        tabIndex: -1,
-        locale: {
-          closeLabel: clear
-        },
-        onClick: onClose
-      });
-    }
-    return caretAs && /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    const caret = caretAs && /*#__PURE__*/_react.default.createElement(_Icon.default, {
       as: caretAs,
       className: prefix('caret-icon'),
       "data-testid": "caret"
     });
+    const cleanButton = showCleanButton && !disabled && /*#__PURE__*/_react.default.createElement(_CloseButton.default, {
+      className: prefix('clean'),
+      tabIndex: -1,
+      locale: {
+        closeLabel: clear
+      },
+      onClick: onClose
+    });
+    if (caret && cleanButton) {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, caret, cleanButton);
+    }
+    return cleanButton || caret || null;
   };
   const props = Component === _InputGroup.default.Addon ? {
     disabled

package/cjs/toaster/toaster.js

@@ -5,9 +5,17 @@ exports.__esModule = true;
 exports.default = void 0;
 var _ToastContainer = _interopRequireWildcard(require("./ToastContainer"));
 var _symbols = require("../internals/symbols");
+var _utils = require("../internals/utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const containers = new Map();
 
+/**
+ * Track in-progress container creation promises keyed by `${containerId}_${placement}`.
+ * This prevents duplicate containers from being created when `push` is called multiple
+ * times synchronously (e.g. inside a loop) before the first container has mounted.
+ */
+const pendingContainerPromises = new Map();
+
 /**
  * Create a container instance.
  * @param placement
@@ -15,7 +23,9 @@ const containers = new Map();
  */
 async function createContainer(placement, props) {
   const [container, containerId] = await _ToastContainer.default.getInstance(props);
-  containers.set(`${containerId}_${placement}`, container);
+  const key = `${containerId}_${placement}`;
+  containers.set(key, container);
+  pendingContainerPromises.delete(key);
   return container;
 }
 
@@ -35,12 +45,37 @@ toaster.push = (message, options = {}) => {
     ...restOptions
   } = options;
   const containerElement = typeof container === 'function' ? container() : container;
-  const containerElementId = containerElement ? containerElement[_symbols.RSUITE_TOASTER_ID] : null;
-  if (containerElementId) {
+  if (containerElement) {
+    // Pre-assign the container ID so subsequent synchronous calls can find it
+    // before the async container creation has completed.
+    if (!containerElement[_symbols.RSUITE_TOASTER_ID]) {
+      containerElement[_symbols.RSUITE_TOASTER_ID] = (0, _utils.guid)();
+    }
+    const containerElementId = containerElement[_symbols.RSUITE_TOASTER_ID];
+    const key = `${containerElementId}_${placement}`;
     const existedContainer = getContainer(containerElementId, placement);
     if (existedContainer) {
       return existedContainer.current?.push(message, restOptions);
     }
+
+    // A container creation for this placement may already be in progress (e.g. when `push`
+    // is called multiple times synchronously in a loop). Reuse that promise instead of
+    // creating a second container.
+    const pendingPromise = pendingContainerPromises.get(key);
+    if (pendingPromise) {
+      return pendingPromise.then(ref => ref.current?.push(message, restOptions));
+    }
+    const newOptions = {
+      ...options,
+      container: containerElement,
+      placement
+    };
+    const containerPromise = createContainer(placement, newOptions);
+
+    // Register the pending promise before any async work begins so that subsequent
+    // synchronous `push` calls for the same placement chain onto it.
+    pendingContainerPromises.set(key, containerPromise);
+    return containerPromise.then(ref => ref.current?.push(message, restOptions));
   }
   const newOptions = {
     ...options,

package/dist/rsuite-no-reset.css

@@ -14642,6 +14642,17 @@ blockquote.rs-text{
   height:auto;
   min-height:var(--rs-time-line-tail-min-height);
 }
+.rs-timeline-reverse.rs-timeline-endless .rs-timeline-item:first-child .rs-timeline-item-tail{
+  top:0;
+  bottom:0;
+  height:auto;
+}
+
+.rs-timeline-reverse.rs-timeline-endless .rs-timeline-item:last-child .rs-timeline-item-tail{
+  height:calc(var(--rs-time-line-dot-center-gap) + var(--rs-time-line-dot-side-length));
+  min-height:0;
+}
+
 .rs-timeline-item:only-child .rs-timeline-item-tail{
   display:none;
 }
@@ -15351,6 +15362,7 @@ blockquote.rs-text{
   text-overflow:ellipsis;
   white-space:nowrap;
   flex:1 1 auto;
+  min-width:0;
 }
 .rs-uploader[data-list-type=text] .rs-uploader-file-item-size{
   flex:0 0 auto;
@@ -15397,6 +15409,7 @@ blockquote.rs-text{
 .rs-uploader[data-list-type=picture]{
   display:inline-flex;
   flex-direction:row;
+  flex-wrap:wrap;
   gap:var(--rs-uploader-item-spacing);
 }
 .rs-uploader[data-list-type=picture] .rs-uploader-trigger-btn{
@@ -15431,6 +15444,7 @@ blockquote.rs-text{
 }
 .rs-uploader[data-list-type=picture] .rs-uploader-file-items{
   display:inline-flex;
+  flex-wrap:wrap;
   gap:var(--rs-uploader-item-spacing);
 }
 .rs-uploader[data-list-type=picture] .rs-uploader-file-item{