Skip to content

Commit

Permalink
Clean up nested editor update (facebook#7039)
Browse files Browse the repository at this point in the history
  • Loading branch information
ivailop7 authored Jan 11, 2025
1 parent bd874a3 commit 930629c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 49 deletions.
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
12 changes: 5 additions & 7 deletions packages/lexical-react/src/LexicalBlockWithAlignableContents.tsx
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

0 comments on commit 930629c

Please sign in to comment.