Skip to content

Commit be95f49

Browse files
Fixed capturing of keyboard events for custom elements
Co-authored-by: vtsvetkov-splunk <142901247+vtsvetkov-splunk@users.noreply.github.com>
1 parent 6128ab9 commit be95f49

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

material/overrides/assets/javascripts/custom.054acff4.min.js renamed to material/overrides/assets/javascripts/custom.526c59dc.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/overrides/assets/javascripts/custom.054acff4.min.js.map renamed to material/overrides/assets/javascripts/custom.526c59dc.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/overrides/main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
{% endblock %}
2424
{% block scripts %}
2525
{{ super() }}
26-
<script src="{{ 'assets/javascripts/custom.054acff4.min.js' | url }}"></script>
26+
<script src="{{ 'assets/javascripts/custom.526c59dc.min.js' | url }}"></script>
2727
{% endblock %}

material/templates/assets/javascripts/bundle.7f914c06.min.js renamed to material/templates/assets/javascripts/bundle.a963951d.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/templates/assets/javascripts/bundle.7f914c06.min.js.map renamed to material/templates/assets/javascripts/bundle.a963951d.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/templates/assets/javascripts/workers/search.c011b7c0.min.js renamed to material/templates/assets/javascripts/workers/search.b8dbb3d2.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/templates/assets/javascripts/workers/search.c011b7c0.min.js.map renamed to material/templates/assets/javascripts/workers/search.b8dbb3d2.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/templates/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
"base": base_url,
219219
"features": features,
220220
"translations": {},
221-
"search": "assets/javascripts/workers/search.c011b7c0.min.js" | url
221+
"search": "assets/javascripts/workers/search.b8dbb3d2.min.js" | url
222222
} -%}
223223
{%- if config.extra.version -%}
224224
{%- set mike = config.plugins.get("mike") -%}
@@ -249,7 +249,7 @@
249249
</script>
250250
{% endblock %}
251251
{% block scripts %}
252-
<script src="{{ 'assets/javascripts/bundle.7f914c06.min.js' | url }}"></script>
252+
<script src="{{ 'assets/javascripts/bundle.a963951d.min.js' | url }}"></script>
253253
{% for script in config.extra_javascript %}
254254
{{ script | script_tag }}
255255
{% endfor %}

src/templates/assets/javascripts/browser/element/_/index.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ export function getOptionalElement<T extends HTMLElement>(
114114
* @returns Element or nothing
115115
*/
116116
export function getActiveElement(): HTMLElement | undefined {
117-
return document.activeElement instanceof HTMLElement
118-
? document.activeElement || undefined
119-
: undefined
117+
return (
118+
document.activeElement?.shadowRoot?.activeElement as HTMLElement ??
119+
document.activeElement as HTMLElement ??
120+
undefined
121+
)
120122
}

0 commit comments

Comments
 (0)