Skip to content

fix(iOS): various fixes for Apple TV #134

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
okwasniewski merged 2 commits into from
Nov 9, 2024
Merged

fix(iOS): various fixes for Apple TV #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
137f009
fix(iOS): various fixes for Apple TV
douglowder Nov 9, 2024
8252183
fix: apply Xcode styling
okwasniewski Nov 9, 2024
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 ios/PageSelectedEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import React
@objc public func arguments() -> [Any] {
return [
viewTag,
RCTNormalizeInputEventName(eventName),
RCTNormalizeInputEventName(eventName) ?? eventName,
[
"key": key
]
Expand Down
2 changes: 1 addition & 1 deletion ios/TabLongPressedEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protocol RCTEvent {}
@objc public func arguments() -> [Any] {
return [
viewTag,
RCTNormalizeInputEventName(eventName),
RCTNormalizeInputEventName(eventName) ?? eventName,
[
"key": key
]
Expand Down
9 changes: 7 additions & 2 deletions ios/TabViewImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ struct TabViewImpl: View {
renderTabItem(at: index)
}
}
#if !os(tvOS)
.onTabItemEvent({ index, isLongPress in
guard let key = props.items.filter({
!$0.hidden || $0.key == props.selectedPage
Expand All @@ -76,6 +77,7 @@ struct TabViewImpl: View {
emitHapticFeedback()
}
})
#endif
.introspectTabView(closure: { tabController in
tabBar = tabController.tabBar
})
Expand All @@ -92,6 +94,9 @@ struct TabViewImpl: View {
UIView.setAnimationsEnabled(true)
}
}
#if os(tvOS)
onSelect(newValue)
#endif
}
}

Expand Down Expand Up @@ -278,7 +283,7 @@ extension View {
func tintColor(_ color: UIColor?) -> some View {
if let color {
let color = Color(color)
if #available(iOS 16.0, *) {
if #available(iOS 16.0, tvOS 16.0, *) {
self.tint(color)
} else {
self.accentColor(color)
Expand All @@ -292,7 +297,7 @@ extension View {
// By default they are always filled.
@ViewBuilder
func noneSymbolVariant() -> some View {
if #available(iOS 15.0, *) {
if #available(iOS 15.0, tvOS 15.0, *) {
self
.environment(\.symbolVariants, .none)
} else {
Expand Down