Skip to content

refactor: demo preview cleanup #17

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
lynnswap merged 1 commit into from
Feb 5, 2026
Merged

refactor: demo preview cleanup #17

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
15 changes: 7 additions & 8 deletions Examples/TabBarDemo/TabBarDemo/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,23 @@ import SwiftUI
import TabBarMenuDemoSupport

struct ContentView: View {
@AppStorage("selectedTab") private var mode :TabBarMenuPreviewMode = .uiTab
@AppStorage("selectedTab") private var mode: TabBarMenuPreviewMode = .uiTab

var body: some View {
NavigationStack{
NavigationStack {
TabBarMenuPreviewScreen(mode: mode)
.toolbar{
.toolbar {
ToolbarItem(placement: .principal) {
modePicker
}
}
}
}
@ViewBuilder
private var modePicker:some View{
Picker(selection:$mode){

private var modePicker: some View {
Picker("Mode", selection: $mode) {
Text("UITab").tag(TabBarMenuPreviewMode.uiTab)
Text("VC").tag(TabBarMenuPreviewMode.uiTabBarItem)
}label:{
EmptyView()
}
.pickerStyle(.segmented)
.labelsHidden()
Expand Down
3 changes: 1 addition & 2 deletions Sources/TabBarMenu/TabBarMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// The Swift Programming Language
// https://docs.swift.org/swift-book

import SwiftUI
import Observation
import UIKit
import ObjectiveC


Expand Down
32 changes: 0 additions & 32 deletions Sources/TabBarMenu/TabBarMenuRequests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,6 @@ struct TabBarMenuTabRequestContext: TabBarMenuRequestContext {
func items(in tabBarController: UITabBarController) -> [UITab] {
tabBarController.tabs
}

fileprivate func isMoreTab(_ tab: UITab, in tabBarController: UITabBarController) -> Bool {
let tabs = tabBarController.tabs
guard let moreIndex = core.moreTabStartIndex(totalCount: tabs.count) else {
return false
}
if let index = tabs.firstIndex(where: { $0 === tab }) {
return index == moreIndex
}
// If we can't find it, be conservative and treat it as the More tab.
return true
}
}

@MainActor
Expand All @@ -113,26 +101,6 @@ struct TabBarMenuViewControllerRequestContext: TabBarMenuRequestContext {
func items(in tabBarController: UITabBarController) -> [UIViewController] {
tabBarController.viewControllers ?? []
}

fileprivate func isMoreViewController(
_ viewController: UIViewController,
in tabBarController: UITabBarController
) -> Bool {
let moreNavigationController = tabBarController.moreNavigationController
if viewController === moreNavigationController {
return true
}
if viewController.tabBarItem === moreNavigationController.tabBarItem {
return true
}
let totalCount = items(in: tabBarController).count
guard let moreIndex = core.moreTabStartIndex(totalCount: totalCount),
let items = tabBarController.tabBar.items,
items.indices.contains(moreIndex) else {
return false
}
return viewController.tabBarItem === items[moreIndex]
}
}

@MainActor
Expand Down
31 changes: 16 additions & 15 deletions Sources/TabBarMenuDemoSupport/TabBarMenuPreview.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SwiftUI
import Observation
import SwiftUI
import TabBarMenu

private struct PreviewTab: Equatable {
Expand Down Expand Up @@ -249,10 +249,10 @@ private final class TabBarMenuPreviewUITabController: TabBarMenuPreviewBaseContr
let actions = tabs.map { tab in
let title = tab.title.isEmpty ? "Untitled" : tab.title
return UIAction(title: title, image: tab.image) { [weak tab] _ in
guard let tab ,let tabBarController = tab.tabBarController else {
guard let tab, let tabBarController = tab.tabBarController else {
return
}
if !tabBarController.moreNavigationController.navigationBar.isHidden{
if !tabBarController.moreNavigationController.navigationBar.isHidden {
tabBarController.moreNavigationController.navigationBar.isHidden = true
}
tabBarController.selectedTab = tab
Expand Down Expand Up @@ -300,7 +300,7 @@ private final class TabBarMenuPreviewViewControllerController: TabBarMenuPreview
guard let viewController, let tabBarController = viewController.tabBarController else {
return
}
if !tabBarController.moreNavigationController.navigationBar.isHidden{
if !tabBarController.moreNavigationController.navigationBar.isHidden {
tabBarController.moreNavigationController.navigationBar.isHidden = true
}
tabBarController.selectedViewController = viewController
Expand Down Expand Up @@ -337,16 +337,17 @@ private struct SampleTabView: View {
let systemImage: String

var body: some View {
ContentUnavailableView{
Label{
ContentUnavailableView {
Label {
Text(title)
}icon:{
} icon: {
Image(systemName: systemImage)
.symbolVariant(.fill)
}
}
}
}

private struct TabBarMenuPreviewRepresentable: UIViewControllerRepresentable {
let mode: TabBarMenuPreviewMode
let viewModel: TabBarMenuPreviewViewModel
Expand All @@ -358,11 +359,14 @@ private struct TabBarMenuPreviewRepresentable: UIViewControllerRepresentable {
return container
}

func updateUIViewController(_ uiViewController: TabBarMenuPreviewContainerController, context: Context) {}
func updateUIViewController(_ uiViewController: TabBarMenuPreviewContainerController, context: Context) {
viewModel.register(uiViewController)
viewModel.updateMode(mode)
}
}

public struct TabBarMenuPreviewScreen: View {
private var mode: TabBarMenuPreviewMode
private let mode: TabBarMenuPreviewMode
@State private var viewModel = TabBarMenuPreviewViewModel()

public init(mode: TabBarMenuPreviewMode) {
Expand All @@ -372,7 +376,7 @@ public struct TabBarMenuPreviewScreen: View {
public var body: some View {
TabBarMenuPreviewRepresentable(mode: mode, viewModel: viewModel)
.ignoresSafeArea()
.toolbar{
.toolbar {
ToolbarItem(placement: .navigation) {
Toggle("Search Tab", isOn: Bindable(viewModel).isSearchTabEnabled)
}
Expand All @@ -382,21 +386,18 @@ public struct TabBarMenuPreviewScreen: View {
}
}
}
.onChange(of: mode) {
viewModel.updateMode(mode)
}
}
}

#if DEBUG
#Preview("TabBarMenu UITab") {
NavigationStack{
NavigationStack {
TabBarMenuPreviewScreen(mode: .uiTab)
}
}

#Preview("TabBarMenu UITabBarItem") {
NavigationStack{
NavigationStack {
TabBarMenuPreviewScreen(mode: .uiTabBarItem)
}
}
Expand Down