Support editing custom posts #25208

crazytonyli · 2026-02-03T08:28:56Z

Description

This PR expands editor cache management to all post types. With the integration of wordpress-mobile/GutenbergKit#299, we can now edit custom posts in the GBK editor.

Testing instructions

Verify the GBK editor continues to work with regular posts and pages.

Verify you can edit custom posts (available in self-hosted sites) using the GBK editor.

dangermattic · 2026-02-03T08:29:25Z

	2 Warnings
⚠️	View files have been modified, but no screenshot or video is included in the pull request. Consider adding some for clarity.
⚠️	This PR is larger than 500 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2026-02-03T08:58:57Z

🤖 Build Failure Analysis

This build has failures. Claude has analyzed them - check the build annotations for details.

dcalhoun

I perceive the draft status and current code to mean this is not ready for formal review. Regardless, I left a few thoughts for consideration from an initial review and testing.

Overall, things seem to operate relatively well. I noted one preexisting bug: CMM-1214

To elaborate on my original request for an integration PR, I primarily wanted to ensure an integration would merge relatively quickly after we merge the GutenbergKit (GBK) PR to avoid breaking changes in the GBK library blocking other GBK work. Sorry if I did not communicate that clearly enough previously. Thank you for beginning this work nonetheless.

dcalhoun · 2026-02-03T17:23:44Z

Modules/Package.swift

        .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.13.1"),
+        .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "7a48d8756f33e3d25daa1fff5843d5cd6fdda887"),


When we are ready, we can integrate a GBK prerelease. We'll publish the prerelease via make release VERSION_TYPE=preminor DRY_RUN=true on GBK's trunk branch.

dcalhoun · 2026-02-03T17:30:14Z

