Skip to content

Commit 7abeb68

Browse files
committed
Fixed rendering of back-to-top button when used with sticky tabs
1 parent 7ca4ca1 commit 7abeb68

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

Diff for: material/assets/javascripts/bundle.8400c76f.min.js renamed to material/assets/javascripts/bundle.d7b0ad22.min.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: material/assets/javascripts/bundle.8400c76f.min.js.map renamed to material/assets/javascripts/bundle.d7b0ad22.min.js.map

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: material/base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
223223
</script>
224224
{% endblock %}
225225
{% block scripts %}
226-
<script src="{{ 'assets/javascripts/bundle.8400c76f.min.js' | url }}"></script>
226+
<script src="{{ 'assets/javascripts/bundle.d7b0ad22.min.js' | url }}"></script>
227227
{% for path in config["extra_javascript"] %}
228228
<script src="{{ path | url }}"></script>
229229
{% endfor %}

Diff for: src/assets/javascripts/components/top/index.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import {
4343
setBackToTopOffset,
4444
setBackToTopState
4545
} from "~/actions"
46-
import { Viewport } from "~/browser"
46+
import { Viewport, setElementFocus } from "~/browser"
4747

4848
import { Component } from "../_"
4949
import { Header } from "../header"
@@ -103,7 +103,7 @@ export function watchBackToTop(
103103
.pipe(
104104
map(({ offset: { y } }) => y),
105105
bufferCount(2, 1),
106-
map(([a, b]) => a > b),
106+
map(([a, b]) => a > b && b),
107107
distinctUntilChanged()
108108
)
109109

@@ -153,10 +153,12 @@ export function mountBackToTop(
153153
/* Update state */
154154
next([{ hidden }, { height }]) {
155155
setBackToTopOffset(el, height + 16)
156-
if (hidden)
156+
if (hidden) {
157157
setBackToTopState(el, "hidden")
158-
else
158+
setElementFocus(el, false)
159+
} else {
159160
resetBackToTopState(el)
161+
}
160162
},
161163

162164
/* Reset on complete */

0 commit comments

Comments
 (0)