Skip to content

[fix] reset focus after iframe reload #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[fix] reset focus after iframe reload #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53748b7
[fix] reset focus after iframe reload
dummdidumm Dec 16, 2022
790465c
Merge branch 'main' into fix-focus
dummdidumm Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/routes/tutorial/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@

let width = browser ? window.innerWidth : 1000;
let selected_view = 0;
/** @type {import('monaco-editor').editor.IStandaloneCodeEditor | undefined} */
let editor_instance;

$: mobile = writable(false);
$: $mobile = width < 768;
Expand Down Expand Up @@ -293,13 +295,30 @@

/** @param {string} src */
function set_iframe_src(src) {
// removing the iframe from the document allows us to
// Removing the iframe from the document allows us to
// change the src without adding a history entry, which
// would make back/forward traversal very annoying
// would make back/forward traversal very annoying.
const parentNode = /** @type {HTMLElement} */ (iframe.parentNode);
parentNode?.removeChild(iframe);
iframe.src = src;
parentNode?.appendChild(iframe);
// We need to reset focus because it's lost on reload when the
// inner app has `export const ssr = false`, which results in
// a initial navigation with a focus reset at the end.
const editor_has_focus = editor_instance?.hasTextFocus();
const active_element = document.activeElement;
const on_blur = () => {
// Timeout so that following focus event happens first
setTimeout(() => {
if (editor_has_focus) {
editor_instance?.focus();
} else {
active_element?.focus();
}
});
};
document.addEventListener('focusout', on_blur, { once: true });
setTimeout(() => document.removeEventListener('focusout', on_blur), 2000);
}
</script>

Expand Down Expand Up @@ -391,6 +410,7 @@
stubs={$files}
selected={$selected}
read_only={$mobile}
bind:editor_instance
on:change={update_stub}
/>
<ImageViewer selected={$selected} />
Expand Down
9 changes: 6 additions & 3 deletions src/routes/tutorial/[slug]/Editor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,20 @@
/** @type {import('$lib/types').Stub | null} */
export let selected = null;
export let read_only = false;
/** @type {import('monaco-editor').editor.IStandaloneCodeEditor | undefined} */
export let editor_instance;

const dispatch = createEventDispatcher();

/** @type {HTMLDivElement} */
let container;

/** @type {ReturnType<typeof init> | undefined}*/
let instance;

let w = 0;
let h = 0;

/** @type {ReturnType<typeof init> | undefined}*/
let instance;

onMount(() => {
let destroyed = false;

Expand All @@ -50,6 +52,7 @@
import('$lib/client/monaco/monaco.js').then(({ monaco }) => {
if (destroyed) return;
instance = init(monaco, dark_mode);
editor_instance = instance.editor;
});

/** @param {MediaQueryListEvent} event */
Expand Down