Fixed active tab stolen on scroll with linked content tabs

squidfunk · Jun 6, 2024 · 1cc45d5 · 1cc45d5
1 parent b5b7e9d
commit 1cc45d5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/...assets/javascripts/bundle.081f42fc.min.js → ...assets/javascripts/bundle.ad660dcc.min.js b/...assets/javascripts/bundle.081f42fc.min.js → ...assets/javascripts/bundle.ad660dcc.min.js
diff --git a/...ts/javascripts/bundle.081f42fc.min.js.map → ...ts/javascripts/bundle.ad660dcc.min.js.map b/...ts/javascripts/bundle.081f42fc.min.js.map → ...ts/javascripts/bundle.ad660dcc.min.js.map
diff --git a/material/templates/base.html b/material/templates/base.html
@@ -249,7 +249,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.081f42fc.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.ad660dcc.min.js' | url }}"></script>
       {% for script in config.extra_javascript %}
         {{ script | script_tag }}
       {% endfor %}

diff --git a/src/templates/assets/javascripts/components/content/tabs/index.ts b/src/templates/assets/javascripts/components/content/tabs/index.ts
@@ -38,7 +38,6 @@ import {
   skip,
   startWith,
   subscribeOn,
-  switchMap,
   takeUntil,
   tap,
   withLatestFrom
@@ -137,7 +136,7 @@ export function mountContentTabs(
   return defer(() => {
     const push$ = new Subject<ContentTabs>()
     const done$ = push$.pipe(ignoreElements(), endWith(true))
-    combineLatest([push$, watchElementSize(el)])
+    combineLatest([push$, watchElementSize(el), watchElementVisibility(el)])
       .pipe(
         takeUntil(done$),
         auditTime(1, animationFrameScheduler)
@@ -286,9 +285,8 @@ export function mountContentTabs(
       })
 
     /* Create and return component */
-    return watchElementVisibility(el)
+    return watchContentTabs(inputs)
       .pipe(
-        switchMap(() => watchContentTabs(inputs)),
         tap(state => push$.next(state)),
         finalize(() => push$.complete()),
         map(state => ({ ref: el, ...state }))