Model search dropdown bug fix x3

This commit is contained in:
Christian Bastian
2024-01-24 02:48:06 -05:00
parent eb7a977d88
commit 6ba66842e3

View File

@@ -780,14 +780,7 @@ class ModelManager extends ComfyDialog {
placeholder: "example: /0/1.5/styles/clothing -.pt", placeholder: "example: /0/1.5/styles/clothing -.pt",
onkeyup: (e) => e.key === "Enter" && this.#modelGridUpdate(), onkeyup: (e) => e.key === "Enter" && this.#modelGridUpdate(),
oninput: () => this.#updateSearchDropdown(), oninput: () => this.#updateSearchDropdown(),
onfocus: () => { onfocus: () => this.#updateSearchDropdown(),
if (searchDropdown.innerHTML === "") {
searchDropdown.style.display = "none";
}
else {
searchDropdown.style.display = "block";
}
},
onblur: () => { searchDropdown.style.display = "none"; }, onblur: () => { searchDropdown.style.display = "none"; },
}), }),
searchDropdown, searchDropdown,
@@ -846,8 +839,6 @@ class ModelManager extends ComfyDialog {
modelGrid.innerHTML = ""; modelGrid.innerHTML = "";
const modelGridModels = ModelGrid.generateInnerHtml(modelList, modelType, this.#el.settings); const modelGridModels = ModelGrid.generateInnerHtml(modelList, modelType, this.#el.settings);
modelGrid.append.apply(modelGrid, modelGridModels); modelGrid.append.apply(modelGrid, modelGridModels);
this.#updateSearchDropdown(true);
} }
async #modelGridRefresh() { async #modelGridRefresh() {
@@ -1005,7 +996,7 @@ class ModelManager extends ComfyDialog {
$: (el) => (this.#el.settings["model-persistent-search"] = el), $: (el) => (this.#el.settings["model-persistent-search"] = el),
type: "checkbox", type: "checkbox",
}), }),
$el("p", ["Search text persistent across model types"]), $el("p", ["Persistent search text across model types"]),
]), ]),
$el("div", [ $el("div", [
$el("input", { $el("input", {
@@ -1099,15 +1090,14 @@ class ModelManager extends ComfyDialog {
return [filterIndex0, cwd]; return [filterIndex0, cwd];
} }
async #updateSearchDropdown(setHidden = false) { async #updateSearchDropdown() {
const modelType = this.#el.modelTypeSelect.value; const modelType = this.#el.modelTypeSelect.value;
const searchDropdown = this.#el.modelDirectorySearchOptions; const searchDropdown = this.#el.modelDirectorySearchOptions;
const filter = this.#el.modelContentFilter.value; const filter = this.#el.modelContentFilter.value;
const directories = this.#data.modelDirectories; const directories = this.#data.modelDirectories;
const previousFilter = this.#data.prevousModelFilters[modelType]; //const previousFilter = this.#data.prevousModelFilters[modelType];
if (previousFilter !== filter) {
let options = []; let options = [];
const sep = "/"; const sep = "/";
if (filter[0] === sep) { if (filter[0] === sep) {
@@ -1149,7 +1139,6 @@ class ModelManager extends ComfyDialog {
} }
} }
} }
}
const innerHtml = options.map((text) => { const innerHtml = options.map((text) => {
const el = document.createElement("p"); const el = document.createElement("p");
@@ -1158,7 +1147,7 @@ class ModelManager extends ComfyDialog {
}); });
searchDropdown.innerHTML = ""; searchDropdown.innerHTML = "";
searchDropdown.append.apply(searchDropdown, innerHtml); searchDropdown.append.apply(searchDropdown, innerHtml);
searchDropdown.style.display = setHidden || options.length == 0 ? "none" : "block"; searchDropdown.style.display = options.length === 0 ? "none" : "block";
} }
this.#data.prevousModelFilters[modelType] = filter; this.#data.prevousModelFilters[modelType] = filter;