fix: tool bar items not refreshing in iOS 26

bummoblizard · bummoblizard · commit 8abc3334181b · 2025-09-16T00:24:57.000+08:00
diff --git a/CodeApp/Managers/BottomBar.swift b/CodeApp/Managers/BottomBar.swift
@@ -15,13 +15,13 @@ struct StatusBar: View {
 
     var leftMostItems: [StatusBarItem] {
         statusBarManager.items
-            .filter { $0.shouldDisplay() }
+            .filter { $0.shouldDisplay(App) }
             .filter { $0.positionPreference == .left }
             .sorted { $0.positionPrecedence > $1.positionPrecedence }
     }
     var rightMostItems: [StatusBarItem] {
         statusBarManager.items
-            .filter { $0.shouldDisplay() }
+            .filter { $0.shouldDisplay(App) }
             .filter { $0.positionPreference == .right }
             .sorted { $0.positionPrecedence < $1.positionPrecedence }
     }
diff --git a/CodeApp/Managers/StatusBarManager.swift b/CodeApp/Managers/StatusBarManager.swift
@@ -11,7 +11,7 @@ struct StatusBarItem: Identifiable {
     let id = UUID()
     var extensionID: String
     var view: AnyView
-    var shouldDisplay: () -> Bool
+    var shouldDisplay: (MainApp) -> Bool
     var positionPreference: PositionPreference
     var positionPrecedence: Int = 0
 
diff --git a/CodeApp/Managers/ToolbarManager.swift b/CodeApp/Managers/ToolbarManager.swift
@@ -15,7 +15,7 @@ struct ToolbarItem: Identifiable {
     var onClick: () -> Void
     var shortCut: KeyboardShortcut?
     var panelToFocusOnTap: String?
-    var shouldDisplay: () -> Bool
+    var shouldDisplay: (MainApp) -> Bool
 }
 
 class ToolbarManager: CodeAppContributionPointManager {
diff --git a/CodeApp/Views/TopBar.swift b/CodeApp/Views/TopBar.swift
@@ -62,7 +62,7 @@ struct TopBar: View {
             }
 
             ForEach(toolBarManager.items) { item in
-                if item.shouldDisplay() {
+                if item.shouldDisplay(App) {
                     ToolbarItemView(item: item)
                 }
             }
diff --git a/Extensions/LocalExecution/LocalExecutionExtension.swift b/Extensions/LocalExecution/LocalExecutionExtension.swift
@@ -33,7 +33,7 @@ class LocalExecutionExtension: CodeAppExtension {
             },
             shortCut: .init("r", modifiers: [.command]),
             panelToFocusOnTap: "TERMINAL",
-            shouldDisplay: {
+            shouldDisplay: { app in
                 guard let activeTextEditor = app.activeTextEditor else { return false }
                 return activeTextEditor.url.isFileURL
                     && LOCAL_EXECUTION_COMMANDS[activeTextEditor.languageIdentifier] != nil
diff --git a/Extensions/MarkdownViewer/MarkdownViewerExtension.swift b/Extensions/MarkdownViewer/MarkdownViewerExtension.swift
@@ -68,7 +68,7 @@ class MarkdownViewerExtension: CodeAppExtension {
                     app.appendAndFocusNewEditor(editor: instance, alwaysInNewTab: true)
                 }
             },
-            shouldDisplay: {
+            shouldDisplay: { app in
                 ["md", "markdown"].contains(app.activeTextEditor?.languageIdentifier.lowercased())
             }
         )
diff --git a/Extensions/MonacoEditor/MonacoEditorExtension.swift b/Extensions/MonacoEditor/MonacoEditorExtension.swift
@@ -14,35 +14,35 @@ class MonacoEditorAuxiliaryExtension: CodeAppExtension {
         let encodingStatusBarItem = StatusBarItem(
             extensionID: MONACO_EDITOR_EXTENSION_ID,
             view: AnyView(EncodingMenu()),
-            shouldDisplay: { app.activeEditor is TextEditorInstance },
+            shouldDisplay: { app in app.activeEditor is TextEditorInstance },
             positionPreference: .right,
             positionPrecedence: Int.max
         )
         let lineColumnIndicatorStatusBarItem = StatusBarItem(
             extensionID: MONACO_EDITOR_EXTENSION_ID,
             view: AnyView(EditorLineColumnIndicator()),
-            shouldDisplay: { app.activeEditor is TextEditorInstance },
+            shouldDisplay: { app in app.activeEditor is TextEditorInstance },
             positionPreference: .right,
             positionPrecedence: Int.max - 1
         )
         let readOnlyStatusBarItem = StatusBarItem(
             extensionID: MONACO_EDITOR_EXTENSION_ID,
             view: AnyView(Text("READ-ONLY")),
-            shouldDisplay: { app.editorOptions.value.readOnly },
+            shouldDisplay: { app in app.editorOptions.value.readOnly },
             positionPreference: .left,
             positionPrecedence: Int.max
         )
         let vimKeyBufferStatusBarItem = StatusBarItem(
             extensionID: MONACO_EDITOR_EXTENSION_ID,
             view: AnyView(VimKeyBufferLabel()),
-            shouldDisplay: { app.activeEditor is TextEditorInstance },
+            shouldDisplay: { app in app.activeEditor is TextEditorInstance },
             positionPreference: .right,
             positionPrecedence: Int.min
         )
         let vimModeStatusBarItem = StatusBarItem(
             extensionID: MONACO_EDITOR_EXTENSION_ID,
             view: AnyView(VimModeLabel()),
-            shouldDisplay: { app.activeEditor is TextEditorInstance },
+            shouldDisplay: { app in app.activeEditor is TextEditorInstance },
             positionPreference: .left,
             positionPrecedence: Int.min
         )
diff --git a/Extensions/RemoteAuxiliary/RemoteAuxiliaryExtension.swift b/Extensions/RemoteAuxiliary/RemoteAuxiliaryExtension.swift
@@ -12,7 +12,7 @@ class RemoteAuxiliaryExtension: CodeAppExtension {
         let item = StatusBarItem(
             extensionID: "REMOTE_AUX",
             view: AnyView(RemoteConnectedLabel()),
-            shouldDisplay: { app.workSpaceStorage.remoteConnected },
+            shouldDisplay: { app in app.workSpaceStorage.remoteConnected },
             positionPreference: .left,
             positionPrecedence: Int.min
         )
diff --git a/Extensions/RemoteExecution/RemoteExecutionExtension.swift b/Extensions/RemoteExecution/RemoteExecutionExtension.swift
@@ -48,7 +48,7 @@ class RemoteExecutionExtension: CodeAppExtension {
             },
             shortCut: nil,
             panelToFocusOnTap: PANEL_ID,
-            shouldDisplay: {
+            shouldDisplay: { app in
                 guard let textEditor = app.activeEditor as? TextEditorInstance else {
                     return false
                 }
diff --git a/Extensions/SimpleWebPreview/SimpleWebPreviewExtension.swift b/Extensions/SimpleWebPreview/SimpleWebPreviewExtension.swift
@@ -38,7 +38,7 @@ class SimpleWebPreviewExtension: CodeAppExtension {
                     app.safariManager.showSafari(url: urlToGo)
                 }
             },
-            shouldDisplay: {
+            shouldDisplay: { app in
                 guard self.webServer.isRunning else { return false }
                 guard let textEditor = app.activeEditor as? TextEditorInstance else {
                     return false
diff --git a/Extensions/SourceControlAuxiliary/SourceControlAuxiliaryExtension.swift b/Extensions/SourceControlAuxiliary/SourceControlAuxiliaryExtension.swift
@@ -16,7 +16,7 @@ class SourceControlAuxiliaryExtension: CodeAppExtension {
             extenionID: EXTENSION_ID,
             icon: "arrow.2.squarepath",
             onClick: { onCompareWithPreviousItemClick(app: app) },
-            shouldDisplay: {
+            shouldDisplay: { app in
                 app.activeEditor is TextEditorInstance
                     && !(app.activeEditor is DiffTextEditorInstnace) && app.gitTracks.count > 0
             }
@@ -29,7 +29,7 @@ class SourceControlAuxiliaryExtension: CodeAppExtension {
                     await app.monacoInstance.moveToPreviousDiff()
                 }
             },
-            shouldDisplay: {
+            shouldDisplay: { app in
                 app.activeEditor is DiffTextEditorInstnace
             }
         )
@@ -41,20 +41,20 @@ class SourceControlAuxiliaryExtension: CodeAppExtension {
                     await app.monacoInstance.moveToNextDiff()
                 }
             },
-            shouldDisplay: {
+            shouldDisplay: { app in
                 app.activeEditor is DiffTextEditorInstnace
             }
         )
         let aheadBehindIndicatorItem = StatusBarItem(
             extensionID: EXTENSION_ID,
             view: AnyView(AheadBehindIndicator()),
-            shouldDisplay: { app.aheadBehind != nil },
+            shouldDisplay: { app in app.aheadBehind != nil },
             positionPreference: .left
         )
         let checkoutMenuItem = StatusBarItem(
             extensionID: EXTENSION_ID,
             view: AnyView(CheckoutMenu()),
-            shouldDisplay: { !app.branch.isEmpty },
+            shouldDisplay: { app in !app.branch.isEmpty },
             positionPreference: .left,
             positionPrecedence: 1
         )

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ struct ToolbarItem: Identifiable {`
`15`	`15`	`var onClick: () -> Void`
`16`	`16`	`var shortCut: KeyboardShortcut?`
`17`	`17`	`var panelToFocusOnTap: String?`
`18`		`- var shouldDisplay: () -> Bool`
	`18`	`+ var shouldDisplay: (MainApp) -> Bool`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`class ToolbarManager: CodeAppContributionPointManager {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ struct TopBar: View {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`ForEach(toolBarManager.items) { item in`
`65`		`- if item.shouldDisplay() {`
	`65`	`+ if item.shouldDisplay(App) {`
`66`	`66`	`ToolbarItemView(item: item)`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class MarkdownViewerExtension: CodeAppExtension {`
`68`	`68`	`app.appendAndFocusNewEditor(editor: instance, alwaysInNewTab: true)`
`69`	`69`	`}`
`70`	`70`	`},`
`71`		`- shouldDisplay: {`
	`71`	`+ shouldDisplay: { app in`
`72`	`72`	`["md", "markdown"].contains(app.activeTextEditor?.languageIdentifier.lowercased())`
`73`	`73`	`}`
`74`	`74`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class RemoteAuxiliaryExtension: CodeAppExtension {`
`12`	`12`	`let item = StatusBarItem(`
`13`	`13`	`extensionID: "REMOTE_AUX",`
`14`	`14`	`view: AnyView(RemoteConnectedLabel()),`
`15`		`- shouldDisplay: { app.workSpaceStorage.remoteConnected },`
	`15`	`+ shouldDisplay: { app in app.workSpaceStorage.remoteConnected },`
`16`	`16`	`positionPreference: .left,`
`17`	`17`	`positionPrecedence: Int.min`
`18`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class RemoteExecutionExtension: CodeAppExtension {`
`48`	`48`	`},`
`49`	`49`	`shortCut: nil,`
`50`	`50`	`panelToFocusOnTap: PANEL_ID,`
`51`		`- shouldDisplay: {`
	`51`	`+ shouldDisplay: { app in`
`52`	`52`	`guard let textEditor = app.activeEditor as? TextEditorInstance else {`
`53`	`53`	`return false`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class SimpleWebPreviewExtension: CodeAppExtension {`
`38`	`38`	`app.safariManager.showSafari(url: urlToGo)`
`39`	`39`	`}`
`40`	`40`	`},`
`41`		`- shouldDisplay: {`
	`41`	`+ shouldDisplay: { app in`
`42`	`42`	`guard self.webServer.isRunning else { return false }`
`43`	`43`	`guard let textEditor = app.activeEditor as? TextEditorInstance else {`
`44`	`44`	`return false`