@snack-uikit/toaster 0.6.13-preview-c70fa919.0 → 0.6.13

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 0.6.13 (2024-04-27)
+
+
+### Bug Fixes
+
+* **FF-4851:** add missing toastOptions ([e1b6b2b](https://github.com/cloud-ru-tech/snack-uikit/commit/e1b6b2bd8c49da4fc36c80f4b65a65dd0c4258de))
+* **FF-4851:** add missing toastOptions, fix typings ([cd70ebb](https://github.com/cloud-ru-tech/snack-uikit/commit/cd70ebb4d3fd2d8ec46fa3917ee079e7a5190273))
+
+
+
+
+
 ## 0.6.12 (2024-04-25)
 
 

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

@@ -2,7 +2,6 @@ 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;
@@ -18,7 +17,6 @@ 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,7 +1,6 @@
 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;
@@ -14,6 +13,5 @@ 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

@@ -24,7 +24,7 @@ function getToastOptions({ type, toastOptions, containerId, toasterProps, }) {
         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);
+            (_a = toastOptions === null || toastOptions === void 0 ? void 0 : toastOptions.onClose) === null || _a === void 0 ? void 0 : _a.call(toastOptions, 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}`,
@@ -81,6 +81,7 @@ const userAction = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'success' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -90,6 +91,7 @@ const userAction = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'neutral' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -99,6 +101,7 @@ const userAction = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'error' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -108,6 +111,7 @@ const userAction = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'warning' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -148,6 +152,7 @@ const systemEvent = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'success' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -157,6 +162,7 @@ const systemEvent = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'neutral' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -166,6 +172,7 @@ const systemEvent = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'warning' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -175,6 +182,7 @@ const systemEvent = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'error' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },
@@ -184,6 +192,7 @@ const systemEvent = {
             toasterProps: Object.assign(Object.assign({}, options), { appearance: 'errorCritical' }),
             toastOptions: {
                 id: options.id,
+                onClose: options.onClose,
             },
         });
     },

package/dist/types.d.ts

@@ -31,8 +31,8 @@ export type UpdateToast = <T extends keyof ToasterPropsMap>(id: string | number,
     toastOptions?: ToastOptions;
     containerId?: ToasterContainerProps['containerId'];
 }) => void;
-export type UserActionOptions = Omit<ToastUserActionProps, 'appearance'> & Pick<ToastOptions, 'id'>;
-export type SystemEventOptions = Omit<ToastSystemEventProps, 'appearance'> & Pick<ToastOptions, 'id'>;
+export type UserActionOptions = Omit<ToastUserActionProps, 'appearance'> & Pick<ToastOptions, 'id' | 'onClose'>;
+export type SystemEventOptions = Omit<ToastSystemEventProps, 'appearance'> & Pick<ToastOptions, 'id' | 'onClose'>;
 export type Toaster = {
     userAction: {
         success(options: UserActionOptions): PromisedId;

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Toaster",
-  "version": "0.6.13-preview-c70fa919.0",
+  "version": "0.6.13",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -40,5 +40,5 @@
     "classnames": "2.3.2",
     "react-toastify": "10.0.5"
   },
-  "gitHead": "4f5eb16add84bb2a55e90afad89553b8e54b7255"
+  "gitHead": "8db420a0c19e722c15478c3db5b74847a24bf6f7"
 }

package/src/components/ToastSystemEvent/ToastSystemEvent.tsx

@@ -10,7 +10,6 @@ import { extractSupportProps, WithSupportProps } from '@snack-uikit/utils';
 import { AUTO_CLOSE_TIME, TOASTER_TYPE } from '../../constants';
 import { ButtonAction, ButtonActionProps } from '../../helperComponents/ButtonAction';
 import { TOAST_SYSTEM_EVENT_TEST_IDS } from '../../testIds';
-import { ToasterId } from '../../types';
 import { APPEARANCE_TO_ON_COLOR_MAP } from './constants';
 import styles from './styles.module.scss';
 import { ToastSystemEventAppearance } from './types';
@@ -32,7 +31,6 @@ 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,7 +7,6 @@ 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';
@@ -25,7 +24,6 @@ export type ToastUserActionProps = Partial<RtToastContentProps> &
     link?: ToastUserActionLink;
     className?: string;
     loading?: boolean;
-    onClose?(id?: ToasterId): void;
   }>;
 
 export function ToastUserAction({

package/src/helpers.tsx

@@ -76,7 +76,7 @@ function getToastOptions<T extends keyof ToasterPropsMap>({
   return {
     toastId: toastOptions?.id,
     onClose: ((data: { id: ToasterId }) => {
-      toasterProps?.onClose?.(data?.id);
+      toastOptions?.onClose?.(data?.id);
     }) as RtToastOptions['onClose'],
     autoClose: toasterProps?.loading ? false : AUTO_CLOSE_TIME[type],
     containerId: containerId || `${TOASTER_CONTAINER_PREFIX}${type}`,
@@ -158,6 +158,7 @@ const userAction = {
       toasterProps: { ...options, appearance: 'success' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -168,6 +169,7 @@ const userAction = {
       toasterProps: { ...options, appearance: 'neutral' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -178,6 +180,7 @@ const userAction = {
       toasterProps: { ...options, appearance: 'error' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -188,6 +191,7 @@ const userAction = {
       toasterProps: { ...options, appearance: 'warning' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -234,6 +238,7 @@ const systemEvent = {
       toasterProps: { ...options, appearance: 'success' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -244,6 +249,7 @@ const systemEvent = {
       toasterProps: { ...options, appearance: 'neutral' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -254,6 +260,7 @@ const systemEvent = {
       toasterProps: { ...options, appearance: 'warning' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -264,6 +271,7 @@ const systemEvent = {
       toasterProps: { ...options, appearance: 'error' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },
@@ -274,6 +282,7 @@ const systemEvent = {
       toasterProps: { ...options, appearance: 'errorCritical' },
       toastOptions: {
         id: options.id,
+        onClose: options.onClose,
       },
     });
   },

package/src/types.ts

@@ -47,8 +47,8 @@ export type UpdateToast = <T extends keyof ToasterPropsMap>(
   },
 ) => void;
 
-export type UserActionOptions = Omit<ToastUserActionProps, 'appearance'> & Pick<ToastOptions, 'id'>;
-export type SystemEventOptions = Omit<ToastSystemEventProps, 'appearance'> & Pick<ToastOptions, 'id'>;
+export type UserActionOptions = Omit<ToastUserActionProps, 'appearance'> & Pick<ToastOptions, 'id' | 'onClose'>;
+export type SystemEventOptions = Omit<ToastSystemEventProps, 'appearance'> & Pick<ToastOptions, 'id' | 'onClose'>;
 
 export type Toaster = {
   userAction: {