@snack-uikit/toaster 0.5.5 → 0.6.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 0.6.0 (2024-01-24)
+
+
+### Features
+
+* **FF-4182:** add onClose callback prop ([6046778](https://github.com/cloud-ru-tech/snack-uikit/commit/60467789d5e6bc940e3f7cf902df7da69b0a0e0b))
+
+
+
+
+
 ## 0.5.5 (2024-01-23)
 
 ### Only dependencies have been changed

package/README.md

@@ -11,10 +11,10 @@
 import { toaster } from '@snack-uikit/toaster';
 
 // create userAction toast
-const userActionId = await toaster.userAction.success({ label });
+const userActionId = await toaster.userAction.success({ label, id });
 
 // create systemEvent toast
-const systemEventId = await toaster.systemEvent.success({ title, description });
+const systemEventId = await toaster.systemEvent.success({ title, description, id });
 
 // update userAction toast
 toaster.userAction.update.error(userActionId, { label: 'new text' });
@@ -47,6 +47,7 @@ type ToastUserActionProps = Partial<RtToastContentProps> &
     label: string;
     link?: ToastUserActionLink;
     className?: string;
+    onClose(id?: string | number): void;
   }>;
 
 type ToastSystemEventLink = {
@@ -64,6 +65,7 @@ type ToastSystemEventProps = Partial<RtToastContentProps> &
     closable?: boolean;
     className?: string;
     onCloseClick?(e: MouseEvent<HTMLButtonElement>, close?: () => void): void;
+    onClose(id?: string | number): void;
   }>;
 ```
 

package/dist/components/ToastSystemEvent/ToastSystemEvent.d.ts

@@ -2,6 +2,7 @@ import { MouseEvent } from 'react';
 import { ToastContentProps as RtToastContentProps } from 'react-toastify';
 import { WithSupportProps } from '@snack-uikit/utils';
 import { ButtonActionProps } from '../../helperComponents/ButtonAction';
+import { ToasterId } from '../../types';
 import { ToastSystemEventAppearance } from './types';
 export type ToastSystemEventLink = {
     text: string;
@@ -17,6 +18,7 @@ export type ToastSystemEventProps = Partial<RtToastContentProps> & WithSupportPr
     closable?: boolean;
     className?: string;
     onCloseClick?(e: MouseEvent<HTMLButtonElement>, close?: () => void): void;
+    onClose?(id?: ToasterId): void;
     action?: ButtonActionProps[];
     loading?: never;
 }>;

package/dist/components/ToastUserAction/ToastUserAction.d.ts

@@ -1,6 +1,7 @@
 import { MouseEvent } from 'react';
 import { ToastContentProps as RtToastContentProps } from 'react-toastify';
 import { WithSupportProps } from '@snack-uikit/utils';
+import { ToasterId } from '../../types';
 import { ToastUserActionAppearance } from './types';
 export type ToastUserActionLink = {
     text: string;
@@ -13,5 +14,6 @@ export type ToastUserActionProps = Partial<RtToastContentProps> & WithSupportPro
     link?: ToastUserActionLink;
     className?: string;
     loading?: boolean;
+    onClose?(id?: ToasterId): void;
 }>;
 export declare function ToastUserAction({ appearance, label, link, className, loading, ...rest }: ToastUserActionProps): import("react/jsx-runtime").JSX.Element;

package/dist/helpers.js

@@ -23,6 +23,10 @@ function getToasterContainer({ type, toasterParent, containerProps, }) {
 function getToastOptions({ type, toastOptions, containerId, toasterProps, }) {
     return {
         toastId: toastOptions === null || toastOptions === void 0 ? void 0 : toastOptions.id,
+        onClose: ((data) => {
+            var _a;
+            (_a = toasterProps === null || toasterProps === void 0 ? void 0 : toasterProps.onClose) === null || _a === void 0 ? void 0 : _a.call(toasterProps, data === null || data === void 0 ? void 0 : data.id);
+        }),
         autoClose: (toasterProps === null || toasterProps === void 0 ? void 0 : toasterProps.loading) ? false : AUTO_CLOSE_TIME[type],
         containerId: containerId || `${TOASTER_CONTAINER_PREFIX}${type}`,
     };

package/dist/types.d.ts

@@ -5,7 +5,7 @@ export type PromisedId = Promise<ToasterId>;
 export type ToastOptions = {
     id?: ToasterId;
     autoClose?: RtToastOptions['autoClose'];
-    onClose?: RtToastOptions['onClose'];
+    onClose?(id?: ToasterId): void;
 };
 export declare enum ToasterType {
     SystemEvent = "system-event",

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Toaster",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -40,5 +40,5 @@
     "classnames": "2.3.2",
     "react-toastify": "9.1.3"
   },
-  "gitHead": "c292f4c45173928f57cc5c9f3cb02efb26887b64"
+  "gitHead": "ef4e92aab9e2c187fe746a1520d884589994a80b"
 }

package/src/components/ToastSystemEvent/ToastSystemEvent.tsx

@@ -10,7 +10,7 @@ import { extractSupportProps, WithSupportProps } from '@snack-uikit/utils';
 import { AUTO_CLOSE_TIME } from '../../constants';
 import { ButtonAction, ButtonActionProps } from '../../helperComponents/ButtonAction';
 import { TOAST_SYSTEM_EVENT_TEST_IDS } from '../../testIds';
-import { ToasterType } from '../../types';
+import { ToasterId, ToasterType } from '../../types';
 import { APPEARANCE_TO_ON_COLOR_MAP } from './constants';
 import styles from './styles.module.scss';
 import { ToastSystemEventAppearance } from './types';
@@ -32,6 +32,7 @@ export type ToastSystemEventProps = Partial<RtToastContentProps> &
     closable?: boolean;
     className?: string;
     onCloseClick?(e: MouseEvent<HTMLButtonElement>, close?: () => void): void;
+    onClose?(id?: ToasterId): void;
     action?: ButtonActionProps[];
     loading?: never;
   }>;

package/src/components/ToastUserAction/ToastUserAction.tsx

@@ -7,6 +7,7 @@ import { Sun } from '@snack-uikit/loaders';
 import { extractSupportProps, WithSupportProps } from '@snack-uikit/utils';
 
 import { TOAST_USER_ACTION_TEST_IDS } from '../../testIds';
+import { ToasterId } from '../../types';
 import styles from './styles.module.scss';
 import { ToastUserActionAppearance } from './types';
 import { getIcon } from './utils';
@@ -24,6 +25,7 @@ export type ToastUserActionProps = Partial<RtToastContentProps> &
     link?: ToastUserActionLink;
     className?: string;
     loading?: boolean;
+    onClose?(id?: ToasterId): void;
   }>;
 
 export function ToastUserAction({

package/src/helpers.tsx

@@ -18,6 +18,7 @@ import {
 } from './constants';
 import {
   OpenToast,
+  SystemEventOptions,
   Toaster,
   ToasterId,
   ToasterPropsMap,
@@ -73,6 +74,9 @@ function getToastOptions<T extends keyof ToasterPropsMap>({
 }): RtToastOptions {
   return {
     toastId: toastOptions?.id,
+    onClose: ((data: { id: ToasterId }) => {
+      toasterProps?.onClose?.(data?.id);
+    }) as RtToastOptions['onClose'],
     autoClose: toasterProps?.loading ? false : AUTO_CLOSE_TIME[type],
     containerId: containerId || `${TOASTER_CONTAINER_PREFIX}${type}`,
   };
@@ -211,35 +215,35 @@ const userAction = {
 };
 
 const systemEvent = {
-  success(options: ToastSystemEventProps) {
+  success(options: SystemEventOptions) {
     return openToast({
       type: ToasterType.SystemEvent,
       toasterProps: { ...options, appearance: 'success' },
     });
   },
 
-  neutral(options: ToastSystemEventProps) {
+  neutral(options: SystemEventOptions) {
     return openToast({
       type: ToasterType.SystemEvent,
       toasterProps: { ...options, appearance: 'neutral' },
     });
   },
 
-  warning(options: ToastSystemEventProps) {
+  warning(options: SystemEventOptions) {
     return openToast({
       type: ToasterType.SystemEvent,
       toasterProps: { ...options, appearance: 'warning' },
     });
   },
 
-  error(options: ToastSystemEventProps) {
+  error(options: SystemEventOptions) {
     return openToast({
       type: ToasterType.SystemEvent,
       toasterProps: { ...options, appearance: 'error' },
     });
   },
 
-  errorCritical(options: ToastSystemEventProps) {
+  errorCritical(options: SystemEventOptions) {
     return openToast({
       type: ToasterType.SystemEvent,
       toasterProps: { ...options, appearance: 'errorCritical' },
@@ -247,35 +251,35 @@ const systemEvent = {
   },
 
   update: {
-    success(id: ToasterId, options: ToastSystemEventProps) {
+    success(id: ToasterId, options: SystemEventOptions) {
       return updateToast(id, {
         type: ToasterType.SystemEvent,
         toasterProps: { ...options, appearance: 'success' },
       });
     },
 
-    neutral(id: ToasterId, options: ToastSystemEventProps) {
+    neutral(id: ToasterId, options: SystemEventOptions) {
       return updateToast(id, {
         type: ToasterType.SystemEvent,
         toasterProps: { ...options, appearance: 'neutral' },
       });
     },
 
-    warning(id: ToasterId, options: ToastSystemEventProps) {
+    warning(id: ToasterId, options: SystemEventOptions) {
       return updateToast(id, {
         type: ToasterType.SystemEvent,
         toasterProps: { ...options, appearance: 'warning' },
       });
     },
 
-    error(id: ToasterId, options: ToastSystemEventProps) {
+    error(id: ToasterId, options: SystemEventOptions) {
       return updateToast(id, {
         type: ToasterType.SystemEvent,
         toasterProps: { ...options, appearance: 'error' },
       });
     },
 
-    errorCritical(id: ToasterId, options: ToastSystemEventProps) {
+    errorCritical(id: ToasterId, options: SystemEventOptions) {
       return updateToast(id, {
         type: ToasterType.SystemEvent,
         toasterProps: { ...options, appearance: 'errorCritical' },

package/src/types.ts

@@ -8,7 +8,7 @@ export type PromisedId = Promise<ToasterId>;
 export type ToastOptions = {
   id?: ToasterId;
   autoClose?: RtToastOptions['autoClose'];
-  onClose?: RtToastOptions['onClose'];
+  onClose?(id?: ToasterId): void;
 };
 
 export enum ToasterType {