Merge branch 'v3.x' into input-date-time

taiga-family · Jun 7, 2024 · 30c3506 · 30c3506
2 parents 7cc43da + 22ee141
commit 30c3506
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/projects/core/directives/dropdown/dropdown-selection.directive.ts b/projects/core/directives/dropdown/dropdown-selection.directive.ts
@@ -56,7 +56,10 @@ export class TuiDropdownSelectionDirective
         this.selection$.pipe(
             map(() => this.getRange()),
             distinctUntilChanged(
-                (x, y) => x.startOffset === y.startOffset && x.endOffset === y.endOffset,
+                (x, y) =>
+                    x.startOffset === y.startOffset &&
+                    x.endOffset === y.endOffset &&
+                    x.commonAncestorContainer === y.commonAncestorContainer,
             ),
         ),
     ]).pipe(

diff --git a/projects/core/directives/hint/hint.component.ts b/projects/core/directives/hint/hint.component.ts
@@ -110,7 +110,7 @@ export class TuiHintComponent<C = any> {
     @HostListener('document:click', ['$event.target'])
     onClick(target: HTMLElement): void {
         if (
-            (!this.el.nativeElement.contains(target) &&
+            (!target.closest('tui-hint') &&
                 !this.hover.el.nativeElement.contains(target)) ||
             tuiIsObscured(this.hover.el.nativeElement)
         ) {

diff --git a/projects/demo-playwright/tests/core/dropdown/dropdown.spec.ts b/projects/demo-playwright/tests/core/dropdown/dropdown.spec.ts
@@ -79,4 +79,18 @@ test.describe('Dropdown', () => {
         await page.locator('tui-dropdown').locator('tui-scrollbar .t-thumb').click();
         await expect(page).toHaveScreenshot('11-dropdown.png');
     });
+
+    test('Dropdown selection', async ({page}) => {
+        await tuiGoto(page, '/directives/dropdown-selection');
+
+        const textarea = new TuiDocumentationPagePO(page)
+            .getExample('#textarea')
+            .locator('textarea');
+
+        await textarea.clear();
+        await textarea.press('@');
+        await textarea.press('Backspace');
+
+        await expect(page.locator('tui-dropdown')).not.toBeVisible();
+    });
 });
diff --git a/projects/kit/components/input-tag/input-tag.component.ts b/projects/kit/components/input-tag/input-tag.component.ts
@@ -356,6 +356,7 @@ export class TuiInputTagComponent
 
         event.preventDefault();
         this.focusInput();
+        this.scrollTo();
     }
 
     onFieldKeyDownBackspace(event: Event): void {