Add Conditional editor theme styles by jkmassel · Pull Request #25160 · wordpress-mobile/WordPress-iOS

jkmassel · 2026-01-22T19:36:02Z

Summary

Fix CMM-1163.

Use API to determine theme style support by querying the WordPress REST API for editor capabilities
Add some initial tests for WordPressClient feature detection and caching behaviour – there's more to do here, but that'll be a future PR.

Changes

`WordPressClient` Feature Detection

Added WordPressClientAPI protocol to abstract WordPress API access for testing
Added supports(_:forSiteId:) method to check API route availability for features
Results are cached internally using a single Task to avoid redundant API calls. In the future, we'll want a way to invalidate this, but we'll do that later.

Editor Capability Fetching

EditorDependencyManager now fetches and caches editor capabilities on My Site load
GutenbergSettings stores feature support per-blog using WordPressClient.Feature.stringValue as stable keys
Theme styles toggle visibility is now determined by API capability rather than hardcoded logic

Testing Instructions

Ensure CI passes
Add cpt.wpmt.co to the app. Ensure the editor loads as expected. Ensure that theme styles toggle cannot be activated in Site Settings.
Add jetpack.wpmt.co to the app. Ensure the editor loads. Ensure that theme styles toggle can be activated.
Add a WP.com simple site to the app. Ensure the editor loads. Ensure that theme styles toggle can be activated.

dangermattic · 2026-01-22T19:36:54Z

	2 Warnings
⚠️	This PR is larger than 500 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	This PR is assigned to the milestone 26.6 ❄️. The due date for this milestone has already passed. Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

wpmobilebot · 2026-01-22T19:49:03Z

📲 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	`30792`
	Version	`PR #25160`
	Bundle ID	`org.wordpress.alpha`
	Commit	`0727cc7`
	Installation URL	191ui6avga14o

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

wpmobilebot · 2026-01-22T19:49:09Z

📲 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	`30792`
	Version	`PR #25160`
	Bundle ID	`com.jetpack.alpha`
	Commit	`0727cc7`
	Installation URL	3pd81s7s7dfi0

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

wpmobilebot · 2026-01-22T20:08:42Z

🤖 Build Failure Analysis

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

crazytonyli · 2026-01-22T20:21:42Z

Modules/Sources/WordPressCore/WordPressClient.swift

+            async let currentUserTask = try await api.users.retrieveMeWithEditContext().data
+            async let activeThemeTask = try await api.themes.listWithEditContext(
+                params: ThemeListParams(status: .active)
+            ).data.first(where: { $0.status == .active })


If one of the requests fails, the whole loadSiteInfoTask fails, which means we won't get any of the "site info". That's probably not something we'd want here?

Great point – resolved by 74db783

crazytonyli · 2026-01-22T20:27:07Z

Modules/Sources/WordPressCore/WordPressClient.swift

+            case .blockTheme: isBlockTheme
+            case .plugins: apiRoot.hasRoute(route: "/wp/v2/plugins")
+            case .applicationPasswordExtras: apiRoot.hasRoute(route: "/application-password-extras/v1/admin-ajax")
+            }


Nitpick: using the urlResolver property in WordPressAPI to find the URL should work on both self-hosted and WP.com sites, so we can merge the two similar branches into one.

crazytonyli · 2026-01-22T20:33:07Z

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift

