fix: added "Ctor" type

positive-js · Sep 26, 2018 · f27765b · f27765b
1 parent eebdf80
commit f27765b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/lib/link/link.component.ts b/src/lib/link/link.component.ts
@@ -11,8 +11,8 @@ import {
 
 import { FocusMonitor } from '@ptsecurity/cdk/a11y';
 import {
-    CanDisable,
-    HasTabIndex,
+    CanDisable, CanDisableCtor,
+    HasTabIndex, HasTabIndexCtor,
     mixinDisabled,
     mixinTabIndex,
     toBoolean
@@ -24,7 +24,8 @@ export class McLinkBase {
     }
 }
 
-export const _McLinkBase = mixinTabIndex(mixinDisabled(McLinkBase));
+export const _McLinkBase: HasTabIndexCtor & CanDisableCtor & typeof McLinkBase
+    = mixinTabIndex(mixinDisabled(McLinkBase));
 
 @Component({
     selector: 'a.mc-link',

diff --git a/src/lib/tree/tree-selection.ts b/src/lib/tree/tree-selection.ts
@@ -14,7 +14,14 @@ import { NodeDef, ViewData } from '@angular/core/src/view';
 import { SelectionModel } from '@ptsecurity/cdk/collections';
 import { CdkTreeNode, CdkTree, CdkTreeNodeOutlet } from '@ptsecurity/cdk/tree';
 
-import { CanDisable, HasTabIndex, mixinDisabled, mixinTabIndex, toBoolean } from '@ptsecurity/mosaic/core';
+import {
+    CanDisable, CanDisableCtor,
+    HasTabIndex,
+    HasTabIndexCtor,
+    mixinDisabled,
+    mixinTabIndex,
+    toBoolean
+} from '@ptsecurity/mosaic/core';
 
 import { FocusKeyManager } from '@ptsecurity/cdk/a11y';
 
@@ -133,7 +140,11 @@ export class McTreeNodeOption<T> extends CdkTreeNode<T> implements CanDisable {
     }
 }
 
-export const _McTreeSelectionBase = mixinTabIndex(mixinDisabled(CdkTree));
+export const _McTreeSelectionBase:
+    HasTabIndexCtor &
+    CanDisableCtor &
+    typeof CdkTree
+    = mixinTabIndex(mixinDisabled(CdkTree));
 
 export class McTreeNavigationChange {
     constructor(