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

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+10 −2
Open

fix: Prevent GutenbergKit retain cycle #24936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 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,14 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor

deinit {
tearDownKeyboardObservers()

// Cancel any pending tasks
editorLoadingTask?.cancel()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line won't do anything because editorLoadingTask retains self, so there is no way deinit can get called before the task finishes.


// Clean up child view controller
editorViewController.willMove(toParent: nil)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like a no-op as it happens automatically when the parent is removed.

editorViewController.view.removeFromSuperview()
editorViewController.removeFromParent()
}

// MARK: - Lifecycle methods
Expand Down