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
2 changes: 1 addition & 1 deletion Sources/ComponentsKit/Components/Button/SUButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private struct CustomButtonStyle: SwiftUI.ButtonStyle {
RoundedRectangle(
cornerRadius: self.model.cornerRadius.value()
)
.stroke(
.strokeBorder(
self.model.borderColor?.color ?? .clear,
lineWidth: self.model.borderWidth
)
Expand Down
21 changes: 9 additions & 12 deletions Sources/ComponentsKit/Components/Card/SUCard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,19 @@ public struct SUCard<Content: View>: View {
.shadow(self.model.shadow)
.observeSize { self.contentSize = $0 }
.contentShape(.rect)
.gesture(
.onTapGesture {
guard self.model.isTappable else { return }
self.onTap()
}
.simultaneousGesture(
DragGesture(minimumDistance: 0.0)
.onChanged { _ in
guard self.model.isTappable else { return }
self.isPressed = true
}
.onEnded { value in
guard self.model.isTappable else { return }

defer { self.isPressed = false }

if CGRect(origin: .zero, size: self.contentSize)
.contains(value.location) {
self.onTap()
}
}
.onEnded { _ in
self.isPressed = false
},
isEnabled: self.model.isTappable
)
.scaleEffect(
self.isPressed ? self.model.animationScale.value : 1,
Expand Down
2 changes: 1 addition & 1 deletion Sources/ComponentsKit/Components/Checkbox/SUCheckbox.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public struct SUCheckbox: View {
}
.overlay {
RoundedRectangle(cornerRadius: self.model.checkboxCornerRadius)
.stroke(
.strokeBorder(
self.model.borderColor.color,
lineWidth: self.model.borderWidth
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public struct SUInputField<FocusValue: Hashable>: View {
RoundedRectangle(
cornerRadius: self.model.cornerRadius.value()
)
.stroke(
.strokeBorder(
self.model.borderColor.color,
lineWidth: self.model.borderWidth
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ struct ModalPresentationModifier<Modal: View>: ViewModifier {

func body(content: Content) -> some View {
content
.transaction {
$0.disablesAnimations = false
}
.onAppear {
if self.isContentVisible {
self.isPresented = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ struct ModalPresentationWithItemModifier<Modal: View, Item: Identifiable>: ViewM

func body(content: Content) -> some View {
content
.transaction {
$0.disablesAnimations = false
}
.onAppear {
self.presentedItem = self.visibleItem
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct ModalContent<VM: ModalVM, Header: View, Body: View, Footer: View>: View {
.clipShape(RoundedRectangle(cornerRadius: self.model.cornerRadius.value))
.overlay(
RoundedRectangle(cornerRadius: self.model.cornerRadius.value)
.stroke(UniversalColor.divider.color, lineWidth: self.model.borderWidth.value)
.strokeBorder(UniversalColor.divider.color, lineWidth: self.model.borderWidth.value)
)
.padding(self.model.outerPaddings.edgeInsets)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public struct SUTextInput<FocusValue: Hashable>: View {
RoundedRectangle(
cornerRadius: self.model.cornerRadius.value()
)
.stroke(
.strokeBorder(
self.model.borderColor.color,
lineWidth: self.model.borderWidth
)
Expand Down