From 61ad597c671ed099592911a2788ae3dfaf5d0c9d Mon Sep 17 00:00:00 2001
From: Brenton Simpson <appsforartists@google.com>
Date: Thu, 19 Jul 2018 20:49:32 -0700
Subject: [PATCH] [added] upstream to _reactiveNextOperator's combineLatest
 generic

Summary: This is a quick fix that should be thought through more thoroughly in #246.

Reviewers: O2 Material Motion, O3 Material JavaScript platform reviewers, #material_motion

Tags: #material_motion

Differential Revision: http://codereview.cc/D3451
---
 .../src/operators/foundation/_reactiveNextOperator.ts     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/operators/foundation/_reactiveNextOperator.ts b/packages/core/src/operators/foundation/_reactiveNextOperator.ts
index d4f34d37..11b9f66e 100644
--- a/packages/core/src/operators/foundation/_reactiveNextOperator.ts
+++ b/packages/core/src/operators/foundation/_reactiveNextOperator.ts
@@ -68,7 +68,13 @@ export function withReactiveNextOperator<T, S extends Constructor<Observable<T>>
             emit: observer.next.bind(observer),
           });
 
-          return combineLatest<D, MaybeReactive<D>>(
+          // TODO: verify this is the correct type.
+          //
+          // I added `{upstream: Observable<T>}` because otherwise `inputs` was
+          // getting inferred to require an `upstream` at a callsite.  This
+          // appears to fix it, but I haven't taken the time to reason if it's
+          // correct.
+          return combineLatest<D, MaybeReactive<D> & {upstream: Observable<T>}>(
             // TypeScript doesn't like ...inputs, so we use the longhand version
             Object.assign(
               { upstream: this },