fix: Preload GutenbergKit and invalidate cache for non-Jetpack sites by dcalhoun · Pull Request #25226 · wordpress-mobile/WordPress-iOS

dcalhoun · 2026-02-05T17:00:38Z

Description

This PR fixes editor preloading and cache invalidation for non-Jetpack self-hosted sites. Previously, these features only worked for Jetpack-connected sites because the logic was in BlogDashboardViewModel, which is only used when displaying the dashboard. Non-Jetpack sites show BlogDetailsViewController (Site Menu) instead.

Changes

Add LockingValue<T> utility - Thread-safe wrapper for single values that aren't Sendable (e.g., NSManagedObjectID), used for lastWarmedUpBlogID in EditorDependencyManager
Consolidate editor warmup in EditorDependencyManager - Add warmUpEditor(for:) method that combines WebKit warmup with data prefetch
Move editor preloading to MySiteViewController - Call warmUpEditor from MySiteViewController.configure(for:) so all site types get editor preloading
Move cache invalidation to MySiteViewController - Call EditorDependencyManager.invalidate(for:) in pulledToRefresh() so all site types get cache invalidation on pull-to-refresh
Remove duplicate code from BlogDashboardViewModel - Remove warmUpEditorIfNeeded() and clearEditorCache() methods since this logic is now in MySiteViewController

Root cause

Both issues stem from the same architectural problem: non-Jetpack self-hosted sites display BlogDetailsViewController (Site Menu) instead of BlogDashboardViewController (Dashboard). The editor warmup and cache invalidation logic was in BlogDashboardViewModel, which is never instantiated for non-Jetpack sites.

Fix CMM-1214.

Testing instructions

1. Editor Preloading (Non-Jetpack)

Add a self-hosted site without Jetpack
Navigate to the Site Menu
Open the editor
Verify the loading bar is NOT shown (editor should load instantly due to preloading)

2. Cache Invalidation (Non-Jetpack)

Add a self-hosted site without Jetpack
Pull-to-refresh on the Site Menu
Open the editor
Verify the loading bar IS shown (cache was invalidated, so editor reloads fresh)

3. Jetpack Sites (Regression Test)

Verify editor preloading still works on Jetpack sites (no loading bar on first open)
Verify cache invalidation on pull-to-refresh still works on Jetpack sites (loading bar shown after refresh)

wpmobilebot · 2026-02-05T18:41:26Z

🤖 Build Failure Analysis

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

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift

dcalhoun · 2026-02-05T21:35:19Z

The CI failures are seemingly unrelated to these changes and should be addressed by #25224.

wpmobilebot · 2026-02-06T13:46:40Z

📲 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	`31040`
	Version	`PR #25226`
	Bundle ID	`org.wordpress.alpha`
	Commit	`e5828fb`
	Installation URL	2p6oihttvab90

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

wpmobilebot · 2026-02-06T13:46:45Z

📲 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	`31040`
	Version	`PR #25226`
	Bundle ID	`com.jetpack.alpha`
	Commit	`e5828fb`
	Installation URL	4avv1csbp8d00

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

Add a thread-safe value wrapper for single values and use it to fix the Swift 6 warning on `_lastPluginsFlagValue` in EditorDependencyManager.

Add warmUpEditor(for:) method that combines WebKit warmup with data prefetch, consolidating the warmup logic in a single location.

Call warmUpEditor from MySiteViewController so all site types get editor preloading, including self-hosted sites without Jetpack that display BlogDetailsViewController instead of the dashboard.

Remove warmUpEditorIfNeeded() since warmup is now handled by MySiteViewController through EditorDependencyManager.warmUpEditor().

Move editor cache invalidation from BlogDashboardViewController to MySiteViewController so all site types get cache invalidation on pull-to-refresh. Previously, cache invalidation only happened in BlogDashboardViewController.pulledToRefresh(), which calls viewModel.clearEditorCache(). Non-Jetpack self-hosted sites show BlogDetailsViewController (Site Menu) instead of the dashboard, so the cache invalidation never occurred for these users. Now MySiteViewController.pulledToRefresh() handles cache invalidation for both dashboard and site menu sections, ensuring consistent behavior across all site types.

Add comprehensive tests for LockingValue including: - Initialization with various types (primitives, optionals, complex types) - Basic value access (get/set) - withLock operations (read, modify, return results, conditional updates) - Thread safety (concurrent reads, writes, increments, compare-and-swap)

…ctID

dangermattic · 2026-02-20T16:04:58Z

	1 Warning
⚠️	This PR is assigned to the milestone 26.7. This milestone is due in less than 4 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

jkmassel · 2026-02-20T21:09:17Z

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift

    }

+    /// Tracks the last blog for which WebKit warmup was performed.
+    private let lastWarmedUpBlogID = LockingValue<NSManagedObjectID?>(nil)


If you were to move this into State and use TaggedManagedObjectID<Blog>? you shouldn't need LockingValue at all.

Should this be reset on a pull-to-refresh?

Good idea. Addressed in ef66aad and 81e0466.

Additionally, in e5828fb, I also cleared lingering slow path or "organic" caches created from opening the editor without a dependency cache.

Those caches are currently not exposed or tracked in EditorDependencyManger. We might consider changing how GutenbergKit manages this class of caches, potentially providing host apps access to them.

