@doist/reactist 28.1.2 → 28.2.1

package/dist/reactist.cjs.development.js

@@ -1453,25 +1453,24 @@ const InternalToast = /*#__PURE__*/React__default["default"].forwardRef(function
   onDismiss,
   onRemoveToast
 }, ref) {
-  const [timeoutRunning, setTimeoutRunning] = React__default["default"].useState(Boolean(autoDismissDelay));
   const timeoutRef = React__default["default"].useRef();
+  const removeToast = React__default["default"].useCallback(function removeToast() {
+    onRemoveToast(toastId);
+    onDismiss == null ? void 0 : onDismiss();
+  }, [onDismiss, onRemoveToast, toastId]);
   const startTimeout = React__default["default"].useCallback(function startTimeout() {
-    setTimeoutRunning(true);
-  }, []);
+    if (!autoDismissDelay) return;
+    timeoutRef.current = window.setTimeout(removeToast, autoDismissDelay * 1000);
+  }, [autoDismissDelay, removeToast]);
   const stopTimeout = React__default["default"].useCallback(function stopTimeout() {
-    setTimeoutRunning(false);
     clearTimeout(timeoutRef.current);
     timeoutRef.current = undefined;
   }, []);
-  const removeToast = React__default["default"].useCallback(function removeToast() {
-    onRemoveToast(toastId);
-    onDismiss == null ? void 0 : onDismiss();
-  }, [onDismiss, onRemoveToast, toastId]);
   React__default["default"].useEffect(function setupAutoDismiss() {
-    if (!timeoutRunning || !autoDismissDelay) return;
-    timeoutRef.current = window.setTimeout(removeToast, autoDismissDelay * 1000);
+    stopTimeout();
+    startTimeout();
     return stopTimeout;
-  }, [autoDismissDelay, removeToast, stopTimeout, timeoutRunning]);
+  }, [startTimeout, stopTimeout]);
   /**
    * If the action is toast action object and not a custom element,
    * the `onClick` property is wrapped in another handler responsible
@@ -1479,18 +1478,26 @@ const InternalToast = /*#__PURE__*/React__default["default"].forwardRef(function
    */
 
   const actionWithCustomActionHandler = React__default["default"].useMemo(() => {
+    var _action$closeToast;
+
     if (!isActionObject(action)) {
       return action;
     }
 
     return _objectSpread2(_objectSpread2({}, action), {}, {
+      closeToast: (_action$closeToast = action.closeToast) != null ? _action$closeToast : true,
       onClick: function handleActionClick() {
+        var _action$closeToast2;
+
         if (!action) {
           return;
         }
 
         action.onClick();
-        removeToast();
+
+        if ((_action$closeToast2 = action.closeToast) != null ? _action$closeToast2 : true) {
+          removeToast();
+        }
       }
     });
   }, [action, removeToast]);