chore: improve

Signed-off-by: waterplea <[email protected]>
taiga-family · Jun 4, 2024 · 8f55a4b · 8f55a4b
1 parent 7131c2f
commit 8f55a4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/projects/cdk/utils/miscellaneous/directive-binding.ts b/projects/cdk/utils/miscellaneous/directive-binding.ts
@@ -1,13 +1,13 @@
-import type {ProviderToken, WritableSignal} from '@angular/core';
+import type {ProviderToken, Signal, WritableSignal} from '@angular/core';
 import {effect, inject, isSignal, signal} from '@angular/core';
 
 export function tuiDirectiveBinding<T, G extends keyof T, R>(
     token: ProviderToken<T>,
     key: G,
-    initial: T[G] extends WritableSignal<R> ? R : T[G],
+    initial: T[G] extends WritableSignal<R> ? R | Signal<R> : Signal<T[G]> | T[G],
 ): WritableSignal<typeof initial> {
-    const result = signal(initial);
-    const directive = inject(token);
+    const result: any = isSignal(initial) ? initial : signal(initial);
+    const directive = inject(token, {self: true});
 
     effect(
         () => {

diff --git a/projects/cdk/utils/miscellaneous/directive-listener.ts b/projects/cdk/utils/miscellaneous/directive-listener.ts
@@ -14,7 +14,7 @@ export function tuiDirectiveListener<T, K extends OutputKeysOf<T>>(
     token: ProviderToken<T>,
     key: K,
 ): Signal<OutputTypeOf<T[K]>> {
-    const prop: any = inject(token)[key];
+    const prop: any = inject(token, {self: true})[key];
 
     return isSignal(prop) ? prop : toSignal<any>(prop);
 }