Fixed rendering of tab indicator of nested content tabs

This commit is contained in:
squidfunk 2024-04-25 10:18:10 +07:00
parent 374bbab9d3
commit 2d07a6aa6e
No known key found for this signature in database
GPG Key ID: 5ED40BC4F9C436DF
4 changed files with 14 additions and 11 deletions

View File

@ -249,7 +249,7 @@
</script> </script>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script src="{{ 'assets/javascripts/bundle.3220b9d7.min.js' | url }}"></script> <script src="{{ 'assets/javascripts/bundle.dd8806f2.min.js' | url }}"></script>
{% for script in config.extra_javascript %} {% for script in config.extra_javascript %}
{{ script | script_tag }} {{ script | script_tag }}
{% endfor %} {% endfor %}

View File

@ -38,6 +38,7 @@ import {
skip, skip,
startWith, startWith,
subscribeOn, subscribeOn,
switchMap,
takeUntil, takeUntil,
tap, tap,
withLatestFrom withLatestFrom
@ -53,7 +54,8 @@ import {
getElementSize, getElementSize,
getElements, getElements,
watchElementContentOffset, watchElementContentOffset,
watchElementSize watchElementSize,
watchElementVisibility
} from "~/browser" } from "~/browser"
import { renderTabbedControl } from "~/templates" import { renderTabbedControl } from "~/templates"
import { h } from "~/utilities" import { h } from "~/utilities"
@ -284,8 +286,9 @@ export function mountContentTabs(
}) })
/* Create and return component */ /* Create and return component */
return watchContentTabs(inputs) return watchElementVisibility(el)
.pipe( .pipe(
switchMap(() => watchContentTabs(inputs)),
tap(state => push$.next(state)), tap(state => push$.next(state)),
finalize(() => push$.complete()), finalize(() => push$.complete()),
map(state => ({ ref: el, ...state })) map(state => ({ ref: el, ...state }))