Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions Sources/ButtonKit/Modifiers/Button+AsyncDisabled.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,8 @@ extension View {

// MARK: SwiftUI Environment

struct AllowsHitTestingWhenLoadingKey: EnvironmentKey {
static let defaultValue: Bool = false
}

struct DisabledWhenLoadingKey: EnvironmentKey {
static let defaultValue: Bool = false
}

extension EnvironmentValues {
var allowsHitTestingWhenLoading: Bool {
get {
return self[AllowsHitTestingWhenLoadingKey.self]
}
set {
self[AllowsHitTestingWhenLoadingKey.self] = newValue
}
}
@Entry var allowsHitTestingWhenLoading: Bool = false

var disabledWhenLoading: Bool {
get {
return self[DisabledWhenLoadingKey.self]
}
set {
self[DisabledWhenLoadingKey.self] = newValue
}
}
@Entry var disabledWhenLoading: Bool = false
}
13 changes: 1 addition & 12 deletions Sources/ButtonKit/Style/Button+AsyncStyle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,8 @@ extension AsyncButtonStyle where Self == OverlayAsyncButtonStyle {
}
}

struct AsyncButtonStyleKey: EnvironmentKey {
static let defaultValue: AnyAsyncButtonStyle = AnyAsyncButtonStyle(.auto)
}

extension EnvironmentValues {
var asyncButtonStyle: AnyAsyncButtonStyle {
get {
return self[AsyncButtonStyleKey.self]
}
set {
self[AsyncButtonStyleKey.self] = newValue
}
}
@Entry var asyncButtonStyle: AnyAsyncButtonStyle = .init(.auto)
}

// MARK: - Type erasure
Expand Down
13 changes: 1 addition & 12 deletions Sources/ButtonKit/Style/Button+ThrowableStyle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,8 @@ extension ThrowableButtonStyle where Self == ShakeThrowableButtonStyle {
}
}

struct ThrowableButtonStyleKey: EnvironmentKey {
static let defaultValue: AnyThrowableButtonStyle = AnyThrowableButtonStyle(.auto)
}

extension EnvironmentValues {
var throwableButtonStyle: AnyThrowableButtonStyle {
get {
return self[ThrowableButtonStyleKey.self]
}
set {
self[ThrowableButtonStyleKey.self] = newValue
}
}
@Entry var throwableButtonStyle: AnyThrowableButtonStyle = .init(.auto)
}

// MARK: - Type erasure
Expand Down
24 changes: 3 additions & 21 deletions Sources/ButtonKit/Trigger/Trigger+Environment.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,31 +81,13 @@ public final class TriggerButton: Sendable {
}
}

private struct TriggerEnvironmentKey: EnvironmentKey {
static let defaultValue = TriggerButton()
}

private struct TriggerNamespaceEnvironmentKey: EnvironmentKey {
static let defaultValue: Namespace.ID? = nil
public extension EnvironmentValues {
@Entry var triggerButton: TriggerButton = .init()
@Entry var triggerButtonNamespace: Namespace.ID? = nil
}

extension View {
public func buttonTriggerNamespace(_ namespace: Namespace.ID) -> some View {
environment(\.triggerButtonNamespace, namespace)
}
}

extension EnvironmentValues {
public var triggerButton: TriggerButton {
self[TriggerEnvironmentKey.self]
}

var triggerButtonNamespace: Namespace.ID? {
get {
self[TriggerNamespaceEnvironmentKey.self]
}
set {
self[TriggerNamespaceEnvironmentKey.self] = newValue
}
}
}