mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-10-31 16:24:11 +00:00
a520d94760
* Enable Swift 6.2 with default main actor isolation for the app target Turn on SWIFT_VERSION 6.2, SWIFT_APPROACHABLE_CONCURRENCY and SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor for the ElementX target, matching the NSE and Share Extension (which already use 6.2 without the main actor default). # Conflicts: # ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update the code generation templates for Swift 6 Emit nonisolated/@unchecked Sendable mocks and nonisolated string enums, and mark async mock methods @concurrent so they keep suspending like the real implementations (otherwise intermediate states are unobservable in tests). Includes the regenerated mocks and strings. # Conflicts: # ElementX/Sources/Mocks/Generated/GeneratedMocks.swift * Make the data layer and services nonisolated and Sendable Annotate the value-type models, Rust SDK proxy wrappers, timeline item graph, settings, logging and NSE-shared types as nonisolated, and conform the service protocols to Sendable so their existentials can cross isolation boundaries. These types run off the main actor and no longer inherit the target's default main actor isolation. * Adopt the new isolation across call sites, mocks and signatures Update call sites, closure signatures and mock configuration helpers to match the nonisolated/Sendable data layer, including the main actor isolated mock inits and the @Sendable filter on recentlyVisitedRooms. ^ Conflicts: ^ ElementX/Sources/Services/SecureBackup/SecureBackupController.swift * Remove redundant @MainActor annotations With the app target defaulting to main actor isolation, the explicit @MainActor on view models, coordinators, views and their protocols is no longer required. * Fix concurrency hotspots surfaced by the migration Resolve the room summary main-thread deadlock by moving diff processing onto AsyncStreams, add the SDKListener.onMainActor FIFO bridge for SDK callbacks, hop KVO/timer/UIKit callbacks to the main actor via assumeIsolated, add isolated deinits, and apply the few justified nonisolated(unsafe) escapes for queue-confined Apple APIs. * Fix the unit tests for Swift 6 concurrency Hop the waitForConfirmation body onto the caller's actor (Swift Testing runs confirmation closures off-actor), and adjust the affected suites and async signatures. * offload diffs on concurrent threads instead of main actor * make room info protocols sendable * use a task group for fetching data so that everything runs concurrently in the TextRoomTimelineView when getting the preview. * use the generic onMainActor implementation, which already makes a stream and send the continuation on the main actor. * small pr comments issues being addressed * update enterprise * Update StaticCode to 1.1.0 and specify the required Swift isolation. * fix ElementCallServiceTests * update enterprise * re-generate mocks * update enterprise * enterprise new code conformed to swift 6 --------- Co-authored-by: Doug <douglase@element.io>
89 lines
3.9 KiB
Swift
89 lines
3.9 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2022-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
import Foundation
|
|
import Observation
|
|
|
|
/// A common ViewModel implementation for handling of `State` and `ViewAction`s. Version 2 of this state
|
|
/// store has been re-written to use Swift's new Observation framework.
|
|
///
|
|
///
|
|
/// Generic type State is constrained to the BindableState protocol in that it may contain (but doesn't have to)
|
|
/// a specific portion of state that can be safely bound to.
|
|
/// If we decide to add more features to our state management (like doing state processing off the main thread)
|
|
/// we can do it in this centralised place.
|
|
class StateStoreViewModelV2<State: BindableState, ViewAction> {
|
|
/// For storing subscription references.
|
|
///
|
|
/// Left as public for `ViewModel` implementations convenience.
|
|
var cancellables = Set<AnyCancellable>()
|
|
|
|
/// Constrained interface for passing to Views.
|
|
var context: Context
|
|
|
|
var state: State {
|
|
get { context.viewState }
|
|
set { context.viewState = newValue }
|
|
}
|
|
|
|
init(initialViewState: State, mediaProvider: MediaProviderProtocol? = nil) {
|
|
context = Context(initialViewState: initialViewState, mediaProvider: mediaProvider)
|
|
context.viewModel = self
|
|
}
|
|
|
|
/// Override to handles incoming `ViewAction`s from the `ViewModel`.
|
|
/// - Parameter viewAction: The `ViewAction` to be processed in `ViewModel` implementation.
|
|
func process(viewAction: ViewAction) {
|
|
// Default implementation, -no-op
|
|
}
|
|
|
|
// MARK: - Context
|
|
|
|
/// A constrained and concise interface for interacting with the ViewModel.
|
|
///
|
|
/// This class is closely bound to`StateStoreViewModel`. It provides the exact interface the view should need to interact
|
|
/// ViewModel (as modelled on our previous template architecture with the addition of two-way binding):
|
|
/// - The ability read/observe view state
|
|
/// - The ability to send view events
|
|
/// - The ability to bind state to a specific portion of the view state safely.
|
|
/// This class was brought about a little bit by necessity. The most idiomatic way of interacting with SwiftUI is via `@Published`
|
|
/// properties which which are property wrappers and therefore can't be defined within protocols.
|
|
/// A similar approach is taken in libraries like [CombineFeedback](https://github.com/sergdort/CombineFeedback).
|
|
/// It provides a nice layer of consistency and also safety. As we are not passing the `ViewModel` to the view directly, shortcuts/hacks
|
|
/// can't be made into the `ViewModel`.
|
|
@dynamicMemberLookup
|
|
@Observable final class Context {
|
|
fileprivate weak var viewModel: StateStoreViewModelV2?
|
|
|
|
/// Get-able property for the `ViewState`
|
|
fileprivate(set) var viewState: State
|
|
|
|
/// An optional image loading service so that views can manage themselves
|
|
/// Intentionally non-generic so that it doesn't grow uncontrollably
|
|
let mediaProvider: MediaProviderProtocol?
|
|
|
|
/// Set-able access to the bindable state.
|
|
subscript<T>(dynamicMember keyPath: WritableKeyPath<State.BindStateType, T>) -> T {
|
|
get { viewState.bindings[keyPath: keyPath] }
|
|
set { viewState.bindings[keyPath: keyPath] = newValue }
|
|
}
|
|
|
|
/// Send a `ViewAction` to the `ViewModel` for processing.
|
|
/// - Parameter viewAction: The `ViewAction` to send to the `ViewModel`.
|
|
func send(viewAction: ViewAction) {
|
|
viewModel?.process(viewAction: viewAction)
|
|
}
|
|
|
|
fileprivate init(initialViewState: State, mediaProvider: MediaProviderProtocol?) {
|
|
self.viewState = initialViewState
|
|
self.mediaProvider = mediaProvider
|
|
}
|
|
}
|
|
}
|