access control improvements, cleanup, show how to check selected index

Author: igork-ramotion

BlobMenu.xcodeproj/project.pbxproj

@@ -125,12 +125,12 @@
 		393AAE86246053B50059752A /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				393AAE87246053B50059752A /* StickyEffectView.swift */,
-				393AAE88246053B50059752A /* HamburgerView.swift */,
-				393AAE89246053B50059752A /* MenuItemView.swift */,
 				393AAE8A246053B50059752A /* BlobMenuView.swift */,
 				393AAE8B246053B50059752A /* BackgroundView.swift */,
+				393AAE87246053B50059752A /* StickyEffectView.swift */,
 				393AAE8C246053B50059752A /* StickyPathGenerator.swift */,
+				393AAE88246053B50059752A /* HamburgerView.swift */,
+				393AAE89246053B50059752A /* MenuItemView.swift */,
 				393AAE8D246053B50059752A /* Theme.swift */,
 			);
 			path = Views;

Example/Example/Screens/ContentView.swift

@@ -10,8 +10,16 @@ import SwiftUI
 import BlobMenu
 
 struct ContentView: View {
+    
+    @Environment(\.blobMenuEnvironment) var menuEnvironment: BlobMenuEnvironment
+    
+    
     var body: some View {
-        BlobMenuView.createMenu(items: MenuItem.all)
+        VStack {
+            BlobMenuView.createMenu(items: MenuItem.all)
+        }.onReceive(menuEnvironment.$selectedIndex) { index in
+            print("index: \(index)")
+        }
     }
 }
 

Sources/Models/BlobMenuEnvironment.swift

@@ -9,20 +9,21 @@
 import Foundation
 import SwiftUI
 
-extension EnvironmentValues {
+public extension EnvironmentValues {
     var blobMenuEnvironment: BlobMenuEnvironment {
         get { return self[BlobMenuEnvironmentKey.self] }
         set { self[BlobMenuEnvironmentKey.self] = newValue }
     }
 }
 
-public struct BlobMenuEnvironmentKey: EnvironmentKey {
-    public static let defaultValue: BlobMenuEnvironment = BlobMenuEnvironment()
+struct BlobMenuEnvironmentKey: EnvironmentKey {
+    static let defaultValue: BlobMenuEnvironment = BlobMenuEnvironment()
 }
 
 public final class BlobMenuEnvironment: ObservableObject {
-    @Published var isOpened: Bool = false
-    @Published var isMenuItemsVisible: Bool = false 
+    @Published public internal(set) var isOpened: Bool = false
+    @Published public internal(set) var isMenuItemsVisible: Bool = false
+    @Published public internal(set) var selectedIndex: Int = 0
 
     fileprivate init() {}
 }

Sources/Utilities/AnimationCompletion.swift

@@ -9,39 +9,6 @@
 import Foundation
 import SwiftUI
 
-/*
-struct AnimationCompletion: GeometryEffect {
-    
-    /// Ratio should be in range [0...1]
-    var progress: CGFloat = 0
-    
-    var onCompletion: () -> Void
-    
-    var animatableData: CGFloat {
-        get { return progress }
-        set { progress = newValue }
-    }
-
-    func effectValue(size: CGSize) -> ProjectionTransform {
-        if self.progress == 1 {
-            DispatchQueue.main.async {
-                self.onCompletion()
-            }
-        }
-        
-        return ProjectionTransform()
-    }
-}
-
-extension View {
-    func onAnimationCompleted(condition: Bool, callback: @escaping () -> Void) -> some View {
-        let m = AnimationCompletion(progress: condition ? 1 : 0, onCompletion: callback)
-        return AnyView(self.modifier(m))
-    }
-}
-*/
-
-
 private struct CompletionPreferenceKey: PreferenceKey {
   typealias Value = CGFloat
 

Sources/Views/BlobMenuView.swift

@@ -10,9 +10,9 @@ import SwiftUI
 
 public struct BlobMenuView: View {
 
-    @EnvironmentObject var environment: BlobMenuEnvironment
-    @State var selectedIndex: Int = 0
+    @State public var selectedIndex: Int
 
+    @EnvironmentObject private var environment: BlobMenuEnvironment
     private let items: [MenuItem]
 
     public static func createMenu(items: [MenuItem], selectedIndex: Int = 0) -> some View {
@@ -21,7 +21,11 @@ public struct BlobMenuView: View {
 
     private init(items: [MenuItem], selectedIndex: Int = 0) {
         self.items = items
-        self.selectedIndex = selectedIndex.limited(0, items.count - 1)
+        
+        let limitedIndex = selectedIndex.limited(0, items.count - 1)
+        _selectedIndex = State<Int>.init(initialValue: limitedIndex)
+        
+        BlobMenuEnvironmentKey.defaultValue.selectedIndex = limitedIndex
 
         UIWindow.current?.addGesture(type: .tap) { _ in
             BlobMenuEnvironmentKey.defaultValue.isMenuItemsVisible = false
@@ -69,7 +73,6 @@ public struct BlobMenuView: View {
 
         return AnyView(effectView.fill(Color.backgroundColor)
             .frame(size: CGSize(width: w, height: f.height)))
-            //.position(CGPoint(x: b.maxX + w / 2 - r, y: f.height / 2))
     }
 
     private var background: some View {
@@ -107,6 +110,7 @@ public struct BlobMenuView: View {
                 MenuItemView(item: item, isSelected: self.selectedIndex == index, isOpened: self.$environment.isMenuItemsVisible).onTapGesture {
 
                     self.selectedIndex = index
+                    BlobMenuEnvironmentKey.defaultValue.selectedIndex = index
                 }
             }
         }