Skip to content

Commit a3b1e7e

Browse files
authored
Updated filters; engine refresh handling; build issues. (#25)
* Simplified DestinationFilters * Updated navigation; engine refresh; compile issues.
1 parent f8eed41 commit a3b1e7e

14 files changed

+107
-57
lines changed

Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.9
1+
// swift-tools-version: 5.7
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription

Sources/AnalyticsLive/LivePlugins/LivePlugins.swift

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,16 @@ public class LivePlugins: UtilityPlugin {
6060
}
6161

6262
public func update(settings: Settings, type: UpdateType) {
63+
if type != .initial { return }
64+
6365
// if we find an existing liveplugins instance ...
6466
if analytics?.find(pluginType: LivePlugins.self) !== self {
6567
// remove ourselves. we can't do this in configure.
6668
analytics?.remove(plugin: self)
6769
return
6870
}
6971

70-
switch type {
71-
case .refresh:
72-
// tell the dependents to teardown
73-
for d in self.dependents {
74-
d.teardown(engine: self.engine)
75-
}
76-
self.engine = JSEngine()
77-
fallthrough
78-
case .initial:
79-
setupEngine(self.engine)
80-
}
72+
setupEngine(self.engine)
8173

8274
let edgeFnData = toDictionary(settings.edgeFunction)
8375
setEdgeFnData(edgeFnData)

Sources/AnalyticsLive/Signals/AutoTracking/SwiftUI/Annotations.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ import Foundation
99
import SwiftUI
1010
import Segment
1111

12+
extension View {
13+
static func structName() -> String {
14+
String(describing: Self.self)
15+
}
16+
}
17+
1218
public struct SignalAnnotation: ViewModifier {
1319
let text: String
1420
init(_ text: String) {

Sources/AnalyticsLive/Signals/AutoTracking/SwiftUI/SignalNavigation.swift

Lines changed: 65 additions & 38 deletions
Large diffs are not rendered by default.

Sources/AnalyticsLive/Signals/AutoTracking/SwiftUI/SignalScrollView.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// Created by Brandon Sneed on 2/5/25.
66
//
77

8+
/*
9+
810
import SwiftUI
911

1012
@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -237,3 +239,6 @@ extension SignalScrollView where Content == AnyView {
237239
self.signalLabel = nil
238240
}
239241
}
242+
243+
*/
244+

Sources/AnalyticsLive/Signals/AutoTracking/SwiftUI/SignalTabView.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public struct SignalTabView<SelectionValue, Content> : SignalingUI, View
4040
self.userDefinedSelection = selection
4141
}
4242

43+
#if compiler(>=5.9)
4344
/// Creates a tab view that uses a builder to create and specify
4445
/// selection values for its tabs.
4546
///
@@ -53,6 +54,7 @@ public struct SignalTabView<SelectionValue, Content> : SignalingUI, View
5354
self.content = content() as! TabContentBuilder<SelectionValue>.Content<C>
5455
self.userDefinedSelection = selection
5556
}
57+
#endif
5658

5759
public var body: some View {
5860
if let userDefinedSelection {
@@ -107,6 +109,7 @@ extension SignalTabView where SelectionValue == Int {
107109
}
108110
}
109111

112+
#if compiler(>=5.9)
110113
@available(iOS 18.0, macOS 15.0, tvOS 18.0, watchOS 11.0, visionOS 2.0, *)
111114
extension SignalTabView {
112115
public init<C>(@TabContentBuilder<Never> content: () -> C)
@@ -117,6 +120,7 @@ extension SignalTabView {
117120
self.userDefinedSelection = nil
118121
}
119122
}
123+
#endif
120124

121125
internal final class TabViewLifecycle {
122126
let id: UUID
@@ -137,7 +141,7 @@ internal struct SignalTabCache {
137141
static var ids = [UUID]()
138142

139143
static func push(_ id: UUID) {
140-
if let existingLabels = tabViews[id] {
144+
if tabViews[id] != nil {
141145
return
142146
} else {
143147
tabViews[id] = []

Sources/AnalyticsLive/Signals/AutoTracking/SwiftUI/Typealiases.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ typealias Stepper = SignalStepper
2929

3030
// List & Collection Views
3131
typealias List = SignalList
32-
typealias ScrollView = SignalScrollView
32+
//typealias ScrollView = SignalScrollView
3333
//@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
3434
//typealias TabView = SignalTabView

Sources/AnalyticsLive/Signals/AutoTracking/UIKit/SignalUIApplication.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by Brandon Sneed on 2/10/25.
66
//
77

8-
#if os(iOS) || os(tvOS) || os(visionOS) || targetEnvironment(macCatalyst)
8+
#if canImport(UIKit) && !os(watchOS)
99

1010
import Foundation
1111
import UIKit
@@ -117,6 +117,7 @@ extension NSObject {
117117

118118
import Foundation
119119
import AppKit
120+
import Segment
120121

121122
internal class TapSwizzler {
122123
static let shared = TapSwizzler()

Sources/AnalyticsLive/Signals/AutoTracking/UIKit/SignalUINavController.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ extension UINavigationController {
137137
// Get info before we pop
138138
let fromVC = topViewController
139139
let rootVC = viewControllers.first
140-
let depth = viewControllers.count - 1 // How many VCs we're popping
141140

142141
// Call original implementation
143142
let result = self.swizzled_popToRootViewController(animated: animated)
@@ -160,6 +159,8 @@ extension UINavigationController {
160159

161160
#else
162161

162+
import Segment
163+
163164
internal class NavigationSwizzler {
164165
static let shared = NavigationSwizzler()
165166
@Atomic private var isRunning = false

0 commit comments

Comments
 (0)