Fixed rendering of back-to-top button when used with sticky tabs

material/base.html

@@ -223,7 +223,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.8400c76f.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.d7b0ad22.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

src/assets/javascripts/components/top/index.ts

@@ -43,7 +43,7 @@ import {
   setBackToTopOffset,
   setBackToTopState
 } from "~/actions"
-import { Viewport } from "~/browser"
+import { Viewport, setElementFocus } from "~/browser"
 
 import { Component } from "../_"
 import { Header } from "../header"
@@ -103,7 +103,7 @@ export function watchBackToTop(
     .pipe(
       map(({ offset: { y } }) => y),
       bufferCount(2, 1),
-      map(([a, b]) => a > b),
+      map(([a, b]) => a > b && b),
       distinctUntilChanged()
     )
 
@@ -153,10 +153,12 @@ export function mountBackToTop(
         /* Update state */
         next([{ hidden }, { height }]) {
           setBackToTopOffset(el, height + 16)
-          if (hidden)
+          if (hidden) {
             setBackToTopState(el, "hidden")
-          else
+            setElementFocus(el, false)
+          } else {
             resetBackToTopState(el)
+          }
         },
 
         /* Reset on complete */