Round trip content
") .setPostId(999) .setPostType("page") + .setPostStatus("draft") .setThemeStyles(true) .setPlugins(true) .setHideTitle(true) @@ -368,6 +379,7 @@ class EditorConfigurationBuilderTest { val original = builder() .setPostId(123) .setPostType("post") + .setPostStatus("publish") .setEditorSettings("""{"test":true}""") .setEditorAssetsEndpoint("https://example.com/assets") .build() @@ -376,6 +388,7 @@ class EditorConfigurationBuilderTest { assertEquals(123, rebuilt.postId) assertEquals("post", rebuilt.postType) + assertEquals("publish", rebuilt.postStatus) assertEquals("""{"test":true}""", rebuilt.editorSettings) assertEquals("https://example.com/assets", rebuilt.editorAssetsEndpoint) } @@ -540,6 +553,19 @@ class EditorConfigurationTest { assertNotEquals(config1, config2) } + @Test + fun `Configurations with different postStatus are not equal`() { + val config1 = builder() + .setPostStatus("draft") + .build() + + val config2 = builder() + .setPostStatus("publish") + .build() + + assertNotEquals(config1, config2) + } + @Test fun `Configurations with different themeStyles are not equal`() { val config1 = builder() @@ -820,6 +846,7 @@ class EditorConfigurationTest { .setContent("Test Content") .setPostId(123) .setPostType("post") + .setPostStatus("publish") .setThemeStyles(true) .setPlugins(true) .setHideTitle(false) @@ -842,6 +869,7 @@ class EditorConfigurationTest { assertEquals("Test Content", config.content) assertEquals(123, config.postId) assertEquals("post", config.postType) + assertEquals("publish", config.postStatus) assertTrue(config.themeStyles) assertTrue(config.plugins) assertFalse(config.hideTitle) diff --git a/android/app/src/main/java/com/example/gutenbergkit/EditorActivity.kt b/android/app/src/main/java/com/example/gutenbergkit/EditorActivity.kt index efe1f29f..78ed9dce 100644 --- a/android/app/src/main/java/com/example/gutenbergkit/EditorActivity.kt +++ b/android/app/src/main/java/com/example/gutenbergkit/EditorActivity.kt @@ -344,6 +344,13 @@ fun EditorScreen( loadingError = error.message ?: "Unknown error" } }) + // Demo app has no persistence layer, so return null. + // In a real app, return the persisted title and content from autosave. + setLatestContentProvider(object : GutenbergView.LatestContentProvider { + override fun getLatestContent(): GutenbergView.LatestContent? { + return null + } + }) onGutenbergViewCreated(this) } }, diff --git a/ios/Demo-iOS/Sources/Views/EditorView.swift b/ios/Demo-iOS/Sources/Views/EditorView.swift index f47538f2..90ca1be8 100644 --- a/ios/Demo-iOS/Sources/Views/EditorView.swift +++ b/ios/Demo-iOS/Sources/Views/EditorView.swift @@ -213,6 +213,12 @@ private struct _EditorView: UIViewControllerRepresentable { print(" Response Body: \(responseBody.prefix(200))...") } } + + func editorDidRequestLatestContent(_ controller: EditorViewController) -> (title: String, content: String)? { + // Demo app has no persistence layer, so return nil. + // In a real app, return the persisted title and content from autosave. + return nil + } } } diff --git a/ios/Sources/GutenbergKit/Sources/EditorViewController.swift b/ios/Sources/GutenbergKit/Sources/EditorViewController.swift index bfa216f0..9edaff7a 100644 --- a/ios/Sources/GutenbergKit/Sources/EditorViewController.swift +++ b/ios/Sources/GutenbergKit/Sources/EditorViewController.swift @@ -170,6 +170,10 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro // Set-up communications with the editor. config.userContentController.add(controller, name: "editorDelegate") + // Register async message handler for content recovery requests. + // This allows JavaScript to request the latest persisted content from the native host. + config.userContentController.addScriptMessageHandler(controller, contentWorld: .page, name: "requestLatestContent") + // This is important so they user can't select anything but text across blocks. config.selectionGranularity = .character @@ -659,6 +663,14 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro } } + fileprivate func controllerDidRequestLatestContent(_ controller: GutenbergEditorController) -> (title: String, content: String)? { + return delegate?.editorDidRequestLatestContent(self) + } + + fileprivate func controllerWebContentProcessDidTerminate(_ controller: GutenbergEditorController) { + webView.reload() + } + // MARK: - Loading Complete: Editor Ready /// Called when the editor JavaScript emits the `onEditorLoaded` message. @@ -714,10 +726,12 @@ public final class EditorViewController: UIViewController, GutenbergEditorContro @MainActor private protocol GutenbergEditorControllerDelegate: AnyObject { func controller(_ controller: GutenbergEditorController, didReceiveMessage message: EditorJSMessage) + func controllerDidRequestLatestContent(_ controller: GutenbergEditorController) -> (title: String, content: String)? + func controllerWebContentProcessDidTerminate(_ controller: GutenbergEditorController) } /// Hiding the conformances, and breaking retain cycles. -private final class GutenbergEditorController: NSObject, WKNavigationDelegate, WKScriptMessageHandler { +private final class GutenbergEditorController: NSObject, WKNavigationDelegate, WKScriptMessageHandler, WKScriptMessageHandlerWithReply { weak var delegate: GutenbergEditorControllerDelegate? let configuration: EditorConfiguration private let editorURL: URL? @@ -728,6 +742,27 @@ private final class GutenbergEditorController: NSObject, WKNavigationDelegate, W super.init() } + // MARK: - WKScriptMessageHandlerWithReply + + func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) async -> (Any?, String?) { + guard message.name == "requestLatestContent" else { + return (nil, "Unknown message handler: \(message.name)") + } + + let content = await MainActor.run { + delegate?.controllerDidRequestLatestContent(self) + } + + guard let content else { + return (nil, nil) // No content available - not an error + } + + return ([ + "title": content.title, + "content": content.content + ] as [String: String], nil) + } + // MARK: - WKNavigationDelegate func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { @@ -756,6 +791,13 @@ private final class GutenbergEditorController: NSObject, WKNavigationDelegate, W return .allow } + func webViewWebContentProcessDidTerminate(_ webView: WKWebView) { + NSLog("webViewWebContentProcessDidTerminate: reloading editor") + MainActor.assumeIsolated { + delegate?.controllerWebContentProcessDidTerminate(self) + } + } + // MARK: - WKScriptMessageHandler func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) { diff --git a/ios/Sources/GutenbergKit/Sources/EditorViewControllerDelegate.swift b/ios/Sources/GutenbergKit/Sources/EditorViewControllerDelegate.swift index 4f01be0a..979acd61 100644 --- a/ios/Sources/GutenbergKit/Sources/EditorViewControllerDelegate.swift +++ b/ios/Sources/GutenbergKit/Sources/EditorViewControllerDelegate.swift @@ -59,6 +59,19 @@ public protocol EditorViewControllerDelegate: AnyObject { /// /// - parameter request: The network request details including URL, headers, body, response, and timing. func editor(_ viewController: EditorViewController, didLogNetworkRequest request: RecordedNetworkRequest) + + /// Provides the latest persisted content for recovery after WebView refresh. + /// + /// Called when the WebView requests content during initialization. The host app should return + /// the most recently persisted title and content from autosave. This allows content recovery + /// when the WebView is re-initialized (e.g., due to OS memory pressure or page refresh). + /// + /// Note: The values in `EditorConfiguration.title` and `EditorConfiguration.content` are "initial values" + /// injected at WebView load time. After a WebView refresh, these may be stale. This delegate method + /// allows the host app to provide fresher content from its autosave mechanism. + /// + /// - Returns: A tuple of (title, content), or nil if no persisted content is available. + func editorDidRequestLatestContent(_ controller: EditorViewController) -> (title: String, content: String)? } #endif diff --git a/ios/Sources/GutenbergKit/Sources/Model/EditorConfiguration.swift b/ios/Sources/GutenbergKit/Sources/Model/EditorConfiguration.swift index e1afcad8..d2fd8577 100644 --- a/ios/Sources/GutenbergKit/Sources/Model/EditorConfiguration.swift +++ b/ios/Sources/GutenbergKit/Sources/Model/EditorConfiguration.swift @@ -12,8 +12,10 @@ public struct EditorConfiguration: Sendable, Hashable, Equatable { public let content: String /// ID of the post being edited public let postID: Int? - /// Type of the post being edited + /// Type of the post being edited (e.g., "post", "page") public let postType: String + /// Status of the post being edited (e.g., "draft", "publish", "pending") + public let postStatus: String /// Toggles application of theme styles public let shouldUseThemeStyles: Bool /// Toggles loading plugin-provided editor assets @@ -55,6 +57,7 @@ public struct EditorConfiguration: Sendable, Hashable, Equatable { content: String, postID: Int?, postType: String, + postStatus: String, shouldUseThemeStyles: Bool, shouldUsePlugins: Bool, shouldHideTitle: Bool, @@ -76,6 +79,7 @@ public struct EditorConfiguration: Sendable, Hashable, Equatable { self.content = content self.postID = postID self.postType = postType + self.postStatus = postStatus self.shouldUseThemeStyles = shouldUseThemeStyles self.shouldUsePlugins = shouldUsePlugins self.shouldHideTitle = shouldHideTitle @@ -106,6 +110,7 @@ public struct EditorConfiguration: Sendable, Hashable, Equatable { content: content, postID: postID, postType: postType, + postStatus: postStatus, shouldUseThemeStyles: shouldUseThemeStyles, shouldUsePlugins: shouldUsePlugins, shouldHideTitle: shouldHideTitle, @@ -150,6 +155,7 @@ public struct EditorConfigurationBuilder { private var content: String private var postID: Int? private var postType: String + private var postStatus: String private var shouldUseThemeStyles: Bool private var shouldUsePlugins: Bool private var shouldHideTitle: Bool @@ -172,6 +178,7 @@ public struct EditorConfigurationBuilder { content: String = "", postID: Int? = nil, postType: String, + postStatus: String = "draft", shouldUseThemeStyles: Bool = false, shouldUsePlugins: Bool = false, shouldHideTitle: Bool = false, @@ -193,6 +200,7 @@ public struct EditorConfigurationBuilder { self.content = content self.postID = postID self.postType = postType + self.postStatus = postStatus self.shouldUseThemeStyles = shouldUseThemeStyles self.shouldUsePlugins = shouldUsePlugins self.shouldHideTitle = shouldHideTitle @@ -265,6 +273,12 @@ public struct EditorConfigurationBuilder { return copy } + public func setPostStatus(_ postStatus: String) -> EditorConfigurationBuilder { + var copy = self + copy.postStatus = postStatus + return copy + } + public func setSiteApiNamespace(_ siteApiNamespace: [String]) -> EditorConfigurationBuilder { var copy = self copy.siteApiNamespace = siteApiNamespace @@ -365,6 +379,7 @@ public struct EditorConfigurationBuilder { content: content, postID: postID, postType: postType, + postStatus: postStatus, shouldUseThemeStyles: shouldUseThemeStyles, shouldUsePlugins: shouldUsePlugins, shouldHideTitle: shouldHideTitle, diff --git a/ios/Sources/GutenbergKit/Sources/Model/GBKitGlobal.swift b/ios/Sources/GutenbergKit/Sources/Model/GBKitGlobal.swift index de3ad4e6..40f98112 100644 --- a/ios/Sources/GutenbergKit/Sources/Model/GBKitGlobal.swift +++ b/ios/Sources/GutenbergKit/Sources/Model/GBKitGlobal.swift @@ -11,10 +11,16 @@ public struct GBKitGlobal: Sendable, Codable { public struct Post: Sendable, Codable { /// The post ID, or -1 for new posts. let id: Int - + + /// The post type (e.g., "post", "page"). + let type: String + + /// The post status (e.g., "draft", "publish", "pending"). + let status: String + /// The post title. let title: String - + /// The post content (Gutenberg block markup). let content: String } @@ -93,6 +99,8 @@ public struct GBKitGlobal: Sendable, Codable { self.locale = configuration.locale self.post = Post( id: configuration.postID ?? -1, + type: configuration.postType, + status: configuration.postStatus, title: configuration.escapedTitle, content: configuration.escapedContent ) diff --git a/ios/Tests/GutenbergKitTests/Model/EditorConfigurationTests.swift b/ios/Tests/GutenbergKitTests/Model/EditorConfigurationTests.swift index dfa22664..2e057150 100644 --- a/ios/Tests/GutenbergKitTests/Model/EditorConfigurationTests.swift +++ b/ios/Tests/GutenbergKitTests/Model/EditorConfigurationTests.swift @@ -20,6 +20,7 @@ struct EditorConfigurationBuilderTests: MakesTestFixtures { #expect(config.content == "") #expect(config.postID == nil) #expect(config.postType == "post") + #expect(config.postStatus == "draft") #expect(config.shouldUseThemeStyles == false) #expect(config.shouldUsePlugins == false) #expect(config.shouldHideTitle == false) @@ -214,6 +215,22 @@ struct EditorConfigurationBuilderTests: MakesTestFixtures { #expect(config.enableNetworkLogging == true) } + @Test("Builder uses draft as default postStatus") + func builderDefaultPostStatus() { + let config = makeConfigurationBuilder().build() + + #expect(config.postStatus == "draft") + } + + @Test("setPostStatus updates postStatus") + func setPostStatusUpdatesPostStatus() { + let config = makeConfigurationBuilder() + .setPostStatus("publish") + .build() + + #expect(config.postStatus == "publish") + } + // MARK: - Method Chaining Tests @Test("Builder supports method chaining") @@ -308,6 +325,7 @@ struct EditorConfigurationBuilderTests: MakesTestFixtures { .setTitle("Round Trip Title") .setContent("Round trip content
") .setPostID(789) + .setPostStatus("publish") .setShouldUseThemeStyles(true) .setShouldUsePlugins(true) .setShouldHideTitle(true) diff --git a/ios/Tests/GutenbergKitTests/Model/GBKitGlobalTests.swift b/ios/Tests/GutenbergKitTests/Model/GBKitGlobalTests.swift index 7920c9cc..e1fcd1aa 100644 --- a/ios/Tests/GutenbergKitTests/Model/GBKitGlobalTests.swift +++ b/ios/Tests/GutenbergKitTests/Model/GBKitGlobalTests.swift @@ -95,6 +95,35 @@ struct GBKitGlobalTests: MakesTestFixtures { #expect(globalWithout.post.id == -1) } + @Test("maps postType to post.type") + func mapsPostType() throws { + let postConfig = makeConfiguration(postType: "post") + let pageConfig = makeConfiguration(postType: "page") + + let postGlobal = try GBKitGlobal(configuration: postConfig, dependencies: makeDependencies()) + let pageGlobal = try GBKitGlobal(configuration: pageConfig, dependencies: makeDependencies()) + + #expect(postGlobal.post.type == "post") + #expect(pageGlobal.post.type == "page") + } + + @Test("maps postStatus to post.status") + func mapsPostStatus() throws { + let draftConfig = makeConfigurationBuilder() + .setPostStatus("draft") + .build() + let publishConfig = makeConfigurationBuilder() + .setPostStatus("publish") + .build() + + let draftGlobal = try GBKitGlobal(configuration: draftConfig, dependencies: makeDependencies()) + let publishGlobal = try GBKitGlobal( + configuration: publishConfig, dependencies: makeDependencies()) + + #expect(draftGlobal.post.status == "draft") + #expect(publishGlobal.post.status == "publish") + } + @Test("maps title with percent encoding") func mapsTitleWithEncoding() throws { let configuration = makeConfiguration(title: "Hello World") @@ -137,6 +166,8 @@ struct GBKitGlobalTests: MakesTestFixtures { #expect(jsonString.contains("themeStyles")) #expect(jsonString.contains("plugins")) #expect(jsonString.contains("post")) + #expect(jsonString.contains("\"type\"")) + #expect(jsonString.contains("\"status\"")) #expect(jsonString.contains("locale")) #expect(jsonString.contains("logLevel")) } @@ -152,6 +183,8 @@ struct GBKitGlobalTests: MakesTestFixtures { #expect(decoded.siteURL == original.siteURL) #expect(decoded.post.id == original.post.id) + #expect(decoded.post.type == original.post.type) + #expect(decoded.post.status == original.post.status) #expect(decoded.post.title == original.post.title) #expect(decoded.themeStyles == original.themeStyles) #expect(decoded.plugins == original.plugins) diff --git a/src/utils/bridge.js b/src/utils/bridge.js index 93345ba9..fd2acf3b 100644 --- a/src/utils/bridge.js +++ b/src/utils/bridge.js @@ -2,7 +2,7 @@ * Internal dependencies */ import parseException from './exception-parser'; -import { debug } from './logger'; +import { debug, error } from './logger'; import { isDevMode } from './dev-mode'; import { basicFetch } from './fetch'; @@ -229,7 +229,8 @@ export function getGBKit() { try { return JSON.parse( localStorage.getItem( 'GBKit' ) ) || {}; - } catch ( error ) { + } catch ( err ) { + error( 'Failed to parse GBKit from localStorage', err ); return {}; } } @@ -245,28 +246,83 @@ export function getGBKit() { */ /** - * Retrieves the current post data from the GBKit global. + * Requests the latest persisted content from the native host. * - * @return {Post} The post object containing the following properties: + * Used during editor initialization to recover content after WebView refresh. + * The native host maintains the authoritative content via autosave events. + * + * @return {Promise<{title: string, content: string}|null>} The latest content or null if unavailable. + */ +export async function requestLatestContent() { + if ( window.webkit?.messageHandlers?.requestLatestContent ) { + try { + return await window.webkit.messageHandlers.requestLatestContent.postMessage( + {} + ); + } catch ( err ) { + error( 'Failed to request content from iOS host', err ); + return null; + } + } + + if ( window.editorDelegate?.requestLatestContent ) { + try { + const result = window.editorDelegate.requestLatestContent(); + return result ? JSON.parse( result ) : null; + } catch ( err ) { + error( 'Failed to request content from Android host', err ); + return null; + } + } + + return null; +} + +/** + * Retrieves the current post data from the native host + * + * Always requests content from the native host first, as it maintains the + * latest content via autosave. Falls back to `window.GBKit.post` only if the + * native bridge is unavailable (e.g., dev mode). + * + * Note: `window.GBKit.post.title/content` are "initial values" injected at + * WebView load. After a WebView refresh, these may be stale. The native host + * has the authoritative content from autosave. + * + * @return {Promise