[refactored] merge to use named args

Summary: Continuation of #193 Reviewers: O2 Material Motion, O3 Material JavaScript platform reviewers, #material_motion, vietanh Reviewed By: #material_motion, vietanh Tags: #material_motion Differential Revision: http://codereview.cc/D3414
material-motion · Oct 11, 2017 · e08a97a · e08a97a
1 parent 635eb98
commit e08a97a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 29 deletions.
diff --git a/packages/core/src/interactions/Draggable.ts b/packages/core/src/interactions/Draggable.ts
@@ -178,7 +178,7 @@ export class Draggable {
                   (downEvent.target as Element).setPointerCapture(downEvent.pointerId);
                 }
 
-                moveSubscription = move$.merge(up$)._filter({
+                moveSubscription = move$.merge({ others: [ up$ ] })._filter({
                   predicate: (nextEvent: PartialPointerEvent) => nextEvent.pointerId === downEvent.pointerId
                 }).subscribe(
                   (nextEvent: PartialPointerEvent) => {
@@ -251,11 +251,13 @@ export class Draggable {
           }
         );
 
-        cancellationSubscription = this.cancellation$.merge(
-          when(not(this.enabled$)),
-          cancel$,
-          contextMenu$,
-        ).subscribe(
+        cancellationSubscription = this.cancellation$.merge({
+          others: [
+            when(not(this.enabled$)),
+            cancel$,
+            contextMenu$,
+          ]
+        }).subscribe(
           () => {
             if (moveSubscription) {
               moveSubscription.unsubscribe();

diff --git a/packages/core/src/interactions/Swipeable.ts b/packages/core/src/interactions/Swipeable.ts
@@ -184,9 +184,11 @@ export class Swipeable {
 
     subscribe({
       sink: spring.enabled$,
-      source: this.whenThresholdFirstCrossed$.merge(
-        when(spring.state$.isAnyOf({ candidates: [ State.AT_REST ] })).rewriteTo(false)
-      ),
+      source: this.whenThresholdFirstCrossed$.merge({
+        others: [
+          when(spring.state$.isAnyOf({ candidates: [ State.AT_REST ] })).rewriteTo(false)
+        ]
+      }),
     });
 
     subscribe({

diff --git a/packages/core/src/operators/__tests__/merge.test.ts b/packages/core/src/operators/__tests__/merge.test.ts
@@ -60,7 +60,7 @@ describe('motionObservable.merge',
 
     it('should dispatch values from both upstream and its stream arguments',
       () => {
-        stream1.merge(stream2, stream3).subscribe(listener);
+        stream1.merge({ others: [ stream2, stream3 ] }).subscribe(listener);
 
         mockObserver1.next(1);
         expect(listener).to.have.been.calledOnce.and.calledWith(1);

diff --git a/packages/core/src/operators/merge.ts b/packages/core/src/operators/merge.ts
@@ -29,8 +29,12 @@ import {
   createPlucker,
 } from './pluck';
 
+export type MergeArgs<T> = {
+  others: Array<Observable<T>>
+};
+
 export interface MotionMergeable<T> extends Observable<T> {
-  merge(...otherStreams: Array<Observable<any>>): ObservableWithMotionOperators<any>;
+  merge(kwargs: MergeArgs<T>): ObservableWithMotionOperators<T>;
 }
 
 export function withMerge<T, S extends Constructor<Observable<T>>>(superclass: S): S & Constructor<MotionMergeable<T>> {
@@ -39,10 +43,10 @@ export function withMerge<T, S extends Constructor<Observable<T>>>(superclass: S
      * Dispatches values as it receives them, both from upstream and from any
      * streams provided as arguments.
      */
-    merge(...otherStreams: Array<Observable<any>>): ObservableWithMotionOperators<any> {
+    merge({ others }: MergeArgs<T>): ObservableWithMotionOperators<T> {
       return new MotionObservable(
-        (observer: Observer<any>) => {
-          const subscriptions = [this, ...otherStreams].map(
+        (observer: Observer<T>) => {
+          const subscriptions = [this, ...others].map(
             stream => stream.subscribe(observer)
           );
 

diff --git a/packages/views-dom/src/getPointerEventStreamsFromElement.ts b/packages/views-dom/src/getPointerEventStreamsFromElement.ts
@@ -53,21 +53,27 @@ export function getPointerEventStreamsFromElement(element: Element): PointerEven
     };
   } else {
     return {
-      down$: getEventStreamFromElement<MouseEvent>('mousedown', element).merge(
-        convertTouchEventsToPointerEvents(
-          getEventStreamFromElement<TouchEvent>('touchstart', element)
-        )
-      ),
-      move$: getEventStreamFromElement<MouseEvent>('mousemove', element).merge(
-        convertTouchEventsToPointerEvents(
-          getEventStreamFromElement<TouchEvent>('touchmove', element)
-        )
-      ),
-      up$: getEventStreamFromElement<MouseEvent>('mouseup', element).merge(
-        convertTouchEventsToPointerEvents(
-          getEventStreamFromElement<TouchEvent>('touchend', element)
-        )
-      ),
+      down$: getEventStreamFromElement<MouseEvent>('mousedown', element).merge({
+        others: [
+          convertTouchEventsToPointerEvents(
+            getEventStreamFromElement<TouchEvent>('touchstart', element)
+          ),
+        ],
+      }),
+      move$: getEventStreamFromElement<MouseEvent>('mousemove', element).merge({
+        others: [
+          convertTouchEventsToPointerEvents(
+            getEventStreamFromElement<TouchEvent>('touchmove', element)
+          ),
+        ],
+      }),
+      up$: getEventStreamFromElement<MouseEvent>('mouseup', element).merge({
+        others: [
+          convertTouchEventsToPointerEvents(
+            getEventStreamFromElement<TouchEvent>('touchend', element)
+          ),
+        ],
+      }),
       cancel$: convertTouchEventsToPointerEvents(
         getEventStreamFromElement<TouchEvent>('touchcancel', element)
       ),