Wrap long lines in the Changes view

mac/Sources/Byre/Changes.swift

@@ -605,11 +605,9 @@ struct DiffLines: View {
     let rows: [DiffRow]
     var taskId: String?
     @Environment(Store.self) private var store
-    @ViewState private var width: CGFloat = 0
 
     var body: some View {
-        ScrollView(.horizontal) {
+        VStack(alignment: .leading, spacing: 0) {
-            StretchColumn(minWidth: width) {
             ForEach(Array(rows.enumerated()), id: \.offset) { _, row in
                 if let taskId, let anchor = row.anchor, let drafts = store.drafts {
                     let comment = drafts.lineComment(taskId, anchor)
@@ -619,10 +617,8 @@ struct DiffLines: View {
                         })
                     if comment != nil {
                         LineCommentBox(drafts: drafts, taskId: taskId, anchor: anchor)
-                                .frame(width: max(0, width - 20))
                             .padding(.horizontal, 10)
                             .padding(.vertical, 4)
-                                .frame(maxWidth: .infinity, alignment: .leading)
                     }
                 } else {
                     DiffLineRow(row: row, mark: row.mark, hoverable: false)
@@ -633,13 +629,6 @@ struct DiffLines: View {
         .padding(.vertical, 4)
         .textSelection(.enabled)
     }
-        .scrollBounceBehavior(.basedOnSize)
-        .onGeometryChange(for: CGFloat.self) { g in
-            g.size.width
-        } action: { w in
-            width = w
-        }
-    }
 }
 
 private struct DiffLineRow: View {
@@ -649,17 +638,18 @@ private struct DiffLineRow: View {
     @ViewState private var hover = false
 
     var body: some View {
-        HStack(spacing: 0) {
+        HStack(alignment: .firstTextBaseline, spacing: 0) {
             if let n = row.lineno {
                 Text(n)
                     .foregroundStyle(Palette.muted)
                     .frame(minWidth: 30, alignment: .trailing)
                     .padding(.trailing, 8)
+                    .fixedSize()
             }
             Text(verbatim: row.text.isEmpty ? " " : row.text)
                 .foregroundStyle(row.kind.color)
+                .fixedSize(horizontal: false, vertical: true)
         }
-        .fixedSize()
         .padding(.horizontal, 10)
         .frame(maxWidth: .infinity, alignment: .leading)
         .background(row.kind.background)