Skip to content
Merged
Changes from 1 commit
Commits
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: 31 additions & 12 deletions src/lib/openFolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ function execOperation(type, action, url, $target, name) {
recents.removeFile(url);
if (helpers.isFile(type)) {
await fsOperation(url).delete();
$target.remove();
removeEntryFromOpenFolder(url);
const file = editorManager.getFile(url, "uri");
if (file) file.uri = null;
editorManager.onupdate("delete-file");
Expand Down Expand Up @@ -617,7 +617,7 @@ function execOperation(type, action, url, $target, name) {
}
recents.removeFolder(url);
helpers.updateUriOfAllActiveFiles(url, null);
$target.parentElement.remove();
removeEntryFromOpenFolder(url);
editorManager.onupdate("delete-folder");
editorManager.emit("update", "delete-folder");
}
Expand Down Expand Up @@ -1000,6 +1000,34 @@ function getLoadedFileTree($el) {
);
}

/**
* Remove matching rendered entries from expanded folder views.
* This keeps FileTree's in-memory state aligned with the rendered tree.
* @param {string} entryUrl
*/
function removeEntryFromOpenFolder(entryUrl) {
const filesApp = sidebarApps.get("files");
const $els = Array.from(filesApp.getAll(`[data-url="${entryUrl}"]`));
Comment thread
bajrangCoder marked this conversation as resolved.
Outdated

$els.forEach(($el) => {
const ownerTree =
$el?.parentElement?._fileTree ||
$el?.parentElement?.parentElement?._fileTree;

if (ownerTree) {
ownerTree.removeEntry(entryUrl);
return;
}

const type = $el.dataset.type;
if (helpers.isFile(type)) {
$el.remove();
} else {
$el.parentElement?.remove();
}
});
}

/**
* Update matching expanded folder views with a new entry.
* @param {string} parentUrl
Expand Down Expand Up @@ -1136,16 +1164,7 @@ openFolder.removeItem = (url) => {
return;
}

const filesApp = sidebarApps.get("files");
const $el = filesApp.getAll(`[data-url="${url}"]`);
Array.from($el).forEach(($el) => {
const type = $el.dataset.type;
if (helpers.isFile(type)) {
$el.remove();
} else {
$el.parentElement.remove();
}
});
removeEntryFromOpenFolder(url);
};

openFolder.removeFolders = (url) => {
Expand Down