diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 64b05a652b85..4e572da38b64 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "70be48d0eb082238f9389749632f80f30c4c499b77ac89d84c8acab08c45509a", + "originHash" : "024ca0929c05dc22af0ce33abb347be2db737ddaa09348ee3a09c1181b56a628", "pins" : [ { "identity" : "alamofire", @@ -149,8 +149,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/wordpress-mobile/GutenbergKit", "state" : { - "revision" : "45e9ed3c77c989f4970731ef2657e658bdc87d2e", - "version" : "0.12.1" + "revision" : "8addad7fd018985dd3f8b15cfcc0d028cdc189b3", + "version" : "0.13.0" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index 11474b9270ee..938b41a641f6 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -56,7 +56,7 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.9.0"), .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"), .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), - .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.12.1"), + .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.13.0"), // We can't use wordpress-rs branches nor commits here. Only tags work. .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20260114"), .package( diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift b/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift index 1423087f046c..a9c98db8282b 100644 --- a/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift +++ b/WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift @@ -83,6 +83,10 @@ extension CommentGutenbergEditorViewController: GutenbergKit.EditorViewControlle // Do nothing } + func editorDidRequestLatestContent(_ controller: GutenbergKit.EditorViewController) -> (title: String, content: String)? { + return nil + } + func editor(_ viewController: GutenbergKit.EditorViewController, didUpdateContentWithState state: GutenbergKit.EditorState) { editorDidUpdate.send(()) } diff --git a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift index ca617baa889f..f6ba67ae4348 100644 --- a/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift @@ -132,10 +132,13 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor // Create configuration with post content let postType = post is Page ? "page" : "post" + let postStatus = post.status?.rawValue ?? "draft" let editorConfiguration = EditorConfiguration(blog: post.blog, postType: postType) .toBuilder() .setTitle(post.postTitle ?? "") .setContent(post.content ?? "") + .setPostID(post.postID?.intValue) + .setPostStatus(postStatus) .setNativeInserterEnabled(FeatureFlag.nativeBlockInserter.enabled) .build() @@ -468,6 +471,12 @@ extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate setNavigationItemsEnabled(true) } + func editorDidRequestLatestContent(_ controller: GutenbergKit.EditorViewController) -> (title: String, content: String)? { + // Return the current post title and content from Core Data. + // This is the authoritative source, updated via autosave. + return (post.postTitle ?? "", post.content ?? "") + } + private func convertMediaInfoArrayToJSONString(_ mediaInfoArray: [MediaInfo]) -> String? { do { let jsonData = try JSONEncoder().encode(mediaInfoArray)