Merge ad19e93 into 6bd4233

mobxjs · Mar 8, 2017 · 9f41e79 · 9f41e79
2 parents 6bd4233 + ad19e93
commit 9f41e79
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.1.6
+
+* Improved typings of `IObservableArray.intercept`: remove superflous type parameter, by @bvanreeven
+
 # 3.1.5
 
 * Improved typings of map changes, see #847, by @hediet

diff --git a/flow-typed/mobx.js b/flow-typed/mobx.js
@@ -142,7 +142,8 @@ declare module 'mobx' {
     observe(
       listener: (changeData: IArrayChange<T> | IArraySplice<T>) => void, fireImmediately?: boolean
     ): Lambda;
-    intercept<T>(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda;
+    intercept(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda;
+    intercept<T>(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda; // TODO: remove in 4.0
     clear(): T[];
     peek(): T[];
     replace(newItems: T[]): T[];

diff --git a/src/types/observablearray.ts b/src/types/observablearray.ts
@@ -21,7 +21,8 @@ const safariPrototypeSetterInheritanceBug = (() => {
 export interface IObservableArray<T> extends Array<T> {
 	spliceWithArray(index: number, deleteCount?: number, newItems?: T[]): T[];
 	observe(listener: (changeData: IArrayChange<T>|IArraySplice<T>) => void, fireImmediately?: boolean): Lambda;
-	intercept<T>(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda;
+	intercept(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda;
+	intercept<T>(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda; // TODO: remove in 4.0
 	clear(): T[];
 	peek(): T[];
 	replace(newItems: T[]): T[];
@@ -90,7 +91,7 @@ class ObservableArrayAdministration<T> implements IInterceptable<IArrayWillChang
 		this.enhancer = (newV, oldV) => enhancer(newV, oldV, name + "[..]");
 	}
 
-	intercept<T>(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda {
+	intercept(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda {
 		return registerInterceptor<IArrayChange<T>|IArraySplice<T>>(this, handler);
 	}
 
@@ -258,7 +259,7 @@ export class ObservableArray<T> extends StubArray {
 		}
 	}
 
-	intercept<T>(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda {
+	intercept(handler: IInterceptor<IArrayChange<T> | IArraySplice<T>>): Lambda {
 		return this.$mobx.intercept(handler);
 	}