@doist/reactist 20.2.0 → 20.3.0

package/dist/reactist.cjs.development.js

@@ -1262,24 +1262,44 @@ const InternalToast = /*#__PURE__*/React__default.forwardRef(function InternalTo
     clearTimeout(timeoutRef.current);
     timeoutRef.current = undefined;
   }, []);
+  const removeToast = React__default.useCallback(function removeToast() {
+    onRemoveToast(toastId);
+    onDismiss == null ? void 0 : onDismiss();
+  }, [onDismiss, onRemoveToast, toastId]);
   React__default.useEffect(function setupAutoDismiss() {
     if (!timeoutRunning || !autoDismissDelay) return;
-    timeoutRef.current = window.setTimeout(() => {
-      onRemoveToast(toastId);
-      onDismiss == null ? void 0 : onDismiss();
-    }, autoDismissDelay * 1000);
+    timeoutRef.current = window.setTimeout(removeToast, autoDismissDelay * 1000);
     return stopTimeout;
-  }, [autoDismissDelay, onDismiss, onRemoveToast, toastId, stopTimeout, timeoutRunning]);
+  }, [autoDismissDelay, removeToast, stopTimeout, timeoutRunning]);
+  /**
+   * If the action is toast action object and not a custom element,
+   * the `onClick` property is wrapped in another handler responsible
+   * for removing the toast when the action is triggered.
+   */
+
+  const actionWithCustomActionHandler = React__default.useMemo(() => {
+    if (!isActionObject(action)) {
+      return action;
+    }
+
+    return _objectSpread2(_objectSpread2({}, action), {}, {
+      onClick: function handleActionClick() {
+        if (!action) {
+          return;
+        }
+
+        action.onClick();
+        removeToast();
+      }
+    });
+  }, [action, removeToast]);
   return /*#__PURE__*/React__default.createElement(StaticToast, {
     ref: ref,
     message: message,
     description: description,
     icon: icon,
-    action: action,
-    onDismiss: showDismissButton ? () => {
-      onDismiss == null ? void 0 : onDismiss();
-      onRemoveToast(toastId);
-    } : undefined,
+    action: actionWithCustomActionHandler,
+    onDismiss: showDismissButton ? removeToast : undefined,
     dismissLabel: dismissLabel,
     // @ts-expect-error
     onMouseEnter: stopTimeout,