Correctly Sync the Active File

Author: thecoolwinter

CodeEdit/Features/Editor/JumpBar/Views/EditorJumpBarView.swift

@@ -21,15 +21,19 @@ struct EditorJumpBarView: View {
     @Environment(\.controlActiveState)
     private var activeState
 
+    @Binding var codeFile: CodeFileDocument?
+
     static let height = 28.0
 
     init(
         file: CEWorkspaceFile?,
         shouldShowTabBar: Bool,
+        codeFile: Binding<CodeFileDocument?>,
         tappedOpenFile: @escaping (CEWorkspaceFile) -> Void
     ) {
         self.file = file ?? nil
         self.shouldShowTabBar = shouldShowTabBar
+        self._codeFile = codeFile
         self.tappedOpenFile = tappedOpenFile
     }
 
@@ -75,7 +79,7 @@ struct EditorJumpBarView: View {
         }
         .safeAreaInset(edge: .trailing, spacing: 0) {
             if !shouldShowTabBar {
-                EditorTabBarTrailingAccessories()
+                EditorTabBarTrailingAccessories(codeFile: $codeFile)
             }
         }
         .frame(height: Self.height, alignment: .center)

CodeEdit/Features/Editor/TabBar/Views/EditorTabBarTrailingAccessories.swift

@@ -26,14 +26,12 @@ struct EditorTabBarTrailingAccessories: View {
 
     @EnvironmentObject private var editor: Editor
 
-    /// Because this view isn't invalidated with the `editor.selectedTab?.file.fileDocument` changes, this allows us
-    /// to refresh relevant views when settings change.
-    @State private var refreshToggleBool: Bool = false
+    @Binding var codeFile: CodeFileDocument?
 
     var body: some View {
         HStack(spacing: 6) {
             // Once more options are implemented that are available for non-code documents, remove this if statement
-            if let codeFile = editor.selectedTab?.file.fileDocument {
+            if let codeFile {
                 editorOptionsMenu(codeFile: codeFile)
                 Divider()
                     .padding(.vertical, 10)
@@ -62,18 +60,13 @@ struct EditorTabBarTrailingAccessories: View {
                             get: { codeFile.wrapLines ?? wrapLinesToEditorWidth },
                             set: {
                                 codeFile.wrapLines = $0
-                                refreshToggleBool.toggle()
                             }
                         )
                     )
-                    .tag(refreshToggleBool)
                 } label: {}
                     .menuStyle(.borderlessButton)
                     .menuIndicator(.hidden)
             }
-            .onReceive(codeFile.$wrapLines) { _ in // This is annoying but it works
-                refreshToggleBool.toggle()
-            }
     }
 
     var splitviewButton: some View {
@@ -116,6 +109,6 @@ struct EditorTabBarTrailingAccessories: View {
 
 struct TabBarTrailingAccessories_Previews: PreviewProvider {
     static var previews: some View {
-        EditorTabBarTrailingAccessories()
+        EditorTabBarTrailingAccessories(codeFile: .constant(nil))
     }
 }

CodeEdit/Features/Editor/TabBar/Views/EditorTabBarView.swift

@@ -9,6 +9,7 @@ import SwiftUI
 
 struct EditorTabBarView: View {
     let hasTopInsets: Bool
+    @Binding var codeFile: CodeFileDocument?
     /// The height of tab bar.
     /// I am not making it a private variable because it may need to be used in outside views.
     static let height = 28.0
@@ -21,7 +22,7 @@ struct EditorTabBarView: View {
                 .accessibilityElement(children: .contain)
                 .accessibilityLabel("Tab Bar")
                 .accessibilityIdentifier("TabBar")
-            EditorTabBarTrailingAccessories()
+            EditorTabBarTrailingAccessories(codeFile: $codeFile)
                 .padding(.top, hasTopInsets ? -1 : 0)
         }
         .frame(height: EditorTabBarView.height - (hasTopInsets ? 1 : 0))

CodeEdit/Features/Editor/Views/EditorAreaView.swift

@@ -104,15 +104,16 @@ struct EditorAreaView: View {
                             .background(.clear)
                     }
                     if shouldShowTabBar {
-                        EditorTabBarView(hasTopInsets: topSafeArea > 0)
+                        EditorTabBarView(hasTopInsets: topSafeArea > 0, codeFile: $codeFile)
                             .id("TabBarView" + editor.id.uuidString)
                             .environmentObject(editor)
                         Divider()
                     }
                     if showEditorJumpBar {
                         EditorJumpBarView(
                             file: editor.selectedTab?.file,
-                            shouldShowTabBar: shouldShowTabBar
+                            shouldShowTabBar: shouldShowTabBar,
+                            codeFile: $codeFile
                         ) { [weak editor] newFile in
                             if let file = editor?.selectedTab, let index = editor?.tabs.firstIndex(of: file) {
                                 editor?.openTab(file: newFile, at: index)