feature: Tab bar is always floating above the tab contents, insets the safe area

- Make it possible to hide the tab bar

Author: bobergj

LICENSE

@@ -19,3 +19,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+Modifications:
+Copyright (c) 2025 Nomasystems S.L.

Package.swift

@@ -1,13 +1,13 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "CustomTabView",
     platforms: [
-        .iOS(.v13),
-        .macOS(.v10_15)
+        .iOS(.v15),
+        .macOS(.v12)
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

README.md

@@ -4,8 +4,8 @@
 
 # SwiftUI CustomTabView
 
-![Language](https://img.shields.io/badge/Swift-5-orange?logo=Swift&logoColor=white)
-![Platforms](https://img.shields.io/badge/Platforms-iOS%2013+,%20macOS%2010.15+-white?labelColor=gray&style=flat)
+![Language](https://img.shields.io/badge/Swift-6-orange?logo=Swift&logoColor=white)
+![Platforms](https://img.shields.io/badge/Platforms-iOS%2015+,%20macOS%2012+-white?labelColor=gray&style=flat)
 ![License](https://img.shields.io/badge/License-MIT-white?labelColor=blue&style=flat)
 
 </div>

Sources/CustomTabView/CustomTabView.swift

@@ -33,7 +33,6 @@ import SwiftUI
 ///   - tabs: An array of values conforming to `Hashable` that represent the tabs. The order of tabs in this array **must** be reflected in the TabBar view provided.
 ///   - selection: The currently selected tab.
 ///   - content: A closure that provides the content for each tab. The order and number of elements in the closure **must** match the `tabs` parameter.
-@available(iOS 13.0, macOS 10.15, *)
 public struct CustomTabView<SelectionValue: Hashable, TabBarView: View, Content: View>: View {
 
     // Tabs
@@ -61,15 +60,15 @@ public struct CustomTabView<SelectionValue: Hashable, TabBarView: View, Content:
     public var body: some View {
         if #available(iOS 18.0, macOS 15.0, *) {
             Group(subviews: content) { subviews in
-                _LayoutView<TabBarView, SelectionValue>(
+                _TabBarLayoutView(
                     tabBarView: tabBarView,
                     selectedTabIndex: tabIndices[selection] ?? 0,
-                    children: subviews
+                    subviews: subviews
                 )
             }
         } else {
             _VariadicView.Tree(
-                _VariadicViewLayout<TabBarView, SelectionValue>(
+                _VariadicViewLayout<TabBarView>(
                     tabBarView: tabBarView,
                     selectedTabIndex: tabIndices[selection] ?? 0
                 )
@@ -80,253 +79,88 @@ public struct CustomTabView<SelectionValue: Hashable, TabBarView: View, Content:
     }
 }
 
-private struct _VariadicViewLayout<TabBarView: View, SelectionValue: Hashable>: _VariadicView_UnaryViewRoot {
-    @Environment(\.layoutDirection) private var layoutDirection: LayoutDirection
-    @Environment(\.tabBarPosition) private var tabBarPosition: TabBarPosition
-    
+private struct _VariadicViewLayout<TabBarView: View>: _VariadicView_UnaryViewRoot {
     let tabBarView: TabBarView
     let selectedTabIndex: Int
 
-    private func contentView(children: _VariadicView.Children) -> some View {
-        #if canImport(UIKit)
-        return UITabBarControllerRepresentable(
-            selectedTabIndex: selectedTabIndex,
-            controlledViews: children.map { UIHostingController(rootView: $0) }
-        )
-        #elseif canImport(AppKit)
-        return NSTabViewControllerRepresentable(
-            selectedTabIndex: selectedTabIndex,
-            controlledViews: children.map { NSHostingController(rootView: $0) }
-        )
-        #endif
-    }
-    
-    private func topBarView(children: _VariadicView.Children) -> some View {
-        VStack(spacing: 0) {
-            tabBarView
-            
-            contentView(children: children)
-        }
-    }
-    
-    private func bottomBarView(children: _VariadicView.Children) -> some View {
-        VStack(spacing: 0) {
-            contentView(children: children)
-            
-            tabBarView
-        }
-    }
-    
-    #if canImport(UIKit)
-    // Keyboard visibility
-    @State private var isKeyboardVisible: Bool = false
-    
-    private func bottomBarViewiOS13(children: _VariadicView.Children) -> some View {
-        VStack(spacing: 0) {
-            contentView(children: children)
-            
-            if !isKeyboardVisible {
-                tabBarView
-            }
-        }
-        .onReceive(keyboardPublisher) { isKeyboardVisible in
-            self.isKeyboardVisible  = isKeyboardVisible
-        }
-    }
-    #endif
-    
-    private func leftBarView(children: _VariadicView.Children) -> some View {
-        HStack(spacing: 0) {
-            tabBarView
-            
-            contentView(children: children)
-        }
-    }
-    
-    private func rightBarView(children: _VariadicView.Children) -> some View {
-        HStack(spacing: 0) {
-            contentView(children: children)
-            
-            tabBarView
-        }
-    }
-    
-    private func floatingBarView(children: _VariadicView.Children, edge: Edge) -> some View {
-        let alignment: Alignment
-        switch edge {
-        case .top:
-            alignment = .top
-        case .leading:
-            alignment = .leading
-        case .bottom:
-            alignment = .bottom
-        case .trailing:
-            alignment = .trailing
-        }
-        
-        return ZStack(alignment: alignment, content: {
-            contentView(children: children)
-            
-            tabBarView
-        })
-    }
-    
     @ViewBuilder
     func body(children: _VariadicView.Children) -> some View {
-        switch tabBarPosition {
-        case .edge(let edge):
-            switch edge {
-            case .top:
-                topBarView(children: children)
-            case .leading:
-                switch layoutDirection {
-                case .leftToRight:
-                    leftBarView(children: children)
-                case .rightToLeft:
-                    rightBarView(children: children)
-                @unknown default:
-                    leftBarView(children: children)
-                }
-            case .bottom:
-                #if canImport(UIKit)
-                if #available(iOS 14, *) {
-                    bottomBarView(children: children)
-                        .ignoresSafeArea(.keyboard, edges: .bottom)
-                } else {
-                    bottomBarViewiOS13(children: children)
-                }
-                #elseif canImport(AppKit)
-                bottomBarView(children: children)
-                #endif
-            case .trailing:
-                switch layoutDirection {
-                case .leftToRight:
-                    rightBarView(children: children)
-                case .rightToLeft:
-                    leftBarView(children: children)
-                @unknown default:
-                    rightBarView(children: children)
-                }
-            }
-        case .floating(let edge):
-            floatingBarView(children: children, edge: edge)
-        }
+        _TabBarLayoutView(tabBarView: tabBarView, selectedTabIndex: selectedTabIndex, subviews: children)
     }
 }
 
-#if canImport(UIKit)
-extension _VariadicViewLayout: KeyboardReadable {}
-#endif
-
-@available(iOS 18.0, macOS 15.0, *)
-private struct _LayoutView<TabBarView: View, SelectionValue: Hashable>: View {
+struct _TabBarLayoutView<TabBarView: View, Subviews>: View where Subviews: RandomAccessCollection, Subviews.Element: View & Identifiable, Subviews.Index == Int {
     @Environment(\.layoutDirection) private var layoutDirection: LayoutDirection
-    @Environment(\.tabBarPosition) private var tabBarPosition: TabBarPosition
-    
+    @Environment(\.tabBarEdge) private var tabBarEdge: Edge
+
+    @State private var tabBarVisibility: [Int: TabBarVisibility] = [:]
+    @State private var tabBarHeight: CGFloat = 0
+
     let tabBarView: TabBarView
     let selectedTabIndex: Int
-    let children: SubviewsCollection
+    let subviews: Subviews
+
+    var body: some View {
+        GeometryReader { proxy in
+            ZStack(alignment: tabBarAlignment, content: {
+                contentView(
+                    subviews: subviews,
+                    additionalSafeAreaInsets: .init(),
+                    additionalSafeAreaInsetsTabBarVisible: additionalSafeAreaInsetsTabBarVisible
+                )
+                #if canImport(UIKit)
+                .ignoresSafeArea(.all, edges: .vertical)
+                #endif
+                tabBarView
+                    .opacity(tabBarVisibility[selectedTabIndex] == .hidden ? 0 : 1)
+                    .onPreferenceChange(TabBarBoundsForSafeAreaKey.self) {
+                        if let anchor = $0 {
+                            tabBarHeight = proxy[anchor].height }
+                        }
+            })
+        }
+    }
 
-    private func contentView(children: SubviewsCollection) -> some View {
+    private func contentView(subviews: Subviews, additionalSafeAreaInsets: EdgeInsets, additionalSafeAreaInsetsTabBarVisible: EdgeInsets) -> some View {
         #if canImport(UIKit)
         return UITabBarControllerRepresentable(
             selectedTabIndex: selectedTabIndex,
-            controlledViews: children.map { UIHostingController(rootView: $0) }
+            tabBarVisibility: $tabBarVisibility,
+            controlledViews: subviews,
+            additionalSafeAreaInsets: additionalSafeAreaInsets,
+            additionalSafeAreaInsetsTabBarVisible: additionalSafeAreaInsetsTabBarVisible
         )
         #elseif canImport(AppKit)
         return NSTabViewControllerRepresentable(
             selectedTabIndex: selectedTabIndex,
-            controlledViews: children.map { NSHostingController(rootView: $0) }
+            controlledViews: subviews.map { NSHostingController(rootView: $0) }
         )
         #endif
     }
-    
-    private func topBarView(children: SubviewsCollection) -> some View {
-        VStack(spacing: 0) {
-            tabBarView
-            
-            contentView(children: children)
-        }
-    }
-    
-    private func bottomBarView(children: SubviewsCollection) -> some View {
-        VStack(spacing: 0) {
-            contentView(children: children)
-            
-            tabBarView
-        }
-    }
-    
-    private func leftBarView(children: SubviewsCollection) -> some View {
-        HStack(spacing: 0) {
-            tabBarView
-            
-            contentView(children: children)
-        }
-    }
-    
-    private func rightBarView(children: SubviewsCollection) -> some View {
-        HStack(spacing: 0) {
-            contentView(children: children)
-            
-            tabBarView
-        }
-    }
-    
-    private func floatingBarView(children: SubviewsCollection, edge: Edge) -> some View {
-        let alignment: Alignment
-        switch edge {
+
+    private var additionalSafeAreaInsetsTabBarVisible: EdgeInsets {
+        switch tabBarEdge {
         case .top:
-            alignment = .top
+            .init(top: tabBarHeight, leading: 0, bottom: 0, trailing: 0)
         case .leading:
-            alignment = .leading
+            .init(top: 0, leading: tabBarHeight, bottom: 0, trailing: 0)
         case .bottom:
-            alignment = .bottom
+            .init(top: 0, leading: 0, bottom: tabBarHeight, trailing: 0)
         case .trailing:
-            alignment = .trailing
+            .init(top: 0, leading: 0, bottom: 0, trailing: tabBarHeight)
         }
-        
-        return ZStack(alignment: alignment, content: {
-            contentView(children: children)
-            
-            tabBarView
-        })
     }
-    
-    var body: some View {
-        switch tabBarPosition {
-        case .edge(let edge):
-            switch edge {
-            case .top:
-                topBarView(children: children)
-            case .leading:
-                switch layoutDirection {
-                case .leftToRight:
-                    leftBarView(children: children)
-                case .rightToLeft:
-                    rightBarView(children: children)
-                @unknown default:
-                    leftBarView(children: children)
-                }
-            case .bottom:
-                #if canImport(UIKit)
-                bottomBarView(children: children)
-                    .ignoresSafeArea(.keyboard, edges: .bottom)
-                #elseif canImport(AppKit)
-                bottomBarView(children: children)
-                #endif
-            case .trailing:
-                switch layoutDirection {
-                case .leftToRight:
-                    rightBarView(children: children)
-                case .rightToLeft:
-                    leftBarView(children: children)
-                @unknown default:
-                    rightBarView(children: children)
-                }
-            }
-        case .floating(let edge):
-            floatingBarView(children: children, edge: edge)
+
+    private var tabBarAlignment: Alignment {
+        switch tabBarEdge {
+        case .top:
+            .top
+        case .leading:
+            .leading
+        case .bottom:
+            .bottom
+        case .trailing:
+            .trailing
         }
     }
 }