@@ -475,16 +475,23 @@ private void Loader_PackagesChanged(object? sender, PackagesChangedEvent e)
475475
476476 if ( e . ProceduralChange )
477477 {
478+ var added = new List < PackageWrapper > ( ) ;
478479 foreach ( var pkg in e . AddedPackages )
479480 {
480481 if ( _wrappedPackages . Any ( w => w . Package . GetVersionedHash ( ) == pkg . GetVersionedHash ( ) ) ) continue ;
481- _wrappedPackages . Add ( new PackageWrapper ( pkg , this ) ) ;
482+ var wrapper = new PackageWrapper ( pkg , this ) ;
483+ _wrappedPackages . Add ( wrapper ) ;
484+ added . Add ( wrapper ) ;
482485 AddPackageToSourcesList ( pkg ) ;
483486 }
484487 var toRemove = _wrappedPackages
485488 . Where ( w => e . RemovedPackages . Any ( r => r . GetVersionedHash ( ) == w . Package . GetVersionedHash ( ) ) )
486489 . ToList ( ) ;
487490 foreach ( var wrapper in toRemove ) { wrapper . Dispose ( ) ; _wrappedPackages . Remove ( wrapper ) ; }
491+
492+ var filter = BuildPackageFilter ( out string query ) ;
493+ FilteredPackages . ApplyChanges ( toRemove , added . Where ( filter ) ) ;
494+ UpdateFilteredState ( query ) ;
488495 }
489496 else
490497 {
@@ -496,8 +503,8 @@ private void Loader_PackagesChanged(object? sender, PackagesChangedEvent e)
496503 _wrappedPackages . Add ( new PackageWrapper ( pkg , this ) ) ;
497504 AddPackageToSourcesList ( pkg ) ;
498505 }
506+ FilterPackages ( ) ;
499507 }
500- FilterPackages ( ) ;
501508 }
502509
503510 private void Loader_FinishedLoading ( object ? sender , EventArgs e )
@@ -644,26 +651,38 @@ public void SubmitSearch()
644651 }
645652 else
646653 {
647- FilterPackages ( fromQuery : true ) ;
654+ FilterPackages ( ) ;
648655 }
649656 }
650657
651- public void FilterPackages ( bool fromQuery = false )
658+ public void FilterPackages ( )
659+ {
660+ var filter = BuildPackageFilter ( out string query ) ;
661+ var results = FilteredPackages . ApplyToList ( _wrappedPackages . Where ( filter ) ) . ToList ( ) ;
662+
663+ FilteredPackages . Clear ( ) ;
664+ foreach ( var w in results ) FilteredPackages . Add ( w ) ;
665+
666+ UpdateFilteredState ( query ) ;
667+ }
668+
669+ private Func < PackageWrapper , bool > BuildPackageFilter ( out string query )
652670 {
653671 var filters = new List < Func < string , string > > ( ) ;
654672 if ( ! UpperLowerCase ) filters . Add ( FilterHelpers . NormalizeCase ) ;
655673 if ( IgnoreSpecialChars ) filters . Add ( FilterHelpers . NormalizeSpecialCharacters ) ;
656674
657- string query = _searchQuery ;
658- foreach ( var f in filters ) query = f ( query ) ;
675+ string normalizedQuery = _searchQuery ;
676+ foreach ( var f in filters ) normalizedQuery = f ( normalizedQuery ) ;
677+ query = normalizedQuery ;
659678
660679 Func < IPackage , bool > matchFunc = SearchMode switch
661680 {
662- SearchMode . Name => pkg => FilterHelpers . NameContains ( pkg , query , filters ) ,
663- SearchMode . Id => pkg => FilterHelpers . IdContains ( pkg , query , filters ) ,
664- SearchMode . Exact => pkg => FilterHelpers . NameOrIdExactMatch ( pkg , query , filters ) ,
681+ SearchMode . Name => pkg => FilterHelpers . NameContains ( pkg , normalizedQuery , filters ) ,
682+ SearchMode . Id => pkg => FilterHelpers . IdContains ( pkg , normalizedQuery , filters ) ,
683+ SearchMode . Exact => pkg => FilterHelpers . NameOrIdExactMatch ( pkg , normalizedQuery , filters ) ,
665684 SearchMode . Similar => _ => true ,
666- _ => pkg => FilterHelpers . NameOrIdContains ( pkg , query , filters ) ,
685+ _ => pkg => FilterHelpers . NameOrIdContains ( pkg , normalizedQuery , filters ) ,
667686 } ;
668687
669688 var ( visibleSources , visibleManagers ) = GetSelectedSourceFilters ( ) ;
@@ -678,13 +697,11 @@ public void FilterPackages(bool fromQuery = false)
678697 && visibleManagers . Contains ( pkg . Manager )
679698 ) ;
680699
681- var results = FilteredPackages . ApplyToList (
682- _wrappedPackages . Where ( w => matchFunc ( w . Package ) && sourceFilter ( w . Package ) )
683- ) . ToList ( ) ;
684-
685- FilteredPackages . Clear ( ) ;
686- foreach ( var w in results ) FilteredPackages . Add ( w ) ;
700+ return w => matchFunc ( w . Package ) && sourceFilter ( w . Package ) ;
701+ }
687702
703+ private void UpdateFilteredState ( string query )
704+ {
688705 UpdateSubtitle ( ) ;
689706 PackageCountUpdated ? . Invoke ( ) ;
690707
@@ -1078,7 +1095,7 @@ private void SubmitMegaQuery(string query)
10781095 {
10791096 MegaQueryVisible = false ;
10801097 _searchQuery = query ? . Trim ( ) ?? "" ;
1081- FilterPackages ( fromQuery : true ) ;
1098+ FilterPackages ( ) ;
10821099 }
10831100
10841101 // ─── Keyboard / search-box actions (called by the View's interface impls) ──
@@ -1109,7 +1126,7 @@ public void ToggleSelectAll()
11091126 public void HandleSearchSubmitted ( )
11101127 {
11111128 if ( MegaQueryBoxEnabled ) SubmitSearch ( ) ;
1112- else FilterPackages ( fromQuery : true ) ;
1129+ else FilterPackages ( ) ;
11131130 }
11141131
11151132 // ─── Operation launchers ─────────────────────────────────────────────────
0 commit comments