fix(cdk): FocusTrap blur manually to prevent ExpressionChanged error (

#40) * fix(cdk): `FocusTrap` blur manually to prevent ExpressionChanged error * improve types for matchers
taiga-family · Nov 23, 2020 · 339df70 · 339df70
1 parent 3a9f2db
commit 339df70
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/projects/cdk/constants/matcher.ts b/projects/cdk/constants/matcher.ts
@@ -1,4 +1,4 @@
-import {TuiIdentityMatcher, TuiMatcher, TuiStringHandler} from '@taiga-ui/cdk/types';
+import {TuiIdentityMatcher, TuiStringHandler} from '@taiga-ui/cdk/types';
 import {TUI_DEFAULT_STRINGIFY} from './stringify';
 
 /**
@@ -7,10 +7,10 @@ import {TUI_DEFAULT_STRINGIFY} from './stringify';
  * @param search search query
  * @param stringify handler to turn item into a string
  */
-export const TUI_DEFAULT_MATCHER: TuiMatcher<any> = (
-    item,
+export const TUI_DEFAULT_MATCHER = <T>(
+    item: T,
     search: string,
-    stringify: TuiStringHandler<any> = TUI_DEFAULT_STRINGIFY,
+    stringify: TuiStringHandler<T> = TUI_DEFAULT_STRINGIFY,
 ) => stringify(item).toLowerCase().includes(search.toLowerCase());
 
 /**
@@ -19,10 +19,10 @@ export const TUI_DEFAULT_MATCHER: TuiMatcher<any> = (
  * @param search search query
  * @param stringify handler to turn item into a string
  */
-export const TUI_STRICT_MATCHER: TuiMatcher<any> = (
-    item,
+export const TUI_STRICT_MATCHER = <T>(
+    item: T,
     search: string,
-    stringify: TuiStringHandler<any> = TUI_DEFAULT_STRINGIFY,
+    stringify: TuiStringHandler<T> = TUI_DEFAULT_STRINGIFY,
 ) => stringify(item).toLowerCase() === search.toLowerCase();
 
 /**

diff --git a/projects/cdk/directives/focus-trap/focus-trap.directive.ts b/projects/cdk/directives/focus-trap/focus-trap.directive.ts
@@ -31,7 +31,11 @@ export class TuiFocusTrapDirective implements AfterViewInit, OnDestroy {
         @Inject(ElementRef)
         private readonly elementRef: ElementRef<HTMLElement>,
         @Inject(Renderer2) private readonly renderer: Renderer2,
-    ) {}
+    ) {
+        if (this.activeElement instanceof HTMLElement) {
+            setNativeFocused(this.activeElement, false);
+        }
+    }
 
     ngAfterViewInit() {
         setNativeFocused(this.elementRef.nativeElement);