增加了 Swift 6 兼容性支持

增加了 queryView 功能
fatbobman · Apr 16, 2024 · 4ba8271 · 4ba8271
1 parent 151b788
commit 4ba8271
Show file tree

Hide file tree

Showing 27 changed files with 334 additions and 37 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/...pm/xcode/package.xcworkspace/xcuserdata/yangxu.xcuserdatad/UserInterfaceState.xcuserstate b/...pm/xcode/package.xcworkspace/xcuserdata/yangxu.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SwiftUIOverlayContainer.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SwiftUIOverlayContainer.xcscheme
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SwiftUIOverlayContainer"
+               BuildableName = "SwiftUIOverlayContainer"
+               BlueprintName = "SwiftUIOverlayContainer"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "SwiftUIOverlayContainerTests"
+               BuildableName = "SwiftUIOverlayContainerTests"
+               BlueprintName = "SwiftUIOverlayContainerTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "SwiftUIOverlayContainer"
+            BuildableName = "SwiftUIOverlayContainer"
+            BlueprintName = "SwiftUIOverlayContainer"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcuserdata/yangxu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/.swiftpm/xcode/xcuserdata/yangxu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "E8B0B5CD-BB78-4F9E-86E6-96E2C76C798B"
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "00FC7129-C0C0-428E-B885-389AB000E4BE"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/SwiftUIOverlayContainer/ContainerManager/ContainerManager.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "99"
+            endingLineNumber = "99"
+            landmarkName = "createPublisher(for:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "10104EFD-C213-4812-AD64-291BFBCDC114"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/SwiftUIOverlayContainer/ContainerManager/ContainerManager.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "130"
+            endingLineNumber = "130"
+            landmarkName = "_show(view:with:in:using:isPresented:animated:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "329034B1-3198-4A21-BF0F-ECEEB2526626"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Sources/SwiftUIOverlayContainer/ContainerManager/ContainerManager.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "120"
+            endingLineNumber = "120"
+            landmarkName = "_show(view:with:in:using:isPresented:animated:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>
diff --git a/.swiftpm/xcode/xcuserdata/yangxu.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/yangxu.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>SwiftUIOverlayContainer-Package.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>SwiftUIOverlayContainer.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>SwiftUIOverlayContainer</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>SwiftUIOverlayContainerTests</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/...codeproj/project.xcworkspace/xcuserdata/yangxu.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/yangxu.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Demo/Demo.xcodeproj/xcuserdata/yangxu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Demo/Demo.xcodeproj/xcuserdata/yangxu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "0A3F0EB0-7747-4252-A57C-05A1B711BDCA"
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/Demo/Demo.xcodeproj/xcuserdata/yangxu.xcuserdatad/xcschemes/xcschememanagement.plist b/Demo/Demo.xcodeproj/xcuserdata/yangxu.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Demo (iOS).xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>Demo (macOS).xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -27,7 +27,10 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "SwiftUIOverlayContainer",
-            dependencies: []
+            dependencies: [],
+            swiftSettings: [
+              .enableExperimentalFeature("StrictConcurrency"),
+            ]
         ),
         .testTarget(
             name: "SwiftUIOverlayContainerTests",

diff --git a/Sources/SwiftUIOverlayContainer/Container/Container.swift b/Sources/SwiftUIOverlayContainer/Container/Container.swift
@@ -75,6 +75,7 @@ struct SwiftUIOverlayContainerModifier: ViewModifier {
 /// The SwiftUI overlay container view.
 ///
 /// Receive the command from container manager, show or dismiss views according the configuration
+@MainActor
 struct OverlayContainer: View {
     /// Container configuration
     let configuration: ContainerConfigurationProtocol

diff --git a/Sources/SwiftUIOverlayContainer/Container/ContainerProtocols.swift b/Sources/SwiftUIOverlayContainer/Container/ContainerProtocols.swift
@@ -117,3 +117,8 @@ public protocol ContainerConfigurationProtocol: ContainerViewConfigurationProtoc
     & ContainerTypeConfigurationProtocol
     & ContainerCompositionProtocol
     & ContainerQueueControlProtocol {}
+
+/// A Query Type for get specific container's queue
+public class IdentifiableContainerViewQuery {
+  var views:[IdentifiableContainerView] = []
+}
diff --git a/Sources/SwiftUIOverlayContainer/Container/ContainerType.swift b/Sources/SwiftUIOverlayContainer/Container/ContainerType.swift
@@ -13,7 +13,7 @@ import Foundation
 import SwiftUI
 
 /// The display type of the container view, this type will determine the layout of the container
-public enum ContainerViewDisplayType {
+public enum ContainerViewDisplayType: Sendable {
     /// The views are arranged horizontally. Normally (spacing is greater than 0), views do not overlap each other. Internal implementation uses HStack.
     ///
     /// In horizontal mode, all views share a single background
@@ -29,7 +29,7 @@ public enum ContainerViewDisplayType {
 }
 
 /// The  view queue type of the container. This type will determine if multiple views are allowed to exist in the container at the same time
-public enum ContainerViewQueueType {
+public enum ContainerViewQueueType: Sendable {
     ///  Only one view can be displayed at a time. When the container receives a new view, the current view will be dismissed and the new view will be displayed.
     case oneByOne
     /// Only one view can be displayed at a time. A new view needs to wait until the current view is dismissed (close call dismiss code, Binding value, auto dismiss, etc.) before it can be displayed.

diff --git a/Sources/SwiftUIOverlayContainer/Container/QueueHandler.swift b/Sources/SwiftUIOverlayContainer/Container/QueueHandler.swift
@@ -277,6 +277,10 @@ extension ContainerQueueHandler {
             dismissMainQueue(animated: animated)
         case let .dismissTopmostView(animated):
             dismissTopmostView(animated: animated)
+        case let .viewQuery(containerName, query):
+            if containerName == container {
+              query.views = mainQueue + tempQueue
+            }
         }
     }
 
@@ -296,6 +300,10 @@ extension ContainerQueueHandler {
             dismissMainQueue(animated: animated)
         case let .dismissTopmostView(animated):
             dismissTopmostView(animated: animated)
+        case let .viewQuery(containerName, query):
+            if containerName == container {
+              query.views = mainQueue + tempQueue
+            }
         }
     }
 
@@ -319,6 +327,10 @@ extension ContainerQueueHandler {
             dismissMainQueue(animated: animated)
         case let .dismissTopmostView(animated):
             dismissTopmostView(animated: animated)
+        case let .viewQuery(containerName, query):
+            if containerName == container {
+              query.views = mainQueue + tempQueue
+            }
         }
     }
 
@@ -336,11 +348,13 @@ extension ContainerQueueHandler {
             _transferring = false
             return
         }
-        delayToRun(seconds: seconds) {
+        Task { @MainActor in
+          await delayToRun(seconds: seconds) {
             guard let view = self.tempQueue.first else { return }
             self.tempQueue.removeFirst()
             self._transferring = false
             self.pushViewIntoQueue(view, queue: .main)
+          }
         }
     }
 }

diff --git a/Sources/SwiftUIOverlayContainer/Container/ViewFrameInfoModifier.swift b/Sources/SwiftUIOverlayContainer/Container/ViewFrameInfoModifier.swift
@@ -13,7 +13,7 @@ import Foundation
 import SwiftUI
 
 struct ViewFrameKey: PreferenceKey {
-    static var defaultValue: CGRect = .zero
+    static let defaultValue: CGRect = .zero
     static func reduce(value: inout CGRect, nextValue: () -> CGRect) {}
 }
 

diff --git a/Sources/SwiftUIOverlayContainer/ContainerManager/ContainerAction.swift b/Sources/SwiftUIOverlayContainer/ContainerManager/ContainerAction.swift
@@ -34,4 +34,8 @@ enum OverlayContainerAction {
     ///
     /// Pass false to disable animation of transition
     case dismissTopmostView(Bool)
+    /// Get specific container's view queue
+    ///
+    /// Pass container's name and a IdentifiableContainerViewQuery instance
+    case viewQuery(String, IdentifiableContainerViewQuery)
 }
diff --git a/Sources/SwiftUIOverlayContainer/ContainerManager/ContainerManager.swift b/Sources/SwiftUIOverlayContainer/ContainerManager/ContainerManager.swift
@@ -29,7 +29,7 @@ import SwiftUI
 ///     }
 ///
 /// Because the Container Manager adopts the singleton pattern, you can directly call public methods such as show and dismiss through code even if you are not in the SwiftUI view.
-public final class ContainerManager: ContainerManagerLogger {
+public final class ContainerManager: ContainerManagerLogger, @unchecked Sendable {
     var publishers: [String: ContainerViewPublisher] = [:]
 
     public init(logger: SwiftUIOverlayContainerLoggerProtocol? = nil, debugLevel: Int = 0) {
@@ -228,6 +228,18 @@ extension ContainerManager: ContainerViewManagementForEnvironment {
             }
         }
     }
+
+    /// Query a specific container's queue
+    ///
+    ///  A very brief wait is required, even if it's only 0.01 seconds, otherwise the result cannot be obtained.
+    /// - Parameters:
+    ///   - container: container name
+    ///   - queryResult: a IdentifiableContainerViewQuery instance
+    public func queryViews(in container: String, queryResult: IdentifiableContainerViewQuery ) {
+      if let publisher = getPublisher(for: container) {
+        publisher.upstream.send(.viewQuery(container, queryResult))
+      }
+    }
 }
 
 public extension ContainerManager {

diff --git a/Sources/SwiftUIOverlayContainer/ContainerView/AutoDismiss.swift b/Sources/SwiftUIOverlayContainer/ContainerView/AutoDismiss.swift
@@ -60,12 +60,10 @@ extension View {
     func autoDismiss(_ type: ContainerViewAutoDismiss, dismissAction: @escaping DismissAction) -> some View {
         if case .seconds(let timeInterval) = type {
             self
-                .task {
+                .task { @MainActor in
                     try? await Task.sleep(seconds: timeInterval)
                     if !Task.isCancelled {
-                        await MainActor.run {
-                            dismissAction()
-                        }
+                        dismissAction()
                     }
                 }
         } else {

diff --git a/Sources/SwiftUIOverlayContainer/ContainerView/ContainerViewProtocols.swift b/Sources/SwiftUIOverlayContainer/ContainerView/ContainerViewProtocols.swift
@@ -12,7 +12,7 @@
 import Foundation
 import SwiftUI
 
-typealias DismissAction = () -> Void
+typealias DismissAction = @MainActor @Sendable () -> Void
 
 /// A configuration protocol for container and container view
 public protocol ContainerViewConfigurationProtocol {

diff --git a/Sources/SwiftUIOverlayContainer/ContainerView/DissmissGesture.swift b/Sources/SwiftUIOverlayContainer/ContainerView/DissmissGesture.swift
@@ -44,6 +44,7 @@ extension ContainerViewDismissGesture {
     ///
     /// The dismiss Action not only includes the cancellation action of Overlay Container view,
     /// but also the dismiss closure specified by user
+    @MainActor
     func generateGesture(with dismissAction: @escaping DismissAction) -> AnyGesture<Void>? {
         // only support longPress in tvOS
         #if os(tvOS)
@@ -169,6 +170,7 @@ extension View {
     ///          .dismissGesture(gestureType:gesture, dismissAction: some action)
     ///
     @ViewBuilder
+    @MainActor
     func dismissGesture(gestureType: ContainerViewDismissGesture, dismissAction: @escaping () -> Void) -> some View {
         if let gesture = gestureType.generateGesture(with: dismissAction) {
             self.gesture(gesture)