...s/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift

        let configuration = EditorConfigurationBuilder(
            content: initialContent ?? "",
-            postType: "comment",
+            postType: .init(postType: "comment", restBase: "comments"), // FIXME: "comment" is not a post type.


If we feel compelled to "fix" the post type, we might also consider fixing the site URL and API root. GBK currently requires all of these, but effectively discards them when "offline mode" is enabled.

For context, this comment editor is currently unused.

WordPress/Classes/ViewRelated/NewGutenberg/PostGBKEditorViewController.swift

crazytonyli · 2026-02-03T20:43:12Z

I primarily wanted to ensure an integration would merge relatively quickly after we merge the GutenbergKit (GBK) PR to avoid breaking changes in the GBK library blocking other GBK work.

Absolutely. I will not merge the GBK PR until this PR is ready.

wpmobilebot · 2026-02-08T21:44:26Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Configuration	Release-Alpha
	Build Number	`30868`
	Version	`PR #25208`
	Bundle ID	`org.wordpress.alpha`
	Commit	`ae4dca3`
	Installation URL	2sa4imkfa7090

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2026-02-08T21:44:35Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Configuration	Release-Alpha
	Build Number	`30868`
	Version	`PR #25208`
	Bundle ID	`com.jetpack.alpha`
	Commit	`ae4dca3`
	Installation URL	3hequ9c0t0g10

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

dcalhoun

These changes tested well for me overall. I was able to create/edit/update/publish posts, pages, and "books" post types.

I left a few inline suggestions and questions worth considering.

Also, I note the CPT header lacks bottom padding matching the post/page header. Additionally, the CPT more menu does not support all the options of the post/page header, but this may already be a known limitation. See images below.

CPT vs post header

CPT	Post

dcalhoun · 2026-02-10T18:44:58Z

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift


-    /// Cached dependencies keyed by blog's ObjectID string representation.
-    private let cache = LockingHashMap<EditorDependencies>()
+    private let state = OSAllocatedUnfairLock(initialState: State())


This is nice. Learning a lot from these changes.

dcalhoun · 2026-02-10T19:14:04Z

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift

+        state.featureFlagObserver = NotificationCenter.default
+            .publisher(for: FeatureFlagOverrideStore.didChangeNotification)
+            .filter { ($0.userInfo?[FeatureFlagOverrideStore.notificationFeatureFlagKey] as? String) == RemoteFeatureFlag.newGutenberg.key }
+            .sink { [weak self] _ in
+                Task {
+                    await self?.invalidateAll()
+                }
+            }


From my testing, this is never triggered when toggling the feature flag.

dcalhoun · 2026-02-10T19:21:12Z

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift

-        if prefetchTasks[key] != nil {
-            return nil
-        }
+        let shouldStartPrefetch = state.withLock { state -> Bool in


Claude noted the following, which seems legitimate. What do you think?

There's a check-then-act race in this method (and the same pattern repeats in invalidate(for:) and fetchEditorCapabilities(for:)): shouldStartPrefetch is evaluated in one state.withLock call, but the task isn't stored until a separate state.withLock at the bottom. Between the two, another caller on a different thread could also pass the guard and start a duplicate task.

One fix would be to set a placeholder in the first lock to reserve the slot (e.g. store a not-yet-started sentinel), or restructure so the task is created and stored within a single locked section.

Yes, that makes sense. The same issue exists in the original code. I think it's a reasonable compromise to avoid overly complicated code. When the race condition occurs, the "preparing editor" code runes more than once, which is harmless. I'd be more careful if the task is writing data to the user's site.

dcalhoun · 2026-02-10T19:30:09Z

WordPress/Classes/ViewRelated/NewGutenberg/CustomPostEditorViewController.swift

+                self?.navigationController?.dismiss(animated: true)
+            }
+            if post.status == .draft {
+                alert.addAction(UIAlertAction(title: Strings.saveDraft, style: .default, handler: { _ in


self is captured strongly here (unlike the [weak self] in the discard handler on line 105). Should we use [weak self] here?

dcalhoun · 2026-02-10T19:31:56Z

WordPress/Classes/ViewRelated/NewGutenberg/CustomPostEditorViewController.swift

+        precondition(post.id > 0, "No new post support yet")
+
+        if post.status == .draft {
+            return UIAction(title: "Publish") { [weak self] _ in


Should we localize "Publish" here and "Update" on line 161 now?

dcalhoun · 2026-02-10T19:37:17Z

WordPress/Classes/ViewRelated/CustomPostTypes/CustomPostMainView.swift

            // TODO: Check if the post supports Gutenberg first?
-            CustomPostEditor(client: client, post: post, details: details, blog: blog) {
-                Task {
-                    _ = try await service.posts().refreshPost(postId: post.id, endpointType: endpoint)
-                }
-            }
+            CustomPostEditor(client: client, post: post, details: details, blog: blog)


We briefly discussed this before (see p1769044197504499-slack-C08UN8YN6KW), but editing classic posts with GBK is less useful at the moment. How difficult might it be to open these classic CPT entries in Aztec? I'm guessing it may be difficult. Alternatively, should we detect them and disallow editing them and display a more helpful notice?

Custom post type editing only supports posts created with the block editor at this time. This post appears to contain incompatible content.

Classic CPT

Good call! That's related to the TODO in this code. Are there any reasonable ways to detect if the post is "classic"?

crazytonyli · 2026-02-10T23:10:12Z

@dcalhoun Thanks for the review. I have addressed all your comments.

sonarqubecloud · 2026-02-10T23:12:44Z

Quality Gate passed

Issues
28 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

crazytonyli · 2026-02-11T00:25:43Z

Additionally, the CPT more menu does not support all the options of the post/page header, but this may already be a known limitation.

Yeah, we don't support preview and post settings yet.

crazytonyli mentioned this pull request Feb 3, 2026

Support editing posts of custom post types wordpress-mobile/GutenbergKit#299

Open

dcalhoun reviewed Feb 3, 2026

View reviewed changes

crazytonyli changed the title ~~Prototype custom post types local~~ Support editing custom posts Feb 4, 2026

crazytonyli force-pushed the prototype-custom-post-types-local branch 2 times, most recently from 6a6c440 to 33deb2f Compare February 8, 2026 21:32

Base automatically changed from prototype-custom-post-types to trunk February 10, 2026 03:29

crazytonyli added 6 commits February 10, 2026 19:39

Add a replacement of SimpleGBKEditorViewController

b8bc47a

Update wordpress-rs and GutenbergKit

3342aa9

Add navigation bar buttons to Custom Post Editor

60d5efa

Remove the loading cached dependencies based on post type check

49d0a31

Send notifications when FeatureFlagOverrideStore changes

0be81b3

Pre-fetch editor dependencies for custom post types

8a4c6b0

crazytonyli force-pushed the prototype-custom-post-types-local branch from 8e6668a to 8a4c6b0 Compare February 10, 2026 07:36

crazytonyli added the Custom Post Types label Feb 10, 2026

crazytonyli added this to the 26.7 milestone Feb 10, 2026

crazytonyli marked this pull request as ready for review February 10, 2026 07:44

crazytonyli requested review from dcalhoun, jkmassel and kean February 10, 2026 07:44

crazytonyli mentioned this pull request Feb 10, 2026

Show post types on home screens #25233

Open

dcalhoun reviewed Feb 10, 2026

View reviewed changes

crazytonyli added 4 commits February 11, 2026 11:49

Fix post editor navigation bar padding

8ac613c

Fix feature flag observer

856c97c

Use a weak reference

84fe180

Localize a couple of strings

ae4dca3

Support editing custom posts #25208

Are you sure you want to change the base?

Support editing custom posts #25208

Uh oh!

Conversation

crazytonyli commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing instructions

Uh oh!

dangermattic commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Build Failure Analysis

Uh oh!

dcalhoun left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

crazytonyli commented Feb 3, 2026

Uh oh!

wpmobilebot commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dcalhoun left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

crazytonyli commented Feb 10, 2026

Uh oh!

sonarqubecloud bot commented Feb 10, 2026

Quality Gate passed

Uh oh!

crazytonyli commented Feb 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

crazytonyli commented Feb 3, 2026 •

edited

Loading

dangermattic commented Feb 3, 2026 •

edited

Loading

wpmobilebot commented Feb 3, 2026 •

edited

Loading

wpmobilebot commented Feb 8, 2026 •

edited

Loading

wpmobilebot commented Feb 8, 2026 •

edited

Loading