Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/editor/contents.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,11 @@ export default class Contents {
let focusNode = null

this.editor.update(() => {
if ($isNodeSelection(this.#selection.current)) {
const nodesToRemove = this.#selection.current.getNodes()
// Use fresh selection - cached this.#selection.current may be frozen
// See: https://github.com/facebook/lexical/issues/6290
const selection = $getSelection()
if ($isNodeSelection(selection)) {
const nodesToRemove = selection.getNodes()
if (nodesToRemove.length === 0) return

focusNode = this.#findAdjacentNodeTo(nodesToRemove)
Expand Down
7 changes: 6 additions & 1 deletion src/editor/selection.js
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,12 @@ export default class Selection {
if (this.current) {
this.editor.update(() => {
this.clear()
fn(this.current.getNodes()[0])
// Use fresh selection - cached this.current may be frozen
// See: https://github.com/facebook/lexical/issues/6290
const selection = $getSelection()
if ($isNodeSelection(selection)) {
fn(selection.getNodes()[0])
}
this.editor.focus()
})
}
Expand Down