Skip to content
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.

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

Clean up nested editor update #7039

Merged
merged 1 commit into from
Jan 11, 2025
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,14 @@ export default function ExcalidrawComponent({
(event: KeyboardEvent) => {
if (isSelected) {
event.preventDefault();
editor.update(() => {
const node = $getNodeByKey(nodeKey);
if (node) {
node.remove();
}
});
const node = $getNodeByKey(nodeKey);
if (node) {
node.remove();
}
}
return false;
},
[editor, isSelected, nodeKey],
[isSelected, nodeKey],
);

useEffect(() => {
Expand Down
12 changes: 5 additions & 7 deletions packages/lexical-playground/src/nodes/ImageComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,15 @@ export default function ImageComponent({
if (isSelected && $isNodeSelection(deleteSelection)) {
const event: KeyboardEvent = payload;
event.preventDefault();
editor.update(() => {
deleteSelection.getNodes().forEach((node) => {
if ($isImageNode(node)) {
node.remove();
}
});
deleteSelection.getNodes().forEach((node) => {
if ($isImageNode(node)) {
node.remove();
}
});
}
return false;
},
[editor, isSelected],
[isSelected],
);

const $onEnter = useCallback(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,18 +210,16 @@ export default function InlineImageComponent({
const event: KeyboardEvent = payload;
event.preventDefault();
if (isSelected && $isNodeSelection(deleteSelection)) {
editor.update(() => {
deleteSelection.getNodes().forEach((node) => {
if ($isInlineImageNode(node)) {
node.remove();
}
});
deleteSelection.getNodes().forEach((node) => {
if ($isInlineImageNode(node)) {
node.remove();
}
});
}
}
return false;
},
[editor, isSelected],
[isSelected],
);

const $onEnter = useCallback(
Expand Down
12 changes: 5 additions & 7 deletions packages/lexical-playground/src/nodes/PageBreakNode/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,15 @@ function PageBreakComponent({nodeKey}: {nodeKey: NodeKey}) {
event.preventDefault();
const deleteSelection = $getSelection();
if (isSelected && $isNodeSelection(deleteSelection)) {
editor.update(() => {
deleteSelection.getNodes().forEach((node) => {
if ($isPageBreakNode(node)) {
node.remove();
}
});
deleteSelection.getNodes().forEach((node) => {
if ($isPageBreakNode(node)) {
node.remove();
}
});
}
return false;
},
[editor, isSelected],
[isSelected],
);

useEffect(() => {
Expand Down
12 changes: 5 additions & 7 deletions packages/lexical-playground/src/nodes/PollComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,17 +150,15 @@ export default function PollComponent({
if (isSelected && $isNodeSelection(deleteSelection)) {
const event: KeyboardEvent = payload;
event.preventDefault();
editor.update(() => {
deleteSelection.getNodes().forEach((node) => {
if ($isPollNode(node)) {
node.remove();
}
});
deleteSelection.getNodes().forEach((node) => {
if ($isPollNode(node)) {
node.remove();
}
});
}
return false;
},
[editor, isSelected],
[isSelected],
);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,15 @@ export function BlockWithAlignableContents({
const deleteSelection = $getSelection();
if (isSelected && $isNodeSelection(deleteSelection)) {
event.preventDefault();
editor.update(() => {
deleteSelection.getNodes().forEach((node) => {
if ($isDecoratorNode(node)) {
node.remove();
}
});
deleteSelection.getNodes().forEach((node) => {
if ($isDecoratorNode(node)) {
node.remove();
}
});
}
return false;
},
[editor, isSelected],
[isSelected],
);

useEffect(() => {
Expand Down
12 changes: 5 additions & 7 deletions packages/lexical-react/src/LexicalHorizontalRuleNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,15 @@ function HorizontalRuleComponent({nodeKey}: {nodeKey: NodeKey}) {
const deleteSelection = $getSelection();
if (isSelected && $isNodeSelection(deleteSelection)) {
event.preventDefault();
editor.update(() => {
deleteSelection.getNodes().forEach((node) => {
if ($isHorizontalRuleNode(node)) {
node.remove();
}
});
deleteSelection.getNodes().forEach((node) => {
if ($isHorizontalRuleNode(node)) {
node.remove();
}
});
}
return false;
},
[editor, isSelected],
[isSelected],
);

useEffect(() => {
Expand Down
Loading