opensource/lexical
1
0
Fork 0
mirror of https://github.com/facebook/lexical.git synced 2025-05-21 00:57:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove isHighlighting flag (#3256)

Browse Source
This commit is contained in:
John Flockton
2022-10-25 19:01:12 +01:00
committed by GitHub
parent fee03f3e71
commit 4f80cd2211
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/lexical-code/src/CodeHighlighter.ts
View File

@ -250,26 +250,31 @@ function updateCodeGutter(node: CodeNode, editor: LexicalEditor): void {
// Using `skipTransforms` to prevent extra transforms since reformatting the code
// will not affect code block content itself.
//
// Using extra flag (`isHighlighting`) since both CodeNode and CodeHighlightNode
// Using extra cache (`nodesCurrentlyHighlighting`) since both CodeNode and CodeHighlightNode
// transforms might be called at the same time (e.g. new CodeHighlight node inserted) and
// in both cases we'll rerun whole reformatting over CodeNode, which is redundant.
// Especially when pasting code into CodeBlock.
let isHighlighting = false;
const nodesCurrentlyHighlighting: Record<string, boolean> = {};
function codeNodeTransform(
node: CodeNode,
editor: LexicalEditor,
tokenizer: Tokenizer,
) {
if (isHighlighting) {
const nodeKey = node.getKey();
if (nodesCurrentlyHighlighting[nodeKey]) {
return;
}
isHighlighting = true;
nodesCurrentlyHighlighting[nodeKey] = true;
// When new code block inserted it might not have language selected
if (node.getLanguage() === undefined) {
node.setLanguage(DEFAULT_CODE_LANGUAGE);
}
const nodeKey = node.getKey();
// Using nested update call to pass `skipTransforms` since we don't want
// each individual codehighlight node to be transformed again as it's already
// in its final state
@ -277,9 +282,11 @@ function codeNodeTransform(
() => {
updateAndRetainSelection(nodeKey, () => {
const currentNode = $getNodeByKey(nodeKey);
if (!$isCodeNode(currentNode) || !currentNode.isAttached()) {
return false;
}
const code = currentNode.getTextContent();
const tokens = tokenizer.tokenize(
code,
@ -291,16 +298,18 @@ function codeNodeTransform(
highlightNodes,
);
const {from, to, nodesForReplacement} = diffRange;
if (from !== to || nodesForReplacement.length) {
node.splice(from, to - from, nodesForReplacement);
return true;
}
return false;
});
},
{
onUpdate: () => {
isHighlighting = false;
delete nodesCurrentlyHighlighting[nodeKey];
},
skipTransforms: true,
},