Fix for the media browser showing also images and videos in file mode (#5853)

* fix for the bug that makes the images appear in the file list of the media browser * pr suggestions
2026-11-03 06:55:59 +00:00 · 2026-07-09 15:51:46 +02:00
parent 5915713a02
commit ee89f8846f
5 changed files with 111 additions and 30 deletions
@@ -0,0 +1,67 @@
+//
+// Copyright 2026 Element Creations Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+// Please see LICENSE files in the repository root for full details.
+//
+
+@testable import ElementX
+import Testing
+
+@MainActor
+struct MediaEventsTimelineScreenViewModelTests {
+    @Test
+    func changingScreenModeSwitchesTimelines() {
+        let mediaTimelineViewModel = makeTimelineViewModel()
+        let filesTimelineViewModel = makeTimelineViewModel()
+        
+        let viewModel = MediaEventsTimelineScreenViewModel(mediaTimelineViewModel: mediaTimelineViewModel,
+                                                           filesTimelineViewModel: filesTimelineViewModel,
+                                                           mediaProvider: MediaProviderMock(.init()),
+                                                           userIndicatorController: UserIndicatorControllerMock(),
+                                                           appMediator: AppMediatorMock(.init()))
+        let context = viewModel.context
+        
+        // Initially the media timeline is active, showing only images and videos.
+        #expect(context.viewState.screenMode == .media)
+        #expect(context.viewState.activeTimelineContext === mediaTimelineViewModel.context)
+        #expect(allItemsMatchScreenMode(.media, groups: context.viewState.groups))
+        
+        // When switching the mode, the files timeline becomes active,
+        // showing only files, audio and voice messages.
+        context.send(viewAction: .changeScreenMode(.files))
+        
+        #expect(context.viewState.screenMode == .files)
+        #expect(context.viewState.activeTimelineContext === filesTimelineViewModel.context)
+        #expect(allItemsMatchScreenMode(.files, groups: context.viewState.groups))
+        
+        // And switching back restores the media timeline.
+        context.send(viewAction: .changeScreenMode(.media))
+        
+        #expect(context.viewState.screenMode == .media)
+        #expect(context.viewState.activeTimelineContext === mediaTimelineViewModel.context)
+        #expect(allItemsMatchScreenMode(.media, groups: context.viewState.groups))
+    }
+    
+    // MARK: - Helpers
+    
+    // Both timelines are given the same mixed chunk of items so that the mode based filtering is what's under test.
+    private func makeTimelineViewModel() -> TimelineViewModel {
+        let timelineController = TimelineControllerMock(.init(timelineKind: .media(.mediaFilesScreen),
+                                                              timelineItems: [TimelineFixtures.separator] + TimelineFixtures.mediaChunk))
+        return TimelineViewModel.mock(timelineKind: .media(.mediaFilesScreen), timelineController: timelineController)
+    }
+    
+    private func allItemsMatchScreenMode(_ screenMode: MediaEventsTimelineScreenMode, groups: [MediaEventsTimelineGroup]) -> Bool {
+        let items = groups.flatMap(\.items)
+        guard !items.isEmpty else { return false }
+        
+        return items.allSatisfy { item in
+            switch item.type {
+            case .image, .video: screenMode == .media
+            case .audio, .file, .voice: screenMode == .files
+            default: false
+            }
+        }
+    }
+}