fix: respect scrollTo during resizing of grid container

rocwang · Sep 27, 2022 · 4ef4689 · 4ef4689
1 parent 1de0fcf
commit 4ef4689
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/pipeline.ts b/src/pipeline.ts
@@ -367,15 +367,11 @@ export function pipeline({
   // endregion
 
   // region: scroll to a given item by index
-  const scrollAction$: Observable<ScrollAction> = scrollTo$.pipe(
-    filter(complement(isNil)),
-    switchMap<number, Observable<[number, ResizeMeasurement, Element]>>(
-      (scrollTo) =>
-        combineLatest([of(scrollTo), resizeMeasurement$, rootResize$]).pipe(
-          take(1)
-        )
-    ),
-    map<[number, ResizeMeasurement, Element], ScrollAction[]>(
+  const scrollToNotNil$:Observable<number> = scrollTo$.pipe( filter(complement(isNil)))
+  const scrollAction$: Observable<ScrollAction> = combineLatest(
+    [scrollToNotNil$, resizeMeasurement$, rootResize$]
+  ).pipe(
+    mergeMap<[number, ResizeMeasurement, Element], ScrollAction[]>(
       ([scrollTo, resizeMeasurement, rootEl]) => {
         const { vertical: verticalScrollEl, horizontal: horizontalScrollEl } =
           getScrollParents(rootEl);
@@ -425,8 +421,7 @@ export function pipeline({
           },
         ];
       }
-    ),
-    mergeAll()
+    )
   );
   // endregion