Simplified content tabs implementation

material/base.html

@@ -213,7 +213,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.195ba817.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.01d7f443.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

src/assets/javascripts/components/content/tabs/index.ts

@@ -68,15 +68,12 @@ export function watchContentTabs(
   return merge(...getElements(":scope > input", el)
     .map(input => fromEvent(input, "change")
       .pipe(
-        mapTo(input.id)
+        mapTo<ContentTabs>({
+          active: getElement(`label[for=${input.id}]`)
+        })
       )
     )
   )
-    .pipe(
-      map(id => ({
-        active: getElement<HTMLLabelElement>(`label[for=${id}]`)
-      }))
-    )
 }
 
 /**

src/assets/javascripts/components/header/title/index.ts

@@ -85,7 +85,7 @@ interface MountOptions {
  * @returns Header title observable
  */
 export function watchHeaderTitle(
-  el: HTMLHeadingElement, { viewport$, header$ }: WatchOptions
+  el: HTMLElement, { viewport$, header$ }: WatchOptions
 ): Observable<HeaderTitle> {
   return watchViewportAt(el, { viewport$, header$ })
     .pipe(
@@ -123,7 +123,7 @@ export function mountHeaderTitle(
     })
 
     /* Obtain headline, if any */
-    const heading = getOptionalElement<HTMLHeadingElement>("article h1")
+    const heading = getOptionalElement("article h1")
     if (typeof heading === "undefined")
       return EMPTY