Skip to content

folder completion: suggest based on lhs of cursor, preserve rhs #386

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
max-baz merged 2 commits into from
May 30, 2025
Merged

folder completion: suggest based on lhs of cursor, preserve rhs #386

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb3f3fc
folder completion: preserve input rhs of cursor
max-baz May 29, 2025
8344e90
use const and string template
max-baz May 30, 2025
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
43 changes: 28 additions & 15 deletions src/popup/addEditInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,7 @@ function AddEditInterface(settingsModel) {
case "Enter":
e.preventDefault();
if (e.target.classList.contains("directory")) {
// replace search term with selected directory
inputEl.value = `${addDirToLoginPath(
loginObj.login,
e.target.getAttribute("value")
)}/`;
this.state.setLogin(inputEl.value);
inputEl.focus();
clickDirectoryHandler.apply(this, [e]);
}
break;
case "Home":
Expand Down Expand Up @@ -142,10 +136,13 @@ function AddEditInterface(settingsModel) {
*/
function clickDirectoryHandler(e) {
e.preventDefault();
var inputEl = document.querySelector("input.filePath");

// replace search term with selected directory
inputEl.value = `${addDirToLoginPath(loginObj.login, e.target.getAttribute("value"))}/`;
const inputEl = document.querySelector("input.filePath");
const dir = e.target.getAttribute("value");
const val = inputEl.value;
const pos = inputEl.selectionStart;
const newLeft = `${addDirToLoginPath(val.slice(0, pos), dir)}/`;
inputEl.value = newLeft + val.slice(pos);
inputEl.selectionStart = inputEl.selectionEnd = newLeft.length;
this.state.setLogin(inputEl.value);
inputEl.focus();
}
Expand Down Expand Up @@ -222,6 +219,19 @@ function AddEditInterface(settingsModel) {
return `min-width: 65px; max-width: 442px; width: ${length * 8}px;`;
}

/**
* Update login
*
* @since 3.11.0
*
* @param {object} vnode
*/
function updateLogin(vnode) {
const path = vnode.target.value;
const cursorPos = vnode.target.selectionStart;
this.setLogin(path, path.slice(0, cursorPos));
}

/**
* Generate and set a new secret on the provided login object
*
Expand Down Expand Up @@ -325,11 +335,12 @@ function AddEditInterface(settingsModel) {
* @since 3.8.0
*
* @param {string} path
* @param {string} pathPreceedingCursor
*/
setLogin: function (path) {
setLogin: function (path, pathPreceedingCursor) {
loginObj.login = path;
if (canTree) {
storeDirs = storeTree.search(path);
storeDirs = storeTree.search(pathPreceedingCursor ?? path);
} else {
storeDirs = [];
}
Expand Down Expand Up @@ -465,8 +476,10 @@ function AddEditInterface(settingsModel) {
placeholder: "filename",
value: loginObj.login,
style: `${getPathWidth(loginObj)}`,
oninput: m.withAttr("value", this.setLogin),
onfocus: m.withAttr("value", this.setLogin),
oninput: updateLogin.bind(this),
onfocus: updateLogin.bind(this),
onmouseup: updateLogin.bind(this),
onkeyup: updateLogin.bind(this),
onkeydown: pathKeyHandler.bind(vnode),
}),
m(`div.suffix${editing ? ".disabled" : ""}`, ".gpg"),
Expand Down