Custom(izable) Navigator Sidebar Implementation

CodeEdit/NavigatorSidebar/Search/SidebarSearch.swift → CodeEdit/NavigatorSidebar/FindNavigator/FindNavigator.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import WorkspaceClient
 import Search
 
-struct SidebarSearch: View {
+struct FindNavigator: View {
     @ObservedObject var state: WorkspaceDocument.SearchState
     @State private var searchText: String = ""
 
@@ -24,8 +24,8 @@ struct SidebarSearch: View {
     var body: some View {
         VStack {
             VStack {
-                SearchModeSelector()
-                SearchBar(state: state, title: "", text: $searchText)
+                FindNavigatorModeSelector()
+                FindNavigatorSearchBar(state: state, title: "", text: $searchText)
                 HStack {
                     Spacer()
                 }
@@ -39,7 +39,7 @@ struct SidebarSearch: View {
                     .font(.system(size: 10))
             }
             Divider()
-            SearchResultList(state: state)
+            FindNavigatorResultList(state: state)
         }
         .onSubmit {
             state.search(searchText)

CodeEdit/NavigatorSidebar/Search/SearchModeSelector.swift → CodeEdit/NavigatorSidebar/FindNavigator/FindNavigatorModeSelector.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 import Search
 
-struct SearchModeSelector: View {
+struct FindNavigatorModeSelector: View {
     @State var selectedMode: [SearchModeModel] = [
         .Find,
         .Text,
@@ -115,6 +115,6 @@ extension View {
 
 struct SearchModeSelector_Previews: PreviewProvider {
     static var previews: some View {
-        SearchModeSelector()
+        FindNavigatorModeSelector()
     }
 }

CodeEdit/NavigatorSidebar/Search/SearchResultFileItem.swift → CodeEdit/NavigatorSidebar/FindNavigator/FindNavigatorResultFileItem.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import WorkspaceClient
 import Search
 
-struct SearchResultFileItem: View {
+struct FindNavigatorResultFileItem: View {
     @ObservedObject var state: WorkspaceDocument.SearchState
     @State var isExpanded: Bool = true
     var fileItem: WorkspaceClient.FileItem

CodeEdit/NavigatorSidebar/Search/SearchResultList.swift → CodeEdit/NavigatorSidebar/FindNavigator/FindNavigatorResultList.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import WorkspaceClient
 import Search
 
-struct SearchResultList: View {
+struct FindNavigatorResultList: View {
     @ObservedObject var state: WorkspaceDocument.SearchState
     @State var selectedResult: SearchResultModel?
 
@@ -24,7 +24,7 @@ struct SearchResultList: View {
     var body: some View {
         List(selection: $selectedResult) {
             ForEach(foundFiles, id: \.self) { (foundFile: SearchResultModel) in
-                SearchResultFileItem(
+                FindNavigatorResultFileItem(
                     state: state,
                     fileItem: foundFile.file, results: getResultWith(foundFile.file)) {
                         state.workspace.openFile(item: foundFile.file)

CodeEdit/NavigatorSidebar/Search/SearchBar.swift → CodeEdit/NavigatorSidebar/FindNavigator/FindNavigatorSearchBar.swift

@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-struct SearchBar: View {
+struct FindNavigatorSearchBar: View {
     @ObservedObject var state: WorkspaceDocument.SearchState
     let title: String
     @Binding var text: String
@@ -45,7 +45,11 @@ struct SearchBar: View {
 struct SearchBar_Previews: PreviewProvider {
     static var previews: some View {
         HStack {
-            SearchBar(state: .init(WorkspaceDocument.init()), title: "placeholder", text: .constant("value"))
+            FindNavigatorSearchBar(
+				state: .init(WorkspaceDocument.init()),
+				title: "placeholder",
+				text: .constant("value")
+			)
         }
         .padding()
     }

CodeEdit/NavigatorSidebar/LeadingSidebar.swift

@@ -0,0 +1,35 @@
+//
+//  SideBar.swift
+//  CodeEdit
+//
+//  Created by Lukas Pistrol on 17.03.22.
+//
+
+import SwiftUI
+import WorkspaceClient
+
+struct LeadingSidebar: View {
+	@ObservedObject var workspace: WorkspaceDocument
+	var windowController: NSWindowController
+	@State private var selection: Int = 0
+
+	var body: some View {
+		ZStack {
+			switch selection {
+			case 0:
+				ProjectNavigator(workspace: workspace, windowController: windowController)
+			case 2:
+				FindNavigator(state: workspace.searchState ?? .init(workspace))
+			default:
+				VStack { Spacer() }
+			}
+		}
+		.safeAreaInset(edge: .top) {
+			LeadingSidebarToolbarTop(selection: $selection)
+				.padding(.bottom, -8)
+		}
+		.safeAreaInset(edge: .bottom) {
+			LeadingSidebarToolbarBottom(workspace: workspace)
+		}
+	}
+}

CodeEdit/NavigatorSidebar/NavigatorSidebarToolbarBottom.swift → CodeEdit/NavigatorSidebar/LeadingSidebarToolbarBottom.swift

@@ -7,7 +7,8 @@
 
 import SwiftUI
 
-struct NavigatorSidebarToolbarBottom: View {
+struct LeadingSidebarToolbarBottom: View {
+	@Environment(\.controlActiveState) var activeState
 
 	@ObservedObject var workspace: WorkspaceDocument
 
@@ -37,6 +38,7 @@ struct NavigatorSidebarToolbarBottom: View {
 		.menuStyle(.borderlessButton)
 		.menuIndicator(.hidden)
 		.frame(maxWidth: 30)
+		.opacity(activeState == .inactive ? 0.45 : 1)
 	}
 
 	private var sortButton: some View {
@@ -51,5 +53,6 @@ struct NavigatorSidebarToolbarBottom: View {
 		}
 		.menuStyle(.borderlessButton)
 		.frame(maxWidth: 30)
+		.opacity(activeState == .inactive ? 0.45 : 1)
 	}
 }

CodeEdit/NavigatorSidebar/NavigatorSidebarToolbarTop.swift → CodeEdit/NavigatorSidebar/LeadingSidebarToolbarTop.swift

@@ -7,7 +7,9 @@
 
 import SwiftUI
 
-struct NavigatorSidebarToolbarTop: View {
+struct LeadingSidebarToolbarTop: View {
+	@Environment(\.controlActiveState) var activeState
+
 	@Binding var selection: Int
 
 	var body: some View {
@@ -42,13 +44,14 @@ struct NavigatorSidebarToolbarTop: View {
 				.foregroundColor(id == selection ? .accentColor : .secondary)
 				.frame(width: 25, height: 25, alignment: .center)
 				.contentShape(Rectangle())
+				.opacity(activeState == .inactive ? 0.45 : 1)
 		}
 		.buttonStyle(.plain)
 	}
 }
 
 struct NavigatorSidebarToolbar_Previews: PreviewProvider {
 	static var previews: some View {
-        NavigatorSidebarToolbarTop(selection: .constant(0))
+        LeadingSidebarToolbarTop(selection: .constant(0))
 	}
 }