chore: small changes (#6800)

taiga-family · Feb 15, 2024 · 069a650 · 069a650
1 parent ab0aba6
commit 069a650
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/projects/core/components/scrollbar/scrollbar.component.ts b/projects/core/components/scrollbar/scrollbar.component.ts
@@ -34,8 +34,6 @@ import {TUI_SCROLL_INTO_VIEW, TUI_SCROLLABLE} from '@taiga-ui/core/constants';
     ],
 })
 export class TuiScrollbarComponent {
-    private delegated = false;
-
     private readonly isLegacy: boolean =
         !this.cssRef.supports('position', 'sticky') ||
         (tuiIsFirefox(this.userAgent) &&
@@ -54,6 +52,10 @@ export class TuiScrollbarComponent {
         @Inject(TUI_IS_IOS) private readonly isIos: boolean,
     ) {}
 
+    get delegated(): boolean {
+        return this.browserScrollRef.nativeElement !== this.el.nativeElement;
+    }
+
     get showScrollbars(): boolean {
         return !this.hidden && !this.isIos && (!this.isLegacy || this.delegated);
     }
@@ -65,7 +67,6 @@ export class TuiScrollbarComponent {
 
     @HostListener(`${TUI_SCROLLABLE}.stop`, ['$event.detail'])
     onScrollable(element: HTMLElement): void {
-        this.delegated = true;
         this.browserScrollRef.nativeElement = element;
     }
 

diff --git a/projects/core/components/scrollbar/scrollbar.style.less b/projects/core/components/scrollbar/scrollbar.style.less
@@ -32,6 +32,10 @@
     flex-basis: auto;
     width: 100%;
     height: max-content;
+
+    &_delegated {
+        height: 100%;
+    }
 }
 
 .t-bars {

diff --git a/projects/core/components/scrollbar/scrollbar.template.html b/projects/core/components/scrollbar/scrollbar.template.html
@@ -2,6 +2,9 @@
     *ngIf="showScrollbars"
     class="t-bars"
 ></tui-scroll-controls>
-<div class="t-content">
+<div
+    class="t-content"
+    [class.t-content_delegated]="delegated"
+>
     <ng-content></ng-content>
 </div>
diff --git a/projects/experimental/components/badge-notification/badge-notification.style.less b/projects/experimental/components/badge-notification/badge-notification.style.less
@@ -34,4 +34,10 @@
         padding: 0;
         font-size: 0;
     }
+
+    :host-context([tuiIconButton]) {
+        position: absolute;
+        right: 25%;
+        top: 25%;
+    }
 }
diff --git a/projects/i18n/languages/english/kit.ts b/projects/i18n/languages/english/kit.ts
@@ -48,7 +48,7 @@ export const TUI_ENGLISH_LANGUAGE_KIT: TuiLanguageKit = {
         defaultLabelMultiple: 'or drop\u00A0them\u00A0here',
         defaultLinkSingle: 'Choose a file',
         defaultLinkMultiple: 'Choose files',
-        maxSizeRejectionReason: 'File is too large ',
+        maxSizeRejectionReason: 'File is larger than ',
         formatRejectionReason: 'Wrong file type',
         drop: 'Drop file here',
         dropMultiple: 'Drop files here',