fix(core): move notification interfaces, add autoClose type

taiga-family · Oct 7, 2021 · ba2b0ef · ba2b0ef
1 parent 310e659
commit ba2b0ef
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/projects/core/interfaces/index.ts b/projects/core/interfaces/index.ts
@@ -8,3 +8,4 @@ export * from './icon-error';
 export * from './number-format-settings';
 export * from './value-content-context';
 export * from './with-optional-min-max';
+export * from './notification-options';
diff --git a/...les/notifications/notification-options.ts → ...s/core/interfaces/notification-options.ts b/...les/notifications/notification-options.ts → ...s/core/interfaces/notification-options.ts
@@ -2,14 +2,16 @@ import {TuiContextWithImplicit} from '@taiga-ui/cdk';
 import {TuiNotification} from '@taiga-ui/core/enums';
 import {PolymorpheusContent} from '@tinkoff/ng-polymorpheus';
 
+export type TuiNotificationAutoClose =
+    | boolean
+    | number
+    | ((status: TuiNotification) => number | boolean);
+
 export interface TuiNotificationOptions {
     readonly label?: PolymorpheusContent<TuiContextWithImplicit<TuiNotification>>;
     readonly status?: TuiNotification;
     readonly hasIcon?: boolean;
-    readonly autoClose?:
-        | boolean
-        | number
-        | ((status: TuiNotification) => number | boolean);
+    readonly autoClose?: TuiNotificationAutoClose;
     readonly hasCloseButton?: boolean;
 }
 

diff --git a/projects/core/modules/notifications/index.ts b/projects/core/modules/notifications/index.ts
@@ -3,6 +3,5 @@ export * from './notification-alert/notification-alert.module';
 export * from './notification-alert/Notification-alert';
 export * from './notifications-host/notifications-host.component';
 export * from './notification-content-context';
-export * from './notification-options';
 export * from './notifications.module';
 export * from './notifications.service';
diff --git a/projects/core/modules/notifications/notification-alert/Notification-alert.ts b/projects/core/modules/notifications/notification-alert/Notification-alert.ts
@@ -1,10 +1,10 @@
-import {PolymorpheusContent} from '@tinkoff/ng-polymorpheus';
-import {Observer} from 'rxjs';
-import {TuiNotificationContentContext} from '../notification-content-context';
 import {
     TuiNotificationOptions,
     TuiNotificationOptionsWithData,
-} from '../notification-options';
+} from '@taiga-ui/core/interfaces';
+import {PolymorpheusContent} from '@tinkoff/ng-polymorpheus';
+import {Observer} from 'rxjs';
+import {TuiNotificationContentContext} from '../notification-content-context';
 
 export class NotificationAlert<O, I> {
     readonly status = this.options.status;

diff --git a/...s/core/modules/notifications/notification-alert/test/notification-alert.component.spec.ts b/...s/core/modules/notifications/notification-alert/test/notification-alert.component.spec.ts
@@ -2,9 +2,13 @@ import {CommonModule} from '@angular/common';
 import {Component, Inject, NgModule, ViewChild} from '@angular/core';
 import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {
+    TuiNotificationOptions,
+    TuiNotificationOptionsWithData,
+} from '@taiga-ui/core/interfaces';
+import {
+    NotificationTokenOptions,
     TUI_NOTIFICATION_DEFAULT_OPTIONS,
     TUI_NOTIFICATION_OPTIONS,
-    NotificationTokenOptions,
 } from '@taiga-ui/core/tokens';
 import {PageObject} from '@taiga-ui/testing';
 import {
@@ -13,10 +17,6 @@ import {
     PolymorpheusContent,
 } from '@tinkoff/ng-polymorpheus';
 import {TuiNotificationContentContext} from '../../notification-content-context';
-import {
-    TuiNotificationOptions,
-    TuiNotificationOptionsWithData,
-} from '../../notification-options';
 import {NotificationAlert} from '../Notification-alert';
 import {TuiNotificationAlertComponent} from '../notification-alert.component';
 import {TuiNotificationAlertModule} from '../notification-alert.module';

diff --git a/projects/core/modules/notifications/notifications.service.ts b/projects/core/modules/notifications/notifications.service.ts
@@ -1,14 +1,14 @@
 import {Inject, Injectable} from '@angular/core';
 import {tuiAssert} from '@taiga-ui/cdk';
+import {
+    TuiNotificationOptions,
+    TuiNotificationOptionsWithData,
+} from '@taiga-ui/core/interfaces';
 import {NotificationTokenOptions, TUI_NOTIFICATION_OPTIONS} from '@taiga-ui/core/tokens';
 import {PolymorpheusContent} from '@tinkoff/ng-polymorpheus';
 import {BehaviorSubject, Observable, Observer} from 'rxjs';
 import {NotificationAlert} from './notification-alert/Notification-alert';
 import {TuiNotificationContentContext} from './notification-content-context';
-import {
-    TuiNotificationOptions,
-    TuiNotificationOptionsWithData,
-} from './notification-options';
 
 const NO_HOST =
     'Notifications are disabled, enable support by adding TuiNotificationsModule to your main app module';

diff --git a/projects/core/tokens/notification-options.ts b/projects/core/tokens/notification-options.ts
@@ -1,13 +1,11 @@
 import {InjectionToken} from '@angular/core';
 import {TuiContextWithImplicit} from '@taiga-ui/cdk';
 import {TuiNotification} from '@taiga-ui/core/enums';
+import {TuiNotificationAutoClose} from '@taiga-ui/core/interfaces';
 import {PolymorpheusContent} from '@tinkoff/ng-polymorpheus';
 
 export interface NotificationTokenOptions {
-    readonly autoClose:
-        | boolean
-        | number
-        | ((status: TuiNotification) => number | boolean);
+    readonly autoClose: TuiNotificationAutoClose;
     readonly label: PolymorpheusContent<TuiContextWithImplicit<TuiNotification>>;
     readonly status: TuiNotification;
     readonly hasIcon: boolean;