@univerjs/sheets-formula-ui 1.0.3 → 1.0.4

package/lib/index.js

@@ -998,7 +998,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-formula-ui";
-var version = "1.0.3";
+var version = "1.0.4";
 
 //#endregion
 //#region src/config/config.ts
@@ -1581,6 +1581,10 @@ let FormulaEditorShowController = class FormulaEditorShowController extends Disp
 			if (range == null) return true;
 			const { startRow, startColumn, endRow, endColumn } = range;
 			if (rowIndex === row && columnIndex === col) {
+				result = {
+					...cellInfo,
+					isInArrayFormulaRange: false
+				};
 				this._createArrayFormulaRangeShape(range, unitId, subUnitId);
 				return false;
 			}
@@ -1771,15 +1775,17 @@ function registerFormulaEditorRuntimePortal(options) {
 	let registeredPortalRoot = null;
 	let disposed = false;
 	const tryRegister = () => {
+		var _options$editorServic;
 		if (disposed) return;
-		const portalRoot = resolveFormulaEditorPortalRoot(options.editorId, ownerDocument);
+		const selection = (_options$editorServic = options.editorService.getEditor(options.editorId)) === null || _options$editorServic === void 0 ? void 0 : _options$editorServic.docSelectionRenderService;
+		const portalRoot = (selection === null || selection === void 0 ? void 0 : selection.selectionContainer.isConnected) ? selection.selectionContainer : null;
 		if (portalRoot === registeredPortalRoot) return;
 		portalRegistration === null || portalRegistration === void 0 || portalRegistration.dispose();
 		portalRegistration = void 0;
 		registeredPortalRoot = null;
-		if (!portalRoot) return;
+		if (!portalRoot || !selection) return;
 		registeredPortalRoot = portalRoot;
-		portalRegistration = registerFormulaEditorPortalRoot(options, ownerDocument, portalRoot);
+		portalRegistration = registerFormulaEditorPortalRoot(options, selection);
 	};
 	const scheduleRetry = (remaining) => {
 		if (remaining <= 0 || !(view === null || view === void 0 ? void 0 : view.requestAnimationFrame)) return;
@@ -1815,13 +1821,9 @@ function registerFormulaEditorRuntimePortal(options) {
 	}));
 	return collection;
 }
