Patch 4.0.1

MijickPopups.podspec

@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
   MijickPopups solves two seemingly contradictory problems - to allow developers to create fully customizable popup, and to make the process as simple as possible.
                                DESC
 
-  s.version               = '4.0.0'
+  s.version               = '4.0.1'
   s.ios.deployment_target = '14.0'
   s.osx.deployment_target = '12.0'
   s.tvos.deployment_target = '15.0'

README.md

@@ -63,26 +63,83 @@
 <p>
     <!--Discord-->
     <a href="https://link.mijick.com/discord">
-        <img alt="Join us on Discord" src="https://github.com/Mijick/Assets/blob/main/Popups/Buttons/discord.png" height="40px">
+        <img alt="Join us on Discord" src="https://github.com/Mijick/Assets/blob/main/Common/Buttons/discord.png" height="40px">
     </a>
     <!--Linkedin-->
     <a href="https://link.mijick.com/linkedin">
-        <img alt="Follow us on LinkedIn" src="https://github.com/Mijick/Assets/blob/main/Popups/Buttons/linkedin.png" height="40px">
+        <img alt="Follow us on LinkedIn" src="https://github.com/Mijick/Assets/blob/main/Common/Buttons/linkedin.png" height="40px">
     </a>
     <!--GitHub-->
     <a href="https://link.mijick.com/github">
-        <img alt="See our other frameworks" src="https://github.com/Mijick/Assets/blob/main/Popups/Buttons/github.png" height="40px">
+        <img alt="See our other frameworks" src="https://github.com/Mijick/Assets/blob/main/Common/Buttons/github.png" height="40px">
     </a>
     <!--Medium-->
     <a href="https://link.mijick.com/medium">
-        <img alt="Read us on Medium" src="https://github.com/Mijick/Assets/blob/main/Popups/Buttons/medium.png" height="40px">
+        <img alt="Read us on Medium" src="https://github.com/Mijick/Assets/blob/main/Common/Buttons/medium.png" height="40px">
     </a>
     <!--Buymeacoffee-->
     <a href="https://link.mijick.com/buymeacoffee">
-        <img alt="Buy us a coffee" src="https://github.com/Mijick/Assets/blob/main/Popups/Buttons/buymeacoffee.png" height="40px">
+        <img alt="Buy us a coffee" src="https://github.com/Mijick/Assets/blob/main/Common/Buttons/buymeacoffee.png" height="40px">
     </a>
 </p>
 
+<!--Features-->
+# ✨ Features
+<table><tbody>
+    <tr>
+        <td>📱</td>
+        <td>Three positions for the popups: Top, Center or Bottom</td>
+    </tr>
+    <tr>
+        <td>🎁</td>
+        <td>Stackable popups</td>
+    </tr>
+    <tr>
+        <td>🐫</td>
+        <td>Three height modes: Automatic, Large or Fullscreen</td>
+    </tr>
+    <tr>
+        <td>⛹️</td>
+        <td>Resizable popups</td>
+    </tr>
+    <tr>
+        <td>🍃</td>
+        <td>Automatic dismissal</td>
+    </tr>
+    <tr>
+        <td>🖖</td>
+        <td>Super easy to use from any place in the code</td>
+    </tr>
+    <tr>
+        <td>🚧</td>
+        <td>Fully customizable</td>
+    </tr>
+    <tr>
+        <td>🕺</td>
+        <td>Beautiful animations</td>
+    </tr>
+    <tr>
+        <td>🤏🏼</td>
+        <td>Gestures support</td>
+    </tr>
+    <tr>
+        <td>🍏</td>
+        <td>Works with SwiftUI sheets</td>
+    </tr>
+    <tr>
+        <td>🖥️</td>
+        <td>Supports iOS, macOS, tvOS, watchOS and visionOS</td>
+    </tr>
+    <tr>
+        <td>⚡️</td>
+        <td>Supports Swift 6</td>
+    </tr>
+    <tr>
+        <td>🚀</td>
+        <td>... and others</td>
+    </tr>
+</tbody></table>
+
 <!--Description-->
 # ☀️ Why MijickPopups?
 MijickPopups library solves two seemingly contradictory problems - to allow developers to create fully customizable popup views, and to make the process as simple as possible. Here is why we think we have successfully met these objectives:
