Skip to content

fix: show completion below terminal line instead of above it #55

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

Open
matteo-cristino wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

fix: show completion below terminal line instead of above it #55

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
16 changes: 12 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@
<div
class="layout"
data-initial-path="{{INITIAL_PATH}}"
data-signals='{ "ps1": "guest@browser:/$ ", "cwd": "/", "current": "", "cursorPos": 0, "buffer": "{{HELP_MESSAGE}}", "history": [], "histIndex": 0, "readme": "", "showReadme": false }'
data-signals='{ "ps1": "guest@browser:/$ ", "cwd": "/", "current": "", "cursorPos": 0, "buffer": "{{HELP_MESSAGE}}", "completionList": "", "history": [], "histIndex": 0, "readme": "", "showReadme": false }'
data-on-load="
// Initialize path from server-rendered attribute
const initialPath = el.getAttribute('data-initial-path') || '/';
Expand Down Expand Up @@ -782,6 +782,9 @@
data-on-click="el.querySelector('#ghost').focus()"
data-on-keydown="
const k=evt.key;
if (k !== 'Tab') {
$completionList = '';
}
if (k==='Enter') {
const cmd = $current;
$buffer += `<div class='line'><span class='ps1'>${escapeHTML($ps1)}</span>${escapeHTML(cmd)}</div>`;
Expand Down Expand Up @@ -880,7 +883,10 @@
})
.then(r => r.ok ? r.json() : Promise.reject(new Error(`HTTP ${r.status}`)))
.then(({ items }) => {
if (!Array.isArray(items) || items.length === 0) return;
if (!Array.isArray(items) || items.length === 0) {
$completionList = '';
return;
}
const slash = (pathArg||'').lastIndexOf('/');
const dirPart = slash >= 0 ? pathArg.slice(0, slash+1) : '';
const basePart = slash >= 0 ? pathArg.slice(slash+1) : (pathArg||'');
Expand All @@ -893,13 +899,15 @@
if (lcp && lcp !== basePart) {
$current = cmd + ' ' + flagsPart + (dirPart + lcp);
$cursorPos = $current.length; // Fix cursor position
$completionList = '';
} else if (items.length === 1) {
const one = items[0];
$current = cmd + ' ' + flagsPart + (dirPart + one.name + (one.dir ? '/' : ''));
$cursorPos = $current.length; // Fix cursor position
$completionList = '';
} else {
const list = items.map(it => it.name + (it.dir ? '/' : '')).join(' ');
$buffer += `<div class='line out'>${makeClickable(ansiToHtml(list))}</div>`;
$completionList = `<div class='line out'>${makeClickable(ansiToHtml(list))}</div>`;
const sc = el.querySelector('.screen'); requestAnimationFrame(()=>{ sc.scrollTop = sc.scrollHeight; });
}
})
Expand Down Expand Up @@ -1011,7 +1019,7 @@
const before = $current.slice(0, $cursorPos);
const cursorChar = $current[$cursorPos] || ' ';
const after = $current.slice($cursorPos + 1);
el.innerHTML = $buffer + `<div class='line'><span class='ps1'>${escapeHTML($ps1)}</span><span class='input-before'></span><span class='cursor'></span><span class='input-after'></span></div>`;
el.innerHTML = $buffer + `<div class='line'><span class='ps1'>${escapeHTML($ps1)}</span><span class='input-before'></span><span class='cursor'></span><span class='input-after'></span></div>` + $completionList;
el.querySelector('.input-before').textContent = before;
el.querySelector('.cursor').textContent = cursorChar;
el.querySelector('.input-after').textContent = after;
Expand Down