diff --git a/src/ui/list/list.component.js b/src/ui/list/list.component.js index c2d28f1..3a4b5f5 100644 --- a/src/ui/list/list.component.js +++ b/src/ui/list/list.component.js @@ -62,35 +62,33 @@ export default class List extends Component { defaultModules = []; const overrideMap = window.importMapOverrides.getOverrideMap().imports; - const filteredSearchModuleNames = Object.keys(overrideMap).filter( - moduleName => - this.state.searchVal.trim().length > 0 - ? moduleName.includes(this.state.searchVal) - : true - ); - - filteredSearchModuleNames.forEach(moduleName => { - const mod = { - moduleName, - defaultUrl: this.state.notOverriddenMap.imports[moduleName], - overrideUrl: overrideMap[moduleName] - }; - if (overrideMap[moduleName]) { - overriddenModules.push(mod); - } else { - defaultModules.push(mod); - } - }); - filteredSearchModuleNames.forEach(overrideKey => { - if (!overriddenModules.some(m => m.moduleName === overrideKey)) { - overriddenModules.push({ - moduleName: overrideKey, - defaultUrl: null, - overrideUrl: overrideMap[overrideKey] - }); - } - }); + Object.keys(this.state.notOverriddenMap.imports) + .filter(this.filterModuleNames) + .forEach(moduleName => { + const mod = { + moduleName, + defaultUrl: this.state.notOverriddenMap.imports[moduleName], + overrideUrl: overrideMap[moduleName] + }; + if (overrideMap[moduleName]) { + overriddenModules.push(mod); + } else { + defaultModules.push(mod); + } + }); + + Object.keys(overrideMap) + .filter(this.filterModuleNames) + .forEach(overrideKey => { + if (!overriddenModules.some(m => m.moduleName === overrideKey)) { + overriddenModules.push({ + moduleName: overrideKey, + defaultUrl: null, + overrideUrl: overrideMap[overrideKey] + }); + } + }); overriddenModules.sort(sorter); defaultModules.sort(sorter); @@ -185,6 +183,12 @@ export default class List extends Component { } this.setState({ dialogModule: null }); }; + + filterModuleNames = moduleName => { + return this.state.searchVal.trim().length > 0 + ? moduleName.includes(this.state.searchVal) + : true; + }; } function mergeImportMap(originalMap, newMap) { diff --git a/test/index.html b/test/index.html index 1d9486d..528fd0d 100644 --- a/test/index.html +++ b/test/index.html @@ -5,6 +5,13 @@