fix(core): prevent injection conflict with CSS global interface

taiga-family · Aug 29, 2022 · 9e79144 · 9e79144
1 parent 6bac921
commit 9e79144
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/projects/cdk/types/index.ts b/projects/cdk/types/index.ts
@@ -2,6 +2,7 @@ export * from './date-mode';
 export * from './dialog';
 export * from './event-with';
 export * from './handler';
+export * from './injection-token-type';
 export * from './input-mode';
 export * from './input-type';
 export * from './mapper';

diff --git a/projects/cdk/types/injection-token-type.ts b/projects/cdk/types/injection-token-type.ts
@@ -0,0 +1,5 @@
+import type {InjectionToken} from '@angular/core';
+
+export type TuiInjectionTokenType<Token> = Token extends InjectionToken<infer T>
+    ? T
+    : never;
diff --git a/projects/core/components/scrollbar/scrollbar.component.ts b/projects/core/components/scrollbar/scrollbar.component.ts
@@ -7,8 +7,14 @@ import {
     Inject,
     Input,
 } from '@angular/core';
-import {CSS, USER_AGENT} from '@ng-web-apis/common';
-import {getElementOffset, isFirefox, TUI_IS_IOS, tuiDefaultProp} from '@taiga-ui/cdk';
+import {CSS as CSS_TOKEN, USER_AGENT} from '@ng-web-apis/common';
+import {
+    getElementOffset,
+    isFirefox,
+    TUI_IS_IOS,
+    tuiDefaultProp,
+    TuiInjectionTokenType,
+} from '@taiga-ui/cdk';
 import {TUI_SCROLL_INTO_VIEW, TUI_SCROLLABLE} from '@taiga-ui/core/constants';
 import {TUI_SCROLL_REF} from '@taiga-ui/core/tokens';
 
@@ -47,7 +53,8 @@ export class TuiScrollbarComponent {
     readonly browserScrollRef = new ElementRef(this.elementRef.nativeElement);
 
     constructor(
-        @Inject(CSS) private readonly cssRef: any,
+        @Inject(CSS_TOKEN)
+        private readonly cssRef: TuiInjectionTokenType<typeof CSS_TOKEN>,
         @Inject(ElementRef) private readonly elementRef: ElementRef<HTMLElement>,
         @Inject(USER_AGENT) private readonly userAgent: string,
         @Inject(TUI_IS_IOS) private readonly isIos: boolean,