Skip to content

fix: add tvOS availability annotations for iOS 26 APIs #508

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

Open
oscnord wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −9
Open

fix: add tvOS availability annotations for iOS 26 APIs #508

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
2 changes: 1 addition & 1 deletion packages/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import SwiftUI
}

#if !os(macOS)
@available(iOS 26.0, *)
@available(iOS 26.0, tvOS 26.0, *)
public func emitPlacementChanged(_ placement: TabViewBottomAccessoryPlacement?) {
var placementValue = "none"
if placement == .inline {
Expand Down
10 changes: 5 additions & 5 deletions packages/react-native-bottom-tabs/ios/TabView/NewTabView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ struct ConditionalBottomAccessoryModifier: ViewModifier {
}

func body(content: Content) -> some View {
#if os(macOS)
#if os(macOS) || os(tvOS)
// tabViewBottomAccessory is not available on macOS
content
#else
if #available(iOS 26.0, tvOS 26.0, visionOS 3.0, *), bottomAccessoryView != nil {
if #available(iOS 26.0, visionOS 3.0, *), bottomAccessoryView != nil {
content
.tabViewBottomAccessory {
renderBottomAccessoryView()
Expand All @@ -95,7 +95,7 @@ struct ConditionalBottomAccessoryModifier: ViewModifier {

@ViewBuilder
private func renderBottomAccessoryView() -> some View {
#if !os(macOS)
#if !os(macOS) && !os(tvOS)
if let bottomAccessoryView {
if #available(iOS 26.0, *) {
BottomAccessoryRepresentableView(view: bottomAccessoryView)
Expand All @@ -105,8 +105,8 @@ struct ConditionalBottomAccessoryModifier: ViewModifier {
}
}

#if !os(macOS)
@available(iOS 26.0, *)
#if !os(macOS) && !os(tvOS)
@available(iOS 26.0, tvOS 26.0, *)
struct BottomAccessoryRepresentableView: PlatformViewRepresentable {
@Environment(\.tabViewBottomAccessoryPlacement) var tabViewBottomAccessoryPlacement
var view: PlatformView
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-bottom-tabs/ios/TabViewImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ extension View {
@ViewBuilder
func tabBarMinimizeBehavior(_ behavior: MinimizeBehavior?) -> some View {
#if compiler(>=6.2)
if #available(iOS 26.0, macOS 26.0, *) {
if #available(iOS 26.0, macOS 26.0, tvOS 26.0, *) {
if let behavior {
self.tabBarMinimizeBehavior(behavior.convert())
} else {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-bottom-tabs/ios/TabViewProps.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ internal enum MinimizeBehavior: String {
case onScrollDown

#if compiler(>=6.2)
@available(iOS 26.0, macOS 26.0, *)
@available(iOS 26.0, macOS 26.0, tvOS 26.0, *)
func convert() -> TabBarMinimizeBehavior {
#if os(macOS)
#if os(macOS) || os(tvOS)
return .automatic
#else
switch self {
Expand Down