Commit `b1fc78b637`

b1fc78b637b27ae2642cd722014ca3bbf3a917f3

parent: f4f3e8781b

Unsigned

cmc <hello@cleberg.net> · 2026-09-07 05:35 UTC

Edit opens on the format the body was stored in (!61)

An org body's Edit sheet opened on Markdown. `ComposeSheet` stored the format as `Binding<String>?`, which is not a dynamic property, so the sheet body never re-ran after the binding took the stored format. Now a real `@Binding` plus a `showsFormat` flag; the release call site is unchanged.

Reproduced and verified in the simulator with the real `IssueView` against a stubbed `issue show` returning `body_format: org`. The live smoke edit flow gains an org round-trip on the fixture issue.

Layout: unified · split

gitbay/Views/Shared/ComposeSheet.swift +23 −5

     let errorMessage: String?
     @Binding var title: String
     @Binding var bodyText: String
-    /// nil hides the picker entirely — the release editor has no parity
+    /// Held as a real `@Binding`, not `Binding<String>?`: an optional
-    /// row and passes nothing, leaving that call site untouched.
+    /// binding is not a dynamic property, so the sheet body never re-ran
-    var format: Binding<String>? = nil
+    /// when the value changed and the picker kept whatever it first saw.
+    @Binding var format: String
+    let showsFormat: Bool
     let onSubmit: () -> Void
+    /// A nil `format` hides the picker entirely — the release editor has
+    /// no parity row and passes nothing, leaving that call site untouched.
+    init(heading: String, submitLabel: String, working: Bool, errorMessage: String?,
+         title: Binding<String>, bodyText: Binding<String>,
+         format: Binding<String>? = nil, onSubmit: @escaping () -> Void) {
+        self.heading = heading
+        self.submitLabel = submitLabel
+        self.working = working
+        self.errorMessage = errorMessage
+        _title = title
+        _bodyText = bodyText
+        _format = format ?? .constant("md")
+        showsFormat = format != nil
+        self.onSubmit = onSubmit
+    }
     @Environment(\.dismiss) private var dismiss
     var body: some View {
                         .font(.gbSans(.body))
                         .autocorrectionDisabled()
                         .accessibilityIdentifier("compose-body")
-                    if let format {
+                    if showsFormat {
-                        Picker("Format", selection: format) {
+                        Picker("Format", selection: $format) {
                             Text("Markdown").tag("md")
                             Text("Org").tag("org")
                         }

gitbayUITests/LiveSmokeUITests.swift +18

	@@ -188,11 +188,29 @@ final class LiveSmokeUITests: XCTestCase {
188	XCTAssertTrue(title.waitForExistence(timeout: 5), "edit sheet did not open")	188	XCTAssertTrue(title.waitForExistence(timeout: 5), "edit sheet did not open")
189	XCTAssertTrue((title.value as? String)?.contains("ui-smoke fixture") == true,	189	XCTAssertTrue((title.value as? String)?.contains("ui-smoke fixture") == true,
190	"edit sheet did not prefill")	190	"edit sheet did not prefill")
		191	// Save the body as org, reopen, and the picker must start on Org:
		192	// the sheet has to read the stored format, not its own default.
		193	let format = app.segmentedControls.matching(identifier: "compose-format").firstMatch
		194	XCTAssertTrue(format.waitForExistence(timeout: 5), "format picker missing")
		195	XCTAssertTrue(format.buttons["Markdown"].isSelected, "fixture did not open on Markdown")
		196	format.buttons["Org"].tap()
191	app.descendants(matching: .any).matching(identifier: "compose-submit")	197	app.descendants(matching: .any).matching(identifier: "compose-submit")
192	.firstMatch.tap()	198	.firstMatch.tap()
193	// Sheet dismissal proves the save round-tripped without error.	199	// Sheet dismissal proves the save round-tripped without error.
194	XCTAssertTrue(waitForDisappearance(title, timeout: 15), "edit save did not dismiss")	200	XCTAssertTrue(waitForDisappearance(title, timeout: 15), "edit save did not dismiss")
195		201
		202	app.descendants(matching: .any).matching(identifier: "issue-actions-menu")
		203	.firstMatch.tap()
		204	XCTAssertTrue(edit.waitForExistence(timeout: 5))
		205	edit.tap()
		206	XCTAssertTrue(format.waitForExistence(timeout: 5), "edit sheet did not reopen")
		207	XCTAssertTrue(format.buttons["Org"].isSelected, "edit sheet did not open on the stored format")
		208	// Restore the fixture to markdown.
		209	format.buttons["Markdown"].tap()
		210	app.descendants(matching: .any).matching(identifier: "compose-submit")
		211	.firstMatch.tap()
		212	XCTAssertTrue(waitForDisappearance(title, timeout: 15), "edit save did not dismiss")
		213
196	back() // to issues list	214	back() // to issues list
197	back() // to repo screen	215	back() // to repo screen
198		216

Commit b1fc78b637

Commit `b1fc78b637`