Skip to content

Align line height calculation and hide search tab title on iOS < 26 #423

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
yooxdb merged 3 commits into from
Sep 13, 2026
Merged

Align line height calculation and hide search tab title on iOS < 26 #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6131867
fix: align custom line height calculation with SwiftUI
yooxdb Sep 5, 2026
5820cbb
fix: hide search tab item title on iOS < 26
yooxdb Sep 5, 2026
78cd30c
fix: use trait collection for UI idiom detection
yooxdb Sep 12, 2026
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
19 changes: 12 additions & 7 deletions Modules/Shared/SharedUIComponents/Sources/AnimatableTabView/SystemTabView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,18 @@ public class SystemUITabBarController<T: TabItem>: UITabBarController, UITabBarC
}
let hostingController = UIHostingController(rootView: rootView)
let tabItem = scene.tabItem
let uiTabItem =
if tabItem.isSearchRole {
UITabBarItem(tabBarSystemItem: .search, tag: tabItem.viewIndex())
} else {
UITabBarItem()
}
if UIDevice.current.userInterfaceIdiom == .pad {
let isPad = traitCollection.userInterfaceIdiom == .pad
let uiTabItem: UITabBarItem
if isPad, tabItem.isSearchRole {
uiTabItem = UITabBarItem(tabBarSystemItem: .search, tag: tabItem.viewIndex())
} else if #available(iOS 26, *), tabItem.isSearchRole {
uiTabItem = UITabBarItem(tabBarSystemItem: .search, tag: tabItem.viewIndex())
} else {
// A system search item's title can't be cleared on iOS < 26, so use a
// plain item there instead to actually hide the label.
uiTabItem = UITabBarItem()
}
if isPad {
uiTabItem.title = tabItem.title
} else if #unavailable(iOS 26) {
uiTabItem.title = nil
Expand Down
2 changes: 1 addition & 1 deletion Modules/Utility/SwiftUIUtility/Sources/Font+LineHeight.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ extension View {
.font(Font(font))
.lineHeight(.multiple(factor: lineHeightMultiple))
} else {
let extra = font.pointSize * lineHeightMultiple
let extra = font.pointSize * (lineHeightMultiple - 1)
let spacing = (extra * 0.5)
return
self
Expand Down
Loading