Skip to content

Prevent crashes during game variant switches #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
austin-smith merged 1 commit into from
Jul 14, 2026
Merged

Prevent crashes during game variant switches #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
136 changes: 70 additions & 66 deletions ComputerSolitaire/Views/FreeCell/FreeCellSlotView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,77 +16,81 @@ struct FreeCellView: View {
let dragGesture: (DragOrigin) -> AnyGesture<DragGesture.Value>

var body: some View {
let card = viewModel.state.freeCells[index]
let accessibleCard: Card? = card.flatMap { card in
let isHidden = hiddenCardIDs.contains(card.id)
let isDragged = viewModel.isDragging && viewModel.isSelected(card: card)
return isHidden || isDragged ? nil : card
}
let isAccessibleCardSelected = accessibleCard.map {
viewModel.isSelected(card: $0)
} ?? false
let isDragSource: Bool = {
guard viewModel.isDragging, let selection = viewModel.selection else { return false }
if case .freeCell(let slot) = selection.source {
return slot == index
// Variant switches can empty the free cells while this view is
// still mounted; render nothing until the board rebuilds.
if viewModel.state.freeCells.indices.contains(index) {
let card = viewModel.state.freeCells[index]
let accessibleCard: Card? = card.flatMap { card in
let isHidden = hiddenCardIDs.contains(card.id)
let isDragged = viewModel.isDragging && viewModel.isSelected(card: card)
return isHidden || isDragged ? nil : card
}
return false
}()
let isAccessibleCardSelected = accessibleCard.map {
viewModel.isSelected(card: $0)
} ?? false
let isDragSource: Bool = {
guard viewModel.isDragging, let selection = viewModel.selection else { return false }
if case .freeCell(let slot) = selection.source {
return slot == index
}
return false
}()

ZStack {
PilePlaceholderView(cardSize: cardSize)
DropHighlightView(
cardSize: cardSize,
isTargeted: isTargeted,
isHintTargeted: isHintTargeted,
hintOpacity: hintHighlightOpacity
)
if let card {
CardView(
card: card,
isSelected: viewModel.isSelected(card: card),
ZStack {
PilePlaceholderView(cardSize: cardSize)
DropHighlightView(
cardSize: cardSize,
isCardTiltEnabled: isCardTiltEnabled,
cardTilts: $cardTilts,
hintWiggleToken: hintedCardIDs.contains(card.id) ? hintWiggleToken : nil,
isAccessibilityElement: false
)
.opacity(
(viewModel.isDragging && viewModel.isSelected(card: card))
|| hiddenCardIDs.contains(card.id) ? 0 : 1
)
.gesture(dragGesture(.freeCell(index)))
.cardFramePreference(card.id)
}
}
.onTapGesture {
viewModel.handleFreeCellTap(index: index)
}
.accessibilityElement(children: .ignore)
.accessibilityAddTraits(.isButton)
.accessibilityAddTraits(isAccessibleCardSelected ? .isSelected : [])
.background(
GeometryReader { proxy in
let boardFrame = proxy.frame(in: .named("board"))
let hitFrame = boardFrame.expanded(
horizontal: DropTargetHitArea.freeCellHorizontalGrace,
top: DropTargetHitArea.freeCellTopGrace,
bottom: DropTargetHitArea.freeCellBottomGrace
isTargeted: isTargeted,
isHintTargeted: isHintTargeted,
hintOpacity: hintHighlightOpacity
)
Color.clear
.preference(
key: DropTargetFrameKey.self,
value: [
.freeCell(index): DropTargetGeometry(
snapFrame: boardFrame,
hitFrame: hitFrame
)
]
if let card {
CardView(
card: card,
isSelected: viewModel.isSelected(card: card),
cardSize: cardSize,
isCardTiltEnabled: isCardTiltEnabled,
cardTilts: $cardTilts,
hintWiggleToken: hintedCardIDs.contains(card.id) ? hintWiggleToken : nil,
isAccessibilityElement: false
)
.opacity(
(viewModel.isDragging && viewModel.isSelected(card: card))
|| hiddenCardIDs.contains(card.id) ? 0 : 1
)
.gesture(dragGesture(.freeCell(index)))
.cardFramePreference(card.id)
}
}
.onTapGesture {
viewModel.handleFreeCellTap(index: index)
}
)
.zIndex(isDragSource ? 10 : 0)
.accessibilityLabel("Free Cell \(index + 1)")
.accessibilityValue(accessibleCard?.accessibilityName ?? "Empty")
.accessibilityElement(children: .ignore)
.accessibilityAddTraits(.isButton)
.accessibilityAddTraits(isAccessibleCardSelected ? .isSelected : [])
.background(
GeometryReader { proxy in
let boardFrame = proxy.frame(in: .named("board"))
let hitFrame = boardFrame.expanded(
horizontal: DropTargetHitArea.freeCellHorizontalGrace,
top: DropTargetHitArea.freeCellTopGrace,
bottom: DropTargetHitArea.freeCellBottomGrace
)
Color.clear
.preference(
key: DropTargetFrameKey.self,
value: [
.freeCell(index): DropTargetGeometry(
snapFrame: boardFrame,
hitFrame: hitFrame
)
]
)
}
)
.zIndex(isDragSource ? 10 : 0)
.accessibilityLabel("Free Cell \(index + 1)")
.accessibilityValue(accessibleCard?.accessibilityName ?? "Empty")
}
}
}
180 changes: 92 additions & 88 deletions ComputerSolitaire/Views/Shared/BoardViews.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,105 +622,109 @@ struct FoundationView: View {
let dragGesture: (DragOrigin) -> AnyGesture<DragGesture.Value>

var body: some View {
let foundation = viewModel.state.foundations[index]
let visibleDepth = min(foundation.count, 4)
let startIndex = foundation.count - visibleDepth
let isDragSource: Bool = {
guard viewModel.isDragging, let selection = viewModel.selection else { return false }
if case .foundation(let pile) = selection.source {
return pile == index
// Variant switches can shrink the foundations array while this view
// is still mounted; render nothing until the parent row rebuilds.
if viewModel.state.foundations.indices.contains(index) {
let foundation = viewModel.state.foundations[index]
let visibleDepth = min(foundation.count, 4)
let startIndex = foundation.count - visibleDepth
let isDragSource: Bool = {
guard viewModel.isDragging, let selection = viewModel.selection else { return false }
if case .foundation(let pile) = selection.source {
return pile == index
}
return false
}()
let accessibleTopCard: Card? = foundation.last.flatMap { card in
let isDragged = viewModel.isDragging && viewModel.isSelected(card: card)
return isDragged || hiddenCardIDs.contains(card.id) ? nil : card
}
return false
}()
let accessibleTopCard: Card? = foundation.last.flatMap { card in
let isDragged = viewModel.isDragging && viewModel.isSelected(card: card)
return isDragged || hiddenCardIDs.contains(card.id) ? nil : card
}
let isAccessibleTopCardSelected = accessibleTopCard.map {
viewModel.isSelected(card: $0)
} ?? false
let highlightZ: Double = 1
ZStack {
PilePlaceholderView(cardSize: cardSize)
if foundation.isEmpty {
// Canfield foundations start at the dealt base rank, not the Ace.
if viewModel.gameVariant == .canfield {
if let baseRank = CanfieldGameRules.baseRank(in: viewModel.state) {
Text(baseRank.label)
let isAccessibleTopCardSelected = accessibleTopCard.map {
viewModel.isSelected(card: $0)
} ?? false
let highlightZ: Double = 1
ZStack {
PilePlaceholderView(cardSize: cardSize)
if foundation.isEmpty {
// Canfield foundations start at the dealt base rank, not the Ace.
if viewModel.gameVariant == .canfield {
if let baseRank = CanfieldGameRules.baseRank(in: viewModel.state) {
Text(baseRank.label)
.font(.system(size: cardSize.width * 0.22, weight: .semibold))
.foregroundStyle(.white.opacity(0.28))
.allowsHitTesting(false)
}
} else {
Image(systemName: "a")
.font(.system(size: cardSize.width * 0.22, weight: .semibold))
.foregroundStyle(.white.opacity(0.28))
.allowsHitTesting(false)
}
} else {
Image(systemName: "a")
.font(.system(size: cardSize.width * 0.22, weight: .semibold))
.foregroundStyle(.white.opacity(0.28))
.allowsHitTesting(false)
}
}
DropHighlightView(
cardSize: cardSize,
isTargeted: isTargeted,
isHintTargeted: isHintTargeted,
hintOpacity: hintHighlightOpacity
)
.zIndex(highlightZ)
ForEach(Array(foundation.enumerated().dropFirst(startIndex)), id: \.element.id) { cardIndex, card in
let isTopCard = cardIndex == foundation.count - 1
let isDragged = isTopCard && viewModel.isDragging && viewModel.isSelected(card: card)
let isHidden = hiddenCardIDs.contains(card.id)
let cardView = CardView(
card: card,
isSelected: isTopCard && viewModel.isSelected(card: card),
DropHighlightView(
cardSize: cardSize,
isCardTiltEnabled: isCardTiltEnabled,
cardTilts: $cardTilts,
hintWiggleToken: hintedCardIDs.contains(card.id) ? hintWiggleToken : nil,
isAccessibilityElement: false
isTargeted: isTargeted,
isHintTargeted: isHintTargeted,
hintOpacity: hintHighlightOpacity
)
.opacity(isDragged || isHidden ? 0 : 1)
.zIndex(isTopCard && isDragged ? 20 : 0)
.allowsHitTesting(isTopCard && !isHidden)

if isTopCard {
cardView
.gesture(dragGesture(.foundation(index)))
.cardFramePreference(card.id)
} else {
cardView
.allowsHitTesting(false)
.zIndex(highlightZ)
ForEach(Array(foundation.enumerated().dropFirst(startIndex)), id: \.element.id) { cardIndex, card in
let isTopCard = cardIndex == foundation.count - 1
let isDragged = isTopCard && viewModel.isDragging && viewModel.isSelected(card: card)
let isHidden = hiddenCardIDs.contains(card.id)
let cardView = CardView(
card: card,
isSelected: isTopCard && viewModel.isSelected(card: card),
cardSize: cardSize,
isCardTiltEnabled: isCardTiltEnabled,
cardTilts: $cardTilts,
hintWiggleToken: hintedCardIDs.contains(card.id) ? hintWiggleToken : nil,
isAccessibilityElement: false
)
.opacity(isDragged || isHidden ? 0 : 1)
.zIndex(isTopCard && isDragged ? 20 : 0)
.allowsHitTesting(isTopCard && !isHidden)

if isTopCard {
cardView
.gesture(dragGesture(.foundation(index)))
.cardFramePreference(card.id)
} else {
cardView
.allowsHitTesting(false)
}
}
}
}
.onTapGesture {
viewModel.handleFoundationTap(index: index)
}
.accessibilityElement(children: .ignore)
.accessibilityAddTraits(.isButton)
.accessibilityAddTraits(isAccessibleTopCardSelected ? .isSelected : [])
.background(
GeometryReader { proxy in
let boardFrame = proxy.frame(in: .named("board"))
let hitFrame = boardFrame.expanded(
horizontal: DropTargetHitArea.foundationHorizontalGrace,
top: DropTargetHitArea.foundationTopGrace,
bottom: DropTargetHitArea.foundationBottomGrace
)
Color.clear
.preference(
key: DropTargetFrameKey.self,
value: [
.foundation(index): DropTargetGeometry(
snapFrame: boardFrame,
hitFrame: hitFrame
)
]
)
.onTapGesture {
viewModel.handleFoundationTap(index: index)
}
)
.zIndex(isDragSource ? 10 : 0)
.accessibilityLabel("Foundation \(index + 1)")
.accessibilityValue(accessibleTopCard?.accessibilityName ?? "Empty")
.accessibilityElement(children: .ignore)
.accessibilityAddTraits(.isButton)
.accessibilityAddTraits(isAccessibleTopCardSelected ? .isSelected : [])
.background(
GeometryReader { proxy in
let boardFrame = proxy.frame(in: .named("board"))
let hitFrame = boardFrame.expanded(
horizontal: DropTargetHitArea.foundationHorizontalGrace,
top: DropTargetHitArea.foundationTopGrace,
bottom: DropTargetHitArea.foundationBottomGrace
)
Color.clear
.preference(
key: DropTargetFrameKey.self,
value: [
.foundation(index): DropTargetGeometry(
snapFrame: boardFrame,
hitFrame: hitFrame
)
]
)
}
)
.zIndex(isDragSource ? 10 : 0)
.accessibilityLabel("Foundation \(index + 1)")
.accessibilityValue(accessibleTopCard?.accessibilityName ?? "Empty")
}
}
}

Expand Down