+        let key = blog.locallyUniqueId + "-capabilities"
+
+        // Don't allow more than one concurrent invalidation
+        if self.prefetchTasks[key] != nil {


Unrelated to this PR: you can use OSAllocatedUnfairLock in LockingHashMap, which is Sendable, to get rid of the @unchecked declaration, which means it's impossible (as long as we continue to have the Swift compiler check in place) to forget use the lock.withLock.

The key is AnyHashable which isn't Sendable so I'm not sure if there's an easy way to do this?

We could drop LockingHashMap once our minimum iOS target is 18.0 in favour of the Swift Mutex type though.

You could keep a strong-typed key and use OSAllocatedUnfairLock<[CacheKey: CacheResult]>. Again, not really related to this PR, probably something for future PRs if needed.

I'm looking into GBK's custom post type support, and I think I'll need to update how this cache works (I probably need to use (Blog, PostType) as the cache key).

dcalhoun · 2026-01-22T22:05:24Z

Noting some early testing results...

Good:

Theme styles correctly loaded for WPCOM Simple sites.
The Use theme styles toggle was correctly disabled for cpt.wpmt.co.

Bad:

With theme styles enabled, theme styles were missing from the editor for WoW/Atomic sites and jetpack.wpmt.co. WoW correctly showed (presumably cached) theme styles before I logged out and back in; then theme styles were missing.
The Use theme styles toggle resets when navigating away from the Site Settings view or toggling an adjacent setting.

Theme styles settings reset

theme-styles-settings.MP4

wpmobilebot · 2026-01-23T00:20:31Z

Version 26.6 has now entered code-freeze, so the milestone of this PR has been updated to 26.7.

dcalhoun · 2026-01-29T14:27:09Z

I updated the PR description to link this to CMM-1163.

Also, should we target the release/26.6 branch?

jkmassel · 2026-02-03T20:48:40Z

should we target the release/26.6 branch

Yep, I've rebased atop that branch.

crazytonyli · 2026-02-03T21:40:38Z

Modules/Sources/WordPressCore/WordPressClient.swift

+        case .success(let user): return user
+        case .failure(let error):
+            self.loadCurrentUserTask = newCurrentUserTask()
+            throw error


It might be better to await self.loadCurrentUserTask.value? This throw returns the preivous fetch attempt's error. I don't think that's something the caller wants when calling try await client.fetchCurrentUser()?

Hmm I think you're probably right – I've taken another run at it in be373d5.

The way it'll work now is if if the first run fails, it'll drop the error but subsequent fetches will propagate it. I think this is an ok trade-off?

crazytonyli · 2026-02-03T21:43:48Z

Modules/Sources/WordPressCore/WordPressClient.swift

+            case .blockEditorSettings: apiRoot.hasRoute(route: "/wp-block-editor/v1/sites/\(siteId)/settings")
+            case .blockTheme: isBlockTheme
+            case .plugins: apiRoot.hasRoute(route: "/wp/v2/plugins")
+            case .applicationPasswordExtras: apiRoot.hasRoute(route: "/application-password-extras/v1/admin-ajax")


Do the plugins and applicationPasswordExtras cases need /sites/\(siteId)/?

BTW, I'm not sure if this comment's suggestion would work, maybe worth give it ago https://github.com/wordpress-mobile/WordPress-iOS/pull/25160/changes#r2718516922

I'm not sure they do, but this works and I'd like to do a separate PR that adopts the wprs path management.

Yes, I believe the applicationPasswordExtras endpoint requires the site ID if fetched from the WP.com API. Presumably the plugins would need it also.

crazytonyli · 2026-02-03T21:45:12Z

Modules/Sources/WordPressCore/WordPressClient.swift

+        // These tasks need to be manually restated here because we can't use the task constructors
+        self.loadSiteInfoTask = Task { try await api.apiRoot.get().data }
+        self.loadCurrentUserTask = Task { try await api.users.retrieveMeWithEditContext().data }
+        self.loadActiveThemeTask = Task { try await api.themes.listWithEditContext(params: ThemeListParams(status: .active)).data.first }


Call Task { self.refresh() } instead?

That still violates task isolation – you can't call self from inside any of these tasks.

crazytonyli · 2026-02-03T21:48:48Z

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift

+        let key = blog.locallyUniqueId + "-capabilities"
+
+        // Don't allow more than one concurrent invalidation
+        if self.prefetchTasks[key] != nil {


You could keep a strong-typed key and use OSAllocatedUnfairLock<[CacheKey: CacheResult]>. Again, not really related to this PR, probably something for future PRs if needed.

I'm looking into GBK's custom post type support, and I think I'll need to update how this cache works (I probably need to use (Blog, PostType) as the cache key).

crazytonyli · 2026-02-03T21:52:03Z

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

        }
+
+        // Refresh editor capabilities
+        EditorDependencyManager.shared.fetchEditorCapabilities(for: blog)


Does this code need the if RemoteFeatureFlag.newGutenberg.enabled(), like the one above?

crazytonyli · 2026-02-03T21:52:29Z

WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController+Swift.swift


+    @objc public func swiftRefreshSettings() {
+        // Refresh editor capabilities
+        EditorDependencyManager.shared.fetchEditorCapabilities(for: self.blog)


Does this code need if RemoteFeatureFlag.newGutenberg.enabled()?

I'm not sure it's strictly needed but doesn't hurt – added in f22e21f

dcalhoun

The latest iteration tested well for me. I did not encounter any oddities while testing WP.com Simple, WoW, and self-hosted sites. I tested variations with and without the Gutenberg plugin. I tested GutenbergKit, Gutenberg Mobile, and Aztec.

WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m

WordPress/Classes/Utility/Editor/GutenbergSettings.swift

dcalhoun · 2026-02-04T17:12:03Z

Modules/Sources/WordPressCore/WordPressClient.swift

+            case .blockEditorSettings: apiRoot.hasRoute(route: "/wp-block-editor/v1/sites/\(siteId)/settings")
+            case .blockTheme: isBlockTheme
+            case .plugins: apiRoot.hasRoute(route: "/wp/v2/plugins")
+            case .applicationPasswordExtras: apiRoot.hasRoute(route: "/application-password-extras/v1/admin-ajax")


Yes, I believe the applicationPasswordExtras endpoint requires the site ID if fetched from the WP.com API. Presumably the plugins would need it also.

…iewController.m Co-authored-by: David Calhoun <github@davidcalhoun.me>

jkmassel · 2026-02-04T18:43:57Z

Yes, I believe the applicationPasswordExtras endpoint requires the site ID if fetched from the WP.com API. Presumably the plugins would need it also.

Sites with plugins shouldn't be going through the WP.com APIs, we should be talking to those sites directly. Is the Application Password extras endpoint live? I'd suggest addressing this in a future PR either way to get this landed though.

dcalhoun · 2026-02-04T19:36:23Z

Yes, I believe the applicationPasswordExtras endpoint requires the site ID if fetched from the WP.com API. Presumably the plugins would need it also.

Sites with plugins shouldn't be going through the WP.com APIs, we should be talking to those sites directly. Is the Application Password extras endpoint live? I'd suggest addressing this in a future PR either way to get this landed though.

I agree with both points. I intended to add additional context, not imply we need to address it now.

No, the Application Passwords Extras endpoint is not yet live.

sonarqubecloud · 2026-02-05T00:48:32Z

Quality Gate passed

Issues
31 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

* Use API to determine theme style support * Add Tests * Split up WordPressClient cache fetches * Fix a warmup call introduced in the rebase * Fix theme styles persistence * Only fetch editor capabilities if new gutenberg is enabled * Address suggestions * Default to `true` for `isThemeStylesEnabled` * Update WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m Co-authored-by: David Calhoun <github@davidcalhoun.me> --------- Co-authored-by: David Calhoun <github@davidcalhoun.me>

* Exclude sensitive headers from Pulse logs (#25213) * Add Conditional editor theme styles (#25160) * Use API to determine theme style support * Add Tests * Split up WordPressClient cache fetches * Fix a warmup call introduced in the rebase * Fix theme styles persistence * Only fetch editor capabilities if new gutenberg is enabled * Address suggestions * Default to `true` for `isThemeStylesEnabled` * Update WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m Co-authored-by: David Calhoun <github@davidcalhoun.me> --------- Co-authored-by: David Calhoun <github@davidcalhoun.me> * Update strings for localization * Bump version number --------- Co-authored-by: Tony Li <tony.li@automattic.com> Co-authored-by: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Co-authored-by: David Calhoun <github@davidcalhoun.me>

jkmassel requested a review from dcalhoun January 22, 2026 19:36

jkmassel added this to the 26.6 milestone Jan 22, 2026

jkmassel added the Gutenberg Editing and display of Gutenberg blocks. label Jan 22, 2026

crazytonyli reviewed Jan 22, 2026

View reviewed changes

jkmassel force-pushed the add/conditional-editor-theme-styles branch 2 times, most recently from cfc334e to bc417dc Compare January 22, 2026 23:11

wpmobilebot modified the milestones: 26.6, 26.7 Jan 23, 2026

jkmassel changed the base branch from trunk to release/26.6 February 3, 2026 20:26

jkmassel added 3 commits February 3, 2026 13:44

Use API to determine theme style support

e90f0f6

Add Tests

8351330

Split up WordPressClient cache fetches

796e829

jkmassel force-pushed the add/conditional-editor-theme-styles branch from 74db783 to 796e829 Compare February 3, 2026 20:48

Fix a warmup call introduced in the rebase

0a91a04

crazytonyli reviewed Feb 3, 2026

View reviewed changes

jkmassel added 2 commits February 3, 2026 15:11

Fix theme styles persistence

f22e21f

Only fetch editor capabilities if new gutenberg is enabled

5fd7fda

jkmassel requested a review from crazytonyli February 4, 2026 15:48

Address suggestions

be373d5

dcalhoun reviewed Feb 4, 2026

View reviewed changes

Default to true for isThemeStylesEnabled

6a92285

Update WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsV…

1876ee7

…iewController.m Co-authored-by: David Calhoun <github@davidcalhoun.me>

crazytonyli approved these changes Feb 4, 2026

View reviewed changes

jkmassel enabled auto-merge (squash) February 4, 2026 23:05

Fix a unit test compilation issue

0727cc7

crazytonyli modified the milestones: 26.7, 26.6 ❄️ Feb 5, 2026

jkmassel merged commit d3343a2 into release/26.6 Feb 5, 2026
26 of 32 checks passed

jkmassel deleted the add/conditional-editor-theme-styles branch February 5, 2026 00:59

Conversation

jkmassel commented Jan 22, 2026 • edited by dcalhoun Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

WordPressClient Feature Detection

Editor Capability Fetching

Testing Instructions

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

🤖 Build Failure Analysis

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!

dcalhoun commented Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jan 23, 2026

Uh oh!

dcalhoun commented Jan 29, 2026

Uh oh!

jkmassel commented Feb 3, 2026

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!

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!

dcalhoun left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jkmassel commented Feb 4, 2026

Uh oh!

dcalhoun commented Feb 4, 2026

Uh oh!

sonarqubecloud bot commented Feb 5, 2026

Quality Gate passed

Uh oh!

Uh oh!

jkmassel commented Jan 22, 2026 •

edited by dcalhoun

Loading

`WordPressClient` Feature Detection

dangermattic commented Jan 22, 2026 •

edited

Loading

wpmobilebot commented Jan 22, 2026 •

edited

Loading

wpmobilebot commented Jan 22, 2026 •

edited

Loading

wpmobilebot commented Jan 22, 2026 •

edited

Loading

dcalhoun commented Jan 22, 2026 •

edited

Loading