jkmassel · 2026-02-20T21:11:27Z

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

    }

    @objc
    private func pulledToRefresh() {


Is it possible to get a completion handler here that we can call from the Task so we can keep the loading state until the task is complete?

@jkmassel possibly. I'm not sure it is worthwhile currently. I'll let Claude communicate what I struggled to put into words. WDYT?

Since pull-to-refresh only invalidates the cache (no re-prefetch), the invalidate operation is purely local I/O (deleting a directory and clearing a URLCache) with no network calls. It completes near-instantly, so tying it to the loading state wouldn't provide meaningful UX benefit.

If we later add re-prefetching after invalidation on pull-to-refresh, it would make sense to revisit this and keep the spinner active until the prefetch completes. The data prefetch is fully async and awaitable. However, EditorViewController.warmup() in GutenbergKit is fire-and-forget with no completion API, so we'd need to add one upstream to cover the full warmup flow.

jkmassel

I left a few small suggestions, but the code generally looks ok to me.

When pull-to-refresh invalidates the editor cache, also reset the lastWarmedUpBlogID so the next warmUpEditor call re-runs WebKit warmup instead of skipping it.

Move lastWarmedUpBlogID from a standalone LockingValue<NSManagedObjectID?> into the existing OSAllocatedUnfairLock-backed State struct as TaggedManagedObjectID<Blog>?. This consolidates all mutable state behind a single lock and eliminates the LockingValue utility, which had no other consumers.

GutenbergKit populates its on-disk asset cache whenever the editor loads, not just through EditorDependencyManager's prefetch path. When the in-memory cache had no entries for a blog, purge() was never called, leaving stale on-disk assets served on subsequent editor opens. Fall back to purging for .post when there are no in-memory cache keys to ensure the on-disk cache is always cleared.

sonarqubecloud · 2026-02-20T23:42:16Z

Quality Gate passed

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

dcalhoun added [Type] Bug Posting/Editing Gutenberg Editing and display of Gutenberg blocks. labels Feb 5, 2026

dcalhoun added this to the 26.7 milestone Feb 5, 2026

dcalhoun commented Feb 5, 2026

View reviewed changes

WordPress/Classes/Utility/Editor/EditorDependencyManager.swift Outdated Show resolved Hide resolved

dcalhoun marked this pull request as ready for review February 5, 2026 21:55

dcalhoun requested a review from jkmassel February 5, 2026 21:55

dcalhoun force-pushed the fix/preload-gutenberg-kit-without-jetpack branch from 72730cd to 7dadca0 Compare February 6, 2026 13:34

dcalhoun added 7 commits February 20, 2026 10:10

refactor: Add LockingValue<T> and fix Swift 6 Sendable warning

50a9421

Add a thread-safe value wrapper for single values and use it to fix the Swift 6 warning on `_lastPluginsFlagValue` in EditorDependencyManager.

refactor: Consolidate editor warmup in EditorDependencyManager

3a39f8a

Add warmUpEditor(for:) method that combines WebKit warmup with data prefetch, consolidating the warmup logic in a single location.

fix: Preload GutenbergKit for non-Jetpack sites

57628d2

Call warmUpEditor from MySiteViewController so all site types get editor preloading, including self-hosted sites without Jetpack that display BlogDetailsViewController instead of the dashboard.

refactor: Remove duplicate editor warmup from BlogDashboardViewModel

7a1fbec

Remove warmUpEditorIfNeeded() since warmup is now handled by MySiteViewController through EditorDependencyManager.warmUpEditor().

fix: Update invalidate call to match async API with TaggedManagedObje…

e90b2ff

…ctID

dcalhoun force-pushed the fix/preload-gutenberg-kit-without-jetpack branch from 7dadca0 to e90b2ff Compare February 20, 2026 16:04

jkmassel reviewed Feb 20, 2026

View reviewed changes

jkmassel approved these changes Feb 20, 2026

View reviewed changes

dcalhoun added 3 commits February 20, 2026 17:59

fix: Reset warmup tracking on cache invalidation

ef66aad

When pull-to-refresh invalidates the editor cache, also reset the lastWarmedUpBlogID so the next warmUpEditor call re-runs WebKit warmup instead of skipping it.

dcalhoun enabled auto-merge February 20, 2026 23:44

dcalhoun added this pull request to the merge queue Feb 20, 2026

Merged via the queue into trunk with commit 1b2b101 Feb 21, 2026
27 of 32 checks passed

dcalhoun deleted the fix/preload-gutenberg-kit-without-jetpack branch February 21, 2026 00:12

Comments

Conversation

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

Uh oh!

Description

Changes

Root cause

Testing instructions

1. Editor Preloading (Non-Jetpack)

2. Cache Invalidation (Non-Jetpack)

3. Jetpack Sites (Regression Test)

Uh oh!

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

Uh oh!

🤖 Build Failure Analysis

Uh oh!

Uh oh!

dcalhoun commented Feb 5, 2026

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

dangermattic commented Feb 20, 2026

Uh oh!

jkmassel Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

jkmassel Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

dcalhoun Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

dcalhoun Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

jkmassel Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

dcalhoun Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

jkmassel left a comment

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Feb 20, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dcalhoun commented Feb 5, 2026 •

edited

Loading

wpmobilebot commented Feb 5, 2026 •

edited

Loading

wpmobilebot commented Feb 6, 2026 •

edited

Loading

wpmobilebot commented Feb 6, 2026 •

edited

Loading