refactor: rename TuiScrollbarComponent to TuiScrollbar

taiga-family · Jun 17, 2024 · e918c7b · e918c7b
1 parent ba38c57
commit e918c7b
Show file tree

Hide file tree

Showing 33 changed files with 73 additions and 88 deletions.
diff --git a/projects/addon-doc/components/navigation/navigation.component.ts b/projects/addon-doc/components/navigation/navigation.component.ts
@@ -38,7 +38,7 @@ import {
     TuiExpand,
     TuiIcon,
     TuiLink,
-    TuiScrollbarComponent,
+    TuiScrollbar,
     TuiTextfieldOptionsDirective,
 } from '@taiga-ui/core';
 import {TuiAccordion} from '@taiga-ui/kit';
@@ -70,7 +70,7 @@ import {
         PolymorpheusOutlet,
         PolymorpheusTemplate,
         RouterLink,
-        TuiScrollbarComponent,
+        TuiScrollbar,
         TuiAccordion,
         NgTemplateOutlet,
         TuiLink,

diff --git a/projects/core/components/calendar/calendar.component.ts b/projects/core/components/calendar/calendar.component.ts
@@ -16,7 +16,7 @@ import {
     TuiMonth,
     tuiNullableSame,
 } from '@taiga-ui/cdk';
-import {TuiScrollbarComponent} from '@taiga-ui/core/components/scrollbar';
+import {TuiScrollbar} from '@taiga-ui/core/components/scrollbar';
 
 import {
     TuiCalendarSheetComponent,
@@ -30,7 +30,7 @@ import {TuiCalendarYearComponent} from './calendar-year.component';
     selector: 'tui-calendar',
     imports: [
         NgIf,
-        TuiScrollbarComponent,
+        TuiScrollbar,
         TuiCalendarYearComponent,
         TuiCalendarSpinComponent,
         TuiCalendarSheetComponent,

diff --git a/projects/core/components/dialog/dialogs.component.ts b/projects/core/components/dialog/dialogs.component.ts
@@ -3,10 +3,7 @@ import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import type {TuiPopover} from '@taiga-ui/cdk';
 import {TuiFocusTrapDirective, tuiInjectElement} from '@taiga-ui/cdk';
 import {tuiHost} from '@taiga-ui/core/animations';
-import {
-    TuiScrollControlsComponent,
-    TuiScrollRefDirective,
-} from '@taiga-ui/core/components/scrollbar';
+import {TuiScrollControls, TuiScrollRef} from '@taiga-ui/core/components/scrollbar';
 import {PolymorpheusOutlet, PolymorpheusTemplate} from '@taiga-ui/polymorpheus';
 import type {Observable} from 'rxjs';
 
@@ -19,9 +16,9 @@ import {TUI_DIALOGS} from './dialog.tokens';
         CommonModule,
         PolymorpheusOutlet,
         PolymorpheusTemplate,
-        TuiScrollRefDirective,
-        TuiScrollControlsComponent,
         TuiFocusTrapDirective,
+        TuiScrollControls,
+        TuiScrollRef,
     ],
     templateUrl: './dialogs.template.html',
     styleUrls: ['./dialogs.style.less'],

diff --git a/projects/core/components/root/root.component.ts b/projects/core/components/root/root.component.ts
@@ -16,7 +16,7 @@ import {
 } from '@taiga-ui/cdk';
 import {TuiAlertsComponent} from '@taiga-ui/core/components/alert';
 import {TUI_DIALOGS, TuiDialogsComponent} from '@taiga-ui/core/components/dialog';
-import {TuiScrollControlsComponent} from '@taiga-ui/core/components/scrollbar';
+import {TuiScrollControls} from '@taiga-ui/core/components/scrollbar';
 import {TuiDropdownsComponent} from '@taiga-ui/core/directives';
 import {TuiHintsComponent} from '@taiga-ui/core/directives/hint';
 import {TuiBreakpointService} from '@taiga-ui/core/services';
@@ -35,7 +35,7 @@ import {debounceTime, map, of} from 'rxjs';
         TuiDialogsComponent,
         TuiAlertsComponent,
         TuiHintsComponent,
-        TuiScrollControlsComponent,
+        TuiScrollControls,
     ],
     templateUrl: './root.template.html',
     styleUrls: ['./root.style.less'],

diff --git a/projects/core/components/scrollbar/scroll-controls.component.ts b/projects/core/components/scrollbar/scroll-controls.component.ts
@@ -1,4 +1,4 @@
-import {CommonModule} from '@angular/common';
+import {AsyncPipe, NgIf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject, NgZone} from '@angular/core';
 import {ANIMATION_FRAME} from '@ng-web-apis/common';
 import {tuiZoneOptimized} from '@taiga-ui/cdk';
@@ -12,13 +12,13 @@ import {TuiScrollbarDirective} from './scrollbar.directive';
 @Component({
     standalone: true,
     selector: 'tui-scroll-controls',
-    imports: [CommonModule, TuiScrollbarDirective],
+    imports: [NgIf, AsyncPipe, TuiScrollbarDirective],
     templateUrl: './scroll-controls.template.html',
     styleUrls: ['./scroll-controls.style.less'],
     changeDetection: ChangeDetectionStrategy.OnPush,
     animations: [tuiFadeIn],
 })
-export class TuiScrollControlsComponent {
+export class TuiScrollControls {
     private readonly scrollRef = inject(TUI_SCROLL_REF).nativeElement;
 
     protected readonly options = tuiToAnimationOptions(inject(TUI_ANIMATIONS_SPEED));

diff --git a/projects/core/components/scrollbar/scroll-ref.directive.ts b/projects/core/components/scrollbar/scroll-ref.directive.ts
@@ -9,4 +9,4 @@ export const SCROLL_REF_SELECTOR = '[tuiScrollRef]';
     selector: SCROLL_REF_SELECTOR,
     providers: [tuiProvide(TUI_SCROLL_REF, ElementRef)],
 })
-export class TuiScrollRefDirective {}
+export class TuiScrollRef {}
diff --git a/projects/core/components/scrollbar/scrollbar.component.ts b/projects/core/components/scrollbar/scrollbar.component.ts
@@ -10,35 +10,35 @@ import {
 import {TUI_IS_IOS, tuiGetElementOffset, tuiInjectElement} from '@taiga-ui/cdk';
 import {TUI_SCROLL_REF} from '@taiga-ui/core/tokens';
 
-import {TuiScrollControlsComponent} from './scroll-controls.component';
+import {TuiScrollControls} from './scroll-controls.component';
 
 /**
- * An event for scrolling an element into view within {@link TuiScrollbarComponent}.
+ * An event for scrolling an element into view within {@link TuiScrollbar}.
  */
 export const TUI_SCROLL_INTO_VIEW = 'tui-scroll-into-view';
 
 /**
- * An event to notify {@link TuiScrollbarComponent} that
+ * An event to notify {@link TuiScrollbar} that
  * it should control a nested element.
  */
 export const TUI_SCROLLABLE = 'tui-scrollable';
 
 @Component({
     standalone: true,
     selector: 'tui-scrollbar',
-    imports: [NgIf, TuiScrollControlsComponent],
+    imports: [TuiScrollControls, NgIf],
     templateUrl: './scrollbar.template.html',
     styleUrls: ['./scrollbar.style.less'],
-    host: {'[class._native-hidden]': '!isIOS || hidden'},
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         {
             provide: TUI_SCROLL_REF,
-            useFactory: () => inject(TuiScrollbarComponent).browserScrollRef,
+            useFactory: () => inject(TuiScrollbar).browserScrollRef,
         },
     ],
+    host: {'[class._native-hidden]': '!isIOS || hidden'},
 })
-export class TuiScrollbarComponent {
+export class TuiScrollbar {
     private readonly el = tuiInjectElement();
 
     protected readonly isIOS = inject(TUI_IS_IOS);

diff --git a/projects/core/directives/dropdown/dropdown.component.ts b/projects/core/directives/dropdown/dropdown.component.ts
@@ -9,7 +9,7 @@ import {
     TuiRectAccessor,
     tuiRectAccessorFor,
 } from '@taiga-ui/core/classes';
-import {TuiScrollbarComponent} from '@taiga-ui/core/components/scrollbar';
+import {TuiScrollbar} from '@taiga-ui/core/components/scrollbar';
 import {TuiPositionService, TuiVisualViewportService} from '@taiga-ui/core/services';
 import {TUI_ANIMATIONS_SPEED} from '@taiga-ui/core/tokens';
 import {tuiToAnimationOptions} from '@taiga-ui/core/utils';
@@ -29,7 +29,7 @@ import {TuiDropdownPositionDirective} from './dropdown-position.directive';
 @Component({
     standalone: true,
     selector: 'tui-dropdown',
-    imports: [PolymorpheusOutlet, PolymorpheusTemplate, TuiScrollbarComponent],
+    imports: [PolymorpheusOutlet, PolymorpheusTemplate, TuiScrollbar],
     templateUrl: './dropdown.template.html',
     styleUrls: ['./dropdown.style.less'],
     // @bad TODO: OnPush

diff --git a/projects/demo/src/modules/components/combo-box/examples/5/index.ts b/projects/demo/src/modules/components/combo-box/examples/5/index.ts
@@ -4,7 +4,7 @@ import {FormsModule} from '@angular/forms';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
 import {TuiLet} from '@taiga-ui/cdk';
-import {TuiDataList, TuiScrollableDirective} from '@taiga-ui/core';
+import {TuiDataList, TuiScrollbar} from '@taiga-ui/core';
 import {TuiFilterByInputPipe} from '@taiga-ui/kit';
 import {TuiComboBoxModule} from '@taiga-ui/legacy';
 
@@ -20,7 +20,7 @@ import {IndexChangeDirective} from './index-change.directive';
         TuiDataList,
         TuiFilterByInputPipe,
         ScrollingModule,
-        TuiScrollableDirective,
+        TuiScrollbar,
         IndexChangeDirective,
     ],
     templateUrl: './index.html',

diff --git a/projects/demo/src/modules/components/multi-select/examples/7/index.ts b/projects/demo/src/modules/components/multi-select/examples/7/index.ts
@@ -11,7 +11,7 @@ import {
     TuiDataListComponent,
     TuiDataListDirective,
     TuiOptionComponent,
-    TuiScrollableDirective,
+    TuiScrollbar,
 } from '@taiga-ui/core';
 import {TuiMultiSelectModule} from '@taiga-ui/legacy';
 
@@ -22,7 +22,7 @@ import {TuiMultiSelectModule} from '@taiga-ui/legacy';
         FormsModule,
         CdkVirtualScrollViewport,
         TuiDataListDirective,
-        TuiScrollableDirective,
+        TuiScrollbar,
         CdkFixedSizeVirtualScroll,
         TuiDataListComponent,
         CdkVirtualForOf,

diff --git a/projects/demo/src/modules/components/pull-to-refresh/index.ts b/projects/demo/src/modules/components/pull-to-refresh/index.ts
@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {TuiDemo} from '@demo/utils';
-import {TuiNotificationComponent, TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiNotificationComponent, TuiScrollbar} from '@taiga-ui/core';
 import {
     PolymorpheusComponent,
     PolymorpheusOutlet,
@@ -12,7 +12,7 @@ import {
     standalone: true,
     imports: [
         TuiDemo,
-        TuiScrollbarComponent,
+        TuiScrollbar,
         TuiNotificationComponent,
         PolymorpheusOutlet,
         PolymorpheusTemplate,

diff --git a/projects/demo/src/modules/components/scrollbar/examples/1/index.ts b/projects/demo/src/modules/components/scrollbar/examples/1/index.ts
@@ -1,11 +1,11 @@
 import {Component} from '@angular/core';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
-import {TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiScrollbar} from '@taiga-ui/core';
 
 @Component({
     standalone: true,
-    imports: [TuiScrollbarComponent],
+    imports: [TuiScrollbar],
     templateUrl: './index.html',
     styleUrls: ['./index.less'],
     encapsulation,

diff --git a/projects/demo/src/modules/components/scrollbar/examples/2/index.ts b/projects/demo/src/modules/components/scrollbar/examples/2/index.ts
@@ -1,11 +1,11 @@
 import {Component} from '@angular/core';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
-import {TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiScrollbar} from '@taiga-ui/core';
 
 @Component({
     standalone: true,
-    imports: [TuiScrollbarComponent],
+    imports: [TuiScrollbar],
     templateUrl: './index.html',
     styleUrls: ['./index.less'],
     encapsulation,

diff --git a/projects/demo/src/modules/components/scrollbar/examples/3/index.ts b/projects/demo/src/modules/components/scrollbar/examples/3/index.ts
@@ -1,20 +1,20 @@
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
-import {TuiButton, TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiButton, TuiScrollbar} from '@taiga-ui/core';
 
 const SOME_OFFSET_CONST = 20;
 
 @Component({
     standalone: true,
-    imports: [TuiButton, TuiScrollbarComponent],
+    imports: [TuiButton, TuiScrollbar],
     templateUrl: './index.html',
     styleUrls: ['./index.less'],
     encapsulation,
     changeDetection,
 })
 export default class Example {
-    @ViewChild(TuiScrollbarComponent, {read: ElementRef})
+    @ViewChild(TuiScrollbar, {read: ElementRef})
     private readonly scrollBar?: ElementRef<HTMLElement>;
 
     protected SOME_OFFSET_CONST = SOME_OFFSET_CONST;

diff --git a/projects/demo/src/modules/components/scrollbar/examples/4/index.ts b/projects/demo/src/modules/components/scrollbar/examples/4/index.ts
@@ -1,11 +1,11 @@
 import {Component} from '@angular/core';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
-import {TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiScrollbar} from '@taiga-ui/core';
 
 @Component({
     standalone: true,
-    imports: [TuiScrollbarComponent],
+    imports: [TuiScrollbar],
     templateUrl: './index.html',
     styleUrls: ['./index.less'],
     encapsulation,

diff --git a/projects/demo/src/modules/components/scrollbar/examples/5/index.ts b/projects/demo/src/modules/components/scrollbar/examples/5/index.ts
@@ -1,11 +1,11 @@
 import {Component} from '@angular/core';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
-import {TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiScrollbar} from '@taiga-ui/core';
 
 @Component({
     standalone: true,
-    imports: [TuiScrollbarComponent],
+    imports: [TuiScrollbar],
     templateUrl: './index.html',
     styleUrls: ['./index.less'],
     encapsulation,

diff --git a/projects/demo/src/modules/components/scrollbar/examples/6/index.ts b/projects/demo/src/modules/components/scrollbar/examples/6/index.ts
@@ -6,13 +6,12 @@ import {
 import {Component} from '@angular/core';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
-import {TuiScrollableDirective, TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiScrollbar} from '@taiga-ui/core';
 
 @Component({
     standalone: true,
     imports: [
-        TuiScrollbarComponent,
-        TuiScrollableDirective,
+        TuiScrollbar,
         CdkVirtualScrollViewport,
         CdkFixedSizeVirtualScroll,
         CdkVirtualForOf,

diff --git a/projects/demo/src/modules/components/select/examples/8/index.ts b/projects/demo/src/modules/components/select/examples/8/index.ts
@@ -11,7 +11,7 @@ import {
     TuiDataListComponent,
     TuiDataListDirective,
     TuiOptionComponent,
-    TuiScrollableDirective,
+    TuiScrollbar,
 } from '@taiga-ui/core';
 import {TuiSelectModule} from '@taiga-ui/legacy';
 
@@ -22,7 +22,7 @@ import {TuiSelectModule} from '@taiga-ui/legacy';
         FormsModule,
         CdkVirtualScrollViewport,
         TuiDataListDirective,
-        TuiScrollableDirective,
+        TuiScrollbar,
         CdkFixedSizeVirtualScroll,
         TuiDataListComponent,
         CdkVirtualForOf,

diff --git a/projects/demo/src/modules/components/services/scroll-service/examples/1/index.ts b/projects/demo/src/modules/components/services/scroll-service/examples/1/index.ts
@@ -5,7 +5,7 @@ import {FormsModule} from '@angular/forms';
 import {changeDetection} from '@demo/emulate/change-detection';
 import {encapsulation} from '@demo/emulate/encapsulation';
 import {TuiElementDirective, TuiScrollService} from '@taiga-ui/cdk';
-import {TuiButton, TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiButton, TuiScrollbar} from '@taiga-ui/core';
 import {TuiInputNumberModule} from '@taiga-ui/legacy';
 
 @Component({
@@ -14,7 +14,7 @@ import {TuiInputNumberModule} from '@taiga-ui/legacy';
         TuiInputNumberModule,
         FormsModule,
         TuiButton,
-        TuiScrollbarComponent,
+        TuiScrollbar,
         TuiElementDirective,
     ],
     templateUrl: './index.html',

diff --git a/projects/demo/src/modules/components/surface/examples/7/index.ts b/projects/demo/src/modules/components/surface/examples/7/index.ts
@@ -6,7 +6,7 @@ import {TuiAmountPipe, TuiThumbnailCardComponent} from '@taiga-ui/addon-commerce
 import {
     TuiButton,
     TuiLink,
-    TuiScrollbarComponent,
+    TuiScrollbar,
     TuiSurfaceDirective,
     TuiTitleDirective,
 } from '@taiga-ui/core';
@@ -26,7 +26,7 @@ import {TuiCardLarge, TuiCellDirective} from '@taiga-ui/layout';
         TuiCellDirective,
         TuiCardLarge,
         CommonModule,
-        TuiScrollbarComponent,
+        TuiScrollbar,
         TuiTitleDirective,
     ],
     templateUrl: './index.html',

diff --git a/projects/demo/src/modules/components/table/examples/3/index.ts b/projects/demo/src/modules/components/table/examples/3/index.ts
@@ -8,7 +8,7 @@ import {IntersectionObserverModule} from '@ng-web-apis/intersection-observer';
 import type {TuiComparator} from '@taiga-ui/addon-table';
 import {TuiTable} from '@taiga-ui/addon-table';
 import {TuiDay, tuiDefaultSort, TuiLet, TuiValidatorDirective} from '@taiga-ui/cdk';
-import {TuiFormatNumberPipe, TuiIcon, TuiScrollbarComponent} from '@taiga-ui/core';
+import {TuiFormatNumberPipe, TuiIcon, TuiScrollbar} from '@taiga-ui/core';
 import {TuiDataListWrapper} from '@taiga-ui/kit';
 import {
     TuiInputDateModule,
@@ -40,7 +40,7 @@ interface Item {
         TuiSelectModule,
         NgForOf,
         TuiLet,
-        TuiScrollbarComponent,
+        TuiScrollbar,
         TuiFormatNumberPipe,
         AsyncPipe,
         TuiIcon,