@@ -145,7 +202,7 @@ Join the welcoming community of developers on [Discord](https://link.mijick.com/
 # 🌼 Contribute
 To contribute a feature or idea to **MijickPopups**, create an [issue](https://github.com/Mijick/Popups/issues/new?assignees=FulcrumOne&labels=state%3A+inactive%2C+type%3A+feature&projects=&template=🚀-feature-request.md&title=%5BFREQ%5D) explaining your idea or bring it up on [Discord](https://discord.com/invite/dT5V7nm5SC). <br>
 If you find a bug, please create an [issue](https://github.com/Mijick/Popups/issues/new?assignees=FulcrumOne%2C+jay-jay-lama&labels=state%3A+inactive%2C+type%3A+bug&projects=&template=🦟-bug-report.md&title=%5BBUG%5D). <br>
-If you would like to contribute, please refer to the [Contribution Guidelines](https://link.mijick.com/contribution-guidelines).
+If you would like to contribute, please refer to the [Contribution Guidelines](https://github.com/Mijick/Popups/blob/main/.github/CONTRIBUTING.md).
 
 <!--Sponsorship-->
 # 💜 Sponsor our work

Sources/Internal/Containers/PopupStack.swift

@@ -27,7 +27,6 @@ extension PopupStack {
 }
 
 
-
 // MARK: - STACK OPERATIONS
 
 
@@ -96,7 +95,6 @@ private extension PopupStack {
 }
 
 
-
 // MARK: - STACK CONTAINER OPERATIONS
 
 

Sources/Internal/Models/AnyPopup.swift

@@ -24,7 +24,6 @@ struct AnyPopup: Popup {
 }
 
 
-
 // MARK: - INITIALIZE & UPDATE
 
 
@@ -70,7 +69,6 @@ private extension AnyPopup {
 }
 
 
-
 // MARK: - PROTOCOLS CONFORMANCE
 
 

Sources/Internal/Models/ID+Popup.swift

@@ -37,7 +37,6 @@ extension PopupID {
 }
 
 
-
 // MARK: - HELPERS
 
 

Sources/Internal/UI/PopupCenterStackView.swift

@@ -15,12 +15,12 @@ struct PopupCenterStackView: View {
     @ObservedObject var viewModel: VM.CenterStack
 
 
-    var body: some View {
+    var body: some View { if viewModel.screen.height > 0 {
         ZStack(content: createPopupStack)
             .id(viewModel.popups.isEmpty)
             .transition(transition)
             .frame(maxWidth: .infinity, maxHeight: viewModel.screen.height)
-    }
+    }}
 }
 private extension PopupCenterStackView {
     func createPopupStack() -> some View {

Sources/Internal/UI/PopupVerticalStackView.swift

@@ -15,11 +15,11 @@ struct PopupVerticalStackView: View {
     @ObservedObject var viewModel: VM.VerticalStack
 
 
-    var body: some View {
+    var body: some View { if viewModel.screen.height > 0 {
         ZStack(alignment: (!viewModel.alignment).toAlignment(), content: createPopupStack)
             .frame(height: viewModel.screen.height, alignment: viewModel.alignment.toAlignment())
             .onDragGesture(onChanged: viewModel.onPopupDragGestureChanged, onEnded: viewModel.onPopupDragGestureEnded, isEnabled: viewModel.dragGestureEnabled)
-    }
+    }}
 }
 private extension PopupVerticalStackView {
     func createPopupStack() -> some View {

Sources/Internal/UI/PopupView.swift

@@ -22,6 +22,14 @@ struct PopupView: View {
     private let bottomStackViewModel: VM.VerticalStack = .init(BottomPopupConfig.self)
 
 
+    init(rootView: any View, popupStack: PopupStack) {
+        #if os(tvOS)
+        self.rootView = rootView
+        #endif
+        self.stack = popupStack
+
+        Task { [self] in await updateViewModels { await $0.updatePopups(stack.popups) } }
+    }
     var body: some View {
         #if os(tvOS)
         AnyView(rootView)

Sources/Internal/View Models/ViewModel+CentreStack.swift

@@ -16,12 +16,11 @@ extension VM { class CenterStack: ViewModel { required init() {}
     var popups: [AnyPopup] = []
     var activePopupProperties: ActivePopupProperties = .init()
     var screen: Screen = .init()
-    var updatePopupAction: ((AnyPopup) async -> ())!
-    var closePopupAction: ((AnyPopup) async -> ())!
+    var updatePopupAction: ((AnyPopup) async -> ())?
+    var closePopupAction: ((AnyPopup) async -> ())?
 }}
 
 
-
 // MARK: - METHODS / VIEW MODEL / ACTIVE POPUP
 
 
@@ -84,7 +83,6 @@ extension VM.CenterStack {
 }
 
 
-
 // MARK: - METHODS / VIEW MODEL / SELECTED POPUP
 
 
@@ -104,7 +102,6 @@ private extension VM.CenterStack {
 }
 
 
-
 // MARK: - METHODS / VIEW
 
 

Sources/Internal/View Models/ViewModel+VerticalStack.swift

@@ -16,12 +16,11 @@ extension VM { class VerticalStack: ViewModel { required init() {}
     var popups: [AnyPopup] = []
     var activePopupProperties: ActivePopupProperties = .init()
     var screen: Screen = .init()
-    var updatePopupAction: ((AnyPopup) async -> ())!
-    var closePopupAction: ((AnyPopup) async -> ())!
+    var updatePopupAction: ((AnyPopup) async -> ())?
+    var closePopupAction: ((AnyPopup) async -> ())?
 }}
 
 
-
 // MARK: - METHODS / VIEW MODEL / ACTIVE POPUP
 
 
@@ -171,7 +170,6 @@ extension VM.VerticalStack {
 }
 
 
-
 // MARK: - METHODS / VIEW MODEL / SELECTED POPUP
 
 
@@ -214,7 +212,6 @@ private extension VM.VerticalStack {
 }
 
 
-
 // MARK: - METHODS / VIEW
 
 
@@ -307,7 +304,6 @@ extension VM.VerticalStack {
 }
 
 
-
 // MARK: - GESTURES
 
 
@@ -371,7 +367,7 @@ extension VM.VerticalStack {
 }
 private extension VM.VerticalStack {
     func dismissLastPopupIfNeeded(_ popup: AnyPopup) async { switch activePopupProperties.translationProgress >= dragThreshold {
-        case true: await closePopupAction(popup)
+        case true: await closePopupAction?(popup)
         case false: return
     }}
     func calculateTargetDragHeight(_ activePopup: AnyPopup) async -> CGFloat {

Sources/Internal/View Models/ViewModel.swift

@@ -21,8 +21,8 @@ enum VM {}
     var screen: Screen { get set }
 
     // MARK: Actions
-    var updatePopupAction: ((AnyPopup) async -> ())! { get set }
-    var closePopupAction: ((AnyPopup) async -> ())! { get set }
+    var updatePopupAction: ((AnyPopup) async -> ())? { get set }
+    var closePopupAction: ((AnyPopup) async -> ())? { get set }
 
     // MARK: Methods
     func calculateActivePopupHeight() async -> CGFloat?
@@ -35,7 +35,6 @@ enum VM {}
 }
 
 
-
 // MARK: - INITIALIZE & SETUP
 
 
@@ -54,7 +53,6 @@ extension ViewModel {
 }
 
 
-
 // MARK: UPDATE
 
 
@@ -95,15 +93,15 @@ extension ViewModel {
 
         let newHeight = await calculatePopupHeight(heightCandidate, popup)
         if newHeight != popup.height {
-            await updatePopupAction(popup.updatedHeight(newHeight))
+            await updatePopupAction?(popup.updatedHeight(newHeight))
         }
     }
 }
 
 // MARK: Popup Drag Height
 extension ViewModel {
     func updatePopupDragHeight(_ targetDragHeight: CGFloat, _ popup: AnyPopup) async {
-        await updatePopupAction(popup.updatedDragHeight(targetDragHeight))
+        await updatePopupAction?(popup.updatedDragHeight(targetDragHeight))
     }
 }
 

Sources/Public/Setup/Public+Setup+SceneDelegate.swift

@@ -73,7 +73,6 @@ extension PopupSceneDelegate {
 }
 
 
-
 // MARK: - WINDOW
 
 

Sources/Public/Setup/Public+Setup+View.swift

@@ -44,11 +44,11 @@ public extension View {
      */
     func registerPopups(id: PopupStackID = .shared, configBuilder: @escaping (GlobalConfigContainer) -> GlobalConfigContainer = { $0 }) -> some View {
         #if os(tvOS)
-        PopupView(rootView: self, stack: .registerStack(id: id)).onAppear { _ = configBuilder(.init()) }
+        PopupView(rootView: self, popupStack: .registerStack(id: id)).onAppear { _ = configBuilder(.init()) }
         #else
         self
             .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .overlay(PopupView(stack: .registerStack(id: id)), alignment: .top)
+            .overlay(PopupView(rootView: self, popupStack: .registerStack(id: id)), alignment: .top)
             .onAppear { _ = configBuilder(.init()) }
         #endif
     }

Tests/Tests+PopupID.swift

@@ -16,7 +16,6 @@ import SwiftUI
 @MainActor final class PopupIDTests: XCTestCase {}
 
 
-
 // MARK: - TEST CASES
 
 
@@ -119,7 +118,6 @@ extension PopupIDTests {
 }
 
 
-
 // MARK: - HELPERS
 
 

Tests/Tests+PopupStack.swift

@@ -20,7 +20,6 @@ import SwiftUI
 }
 
 
-
 // MARK: - TEST CASES
 
 
@@ -241,7 +240,6 @@ extension PopupStackTests {
 }
 
 
-
 // MARK: - HELPERS
 
 

Tests/Tests+ViewModel+PopupCenterStack.swift

@@ -37,7 +37,6 @@ private extension PopupCenterStackViewModelTests {
 }
 
 
-
 // MARK: - TEST CASES
 
 
@@ -223,7 +222,6 @@ private extension PopupCenterStackViewModelTests {
 }
 
 
-
 // MARK: - HELPERS