Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheets-formula-ui): highlight doc (#4516)

zhangw83a781ede0b5
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/index.tsx b/packages/sheets-formula-ui/src/views/formula-editor/index.tsx
index 431dfb0332..174c35780b 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/index.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/index.tsx
@@ -152,15 +152,12 @@ export function FormulaEditor(props: IFormulaEditorProps) {
if (!editorRef.current) {
return;
}
- const preText = highTextRef.current;
highTextRef.current = text;
const sequenceNodes = getFormulaToken(text[0] === '=' ? text.slice(1) : '');
const ranges = highlightDoc(
editorRef.current,
sequenceNodes,
isNeedResetSelection,
- // remove equals need to remove highlight style
- preText.slice(1) === text && preText[0] === '=',
newSelections
);
refSelections.current = ranges;
diff --git a/packages/sheets-formula-ui/src/views/range-selector/hooks/useHighlight.ts b/packages/sheets-formula-ui/src/views/range-selector/hooks/useHighlight.ts
index fda5b9eb2a..3f2e4082c5 100644
--- a/packages/sheets-formula-ui/src/views/range-selector/hooks/useHighlight.ts
+++ b/packages/sheets-formula-ui/src/views/range-selector/hooks/useHighlight.ts
@@ -169,7 +169,6 @@ export function useDocHight(_leadingCharacter: string = '') {
editor: Editor,
sequenceNodes: INode[],
isNeedResetSelection = true,
- clearTextRun = true,
newSelections?: ITextRange[]
) => {
const data = editor.getDocumentData();
@@ -181,15 +180,15 @@ export function useDocHight(_leadingCharacter: string = '') {
if (!body) {
return [];
}
+ const str = body.dataStream.slice(0, body.dataStream.length - 2);
const cloneBody = { dataStream: '', ...data.body };
+ if (!str.startsWith(_leadingCharacter)) return [];
if (sequenceNodes == null || sequenceNodes.length === 0) {
- if (clearTextRun) {
- cloneBody.textRuns = [];
- commandService.syncExecuteCommand(ReplaceTextRunsCommand.id, {
- unitId: editorId,
- body: getBodySlice(cloneBody, 0, cloneBody.dataStream.length - 2),
- });
- }
+ cloneBody.textRuns = [];
+ commandService.syncExecuteCommand(ReplaceTextRunsCommand.id, {
+ unitId: editorId,
+ body: getBodySlice(cloneBody, 0, cloneBody.dataStream.length - 2),
+ });
return [];
} else {
const { textRuns, refSelections } = buildTextRuns(descriptionService, colorMap, sequenceNodes);
@@ -199,7 +198,7 @@ export function useDocHight(_leadingCharacter: string = '') {
e.st = e.st + leadingCharacterLength;
});
}
- cloneBody.textRuns = textRuns;
+ cloneBody.textRuns = [{ st: 0, ed: 1, ts: { fs: 11 } }, ...textRuns];
const text = sequenceNodes.reduce((pre, cur) => {
if (typeof cur === 'string') {
return `${pre}${cur}`;
@@ -218,7 +217,6 @@ export function useDocHight(_leadingCharacter: string = '') {
selection.endOffset = Math.max(0, Math.min(selection.endOffset, maxOffset));
});
}
-
commandService.syncExecuteCommand(ReplaceTextRunsCommand.id, {
unitId: editorId,
body: getBodySlice(cloneBody, 0, cloneBody.dataStream.length - 2),
@@ -284,6 +282,7 @@ export function buildTextRuns(descriptionService: IDescriptionService, colorMap:
cl: {
rgb: plainTextColor,
},
+ fs: 11,
},
});
continue;
@@ -296,6 +295,7 @@ export function buildTextRuns(descriptionService: IDescriptionService, colorMap:
cl: {
rgb: plainTextColor,
},
+ fs: 11,
},
});
continue;
@@ -336,6 +336,7 @@ export function buildTextRuns(descriptionService: IDescriptionService, colorMap:
cl: {
rgb: themeColor,
},
+ fs: 11,
},
});
} else {
@@ -346,6 +347,7 @@ export function buildTextRuns(descriptionService: IDescriptionService, colorMap:
cl: {
rgb: plainTextColor,
},
+ fs: 11,
},
});
}