-function resolveFormulaEditorPortalRoot(editorId, ownerDocument) {
-	return ownerDocument.getElementById(`univer-doc-selection-container-${editorId}`) ?? ownerDocument.getElementById(`__editor_${editorId}`);
-}
-function registerFormulaEditorPortalRoot(options, ownerDocument, portalRoot) {
+function registerFormulaEditorPortalRoot(options, selection) {
 	const collection = new DisposableCollection();
-	const editorElement = ownerDocument.getElementById(`__editor_${options.editorId}`);
-	(editorElement && editorElement !== portalRoot ? [portalRoot, editorElement] : [portalRoot]).forEach((element) => {
+	[selection.selectionContainer, selection.inputElement].forEach((element) => {
 		if (options.interactionBoundaryService) collection.add(options.interactionBoundaryService.registerOwnedElement(options.embedId, element));
 		if (options.focusCoordinator) collection.add(options.focusCoordinator.registerElement({
 			embedId: options.embedId,
@@ -1861,7 +1863,7 @@ function focusFormulaEditor(editorService, editor, offset) {
 	if (!editor) return;
 	const selections = [...editor.getSelectionRanges()];
 	editorService.focus(editor.getEditorId());
-	focusFormulaEditorElement(editor);
+	editor.docSelectionRenderService.focus();
 	if (editor.docSelectionRenderService.isOnPointerEvent) return;
 	if (Tools.isDefine(offset)) editor.setSelectionRanges([{
 		startOffset: offset,
@@ -1877,16 +1879,7 @@ function focusFormulaEditor(editorService, editor, offset) {
 		}]);
 	} else editor.setSelectionRanges(selections);
 }
-function focusFormulaEditorElement(editor) {
-	var _editor$editorDOM;
-	const editorElement = (((_editor$editorDOM = editor.editorDOM) === null || _editor$editorDOM === void 0 ? void 0 : _editor$editorDOM.ownerDocument) ?? document).getElementById(`__editor_${editor.getEditorId()}`);
-	editorElement === null || editorElement === void 0 || editorElement.focus({ preventScroll: true });
-}
-function shouldSkipFormulaEditorMouseUpFocus(_target) {
-	return false;
-}
 function shouldRefocusFormulaEditorOnMouseUp(options) {
-	if (shouldSkipFormulaEditorMouseUpFocus(options.target)) return false;
 	if (options.isPointerSelecting || options.isFocusing) return false;
 	return true;
 }
@@ -1974,18 +1967,16 @@ let RefSelectionsRenderService = class RefSelectionsRenderService extends BaseSe
 			if (evt.button !== 2) state.stopPropagation();
 		}));
 		listenerDisposables.add(spreadsheetRowHeader === null || spreadsheetRowHeader === void 0 ? void 0 : spreadsheetRowHeader.onPointerDown$.subscribeEvent((evt, state) => {
-			if (!this.inRefSelectionMode()) return;
 			const skeleton = this._sheetSkeletonManagerService.getCurrentSkeleton();
-			if (!skeleton) return;
+			if (!this.inRefSelectionMode() || !skeleton) return;
 			const { row } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);
 			if (checkInHeaderRanges(this._workbookSelections.getCurrentSelections(), row, RANGE_TYPE.ROW)) return;
 			this._onPointerDown(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.ROW, this._getActiveViewport(evt), ScrollTimerType.Y);
 			if (evt.button !== 2) state.stopPropagation();
 		}));
 		listenerDisposables.add(spreadsheetColumnHeader === null || spreadsheetColumnHeader === void 0 ? void 0 : spreadsheetColumnHeader.onPointerDown$.subscribeEvent((evt, state) => {
-			if (!this.inRefSelectionMode()) return;
 			const skeleton = this._sheetSkeletonManagerService.getCurrentSkeleton();
-			if (!skeleton) return;
+			if (!this.inRefSelectionMode() || !skeleton) return;
 			const { column } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);
 			if (checkInHeaderRanges(this._workbookSelections.getCurrentSelections(), column, RANGE_TYPE.COLUMN)) return;
 			this._onPointerDown(evt, (spreadsheet.zIndex || 1) + 1, RANGE_TYPE.COLUMN, this._getActiveViewport(evt), ScrollTimerType.X);
@@ -1993,9 +1984,8 @@ let RefSelectionsRenderService = class RefSelectionsRenderService extends BaseSe
 		}));
 		listenerDisposables.add(spreadsheetLeftTopPlaceholder === null || spreadsheetLeftTopPlaceholder === void 0 ? void 0 : spreadsheetLeftTopPlaceholder.onPointerDown$.subscribeEvent((evt, state) => {
 			this._reset();
-			if (!this.inRefSelectionMode()) return;
 			const skeleton = this._sheetSkeletonManagerService.getCurrentSkeleton();
-			if (!skeleton) return;
+			if (!this.inRefSelectionMode() || !skeleton) return;
 			const selectionWithStyle = getAllSelection(skeleton);
 			this._addSelectionControlByModelData(selectionWithStyle);
 			this._selectionMoveStart$.next(this.getSelectionDataWithStyle());
@@ -2161,7 +2151,7 @@ let RefSelectionsRenderService = class RefSelectionsRenderService extends BaseSe
 			endRow: activeSelectionControl.model.endRow,
 			endColumn: activeSelectionControl.model.endColumn
 		} : null;
-		const remainLastEnable = this._remainLastEnabled && !evt.ctrlKey && !evt.metaKey && !evt.shiftKey && !this._skipLastEnabled && !this._singleSelectionEnabled;
+		const remainLastEnable = this._remainLastEnabled && !this._isMultiSelectModifier(evt) && !evt.shiftKey && !this._skipLastEnabled && !this._singleSelectionEnabled;
 		if (expandByShiftKey && currentCell) this._makeSelectionByTwoCells(currentCell, cursorCellRangeWithRangeType, skeleton, rangeType, activeSelectionControl);
 		else if (remainLastEnable && activeSelectionControl) activeSelectionControl.updateRangeBySelectionWithCoord(selectionCellWithCoord);
 		else activeSelectionControl = this.newSelectionControl(scene, skeleton, selectionWithStyle);
@@ -2734,8 +2724,8 @@ const useLeftAndRightArrow = (isNeed, shouldMoveSelection, editor, onMoveInEdito
 			if (keycode === KeyCode.ARROW_DOWN) direction = Direction.DOWN;
 			else if (keycode === KeyCode.ARROW_UP) direction = Direction.UP;
 			else if (keycode === KeyCode.ARROW_RIGHT) direction = Direction.RIGHT;
-			if (metaKey === MetaKeys.SHIFT) commandService.executeCommand(MoveSelectionOperation.id, { direction });
-			else commandService.executeCommand(MoveCursorOperation.id, { direction });
+			if (metaKey === MetaKeys.SHIFT) return commandService.syncExecuteCommand(MoveSelectionOperation.id, { direction });
+			else return commandService.syncExecuteCommand(MoveCursorOperation.id, { direction });
 		};
 		const handleKeycode = (keycode, metaKey) => {
 			let direction = Direction.DOWN;
@@ -2745,35 +2735,38 @@ const useLeftAndRightArrow = (isNeed, shouldMoveSelection, editor, onMoveInEdito
 			else if (keycode === KeyCode.ARROW_RIGHT) direction = Direction.RIGHT;
 			if (shouldMoveSelectionRef.current) {
 				var _getRefSelectionCount;
-				const fromCurrentSelection = shouldMoveFormulaSelectionFromCurrentSelection(shouldMoveSelectionRef.current, ((_getRefSelectionCount = getRefSelectionCountRef.current) === null || _getRefSelectionCount === void 0 ? void 0 : _getRefSelectionCount.call(getRefSelectionCountRef)) ?? 0);
-				if (metaKey === MetaKeys.CTRL_COMMAND) commandService.executeCommand(MoveSelectionCommand.id, {
+				const refSelectionCount = ((_getRefSelectionCount = getRefSelectionCountRef.current) === null || _getRefSelectionCount === void 0 ? void 0 : _getRefSelectionCount.call(getRefSelectionCountRef)) ?? 0;
+				const fromCurrentSelection = shouldMoveFormulaSelectionFromCurrentSelection(shouldMoveSelectionRef.current, refSelectionCount);
+				if (metaKey === MetaKeys.CTRL_COMMAND) return commandService.executeCommand(MoveSelectionCommand.id, {
 					direction,
 					jumpOver: JumpOver.moveGap,
 					extra: "formula-editor",
 					fromCurrentSelection
 				});
-				else if (metaKey === MetaKeys.SHIFT) commandService.executeCommand(ExpandSelectionCommand.id, {
+				else if (metaKey === MetaKeys.SHIFT) return commandService.executeCommand(ExpandSelectionCommand.id, {
 					direction,
-					extra: "formula-editor"
+					extra: "formula-editor",
+					fromCurrentSelection: refSelectionCount === 0
 				});
-				else if (metaKey === (MetaKeys.CTRL_COMMAND | MetaKeys.SHIFT)) commandService.executeCommand(ExpandSelectionCommand.id, {
+				else if (metaKey === (MetaKeys.CTRL_COMMAND | MetaKeys.SHIFT)) return commandService.executeCommand(ExpandSelectionCommand.id, {
 					direction,
 					jumpOver: JumpOver.moveGap,
-					extra: "formula-editor"
+					extra: "formula-editor",
+					fromCurrentSelection: refSelectionCount === 0
 				});
-				else commandService.executeCommand(MoveSelectionCommand.id, {
+				else return commandService.executeCommand(MoveSelectionCommand.id, {
 					direction,
 					extra: "formula-editor",
 					fromCurrentSelection
 				});
-			} else handleMoveInEditor(keycode, metaKey);
+			} else return handleMoveInEditor(keycode, metaKey);
 		};
 		d.add(commandService.registerCommand({
 			id: operationId,
 			type: CommandType.OPERATION,
 			handler(_event, params) {
 				const { keyCode, metaKey } = params;
-				handleKeycode(keyCode, metaKey);
+				return handleKeycode(keyCode, metaKey);
 			}
 		}));
 		[
@@ -2833,7 +2826,7 @@ const useLeftAndRightArrow = (isNeed, shouldMoveSelection, editor, onMoveInEdito
 			return {
 				id: operationId,
 				binding: metaKey ? keyCode | metaKey : keyCode,
-				preconditions: shouldHandleShortcut,
+				preconditions: () => shouldHandleShortcut() && (!(metaKey && metaKey & MetaKeys.CTRL_COMMAND) || Boolean(shouldMoveSelectionRef.current)),
 				priority: 900,
 				staticParameters: {
 					eventType: DeviceInputEventType.Keyboard,
@@ -4391,6 +4384,7 @@ const MobileFormulaEditor = forwardRef((props, ref) => {
 			element: formulaEditorContainer
 		}));
 		collection.add(registerFormulaEditorRuntimePortal({
+			editorService,
 			embedId: scope.embedId,
 			editorId,
 			ownerDocument: formulaEditorContainer.ownerDocument,
@@ -4400,6 +4394,7 @@ const MobileFormulaEditor = forwardRef((props, ref) => {
 		return () => collection.dispose();
 	}, [
 		editorId,
+		editorService,
 		injector,
 		isFocus
 	]);
@@ -4543,10 +4538,9 @@ const MobileFormulaEditor = forwardRef((props, ref) => {
 			contextService.setContextValue(MOBILE_FORMULA_FUNCTION_PANEL_OPEN, false);
 		});
 	};
-	const handleMouseUp = (event) => {
+	const handleMouseUp = () => {
 		if (hasActiveFormulaEmbedInteraction(formulaEditorContainerRef.current)) return;
 		if (!shouldRefocusFormulaEditorOnMouseUp({
-			target: event.target,
 			isFocusing,
 			isPointerSelecting: docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isOnPointerEvent
 		})) return;
@@ -5212,6 +5206,7 @@ function RangeSelector(props) {
 	const { className, onVerify, selectorRef, unitId, subUnitId, maxRangeCount, supportAcrossSheet, keepSheetReference, autoFocus, onChange, onRangeSelectorDialogVisibleChange, onClickOutside, onFocusChange, forceShowDialogWhenSelectionChanged, hideEditor, resetRange, onClose } = props;
 	const [focusing, setFocusing] = useState(autoFocus ?? false);
 	const [popupVisible, setPopupVisible] = useState(false);
+	const [tooltipVisible, setTooltipVisible] = useState(false);
 	const [rangeSelectorRanges, setRangeSelectorRanges] = useState([]);
 	const editorService = useDependency(IEditorService);
 	const { sequenceNodes } = useRangesHighlight(editor, focusing, unitId, subUnitId);
@@ -5225,6 +5220,7 @@ function RangeSelector(props) {
 	});
 	const handleOpenModal = useEvent(() => {
 		var _editor$getDocumentDa;
+		setTooltipVisible(false);
 		blurEditor();
 		setRangeSelectorRanges(parseRanges((editor === null || editor === void 0 || (_editor$getDocumentDa = editor.getDocumentDataModel()) === null || _editor$getDocumentDa === void 0 ? void 0 : _editor$getDocumentDa.getPlainText()) ?? ""));
 		setPopupVisible(true);
@@ -5241,6 +5237,7 @@ function RangeSelector(props) {
 			blur: blurEditor,
 			verify: () => verifyRange(sequenceNodesRef.current),
 			showDialog: (ranges) => {
+				setTooltipVisible(false);
 				blurEditor();
 				setRangeSelectorRanges(ranges);
 				setPopupVisible(true);
@@ -5296,6 +5293,8 @@ function RangeSelector(props) {
 		icon: /* @__PURE__ */ jsx(Tooltip, {
 			title: localeService.t("sheets-formula-ui.rangeSelector.buttonTooltip"),
 			placement: "bottom",
+			visible: tooltipVisible && !popupVisible,
+			onVisibleChange: (visible) => setTooltipVisible(visible && !popupVisible),
 			children: /* @__PURE__ */ jsx(SelectRangeIcon, {
 				className: "-univer-translate-y-0.5 univer-cursor-pointer dark:!univer-text-gray-300",
 				onClick: handleOpenModal
@@ -5327,6 +5326,7 @@ function RangeSelector(props) {
 		keepSheetReference,
 		onShowBySelection: (ranges) => {
 			if (focusing || forceShowDialogWhenSelectionChanged) {
+				setTooltipVisible(false);
 				setRangeSelectorRanges(ranges);
 				setPopupVisible(true);
 				return false;
@@ -6763,6 +6763,7 @@ const FormulaEditor = forwardRef((props, ref) => {
 			element: formulaEditorContainer
 		}));
 		collection.add(registerFormulaEditorRuntimePortal({
+			editorService,
 			embedId: scope.embedId,
 			editorId,
 			ownerDocument: formulaEditorContainer.ownerDocument,
@@ -6772,6 +6773,7 @@ const FormulaEditor = forwardRef((props, ref) => {
 		return () => collection.dispose();
 	}, [
 		editorId,
+		editorService,
 		injector,
 		isFocus
 	]);
@@ -6865,10 +6867,9 @@ const FormulaEditor = forwardRef((props, ref) => {
 			highlight(`=${res.text}`);
 		}
 	};
-	const handleMouseUp = (event) => {
+	const handleMouseUp = () => {
 		if (hasActiveFormulaEmbedInteraction(formulaEditorContainerRef.current)) return;
 		if (!shouldRefocusFormulaEditorOnMouseUp({
-			target: event.target,
 			isFocusing,
 			isPointerSelecting: docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isOnPointerEvent
 		})) return;
@@ -7083,4 +7084,4 @@ UniverSheetsFormulaUIPlugin = __decorate([
 ], UniverSheetsFormulaUIPlugin);
 
 //#endregion
-export { FORMULA_PROMPT_ACTIVATED, FormulaEditor, FormulaReorderController, GlobalRangeSelectorService, HelpFunctionOperation, InsertFunctionOperation, MobileRangeSelector, MoreFunctionsOperation, RangeSelector, RefSelectionsRenderService, ReferenceAbsoluteOperation, SearchFunctionOperation, SheetCopyFormulaOnlyCommand, SheetOnlyPasteFormulaCommand, menuSchema as SheetsFormulaUIMenuSchema, UniverSheetsFormulaMobileUIPlugin, UniverSheetsFormulaUIPlugin, genFormulaRefSelectionStyle };
+export { FORMULA_PROMPT_ACTIVATED, FormulaEditor, FormulaReorderController, GlobalRangeSelectorService, HelpFunctionOperation, InsertFunctionOperation, MORE_FUNCTIONS_COMPONENT, MobileRangeSelector, MoreFunctionsOperation, RangeSelector, RefSelectionsRenderService, ReferenceAbsoluteOperation, SearchFunctionOperation, SheetCopyFormulaOnlyCommand, SheetOnlyPasteFormulaCommand, menuSchema as SheetsFormulaUIMenuSchema, UniverSheetsFormulaMobileUIPlugin, UniverSheetsFormulaUIPlugin, genFormulaRefSelectionStyle };

package/lib/types/index.d.ts

@@ -32,6 +32,7 @@ export type { IShowRangeSelectorDialogOptions } from './services/range-selector.
 export { RefSelectionsRenderService } from './services/render-services/ref-selections.render.service';
 export { FormulaEditor } from './views/formula-editor/index';
 export type { IFormulaEditorRef } from './views/formula-editor/index';
+export { MORE_FUNCTIONS_COMPONENT } from './views/more-functions/interface';
 export { RangeSelector } from './views/range-selector/index';
 export type { IRangeSelectorInstance, IRangeSelectorProps } from './views/range-selector/index';
 export { MobileRangeSelector } from './views/range-selector/MobileRangeSelector';

package/lib/types/views/formula-editor/formula-embed-integration.service.d.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import type { IDisposable } from '@univerjs/core';
+import type { IEditorService } from '@univerjs/docs-ui';
 export declare const FORMULA_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE = "data-embed-interaction-boundary-owner";
 export declare const FORMULA_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE = "data-embed-runtime-focus-role";
 export declare const FORMULA_EMBED_ID_ATTRIBUTE = "data-embed-id";
@@ -48,6 +49,7 @@ export declare const IFormulaEmbedInteractionBoundaryService: import("@wendellhu
 interface IRegisterFormulaEditorRuntimePortalOptions {
     embedId: string;
     editorId: string;
+    editorService: IEditorService;
     ownerDocument?: Document;
     interactionBoundaryService?: IFormulaEmbedInteractionBoundaryService;
     focusCoordinator?: IFormulaEmbedRuntimeFocusCoordinator;

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

@@ -15,12 +15,8 @@
  */
 import type { Editor } from '@univerjs/docs-ui';
 import { IEditorService } from '@univerjs/docs-ui';
-export declare function focusFormulaEditor(editorService: Pick<IEditorService, 'focus'>, editor?: Pick<Editor, 'getEditorId' | 'getSelectionRanges' | 'setSelectionRanges' | 'getDocumentData' | 'docSelectionRenderService'> & {
-    editorDOM?: HTMLElement;
-}, offset?: number): void;
-export declare function shouldSkipFormulaEditorMouseUpFocus(_target: EventTarget | null): boolean;
+export declare function focusFormulaEditor(editorService: Pick<IEditorService, 'focus'>, editor?: Pick<Editor, 'getEditorId' | 'getSelectionRanges' | 'setSelectionRanges' | 'getDocumentData' | 'docSelectionRenderService'>, offset?: number): void;
 export declare function shouldRefocusFormulaEditorOnMouseUp(options: {
-    target: EventTarget | null;
     isFocusing: boolean | undefined;
     isPointerSelecting: boolean | undefined;
 }): boolean;