Skip to content

Transparent overlay instead of DOM overwrite #109

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 1 commit into from
Apr 15, 2024
Merged

Transparent overlay instead of DOM overwrite #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 29 additions & 1 deletion ui/arduino/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}

* {
/* box-sizing: border-box; */
-moz-user-select: none;
-webkit-user-select: none;
user-select: none;
Expand Down Expand Up @@ -643,3 +642,32 @@ button.small .icon {
#code-editor .cm-panel.cm-search [name="close"] {
position: relative;
}

#overlay {
position: fixed;
display: flex;
background: rgba(255, 255, 255, 0.5);
align-items: center;
justify-content: center;
transition: all 0.25s;
pointer-events: none;
opacity: 0;
}

#overlay.open {
width: 100%;
height: 100%;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 9999;
pointer-events: all;
cursor: wait;
opacity: 1;
}

#overlay.open > * {
background: white;
padding: 1em 1.5em;
}
23 changes: 16 additions & 7 deletions ui/arduino/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,27 @@ function App(state, emit) {
`
}

let overlay = html`<div id="overlay" class="closed"></div>`

if (state.diskFiles == null) {
emit('load-disk-files')
return html`<div id="app"><p>Loading files...</p></div>`
overlay = html`<div id="overlay" class="open"><p>Loading files...</p></div>`
}

if (state.isRemoving) return html`<div id="app"><p>Removing...</p></div>`
if (state.isConnecting) return html`<div id="app"><p>Connecting...</p></div>`
if (state.isLoadingFiles) return html`<div id="app"><p>Loading files...</p></div>`
if (state.isSaving) return html`<div id="app"><p>Saving file... ${state.savingProgress}</p></div>`
if (state.isTransferring) return html`<div id="app"><p>Transferring file... ${state.transferringProgress}</p></div>`
if (state.isRemoving) overlay = html`<div id="overlay" class="open"><p>Removing...</p></div>`
if (state.isConnecting) overlay = html`<div id="overlay" class="open"><p>Connecting...</p></div>`
if (state.isLoadingFiles) overlay = html`<div id="overlay" class="open"><p>Loading files...</p></div>`
if (state.isSaving) overlay = html`<div id="overlay" class="open"><p>Saving file... ${state.savingProgress}</p></div>`
if (state.isTransferring) overlay = html`<div id="overlay" class="open"><p>Transferring file... ${state.transferringProgress}</p></div>`

const view = state.view == 'editor' ? EditorView(state, emit) : FileManagerView(state, emit)
return html`
<div id="app">
${view}
${overlay}
</div>
`

return state.view == 'editor' ? EditorView(state, emit) : FileManagerView(state, emit)
}

window.addEventListener('load', () => {
Expand Down
14 changes: 6 additions & 8 deletions ui/arduino/views/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
function EditorView(state, emit) {
return html`
<div id="app">
<div class="working-area">
${Toolbar(state, emit)}
${Tabs(state, emit)}
${CodeEditor(state, emit)}
${ReplPanel(state, emit)}
</div>
${ConnectionDialog(state, emit)}
<div class="working-area">
${Toolbar(state, emit)}
${Tabs(state, emit)}
${CodeEditor(state, emit)}
${ReplPanel(state, emit)}
</div>
${ConnectionDialog(state, emit)}
`
}
62 changes: 30 additions & 32 deletions ui/arduino/views/file-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,42 @@ function FileManagerView(state, emit) {
}

return html`
<div id="app">
<div class="working-area">
${Toolbar(state, emit)}
<div id="file-manager">
<div id="board-files">
<div class="device-header">
<img class="icon" src="media/${state.isConnected?'connect':'disconnect'}.svg" />
<div onclick=${() => emit('open-connection-dialog')} class="text">
<span>${boardFullPath}</span>
</div>
<button disabled=${!state.isConnected} onclick=${() => emit('create-folder', 'board')}>
<img class="icon" src="media/new-folder.svg" />
</button>
<button disabled=${!state.isConnected} onclick=${() => emit('create-file', 'board')}>
<img class="icon" src="media/new-file.svg" />
</button>
<div class="working-area">
${Toolbar(state, emit)}
<div id="file-manager">
<div id="board-files">
<div class="device-header">
<img class="icon" src="media/${state.isConnected?'connect':'disconnect'}.svg" />
<div onclick=${() => emit('open-connection-dialog')} class="text">
<span>${boardFullPath}</span>
</div>
${BoardFileList(state, emit)}
<button disabled=${!state.isConnected} onclick=${() => emit('create-folder', 'board')}>
<img class="icon" src="media/new-folder.svg" />
</button>
<button disabled=${!state.isConnected} onclick=${() => emit('create-file', 'board')}>
<img class="icon" src="media/new-file.svg" />
</button>
</div>
${FileActions(state, emit)}
<div id="disk-files">
<div class="device-header">
<img class="icon" src="media/computer.svg" />
<div class="text" onclick=${() => emit('select-disk-navigation-root')}>
<span>${diskFullPath}</span>
</div>
<button onclick=${() => emit('create-folder', 'disk')}>
<img class="icon" src="media/new-folder.svg" />
</button>
<button onclick=${() => emit('create-file', 'disk')}>
<img class="icon" src="media/new-file.svg" />
</button>
${BoardFileList(state, emit)}
</div>
${FileActions(state, emit)}
<div id="disk-files">
<div class="device-header">
<img class="icon" src="media/computer.svg" />
<div class="text" onclick=${() => emit('select-disk-navigation-root')}>
<span>${diskFullPath}</span>
</div>
${DiskFileList(state, emit)}
<button onclick=${() => emit('create-folder', 'disk')}>
<img class="icon" src="media/new-folder.svg" />
</button>
<button onclick=${() => emit('create-file', 'disk')}>
<img class="icon" src="media/new-file.svg" />
</button>
</div>
${DiskFileList(state, emit)}
</div>
</div>
${ConnectionDialog(state, emit)}
</div>
${ConnectionDialog(state, emit)}
`
}