Skip to content

revert #168, fix #167 #190

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

Merged
merged 5 commits into from
Jan 24, 2023
Merged

revert #168, fix #167 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24a31d2
revert #168, fix #167
Rich-Harris Jan 23, 2023
677b9fe
Merge branch 'main' into revert-focus-fix
Rich-Harris Jan 23, 2023
c2e6e14
merge
Rich-Harris Jan 24, 2023
cf17c6a
fix
Rich-Harris Jan 24, 2023
bf71e6e
better organisation
Rich-Harris Jan 24, 2023
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: 9 additions & 15 deletions content/tutorial/common/src/__client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ window.addEventListener('message', async (e) => {
}
});

window.addEventListener('pointerdown', () => {
parent.postMessage(
{
type: 'pointerdown'
},
'*'
);
});

function ping() {
parent.postMessage(
{
Expand All @@ -89,18 +98,3 @@ if (import.meta.hot) {
);
});
}

/**
* The iframe sometimes takes focus control in ways we can't prevent
* while the editor is focussed. Refocus the editor in these cases.
*/
window.addEventListener('focusin', (e) => {
if (e.target.tagName === 'BODY') {
parent.postMessage(
{
type: 'focus_on_editor'
},
'*'
);
}
});
16 changes: 1 addition & 15 deletions src/routes/tutorial/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import ImageViewer from './ImageViewer.svelte';
import ScreenToggle from './ScreenToggle.svelte';
import Sidebar from './Sidebar.svelte';
import { state, selected, completed } from './state';
import { state, selected, completed } from './state.js';

/** @type {import('./$types').PageData} */
export let data;
Expand Down Expand Up @@ -160,20 +160,6 @@
flex-direction: column;
}

iframe {
width: 100%;
height: 100%;
flex: 1;
resize: none;
box-sizing: border-box;
border: none;
background: var(--sk-back-2);
}

iframe:not(.loaded) {
display: none;
}

.editor-container {
position: relative;
background-color: var(--sk-back-3);
Expand Down
42 changes: 24 additions & 18 deletions src/routes/tutorial/[slug]/Editor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,7 @@
let w = 0;
let h = 0;

/**
* The iframe sometimes takes focus control in ways we can't prevent
* while the editor is focussed. Refocus the editor in these cases.
* This boolean tracks whether or not the editor should be refocused.
*/
let preserve_focus = true;
/** @type {any} */
let remove_focus_timeout;
let preserve_editor_focus = false;

onMount(() => {
let destroyed = false;
Expand Down Expand Up @@ -238,27 +231,40 @@
</script>

<svelte:window
on:pointerdown={(e) => {
console.log(`pointerdown ${container.contains(e.target)}`);
if (!container.contains(/** @type {HTMLElement} */ (e.target))) {
preserve_editor_focus = false;
}
}}
on:message={(e) => {
if (preserve_focus && e.data.type === 'focus_on_editor') {
instance?.editor.focus();
if (e.data.type === 'pointerdown') {
preserve_editor_focus = false;
}
}}
/>

<div bind:clientWidth={w} bind:clientHeight={h}>
<div
bind:this={container}
on:keydown={(e) => {
if (e.key === 'Tab') {
preserve_editor_focus = false;

setTimeout(() => {
preserve_editor_focus = true;
}, 100);
}
}}
on:focusin={() => {
clearTimeout(remove_focus_timeout);
preserve_focus = true;
preserve_editor_focus = true;
}}
on:focusout={() => {
// Heuristic: user did refocus themmselves if focus_on_editor
// doesn't happen in the next few miliseconds. Needed
// because else navigations inside the iframe refocus the editor.
remove_focus_timeout = setTimeout(() => {
preserve_focus = false;
}, 500);
if (preserve_editor_focus) {
setTimeout(() => {
instance?.editor.focus();
}, 0);
}
}}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/tutorial/[slug]/Output.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import Chrome from './Chrome.svelte';
import Loading from './Loading.svelte';
import { create_adapter } from './adapter';
import { state } from './state';
import { state } from './state.js';

/** @type {string} */
export let path;
Expand Down