@univerjs/sheets-formula-ui 1.0.0-alpha.6 → 1.0.0-alpha.7

package/lib/index.js

@@ -5,13 +5,15 @@ import { BehaviorSubject, Subject, combineLatestWith, debounceTime, distinctUnti
 import { DocBackScrollRenderController, DocSelectionRenderService, IEditorService, MoveCursorOperation, MoveSelectionOperation, ReplaceTextRunsCommand, RichTextEditor, createEditorUndoRedoKeyboardConfig, useKeyboardEvent, useResize } from "@univerjs/docs-ui";
 import { DeviceInputEventType, IRenderManagerService, SHEET_VIEWPORT_KEY, ScrollTimerType, Vector2 } from "@univerjs/engine-render";
 import { BEFORE_CELL_EDIT, INTERCEPTOR_POINT, IRefSelectionsService, REF_SELECTIONS_ENABLED, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, ReorderRangeCommand, SelectionMoveType, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SetSelectionsOperation, SetWorksheetActiveOperation, SetWorksheetRowAutoHeightMutation, SheetInterceptorService, SheetSkeletonService, SheetsSelectionsService, WorkbookCopyPermission, WorkbookEditablePermission, WorksheetCopyPermission, WorksheetEditPermission, WorksheetSetCellValuePermission, attachSelectionWithCoord, convertSelectionDataToRange, getCellAtRowCol, getSheetCommandTarget, setEndForRange } from "@univerjs/sheets";
-import { IDescriptionService, ImageFormulaCellInterceptorController, InsertFunctionCommand, PLUGIN_CONFIG_KEY_BASE, QuickSumCommand, TriggerCalculationController, UniverSheetsFormulaPlugin } from "@univerjs/sheets-formula";
+import { ImageFormulaCellInterceptorController, InsertFunctionCommand, PLUGIN_CONFIG_KEY_BASE, QuickSumCommand, TriggerCalculationController, UniverSheetsFormulaPlugin } from "@univerjs/sheets-formula";
 import { BuiltInUIPart, ComponentManager, IContextMenuService, IMenuManagerService, IShortcutService, ISidebarService, IUIPartsService, IconManager, KeyCode, MenuItemType, MetaKeys, ProgressBar, RectPopup, RibbonFormulasGroup, connectInjector, getMenuHiddenObservable, useDependency, useEvent, useObservable, useUpdateEffect } from "@univerjs/ui";
 import { DocSelectionManagerService } from "@univerjs/docs";
+import { IDescriptionService } from "@univerjs/formula";
 import { CheckMarkIcon, CloseIcon, DatabaseFunctionIcon, DateFunctionIcon, DeleteIcon, EngineeringFunctionIcon, FinancialFunctionIcon, FunctionIcon, IncreaseIcon, InformationFunctionIcon, LogicalFunctionIcon, LookupFunctionIcon, MathFunctionIcon, MoreRightIcon, SelectRangeIcon, StatisticalFunctionIcon, TextFunctionIcon } from "@univerjs/icons";
 import { Button, Dialog, Input, Select, Tooltip, borderClassName, borderLeftClassName, borderTopClassName, clsx, divideYClassName, scrollbarClassName } from "@univerjs/design";
 import { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { buildFormulaTextRuns, getFormulaHighlightDataStream, getFormulaReplaceResult, isFormulaReferenceAddingContext, isFormulaReferenceAddingTextContext, searchFormulaFunctions } from "@univerjs/formula-ui";
 import { debounceTime as debounceTime$1 } from "rxjs/operators";
 
 //#region src/commands/commands/formula-clipboard.command.ts
@@ -695,6 +697,30 @@ const SearchFunctionOperation = {
 	}
 };
 
+//#endregion
+//#region src/common/selection.ts
+function genFormulaRefSelectionStyle(themeService, refColor, id) {
+	return {
+		id,
+		strokeWidth: 1,
+		stroke: refColor,
+		fill: new ColorKit(refColor).setAlpha(.05).toRgbString(),
+		widgets: {
+			tl: true,
+			tc: true,
+			tr: true,
+			ml: true,
+			mr: true,
+			bl: true,
+			bc: true,
+			br: true
+		},
+		widgetSize: 6,
+		widgetStrokeWidth: 1,
+		widgetStroke: themeService.getColorFromTheme("white")
+	};
+}
+
 //#endregion
 //#region src/controllers/formula-reorder.controller.ts
 let FormulaReorderController = class FormulaReorderController extends Disposable {
@@ -902,6 +928,12 @@ const menuSchema = {
 	[RibbonFormulasGroup.BASIC]: {
 		[`${InsertFunctionOperation.id}.common`]: {
 			order: 0,
+			gridLayout: {
+				row: 1,
+				column: 1,
+				rowSpan: 2,
+				showLabel: false
+			},
 			menuItemFactory: InsertCommonFunctionMenuItemFactory,
 			[MoreFunctionsOperation.id]: {
 				order: 0,
@@ -962,7 +994,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-formula-ui";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.7";
 
 //#endregion
 //#region src/config/config.ts
@@ -2060,30 +2092,6 @@ const useFormulaToken = () => {
 	return useCallback((text) => lexerTreeBuilder.sequenceNodesBuilder(text) || [], [lexerTreeBuilder]);
 };
 
-//#endregion
-//#region src/common/selection.ts
-function genFormulaRefSelectionStyle(themeService, refColor, id) {
-	return {
-		id,
-		strokeWidth: 1,
-		stroke: refColor,
-		fill: new ColorKit(refColor).setAlpha(.05).toRgbString(),
-		widgets: {
-			tl: true,
-			tc: true,
-			tr: true,
-			ml: true,
-			mr: true,
-			bl: true,
-			bc: true,
-			br: true
-		},
-		widgetSize: 6,
-		widgetStrokeWidth: 1,
-		widgetStroke: themeService.getColorFromTheme("white")
-	};
-}
-
 //#endregion
 //#region src/views/formula-editor/hooks/use-highlight.ts
 function isSameSelectionRange(left, right) {
@@ -2223,7 +2231,7 @@ function useDocHight(_leadingCharacter = "") {
 				e.ed = e.ed + leadingCharacterLength;
 				e.st = e.st + leadingCharacterLength;
 			});
-			const highlightDataStream = getFormulaHighlightDataStream(_leadingCharacter, sequenceNodes, sourceText);
+			const highlightDataStream = getFormulaHighlightDataStream$1(_leadingCharacter, sequenceNodes, sourceText);
 			const highlightTextRuns = [{
 				st: 0,
 				ed: 1,
@@ -2258,11 +2266,8 @@ function createFormulaHighlightBody(dataStream, textRuns) {
 		textRuns
 	};
 }
-function getFormulaHighlightDataStream(leadingCharacter, sequenceNodes, sourceText) {
-	return `${leadingCharacter}${sourceText !== null && sourceText !== void 0 ? sourceText : sequenceNodes.reduce((pre, cur) => {
-		if (typeof cur === "string") return `${pre}${cur}`;
-		return `${pre}${cur.token}`;
-	}, "")}\r\n`;
+function getFormulaHighlightDataStream$1(leadingCharacter, sequenceNodes, sourceText) {
+	return getFormulaHighlightDataStream(leadingCharacter, sequenceNodes, sourceText);
 }
 function useColor() {
 	const themeService = useDependency(ThemeService);
@@ -2289,79 +2294,7 @@ function useColor() {
 	}, [themeService.getCurrentTheme()]);
 }
 function buildTextRuns(descriptionService, colorMap, sequenceNodes) {
-	const { formulaRefColors, numberColor, stringColor, plainTextColor } = colorMap;
-	const textRuns = [];
-	const refSelections = [];
-	const themeColorMap = /* @__PURE__ */ new Map();
-	let refColorIndex = 0;
-	for (let i = 0, len = sequenceNodes.length; i < len; i++) {
-		const node = sequenceNodes[i];
-		if (typeof node === "string") {
-			const theLastItem = textRuns[textRuns.length - 1];
-			const start = theLastItem ? theLastItem.ed : 0;
-			const end = start + node.length;
-			textRuns.push({
-				st: start,
-				ed: end,
-				ts: {
-					cl: { rgb: plainTextColor },
-					fs: 11
-				}
-			});
-			continue;
-		}
-		if (descriptionService.hasDefinedNameDescription(node.token.trim())) {
-			textRuns.push({
-				st: node.startIndex,
-				ed: node.endIndex + 1,
-				ts: {
-					cl: { rgb: plainTextColor },
-					fs: 11
-				}
-			});
-			continue;
-		}
-		const { startIndex, endIndex, nodeType, token } = node;
-		let themeColor = "";
-		if (nodeType === sequenceNodeType.REFERENCE) {
-			if (themeColorMap.has(token)) themeColor = themeColorMap.get(token);
-			else {
-				themeColor = formulaRefColors[refColorIndex % formulaRefColors.length];
-				themeColorMap.set(token, themeColor);
-				refColorIndex++;
-			}
-			refSelections.push({
-				refIndex: i,
-				themeColor,
-				token,
-				startIndex: node.startIndex,
-				endIndex: node.endIndex,
-				index: refSelections.length
-			});
-		} else if (nodeType === sequenceNodeType.NUMBER) themeColor = numberColor;
-		else if (nodeType === sequenceNodeType.STRING) themeColor = stringColor;
-		else if (nodeType === sequenceNodeType.ARRAY) themeColor = stringColor;
-		if (themeColor && themeColor.length > 0) textRuns.push({
-			st: startIndex,
-			ed: endIndex + 1,
-			ts: {
-				cl: { rgb: themeColor },
-				fs: 11
-			}
-		});
-		else textRuns.push({
-			st: startIndex,
-			ed: endIndex + 1,
-			ts: {
-				cl: { rgb: plainTextColor },
-				fs: 11
-			}
-		});
-	}
-	return {
-		textRuns,
-		refSelections
-	};
+	return buildFormulaTextRuns(descriptionService, colorMap, sequenceNodes);
 }
 
 //#endregion
@@ -2651,24 +2584,6 @@ const prepareSelectionChangeContext = (opts) => {
 		offset
 	};
 };
-function getSequenceNodeCharAtOffset(sequenceNodes, offset) {
-	let currentOffset = 0;
-	for (const node of sequenceNodes) {
-		const text = typeof node === "string" ? node : node.token;
-		const nextOffset = currentOffset + text.length;
-		if (offset > currentOffset && offset <= nextOffset) return text[offset - currentOffset - 1];
-		currentOffset = nextOffset;
-	}
-}
-function isFormulaReferenceAddingContext(sequenceNodes, offset) {
-	const char = getSequenceNodeCharAtOffset(sequenceNodes, offset);
-	return Boolean(char && matchRefDrawToken(char));
-}
-function isFormulaReferenceAddingTextContext(formulaText, offset) {
-	const char = formulaText[offset - 1];
-	const nextChar = formulaText[offset];
-	return Boolean(char && matchRefDrawToken(char) && (!nextChar || isFormulaLexerToken(nextChar) && nextChar !== matchToken.OPEN_BRACKET));
-}
 function insertFormulaReferenceText(formulaText, refText, offset) {
 	return `${formulaText.slice(0, offset)}${refText}${formulaText.slice(offset)}`;
 }
@@ -3170,25 +3085,8 @@ const useVerify = (isNeed, onVerify, formulaText) => {
 
 //#endregion
 //#region src/views/formula-editor/hooks/use-formula-search.ts
-function shouldAppendOpenBracket(functionType) {
-	return functionType !== FunctionType.DefinedName && functionType !== FunctionType.Table;
-}
-function getFormulaReplaceResult(nodes, index, formulaName, functionType) {
-	const cloneNodes = [...nodes];
-	if (index !== -1) {
-		const lastNodes = cloneNodes.splice(index + 1);
-		const oldNode = cloneNodes.pop() || "";
-		let offset = (typeof oldNode === "string" ? oldNode.length : oldNode.token.length) - formulaName.length;
-		cloneNodes.push(formulaName);
-		if (lastNodes[0] !== matchToken.OPEN_BRACKET && shouldAppendOpenBracket(functionType)) {
-			cloneNodes.push(matchToken.OPEN_BRACKET);
-			offset--;
-		}
-		return {
-			text: sequenceNodeToText([...cloneNodes, ...lastNodes]),
-			offset
-		};
-	}
+function getFormulaReplaceResult$1(nodes, index, formulaName, functionType) {
+	return getFormulaReplaceResult(nodes, index, formulaName, functionType);
 }
 const useFormulaSearch = (isNeed, nodes = [], editor) => {
 	const descriptionService = useDependency(IDescriptionService);
@@ -3215,7 +3113,7 @@ const useFormulaSearch = (isNeed, nodes = [], editor) => {
 						if (currentNode && typeof currentNode !== "string" && currentNode.nodeType === sequenceNodeType.FUNCTION) {
 							indexRef.current = currentNodeIndex;
 							const token = currentNode.token;
-							setSearchList(descriptionService.getSearchListByNameFirstLetter(token).slice(0, 10));
+							setSearchList(searchFormulaFunctions(descriptionService, token));
 							setSearchText(token);
 							return;
 						}
@@ -3237,7 +3135,7 @@ const useFormulaSearch = (isNeed, nodes = [], editor) => {
 		if (!isNeed) reset();
 	}, [isNeed]);
 	const handlerFormulaReplace = (formulaName, functionType) => {
-		return getFormulaReplaceResult(stateRef.current.nodes, indexRef.current, formulaName, functionType);
+		return getFormulaReplaceResult$1(stateRef.current.nodes, indexRef.current, formulaName, functionType);
 	};
 	return {
 		searchList,
@@ -5463,4 +5361,4 @@ UniverSheetsFormulaUIPlugin = __decorate([
 ], UniverSheetsFormulaUIPlugin);
 
 //#endregion
-export { FORMULA_PROMPT_ACTIVATED, FormulaEditor, FormulaReorderController, GlobalRangeSelectorService, HelpFunctionOperation, InsertFunctionOperation, MoreFunctionsOperation, RangeSelector, RefSelectionsRenderService, ReferenceAbsoluteOperation, SearchFunctionOperation, SheetCopyFormulaOnlyCommand, SheetOnlyPasteFormulaCommand, menuSchema as SheetsFormulaUIMenuSchema, UniverSheetsFormulaUIPlugin };
+export { FORMULA_PROMPT_ACTIVATED, FormulaEditor, FormulaReorderController, GlobalRangeSelectorService, HelpFunctionOperation, InsertFunctionOperation, MoreFunctionsOperation, RangeSelector, RefSelectionsRenderService, ReferenceAbsoluteOperation, SearchFunctionOperation, SheetCopyFormulaOnlyCommand, SheetOnlyPasteFormulaCommand, menuSchema as SheetsFormulaUIMenuSchema, UniverSheetsFormulaUIPlugin, genFormulaRefSelectionStyle };

package/lib/types/index.d.ts

@@ -20,6 +20,7 @@ export { InsertFunctionOperation } from './commands/operations/insert-function.o
 export { MoreFunctionsOperation } from './commands/operations/more-functions.operation';
 export { ReferenceAbsoluteOperation } from './commands/operations/reference-absolute.operation';
 export { SearchFunctionOperation } from './commands/operations/search-function.operation';
+export { genFormulaRefSelectionStyle } from './common/selection';
 export type { IUniverSheetsFormulaUIConfig } from './config/config';
 export { FormulaReorderController } from './controllers/formula-reorder.controller';
 export { menuSchema as SheetsFormulaUIMenuSchema } from './menu/schema';

package/lib/types/services/prompt.service.d.ts

@@ -15,7 +15,7 @@
  */
 import type { Direction, IDisposable } from '@univerjs/core';
 import type { IFunctionInfo, ISequenceNode } from '@univerjs/engine-formula';
-import type { ISearchItem } from '@univerjs/sheets-formula';
+import type { ISearchItem } from '@univerjs/formula';
 import type { Observable } from 'rxjs';
 import { IContextService } from '@univerjs/core';
 /** If the formula prompt is visible. */

package/lib/types/views/formula-editor/hooks/use-formula-search.d.ts

@@ -14,13 +14,9 @@
  * limitations under the License.
  */
 import type { Editor } from '@univerjs/docs-ui';
-import type { ISearchItemWithType } from '@univerjs/sheets-formula';
+import type { FunctionType } from '@univerjs/engine-formula';
+import type { ISearchItemWithType } from '@univerjs/formula';
 import type { INode } from './use-formula-token';
-import { FunctionType } from '@univerjs/engine-formula';
-export declare function getFormulaReplaceResult(nodes: INode[], index: number, formulaName: string, functionType: FunctionType): {
-    text: string;
-    offset: number;
-} | undefined;
 export declare const useFormulaSearch: (isNeed: boolean, nodes?: INode[], editor?: Editor) => {
     searchList: ISearchItemWithType[];
     searchText: string;

package/lib/types/views/formula-editor/hooks/use-highlight.d.ts

@@ -15,11 +15,9 @@
  */
 import type { IDocumentBody, ITextRange, ITextRun, Workbook } from '@univerjs/core';
 import type { Editor } from '@univerjs/docs-ui';
-import type { ISequenceNode } from '@univerjs/engine-formula';
 import type { ISelectionWithStyle, SheetsSelectionsService } from '@univerjs/sheets';
 import type { INode } from './use-formula-token';
 import { IUniverInstanceService, ThemeService } from '@univerjs/core';
-import { IDescriptionService } from '@univerjs/sheets-formula';
 import { SheetSkeletonManagerService } from '@univerjs/sheets-ui';
 import { RefSelectionsRenderService } from '../../../services/render-services/ref-selections.render.service';
 export interface IRefSelection {
@@ -48,14 +46,13 @@ export declare function calcHighlightRanges(opts: {
  * @param {IRefSelection[]} refSelections
  */
 export declare function useSheetHighlight(unitId: string, subUnitId: string): (refSelections: IRefSelection[], editor?: Editor, isEnd?: any) => void;
-export declare function useDocHight(_leadingCharacter?: string): (editor: Editor, sequenceNodes: INode[], isNeedResetSelection?: any, newSelections?: ITextRange[], sourceText?: string) => IRefSelection[];
+export declare function useDocHight(_leadingCharacter?: string): (editor: Editor, sequenceNodes: INode[], isNeedResetSelection?: any, newSelections?: ITextRange[], sourceText?: string) => import("@univerjs/formula-ui").IFormulaRefSelection[];
 /**
  * ReplaceTextRunsCommand shifts the editor's existing structural metadata when text changes.
  * Its replacement body must therefore contain only inline formula data; carrying paragraphs
  * or section breaks copied from the old snapshot would leave their indexes stale.
  */
 export declare function createFormulaHighlightBody(dataStream: string, textRuns: ITextRun[]): IDocumentBody;
-export declare function getFormulaHighlightDataStream(leadingCharacter: string, sequenceNodes: Array<ISequenceNode | string>, sourceText?: string): string;
 interface IColorMap {
     formulaRefColors: string[];
     numberColor: string;
@@ -63,8 +60,4 @@ interface IColorMap {
     plainTextColor: string;
 }
 export declare function useColor(): IColorMap;
-export declare function buildTextRuns(descriptionService: IDescriptionService, colorMap: IColorMap, sequenceNodes: Array<ISequenceNode | string>): {
-    textRuns: ITextRun[];
-    refSelections: IRefSelection[];
-};
 export {};

package/lib/types/views/formula-editor/hooks/use-sheet-selection-change.d.ts

@@ -29,13 +29,6 @@ export declare const prepareSelectionChangeContext: (opts: {
     sequenceNodes: (string | import("@univerjs/engine-formula").ISequenceNode)[];
     offset: number;
 } | undefined;
-export declare function getSequenceNodeCharAtOffset(sequenceNodes: (string | {
-    token: string;
-})[], offset: number): string | undefined;
-export declare function isFormulaReferenceAddingContext(sequenceNodes: (string | {
-    token: string;
-})[], offset: number): boolean;
-export declare function isFormulaReferenceAddingTextContext(formulaText: string, offset: number): boolean;
 export declare function insertFormulaReferenceText(formulaText: string, refText: string, offset: number): string;
 export declare function shouldSkipFormulaReferenceUpdate(isAdd: boolean, selectionCount: number): boolean;
 export declare function getSelectionsForFormulaRefUpdate(selections: IRange[], updatingRefIndex: number, isCtrlAddMode?: boolean): {