diff --git a/patches/react-native-bottom-tabs+1.1.0.patch b/bun-patches/react-native-bottom-tabs@1.2.0.patch similarity index 55% rename from patches/react-native-bottom-tabs+1.1.0.patch rename to bun-patches/react-native-bottom-tabs@1.2.0.patch index 0f5331fe..ac097619 100644 --- a/patches/react-native-bottom-tabs+1.1.0.patch +++ b/bun-patches/react-native-bottom-tabs@1.2.0.patch @@ -1,21 +1,23 @@ -diff --git a/node_modules/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift b/node_modules/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift ---- a/node_modules/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift -+++ b/node_modules/react-native-bottom-tabs/ios/BottomAccessoryProvider.swift -@@ -8,7 +8,7 @@ +diff --git a/ios/BottomAccessoryProvider.swift b/ios/BottomAccessoryProvider.swift +index 539efee7156599e1fc795e11bf411b7dfaf12ec7..b2af39a2e6b014e9b1ae0a51b21115c19280df69 100644 +--- a/ios/BottomAccessoryProvider.swift ++++ b/ios/BottomAccessoryProvider.swift +@@ -8,7 +8,7 @@ import SwiftUI self.delegate = delegate } - + - #if !os(macOS) + #if !os(macOS) && !os(tvOS) @available(iOS 26.0, *) public func emitPlacementChanged(_ placement: TabViewBottomAccessoryPlacement?) { var placementValue = "none" -diff --git a/node_modules/react-native-bottom-tabs/ios/TabView/NewTabView.swift b/node_modules/react-native-bottom-tabs/ios/TabView/NewTabView.swift ---- a/node_modules/react-native-bottom-tabs/ios/TabView/NewTabView.swift -+++ b/node_modules/react-native-bottom-tabs/ios/TabView/NewTabView.swift -@@ -67,11 +67,11 @@ +diff --git a/ios/TabView/NewTabView.swift b/ios/TabView/NewTabView.swift +index 22c52cdf25ad0f7398d89197cb431ca8dc8e0f99..f85364ad1d53395a336c2eedbbd8cde8eed6c94a 100644 +--- a/ios/TabView/NewTabView.swift ++++ b/ios/TabView/NewTabView.swift +@@ -78,11 +78,11 @@ struct ConditionalBottomAccessoryModifier: ViewModifier { } - + func body(content: Content) -> some View { - #if os(macOS) - // tabViewBottomAccessory is not available on macOS @@ -28,8 +30,8 @@ diff --git a/node_modules/react-native-bottom-tabs/ios/TabView/NewTabView.swift content .tabViewBottomAccessory { renderBottomAccessoryView() -@@ -84,7 +84,7 @@ - +@@ -95,7 +95,7 @@ struct ConditionalBottomAccessoryModifier: ViewModifier { + @ViewBuilder private func renderBottomAccessoryView() -> some View { - #if !os(macOS) @@ -37,20 +39,26 @@ diff --git a/node_modules/react-native-bottom-tabs/ios/TabView/NewTabView.swift if let bottomAccessoryView { if #available(iOS 26.0, *) { BottomAccessoryRepresentableView(view: bottomAccessoryView) -@@ -94,7 +94,7 @@ +@@ -105,7 +105,7 @@ struct ConditionalBottomAccessoryModifier: ViewModifier { } } - + -#if !os(macOS) +#if !os(macOS) && !os(tvOS) @available(iOS 26.0, *) struct BottomAccessoryRepresentableView: PlatformViewRepresentable { @Environment(\.tabViewBottomAccessoryPlacement) var tabViewBottomAccessoryPlacement -diff --git a/node_modules/react-native-bottom-tabs/ios/TabViewImpl.swift b/node_modules/react-native-bottom-tabs/ios/TabViewImpl.swift ---- a/node_modules/react-native-bottom-tabs/ios/TabViewImpl.swift -+++ b/node_modules/react-native-bottom-tabs/ios/TabViewImpl.swift -@@ -281,7 +281,7 @@ - +@@ -135,3 +135,4 @@ struct BottomAccessoryRepresentableView: PlatformViewRepresentable { + } + } + #endif ++#endif +diff --git a/ios/TabViewImpl.swift b/ios/TabViewImpl.swift +index 72938be90540ea3a483d7db9a80fb74c04d31272..277278ffdd9268a96cb09869eb1d0c0d5e6ad300 100644 +--- a/ios/TabViewImpl.swift ++++ b/ios/TabViewImpl.swift +@@ -281,7 +281,7 @@ extension View { + @ViewBuilder func tabBarMinimizeBehavior(_ behavior: MinimizeBehavior?) -> some View { - #if compiler(>=6.2) @@ -58,13 +66,14 @@ diff --git a/node_modules/react-native-bottom-tabs/ios/TabViewImpl.swift b/node_ if #available(iOS 26.0, macOS 26.0, *) { if let behavior { self.tabBarMinimizeBehavior(behavior.convert()) -diff --git a/node_modules/react-native-bottom-tabs/ios/TabViewProps.swift b/node_modules/react-native-bottom-tabs/ios/TabViewProps.swift ---- a/node_modules/react-native-bottom-tabs/ios/TabViewProps.swift -+++ b/node_modules/react-native-bottom-tabs/ios/TabViewProps.swift -@@ -6,7 +6,7 @@ +diff --git a/ios/TabViewProps.swift b/ios/TabViewProps.swift +index 9cfb29a983b34d3f84fc7a678d19ef4ff30e0325..6a5854483e66200b71722bbac12e100742222bd3 100644 +--- a/ios/TabViewProps.swift ++++ b/ios/TabViewProps.swift +@@ -6,7 +6,7 @@ internal enum MinimizeBehavior: String { case onScrollUp case onScrollDown - + -#if compiler(>=6.2) +#if compiler(>=6.2) && !os(tvOS) @available(iOS 26.0, macOS 26.0, *) diff --git a/bun.lock b/bun.lock index a8cec67d..fb8fea5a 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,7 @@ "": { "name": "streamyfin", "dependencies": { - "@bottom-tabs/react-navigation": "1.1.0", + "@bottom-tabs/react-navigation": "1.2.0", "@douglowder/expo-av-route-picker-view": "^0.0.5", "@expo/metro-runtime": "~55.0.11", "@expo/react-native-action-sheet": "^4.1.1", @@ -63,7 +63,7 @@ "react-i18next": "16.5.3", "react-native": "npm:react-native-tvos@0.83.6-0", "react-native-awesome-slider": "^2.9.0", - "react-native-bottom-tabs": "1.1.0", + "react-native-bottom-tabs": "1.2.0", "react-native-circular-progress": "^1.4.1", "react-native-collapsible": "^1.6.2", "react-native-country-flag": "^2.0.2", @@ -119,6 +119,8 @@ "patchedDependencies": { "react-native-screens@4.18.0": "bun-patches/react-native-screens@4.18.0.patch", "react-native-udp@4.1.7": "bun-patches/react-native-udp@4.1.7.patch", + "react-native-bottom-tabs@1.2.0": "bun-patches/react-native-bottom-tabs@1.2.0.patch", + "@react-native/codegen@0.83.6": "bun-patches/@react-native%2Fcodegen@0.83.6.patch", }, "packages": { "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="], @@ -325,7 +327,7 @@ "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.3.11", "", { "os": "win32", "cpu": "x64" }, "sha512-43VrG813EW+b5+YbDbz31uUsheX+qFKCpXeY9kfdAx+ww3naKxeVkTD9zLIWxUPfJquANMHrmW3wbe/037G0Qg=="], - "@bottom-tabs/react-navigation": ["@bottom-tabs/react-navigation@1.1.0", "", { "dependencies": { "color": "^5.0.0" }, "peerDependencies": { "@react-navigation/native": ">=7", "react": "*", "react-native": "*", "react-native-bottom-tabs": "*" } }, "sha512-+4YppCodABcSNIgJiq95QUQ+3ClVBG+rLG3WmYI0+/nbxqKbCz6luFBep4KFOj98Iplj1JY2Ki6ix8CcOZVQ/Q=="], + "@bottom-tabs/react-navigation": ["@bottom-tabs/react-navigation@1.2.0", "", { "dependencies": { "color": "^5.0.0" }, "peerDependencies": { "@react-navigation/native": ">=7", "react": "*", "react-native": "*", "react-native-bottom-tabs": "*" } }, "sha512-gEnLP7q9Iai0KlVxHDIdlrDgkvJ5vwPzL2+2ucz5BdPWd++Cf5GO1jPq92R4/85PrioviCZnlAD91Wx8WxPOjA=="], "@dominicstop/ts-event-emitter": ["@dominicstop/ts-event-emitter@1.1.0", "", {}, "sha512-CcxmJIvUb1vsFheuGGVSQf4KdPZC44XolpUT34+vlal+LyQoBUOn31pjFET5M9ctOxEpt8xa0M3/2M7uUiAoJw=="], @@ -1613,7 +1615,7 @@ "react-native-awesome-slider": ["react-native-awesome-slider@2.9.0", "", { "peerDependencies": { "react": "*", "react-native": "*", "react-native-gesture-handler": ">=2.0.0", "react-native-reanimated": ">=3.0.0" } }, "sha512-sc5qgX4YtM6IxjtosjgQLdsal120MvU+YWs0F2MdgQWijps22AXLDCUoBnZZ8vxVhVyJ2WnnIPrmtVBvVJjSuQ=="], - "react-native-bottom-tabs": ["react-native-bottom-tabs@1.1.0", "", { "dependencies": { "react-freeze": "^1.0.0", "sf-symbols-typescript": "^2.0.0", "use-latest-callback": "^0.2.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-Uu1gvM3i1Hb4DjVvR/38J1QVQEs0RkPc7K6yon99HgvRWWOyLs7kjPDhUswtb8ije4pKW712skIXWJ0lgKzbyQ=="], + "react-native-bottom-tabs": ["react-native-bottom-tabs@1.2.0", "", { "dependencies": { "react-freeze": "^1.0.0", "sf-symbols-typescript": "^2.0.0", "use-latest-callback": "^0.2.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-ScVPko86ts+m6JMNtI24MCSYJCOZc1aZkn9qwS9ly3o0ubajRWDpCzgRJfRFysi08bKrcqAXKVCHZNHvNb2PTA=="], "react-native-circular-progress": ["react-native-circular-progress@1.4.1", "", { "dependencies": { "prop-types": "^15.8.1" }, "peerDependencies": { "react": ">=16.0.0", "react-native": ">=0.50.0", "react-native-svg": ">=7.0.0" } }, "sha512-HEzvI0WPuWvsCgWE3Ff2HBTMgAEQB2GvTFw0KHyD/t1STAlDDRiolu0mEGhVvihKR3jJu3v3V4qzvSklY/7XzQ=="], @@ -2353,8 +2355,6 @@ "react-native/semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="], - "react-native-bottom-tabs/sf-symbols-typescript": ["sf-symbols-typescript@2.1.0", "", {}, "sha512-ezT7gu/SHTPIOEEoG6TF+O0m5eewl0ZDAO4AtdBi5HjsrUI6JdCG17+Q8+aKp0heM06wZKApRCn5olNbs0Wb/A=="], - "react-native-reanimated/semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="], "react-native-web/@react-native/normalize-colors": ["@react-native/normalize-colors@0.74.89", "", {}, "sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg=="], diff --git a/package.json b/package.json index 358298a1..090bc701 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "postinstall": "patch-package" }, "dependencies": { - "@bottom-tabs/react-navigation": "1.1.0", + "@bottom-tabs/react-navigation": "1.2.0", "@douglowder/expo-av-route-picker-view": "^0.0.5", "@expo/metro-runtime": "~55.0.11", "@expo/react-native-action-sheet": "^4.1.1", @@ -83,7 +83,7 @@ "react-i18next": "16.5.3", "react-native": "npm:react-native-tvos@0.83.6-0", "react-native-awesome-slider": "^2.9.0", - "react-native-bottom-tabs": "1.1.0", + "react-native-bottom-tabs": "1.2.0", "react-native-circular-progress": "^1.4.1", "react-native-collapsible": "^1.6.2", "react-native-country-flag": "^2.0.2", @@ -165,6 +165,8 @@ ], "patchedDependencies": { "react-native-screens@4.18.0": "bun-patches/react-native-screens@4.18.0.patch", - "react-native-udp@4.1.7": "bun-patches/react-native-udp@4.1.7.patch" + "react-native-udp@4.1.7": "bun-patches/react-native-udp@4.1.7.patch", + "@react-native/codegen@0.83.6": "bun-patches/@react-native%2Fcodegen@0.83.6.patch", + "react-native-bottom-tabs@1.2.0": "bun-patches/react-native-bottom-tabs@1.2.0.patch" } }