Fix tvOS

oversizedev · Sep 26, 2024 · bbf032b · bbf032b
1 parent 415056e
commit bbf032b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 25 deletions.
diff --git a/Sources/OversizeRouter/RoutingViews/RoutingSidebarView.swift b/Sources/OversizeRouter/RoutingViews/RoutingSidebarView.swift
@@ -20,35 +20,33 @@ public struct RoutingSidebarView<Tab>: View where Tab: TabableView {
     }
 
     public var body: some View {
-        if #available(macOS 15.0, iOS 18.0, *) {
-            TabView(selection: $router.selection) {
-                ForEach(router.tabs) { tab in
-                    tab.view()
-                        .tag(tab)
-                        .tabItem {
-                            tab.icon
-                            Text(tab.title)
-                        }
-                        .environment(router)
-                        .environment(hudRouter)
-                }
-            }
+        #if os(iOS) || os(macOS) || os(tvOS) || os(visionOS)
+        if #available(iOS 18.0, macOS 15.0, tvOS 18.0, visionOS 2.0, *) {
+            tabView
             .tabViewStyle(.sidebarAdaptable)
             .hud(hudRouter.hudText, isPresented: $hudRouter.isShowHud)
         } else {
-            TabView(selection: $router.selection) {
-                ForEach(router.tabs) { tab in
-                    tab.view()
-                        .tag(tab)
-                        .tabItem {
-                            tab.icon
-                            Text(tab.title)
-                        }
-                        .environment(router)
-                        .environment(hudRouter)
-                }
-            }
+            tabView
             .hud(hudRouter.hudText, isPresented: $hudRouter.isShowHud)
         }
+        #else
+
+        tabView
+        #endif
+    }
+
+    var tabView: some View {
+        TabView(selection: $router.selection) {
+            ForEach(router.tabs) { tab in
+                tab.view()
+                    .tag(tab)
+                    .tabItem {
+                        tab.icon
+                        Text(tab.title)
+                    }
+                    .environment(router)
+                    .environment(hudRouter)
+            }
+        }
     }
 }
diff --git a/Sources/OversizeRouter/RoutingViews/RoutingSplitView.swift b/Sources/OversizeRouter/RoutingViews/RoutingSplitView.swift
@@ -57,6 +57,14 @@ public struct RoutingSplitView<TopSidebar, BottomSidebar, Tab>: View where Tab:
                 }
             }
             .listStyle(.sidebar)
+        #elseif os(watchOS)
+        List {
+            ForEach(router.tabs) { menu in
+                NavigationLink(value: menu) {
+                    Text(menu.title)
+                }
+            }
+        }
         #else
             List(selection: $router.selection) {
                 topSidebar