Skip to content

fix: Prevent GutenbergKit retain cycle #24936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 21, 2025
+7 −3
Merged

fix: Prevent GutenbergKit retain cycle #24936

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca5ccc5
fix: Prevent GutenbergKit retain cycle
dcalhoun Oct 10, 2025
e8bb7fd
refactor: Remove redundant view controller clean up
dcalhoun Oct 20, 2025
35a0f0c
fix: Editor loading allows deinit with weak self references
dcalhoun Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
private var hasEditorStarted = false
private var isModalDialogOpen = false

lazy var autosaver = Autosaver() {
self.performAutoSave()
lazy var autosaver = Autosaver() { [weak self] in
self?.performAutoSave()
}

// MARK: - Private Properties
Expand Down Expand Up @@ -197,6 +197,9 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor

deinit {
tearDownKeyboardObservers()

// Cancel any pending tasks
editorLoadingTask?.cancel()
}

// MARK: - Lifecycle methods
Expand Down Expand Up @@ -247,7 +250,8 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
preconditionFailure("Dependency loading should not be cancelled")
}

self.editorLoadingTask = Task {
self.editorLoadingTask = Task { [weak self] in
guard let self else { return }
do {
while case .loadingDependencies = self.editorState {
try await Task.sleep(nanoseconds: 1000)
Expand Down