replace clerk env object with observed object singleton (#31)

clerk · Mar 25, 2024 · 70d5661 · 70d5661
1 parent 2e6ff08
commit 70d5661
Show file tree

Hide file tree

Showing 51 changed files with 59 additions and 109 deletions.
diff --git a/ClerkDemo/ClerkDemo/DemoSpecific/ClerkDemoSettingsModifier.swift b/ClerkDemo/ClerkDemo/DemoSpecific/ClerkDemoSettingsModifier.swift
@@ -42,5 +42,4 @@ extension View {
 #Preview {
     HomeView()
         .demoSettings()
-        .environmentObject(Clerk.shared)
 }
diff --git a/ClerkDemo/ClerkDemo/DemoSpecific/DemoAppSettingsView.swift b/ClerkDemo/ClerkDemo/DemoSpecific/DemoAppSettingsView.swift
@@ -12,7 +12,7 @@ import Factory
 struct DemoAppSettingsView: View {
     @AppStorage("publishableKey") var publishableKey: String = ""
     @State private var text: String = ""
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @Environment(\.dismiss) private var dismiss
 
     var body: some View {
@@ -51,5 +51,4 @@ struct DemoAppSettingsView: View {
 
 #Preview {
     DemoAppSettingsView()
-        .environmentObject(Clerk.shared)
 }
diff --git a/ClerkDemo/ClerkDemo/HomeView.swift b/ClerkDemo/ClerkDemo/HomeView.swift
@@ -34,5 +34,4 @@ struct HomeView: View {
 
 #Preview {
     HomeView()
-        .environmentObject(Clerk.shared)
 }
diff --git a/Sources/UI/Common/AuthSocialProvidersView.swift b/Sources/UI/Common/AuthSocialProvidersView.swift
@@ -11,7 +11,7 @@ import SwiftUI
 import Algorithms
 
 struct AuthSocialProvidersView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @State private var errorWrapper: ErrorWrapper?
     @Environment(\.clerkTheme) private var clerkTheme
     @State private var viewSize: CGSize?
@@ -122,7 +122,6 @@ extension AuthSocialProvidersView {
 #Preview {
     AuthSocialProvidersView(useCase: .signIn)
         .padding()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Common/OrgLogoView.swift b/Sources/UI/Common/OrgLogoView.swift
@@ -9,7 +9,7 @@ import SwiftUI
 import NukeUI
 
 struct OrgLogoView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @Environment(\.clerkTheme) private var clerkTheme
 
     var body: some View {

diff --git a/Sources/UI/Components/Auth/AuthView.swift b/Sources/UI/Components/Auth/AuthView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct AuthView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.dismiss) private var dismiss
     @Environment(\.clerkTheme) private var clerkTheme
@@ -141,7 +141,6 @@ struct AuthView: View {
 
 #Preview {
     AuthView()
-        .environmentObject(Clerk.shared)
         .environmentObject(ClerkUIState())
 }
 

diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOneAlternativeMethodsView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOneAlternativeMethodsView.swift
@@ -11,7 +11,7 @@ import SwiftUI
 import NukeUI
 
 struct SignInFactorOneAlternativeMethodsView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @State private var errorWrapper: ErrorWrapper?
 
@@ -93,7 +93,6 @@ struct SignInFactorOneAlternativeMethodsView: View {
 #Preview {
     SignInFactorOneAlternativeMethodsView(currentFactor: nil)
         .padding()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOneEmailCodeView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOneEmailCodeView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorOneEmailCodeView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
 
     @State private var code: String = ""
@@ -83,7 +83,6 @@ struct SignInFactorOneEmailCodeView: View {
 
 #Preview {
     SignInFactorOneEmailCodeView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOneEmailLinkView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOneEmailLinkView.swift
@@ -8,7 +8,7 @@
 //import SwiftUI
 //
 //struct SignInFactorOneEmailLinkView: View {
-//    @EnvironmentObject private var clerk: Clerk
+//    @ObservedObject private var clerk = Clerk.shared
 //    @EnvironmentObject private var clerkUIState: ClerkUIState
 //    @State private var errorWrapper: ErrorWrapper?
 //        
@@ -69,5 +69,4 @@
 //
 //#Preview {
 //    SignInFactorOneEmailLinkView()
-//        .environmentObject(Clerk.shared)
 //}
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOnePasswordView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOnePasswordView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorOnePasswordView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
 
@@ -105,7 +105,6 @@ struct SignInFactorOnePasswordView: View {
 
 #Preview {
     SignInFactorOnePasswordView()
-        .environmentObject(Clerk.shared)
         .environmentObject(ClerkUIState())
 }
 

diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOnePhoneCodeView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOnePhoneCodeView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorOnePhoneCodeView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
 
     @State private var code: String = ""
@@ -83,7 +83,6 @@ struct SignInFactorOnePhoneCodeView: View {
 
 #Preview {
     SignInFactorOnePhoneCodeView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOneResetView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOneResetView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorOneResetView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
 
@@ -118,7 +118,6 @@ struct SignInFactorOneResetView: View {
 
 #Preview {
     SignInFactorOneResetView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOneUseAnotherMethodView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOneUseAnotherMethodView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorOneUseAnotherMethodView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
     @Environment(\.dismiss) private var dismiss
@@ -56,7 +56,6 @@ struct SignInFactorOneUseAnotherMethodView: View {
 
 #Preview {
     SignInFactorOneUseAnotherMethodView(currentFactor: nil)
-        .environmentObject(Clerk.shared)
         .environmentObject(ClerkUIState())
 }
 

diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorOneView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorOneView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorOneView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.openURL) private var openURL
 
@@ -95,7 +95,6 @@ struct SignInFactorOneView: View {
 
 #Preview {
     SignInFactorOneView()
-        .environmentObject(Clerk.shared)
         .environmentObject(ClerkUIState())
 }
 

diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorTwoAlternativeMethodsView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorTwoAlternativeMethodsView.swift
@@ -11,7 +11,7 @@ import SwiftUI
 import NukeUI
 
 struct SignInFactorTwoAlternativeMethodsView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @State private var errorWrapper: ErrorWrapper?
 
@@ -61,7 +61,6 @@ struct SignInFactorTwoAlternativeMethodsView: View {
 
 #Preview {
     SignInFactorTwoAlternativeMethodsView(currentFactor: nil)
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorTwoBackupCodeView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorTwoBackupCodeView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorTwoBackupCodeView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
 
@@ -82,7 +82,6 @@ struct SignInFactorTwoBackupCodeView: View {
 
 #Preview {
     SignInFactorTwoBackupCodeView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorTwoPhoneCodeView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorTwoPhoneCodeView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorTwoPhoneCodeView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
 
     @State private var code: String = ""
@@ -78,7 +78,6 @@ struct SignInFactorTwoPhoneCodeView: View {
 
 #Preview {
     SignInFactorTwoPhoneCodeView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorTwoTotpCodeView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorTwoTotpCodeView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorTwoTotpCodeView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
 
     @State private var code: String = ""
@@ -61,7 +61,6 @@ struct SignInFactorTwoTotpCodeView: View {
 
 #Preview {
     SignInFactorTwoTotpCodeView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorTwoUseAnotherMethodView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorTwoUseAnotherMethodView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorTwoUseAnotherMethodView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
     @Environment(\.dismiss) private var dismiss
@@ -55,7 +55,6 @@ struct SignInFactorTwoUseAnotherMethodView: View {
 
 #Preview {
     SignInFactorTwoUseAnotherMethodView(currentFactor: nil)
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFactorTwoView.swift b/Sources/UI/Components/Auth/SignIn/SignInFactorTwoView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFactorTwoView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.openURL) private var openURL
 

diff --git a/Sources/UI/Components/Auth/SignIn/SignInForgotPasswordView.swift b/Sources/UI/Components/Auth/SignIn/SignInForgotPasswordView.swift
@@ -12,7 +12,7 @@ import NukeUI
 import AuthenticationServices
 
 struct SignInForgotPasswordView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
     @State private var errorWrapper: ErrorWrapper?
@@ -82,7 +82,6 @@ struct SignInForgotPasswordView: View {
 
 #Preview {
     SignInForgotPasswordView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignIn/SignInFormView.swift b/Sources/UI/Components/Auth/SignIn/SignInFormView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInFormView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
 
@@ -147,7 +147,6 @@ struct SignInFormView: View {
 #Preview {
     SignInFormView()
         .padding()
-        .environmentObject(Clerk.shared)
         .environmentObject(ClerkUIState())
 }
 

diff --git a/Sources/UI/Components/Auth/SignIn/SignInResetPasswordView.swift b/Sources/UI/Components/Auth/SignIn/SignInResetPasswordView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInResetPasswordView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
 

diff --git a/Sources/UI/Components/Auth/SignIn/SignInStartView.swift b/Sources/UI/Components/Auth/SignIn/SignInStartView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignInStartView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
 
     private var socialProvidersEnabled: Bool {
@@ -66,7 +66,6 @@ struct SignInStartView: View {
 
 #Preview {
     SignInStartView()
-        .environmentObject(Clerk.shared)
 }
 
 #endif
diff --git a/Sources/UI/Components/Auth/SignUp/SignUpEmailCodeView.swift b/Sources/UI/Components/Auth/SignUp/SignUpEmailCodeView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignUpEmailCodeView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
 
     @State private var code: String = ""
@@ -79,7 +79,6 @@ struct SignUpEmailCodeView: View {
 
 #Preview {
     return SignUpEmailCodeView()
-        .environmentObject(Clerk.shared)
         .environmentObject(ClerkUIState())
 }
 

diff --git a/Sources/UI/Components/Auth/SignUp/SignUpFormView.swift b/Sources/UI/Components/Auth/SignUp/SignUpFormView.swift
@@ -10,7 +10,7 @@
 import SwiftUI
 
 struct SignUpFormView: View {
-    @EnvironmentObject private var clerk: Clerk
+    @ObservedObject private var clerk = Clerk.shared
     @EnvironmentObject private var clerkUIState: ClerkUIState
     @Environment(\.clerkTheme) private var clerkTheme
     @FocusState private var focusedField: Field?
@@ -228,7 +228,6 @@ struct SignUpFormView: View {
 #Preview {
     SignUpFormView()
         .padding()
-        .environmentObject(Clerk.shared)
 }
 
 #endif