Skip to content

feat(sidebar): hide pinned section when empty #249

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

Closed
zorahrel wants to merge 1 commit into from
Closed

feat(sidebar): hide pinned section when empty #249

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
6 changes: 3 additions & 3 deletions ora/Features/Sidebar/Views/ContainerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ struct ContainerView: View {
}

ScrollView(.vertical, showsIndicators: false) {
VStack(alignment: .leading, spacing: 16) {
if !privacyMode.isPrivate {
VStack(alignment: .leading, spacing: 8) {
if !privacyMode.isPrivate, !pinnedTabs.isEmpty || draggedItem != nil {
PinnedTabsList(
tabs: pinnedTabs,
draggedItem: $draggedItem,
Expand All @@ -66,7 +66,7 @@ struct ContainerView: View {
onMoveToContainer: moveTab,
containers: containers
)
Divider()
if !pinnedTabs.isEmpty { Divider() }
}
NormalTabsList(
tabs: normalTabs,
Expand Down
15 changes: 8 additions & 7 deletions ora/Features/Sidebar/Views/TabList/PinnedTabsList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ struct PinnedTabsList: View {
@Environment(\.theme) var theme

var body: some View {
VStack(spacing: 8) {
Text("Pinned")
.font(.callout)
.foregroundColor(theme.mutedForeground)
.padding(.top, 8)
.frame(maxWidth: .infinity, alignment: .leading)
VStack(spacing: 4) {
if !tabs.isEmpty || draggedItem != nil {
Text("Pinned")
.font(.callout)
.foregroundColor(theme.mutedForeground)
.frame(maxWidth: .infinity, alignment: .leading)
}
if tabs.isEmpty {
EmptyPinnedTabs()
if draggedItem != nil { EmptyPinnedTabs() }
} else {
ForEach(tabs) { tab in
TabItem(
Expand Down