Commit `2dd2805e4a`

2dd2805e4ae00226dd9cfb9ec9b7c916e88a6fca

parent: 57e588172b

Unsigned

cmc <hello@cleberg.net> · 2026-04-01 19:04 UTC

Fix several bugs ahead of 2.6.1

FileTreeView: when wrap is OFF, activate an explicit width constraint on
the code container derived from the widest line, giving the horizontal
scroll view a defined content size. Previously the constraint was
deactivated with nothing to replace it, making horizontal scrolling
unreliable. Also set horizontalScrollView.isScrollEnabled = !wrapLines
to prevent gesture conflicts when wrap is ON.

InboxView: remove the unnecessary loadThreads() network call fired after
markAllThreadsRead(). The threads array is already updated optimistically
and read state is persisted via InboxReadStateStore, so the refetch was
redundant and caused a brief loading flash.

HomeView: add scenePhase onChange handler to refresh dashboard data when
the app returns to the foreground, matching the existing pattern in
InboxView.

DiffView: wrap DiffBlockView content in a horizontal ScrollView so long
diff lines are readable. Switch inner VStack to LazyVStack for better
performance on large diffs.

SettingsView: replace direct UserDefaults access in behaviorSection with
@AppStorage, consistent with the rest of the app.

Layout: unified · split

Hutch/Views/Home/HomeView.swift +7

 struct HomeView: View {
     @AppStorage(AppStorageKeys.swipeActionsEnabled) private var swipeActionsEnabled = true
     @Environment(AppState.self) private var appState
+    @Environment(\.scenePhase) private var scenePhase
     @State private var viewModel: HomeViewModel?
     private let previewLimit = 4
     private let projectPreviewLimit = 3
             await vm.loadDashboard()
         }
+        .onChange(of: scenePhase) { _, newPhase in
+            guard newPhase == .active, let viewModel else { return }
+            Task {
+                await viewModel.loadDashboard()
+            }
+        }
     }
     @ViewBuilder

Hutch/Views/Inbox/InboxView.swift −3

                         withAnimation(.easeInOut(duration: 0.2)) {
                             viewModel.markAllThreadsRead()
                         }
-                        Task {
-                            await viewModel.loadThreads()
-                        }
                     }
                 }
             }

Hutch/Views/Repositories/DiffView.swift +6 −4

     let lines: [String]
     var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
+        ScrollView(.horizontal, showsIndicators: false) {
-            ForEach(Array(lines.enumerated()), id: \.offset) { _, line in
+            LazyVStack(alignment: .leading, spacing: 0) {
-                DiffLineView(line: line)
+                ForEach(Array(lines.enumerated()), id: \.offset) { _, line in
+                    DiffLineView(line: line)
+                }
             }
+            .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
         }
         .font(.system(.caption, design: .monospaced))
-        .frame(maxWidth: .infinity, alignment: .leading)
         .background(Color(.secondarySystemBackground))
     }
 }

Hutch/Views/Repositories/FileTreeView.swift +17 −1

     private let codeStackView = UIStackView()
     private var codeContainerWidthConstraint: NSLayoutConstraint?
+    private var codeContainerExplicitWidthConstraint: NSLayoutConstraint?
     private var gutterWidthConstraint: NSLayoutConstraint?
     private var rows: [LineRow] = []
         codeContainerView.addSubview(codeStackView)
         codeContainerWidthConstraint = codeContainerView.widthAnchor.constraint(equalTo: horizontalScrollView.frameLayoutGuide.widthAnchor)
+        codeContainerExplicitWidthConstraint = codeContainerView.widthAnchor.constraint(equalToConstant: 0)
         gutterWidthConstraint = gutterContainerView.widthAnchor.constraint(equalToConstant: 0)
         NSLayoutConstraint.activate([
     private func updateWrapConfiguration(resetHorizontalOffset: Bool) {
         horizontalScrollView.alwaysBounceHorizontal = !wrapLines
-        horizontalScrollView.isScrollEnabled = true
+        horizontalScrollView.isScrollEnabled = !wrapLines
         if wrapLines {
             codeContainerWidthConstraint?.isActive = true
+            codeContainerExplicitWidthConstraint?.isActive = false
         } else {
             codeContainerWidthConstraint?.isActive = false
+            codeContainerExplicitWidthConstraint?.isActive = true
         }
         for row in rows {
             row.codeHeightConstraint.constant = rowHeight
         }
+        if wrapLines {
+            codeContainerExplicitWidthConstraint?.constant = 0
+        } else {
+            let maxLineWidth = rows.reduce(CGFloat(0)) { partialResult, row in
+                let measuredWidth = row.codeLabel.sizeThatFits(
+                    CGSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)
+                ).width
+                return max(partialResult, ceil(measuredWidth))
+            }
+            codeContainerExplicitWidthConstraint?.constant = max(maxLineWidth, availableWidth)
+        }
         needsLineLayoutUpdate = false
     }

Hutch/Views/Settings/SettingsView.swift +2 −9

 struct SettingsView: View {
     @Environment(AppState.self) private var appState
     @Environment(\.colorScheme) private var colorScheme
+    @AppStorage(AppStorageKeys.swipeActionsEnabled) private var swipeActionsEnabled = true
     @State private var viewModel: SettingsViewModel?
     @State private var pendingDestructiveAction: SettingsDestructiveAction?
     @ViewBuilder
     private func behaviorSection() -> some View {
         Section {
-            Toggle(
+            Toggle("Swipe actions", isOn: $swipeActionsEnabled)
-                "Swipe actions",
-                isOn: Binding(
-                    get: {
-                        UserDefaults.standard.object(forKey: AppStorageKeys.swipeActionsEnabled) as? Bool ?? true
-                    },
-                    set: { UserDefaults.standard.set($0, forKey: AppStorageKeys.swipeActionsEnabled) }
-                )
-            )
         } header: {
             Text("Behavior")
         } footer: {

Commit 2dd2805e4a

Commit `2dd2805e4a`