@univerjs/sheets-hyper-link-ui 0.4.0-alpha.1 → 0.4.0-experimental.20241017-da434a2

package/lib/es/index.js

@@ -2,18 +2,19 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { Tools, Inject, LocaleService, UniverInstanceType, isValidRange, IUniverInstanceService, ICommandService, IConfigService, RANGE_TYPE, Rectangle, Injector, Disposable, Range, ObjectMatrix, CommandType, IUndoRedoService, BuildTextUtils, DataStreamTreeTokenType, CustomRangeType, TextX, CellValueType, sequenceExecuteAsync, generateRandomId, getBodySlice, useDependency, IContextService, ThemeService, ColorKit, DisposableCollection, createInternalEditorID, FOCUSING_SHEET, DOCS_ZEN_EDITOR_UNIT_ID_KEY, sequenceExecute, useObservable as useObservable$1, DataValidationType, IPermissionService, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, InterceptorEffectEnum, DependentOn, Plugin } from "@univerjs/core";
+import { Tools, Inject, LocaleService, UniverInstanceType, isValidRange, IUniverInstanceService, ICommandService, IConfigService, RANGE_TYPE, Rectangle, Injector, Disposable, Range, ObjectMatrix, CommandType, IUndoRedoService, BuildTextUtils, DataStreamTreeTokenType, CustomRangeType, TextX, CellValueType, sequenceExecuteAsync, generateRandomId, getBodySlice, useDependency, IContextService, ThemeService, ColorKit, DisposableCollection, FOCUSING_SHEET, DOCS_ZEN_EDITOR_UNIT_ID_KEY, sequenceExecute, useObservable as useObservable$1, DataValidationType, IPermissionService, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, InterceptorEffectEnum, DependentOn, Plugin } from "@univerjs/core";
 import { SheetHyperLinkType, ERROR_RANGE, HyperLinkModel, RemoveHyperLinkMutation, AddHyperLinkMutation, UniverSheetsHyperLinkPlugin } from "@univerjs/sheets-hyper-link";
-import { ScrollToRangeOperation, COPY_TYPE, virtualizeDiscreteRanges, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, SheetSkeletonManagerService, IEditorBridgeService, IMarkSelectionService, SheetCanvasPopManagerService, getEditingCustomRangePosition, getCustomRangePosition, whenSheetEditorFocused, getCurrentRangeDisable$, IAutoFillService, APPLY_TYPE, getAutoFillRepeatRange, SheetPermissionInterceptorBaseController, HoverManagerService, HoverRenderController } from "@univerjs/sheets-ui";
+import { ScrollToRangeOperation, COPY_TYPE, virtualizeDiscreteRanges, rangeToDiscreteRange, PREDEFINED_HOOK_NAME, getRepeatRange, ISheetClipboardService, IEditorBridgeService, SheetSkeletonManagerService, IMarkSelectionService, SheetCanvasPopManagerService, getEditingCustomRangePosition, getCustomRangePosition, whenSheetEditorFocused, getCurrentRangeDisable$, IAutoFillService, APPLY_TYPE, getAutoFillRepeatRange, SheetPermissionInterceptorBaseController, HoverManagerService, HoverRenderController } from "@univerjs/sheets-ui";
 import { MessageType, FormLayout, Input, Select, Button, Tooltip } from "@univerjs/design";
 import { deserializeRangeWithSheet, serializeRangeWithSheet, serializeRange, IDefinedNamesService, serializeRangeToRefString } from "@univerjs/engine-formula";
 import { SetSelectionsOperation, SetWorksheetActiveOperation, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SheetsSelectionsService, getSheetCommandTarget, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetInsertHyperlinkPermission, RangeProtectionPermissionEditPoint, WorkbookViewPermission, WorksheetViewPermission, RangeProtectionPermissionViewPoint, WorkbookCopyPermission, WorksheetCopyPermission, ClearSelectionContentCommand, ClearSelectionAllCommand, ClearSelectionFormatCommand, SheetInterceptorService, RemoveSheetCommand, INTERCEPTOR_POINT, RefRangeService, handleDefaultRangeChangeWithEffectRefCommands, SetRangeValuesCommand } from "@univerjs/sheets";
 import { IMessageService, useObservable, IZenZoneService, useEvent, KeyCode, MenuItemType, MenuPosition, MenuGroup, MetaKeys, getMenuHiddenObservable, RibbonStartGroup, ContextMenuPosition, ContextMenuGroup, ComponentManager, IShortcutService, IMenuManagerService } from "@univerjs/ui";
 import { DocSelectionManagerService } from "@univerjs/docs";
 import { Subject, BehaviorSubject, map, mergeMap, Observable, debounceTime } from "rxjs";
-import { addCustomRangeBySelectionFactory, replaceSelectionFactory, DocSelectionRenderService, RangeSelector, DocBackScrollRenderController, deleteCustomRangeFactory, DocCanvasPopManagerService, IEditorService, IRangeSelectorService, DocEventManagerService, UniverDocsUIPlugin } from "@univerjs/docs-ui";
+import { addCustomRangeBySelectionFactory, replaceSelectionFactory, DocSelectionRenderService, DocBackScrollRenderController, deleteCustomRangeFactory, DocCanvasPopManagerService, IEditorService, IRangeSelectorService, DocEventManagerService, UniverDocsUIPlugin } from "@univerjs/docs-ui";
 import require$$0, { useState, useMemo, useRef, useEffect, forwardRef, createElement } from "react";
 import { IRenderManagerService } from "@univerjs/engine-render";
+import { RangeSelector } from "@univerjs/sheets-formula-ui";
 function isLegalLink(link) {
   return Tools.isLegalUrl(link);
 }
@@ -421,7 +422,7 @@ const AddHyperLinkCommand = {
     var _a15;
     if (!params)
       return !1;
-    const commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), renderManagerService = accessor.get(IRenderManagerService), univerInstanceService = accessor.get(IUniverInstanceService), hyperLinkModel = accessor.get(HyperLinkModel), { unitId, subUnitId, link } = params, workbook = univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET), currentRender = renderManagerService.getRenderById(unitId);
+    const commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), renderManagerService = accessor.get(IRenderManagerService), univerInstanceService = accessor.get(IUniverInstanceService), hyperLinkModel = accessor.get(HyperLinkModel), editorBridgeService = accessor.get(IEditorBridgeService), { unitId, subUnitId, link } = params, workbook = univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET), currentRender = renderManagerService.getRenderById(unitId);
     if (!currentRender || !workbook)
       return !1;
     const worksheet = workbook == null ? void 0 : workbook.getSheetBySheetId(subUnitId), skeleton = (_a15 = currentRender.with(SheetSkeletonManagerService).getCurrent()) == null ? void 0 : _a15.skeleton;
@@ -462,18 +463,18 @@ const AddHyperLinkCommand = {
       }
     }), !textX)
       return !1;
-    const newBody = TextX.apply(body, textX.serialize()), rangeValue = {
-      ...snapshot,
-      body: newBody
-    }, redoParams = {
+    const newBody = TextX.apply(body, textX.serialize()), newCellData = {
+      p: {
+        ...snapshot,
+        body: newBody
+      },
+      t: CellValueType.STRING
+    }, finalCellData = await editorBridgeService.beforeSetRangeValue(workbook, worksheet, row, column, newCellData), redoParams = {
       unitId,
       subUnitId,
       cellValue: {
         [link.row]: {
-          [link.column]: {
-            p: rangeValue,
-            t: CellValueType.STRING
-          }
+          [link.column]: finalCellData
         }
       }
     }, redo = {
@@ -531,7 +532,7 @@ const AddHyperLinkCommand = {
     var _a15, _b, _c, _d;
     if (!params)
       return !1;
-    const commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), renderManagerService = accessor.get(IRenderManagerService), univerInstanceService = accessor.get(IUniverInstanceService), hyperLinkModel = accessor.get(HyperLinkModel), { unitId, subUnitId, payload: link, row, column, id } = params, workbook = univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET), currentRender = renderManagerService.getRenderById(unitId);
+    const commandService = accessor.get(ICommandService), undoRedoService = accessor.get(IUndoRedoService), renderManagerService = accessor.get(IRenderManagerService), univerInstanceService = accessor.get(IUniverInstanceService), hyperLinkModel = accessor.get(HyperLinkModel), editorBridgeService = accessor.get(IEditorBridgeService), { unitId, subUnitId, payload: link, row, column, id } = params, workbook = univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET), currentRender = renderManagerService.getRenderById(unitId);
     if (!currentRender || !workbook)
       return !1;
     const worksheet = workbook == null ? void 0 : workbook.getSheetBySheetId(subUnitId), skeleton = (_a15 = currentRender.with(SheetSkeletonManagerService).getCurrent()) == null ? void 0 : _a15.skeleton;
@@ -572,20 +573,20 @@ const AddHyperLinkCommand = {
     });
     if (!replaceSelection)
       return !1;
-    const newBody = TextX.apply(Tools.deepClone(snapshot.body), replaceSelection.textX.serialize()), redo = {
+    const newBody = TextX.apply(Tools.deepClone(snapshot.body), replaceSelection.textX.serialize()), newCellData = {
+      p: {
+        ...snapshot,
+        body: newBody
+      },
+      t: CellValueType.STRING
+    }, finalCellData = await editorBridgeService.beforeSetRangeValue(workbook, worksheet, row, column, newCellData), redo = {
       id: SetRangeValuesMutation.id,
       params: {
         unitId,
         subUnitId,
         cellValue: {
           [row]: {
-            [column]: {
-              p: {
-                ...snapshot,
-                body: newBody
-              },
-              t: CellValueType.STRING
-            }
+            [column]: finalCellData
           }
         }
       }
@@ -687,11 +688,13 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
   cellLinkEditButtons
 }, CellLinkEdit = /* @__PURE__ */ __name(() => {
   var _a15;
-  const [id, setId] = useState(""), [hide, setHide] = useState(!1), [display, setDisplay] = useState(""), [showLabel, setShowLabel] = useState(!0), [type, setType] = useState(SheetHyperLinkType.URL), [payload, setPayload] = useState(""), localeService = useDependency(LocaleService), definedNameService = useDependency(IDefinedNamesService), editorBridgeService = useDependency(IEditorBridgeService), univerInstanceService = useDependency(IUniverInstanceService), popupService = useDependency(SheetsHyperLinkPopupService), editing = useObservable(popupService.currentEditing$), resolverService = useDependency(SheetsHyperLinkResolverService), commandService = useDependency(ICommandService), sidePanelService = useDependency(SheetsHyperLinkSidePanelService), sidePanelOptions = useMemo(() => sidePanelService.getOptions(), [sidePanelService]), zenZoneService = useDependency(IZenZoneService), renderManagerService = useDependency(IRenderManagerService), markSelectionService = useDependency(IMarkSelectionService), textSelectionService = useDependency(DocSelectionManagerService), contextService = useDependency(IContextService), themeService = useDependency(ThemeService), docSelectionManagerService = useDependency(DocSelectionManagerService), customHyperLinkSidePanel = useMemo(() => {
+  const [id, setId] = useState(""), [hide, setHide] = useState(!1), [display, setDisplay] = useState(""), [showLabel, setShowLabel] = useState(!0), [type, setType] = useState(SheetHyperLinkType.URL), [payload, setPayload] = useState(""), localeService = useDependency(LocaleService), definedNameService = useDependency(IDefinedNamesService), editorBridgeService = useDependency(IEditorBridgeService), univerInstanceService = useDependency(IUniverInstanceService), popupService = useDependency(SheetsHyperLinkPopupService), editing = useObservable(popupService.currentEditing$), resolverService = useDependency(SheetsHyperLinkResolverService), commandService = useDependency(ICommandService), sidePanelService = useDependency(SheetsHyperLinkSidePanelService), sidePanelOptions = useMemo(() => sidePanelService.getOptions(), [sidePanelService]), zenZoneService = useDependency(IZenZoneService), renderManagerService = useDependency(IRenderManagerService), markSelectionService = useDependency(IMarkSelectionService), textSelectionService = useDependency(DocSelectionManagerService), contextService = useDependency(IContextService), themeService = useDependency(ThemeService), docSelectionManagerService = useDependency(DocSelectionManagerService), rangeSelectorActionsRef = useRef({}), customHyperLinkSidePanel = useMemo(() => {
     if (!sidePanelService.isBuiltInLinkType(type))
       return sidePanelService.getCustomHyperLink(type);
-  }, [sidePanelService, type]), [showError, setShowError] = useState(!1), setByPayload = useRef(!1);
+  }, [sidePanelService, type]), [showError, setShowError] = useState(!1), [isFocusRangeSelector, isFocusRangeSelectorSet] = useState(!1), setByPayload = useRef(!1), workbook = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), subUnitId = (workbook == null ? void 0 : workbook.getActiveSheet().getSheetId()) || "";
   useEffect(() => {
+    isFocusRangeSelectorSet(!1);
+  }, [subUnitId]), useEffect(() => {
     var _a16, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     if ((editing == null ? void 0 : editing.row) !== void 0 && editing.col !== void 0) {
       const { label, customRange, row, col } = editing;
@@ -801,7 +804,11 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
     return () => {
       editorBridgeService.disableForceKeepVisible(), disposeCollection.dispose();
     };
-  }, [editorBridgeService, renderManagerService]);
+  }, [editorBridgeService, renderManagerService]), useEffect(() => (popupService.setIsKeepVisible(type === SheetHyperLinkType.RANGE), () => {
+    popupService.setIsKeepVisible(!1);
+  }), [type]), useEffect(() => () => {
+    zenZoneService.temporaryHidden && (zenZoneService.show(), contextService.setContextValue(FOCUSING_SHEET, !1));
+  }, [contextService, zenZoneService]);
   const linkTypeOptions = [
     {
       label: localeService.t("hyperLink.form.link"),
@@ -820,7 +827,7 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
       value: SheetHyperLinkType.DEFINE_NAME
     },
     ...sidePanelOptions
-  ], workbook = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+  ];
   if (!workbook)
     return;
   const hiddens = workbook.getHiddenWorksheets(), sheetsOption = workbook.getSheets().map((sheet) => ({ label: sheet.getName(), value: sheet.getSheetId() })).filter((opt) => hiddens.indexOf(opt.value) === -1), definedNames = Object.values((_a15 = definedNameService.getDefinedNameMap(workbook.getUnitId())) != null ? _a15 : {}).map((value) => ({
@@ -835,9 +842,9 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
         return `#gid=${worksheet.getSheetId()}&range=${serializeRange(info.range)}`;
     }
     return `#${type2}=${payload2}`;
-  }, "formatUrl"), handleRangeChange = useEvent((newValue) => {
+  }, "formatUrl"), handleRangeChange = useEvent((rangeText) => {
     var _a16;
-    const range = newValue[0];
+    const range = rangeText.split(",").map(deserializeRangeWithSheet)[0];
     if (!range || !isValidRange(range.range))
       return;
     range.sheetName || (range.sheetName = ((_a16 = workbook.getActiveSheet()) == null ? void 0 : _a16.getName()) || "");
@@ -894,8 +901,14 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
       });
     }
     commandService.executeCommand(CloseHyperLinkPopupOperation.id);
-  }, "handleSubmit");
-  return editing ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.cellLinkEdit, style: { display: hide ? "none" : "block" }, children: [
+  }, "handleSubmit"), handlePanelClick = /* @__PURE__ */ __name((e) => {
+    var _a16;
+    if (type !== SheetHyperLinkType.RANGE)
+      return;
+    const handleOutClick = (_a16 = rangeSelectorActionsRef.current) == null ? void 0 : _a16.handleOutClick;
+    handleOutClick && handleOutClick(e, isFocusRangeSelectorSet);
+  }, "handlePanelClick");
+  return editing ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$1.cellLinkEdit, style: { display: hide ? "none" : "block" }, onClick: handlePanelClick, children: [
     showLabel ? /* @__PURE__ */ jsxRuntimeExports.jsx(
       FormLayout,
       {
@@ -950,13 +963,18 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
     type === SheetHyperLinkType.RANGE && /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { error: showError && !payload ? localeService.t("hyperLink.form.inputError") : "", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
       RangeSelector,
       {
-        openForSheetUnitId: workbook.getUnitId(),
-        id: createInternalEditorID("hyper-link-edit"),
-        isSingleChoice: !0,
-        value: payloadInitial,
+        unitId: workbook.getUnitId(),
+        subUnitId,
+        isOnlyOneRange: !0,
+        isSupportAcrossSheet: !0,
+        initValue: payloadInitial,
         onChange: handleRangeChange,
-        dialogOnly: !0,
-        onSelectorVisibleChange: /* @__PURE__ */ __name(async (visible) => {
+        isFocus: isFocusRangeSelector,
+        onBlur: /* @__PURE__ */ __name(() => {
+          isFocusRangeSelectorSet(!1);
+        }, "onBlur"),
+        actions: rangeSelectorActionsRef.current,
+        onRangeSelectorDialogVisibleChange: /* @__PURE__ */ __name(async (visible) => {
           var _a16, _b;
           if (visible)
             editing.type === HyperLinkEditSourceType.ZEN_EDITOR && (zenZoneService.hide(), contextService.setContextValue(FOCUSING_SHEET, !0)), editing.type !== HyperLinkEditSourceType.VIEWING && editorBridgeService.enableForceKeepVisible(), setHide(!0);
@@ -974,7 +992,7 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
             }
             editorBridgeService.disableForceKeepVisible(), setHide(!1);
           }
-        }, "onSelectorVisibleChange")
+        }, "onRangeSelectorDialogVisibleChange")
       }
     ) }),
     type === SheetHyperLinkType.SHEET && /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { error: showError && !payload ? localeService.t("hyperLink.form.selectError") : "", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -1367,6 +1385,7 @@ let SheetsHyperLinkPopupService = (_a3 = class extends Disposable {
     __publicField(this, "_currentEditingPopup", null);
     __publicField(this, "_currentEditing$", new BehaviorSubject(null));
     __publicField(this, "currentEditing$", this._currentEditing$.asObservable());
+    __publicField(this, "_isKeepVisible", !1);
     this._sheetCanvasPopManagerService = _sheetCanvasPopManagerService, this._injector = _injector, this._univerInstanceService = _univerInstanceService, this._editorBridgeService = _editorBridgeService, this._textSelectionManagerService = _textSelectionManagerService, this._docCanvasPopManagerService = _docCanvasPopManagerService, this._editorService = _editorService, this._rangeSelectorService = _rangeSelectorService, this._zenZoneService = _zenZoneService, this.disposeWithMe(() => {
       this.hideCurrentPopup(), this.endEditing(), this._currentEditing$.complete(), this._currentPopup$.complete();
     });
@@ -1377,6 +1396,12 @@ let SheetsHyperLinkPopupService = (_a3 = class extends Disposable {
   get currentEditing() {
     return this._currentEditing$.getValue();
   }
+  setIsKeepVisible(v) {
+    this._isKeepVisible = v;
+  }
+  getIsKeepVisible() {
+    return this._isKeepVisible;
+  }
   showPopup(location2) {
     if (this._currentPopup && isEqualLink(location2, this._currentPopup) || (this.hideCurrentPopup(void 0, !0), location2.type !== HyperLinkEditSourceType.ZEN_EDITOR && this._zenZoneService.visible))
       return;
@@ -1459,11 +1484,10 @@ let SheetsHyperLinkPopupService = (_a3 = class extends Disposable {
       componentKey: CellLinkEdit.componentKey,
       direction: "bottom",
       onClickOutside: /* @__PURE__ */ __name(() => {
-        const hyperLinkRangeSelectorId = createInternalEditorID("hyper-link-edit");
-        this._editorService.getFocusId() !== hyperLinkRangeSelectorId && (this._rangeSelectorService.getCurrentSelectorId() === hyperLinkRangeSelectorId && this._rangeSelectorService.selectorModalVisible || this.endEditing());
+        this.getIsKeepVisible() || this.endEditing();
       }, "onClickOutside"),
       onContextMenu: /* @__PURE__ */ __name(() => {
-        this.endEditing();
+        this.getIsKeepVisible() || this.endEditing();
       }, "onContextMenu"),
       hiddenType: "hide"
     };

package/lib/types/commands/commands/add-hyper-link.command.d.ts

@@ -1,5 +1,5 @@
-import { ICellHyperLink } from '@univerjs/sheets-hyper-link';
 import { ICommand } from '@univerjs/core';
+import { ICellHyperLink } from '@univerjs/sheets-hyper-link';
 export interface IAddHyperLinkCommandParams {
     unitId: string;
     subUnitId: string;

package/lib/types/commands/commands/update-hyper-link.command.d.ts

@@ -1,5 +1,5 @@
-import { ICellLinkContent } from '@univerjs/sheets-hyper-link';
 import { ICommand } from '@univerjs/core';
+import { ICellLinkContent } from '@univerjs/sheets-hyper-link';
 export interface IUpdateHyperLinkCommandParams {
     unitId: string;
     subUnitId: string;

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

@@ -51,12 +51,15 @@ export declare class SheetsHyperLinkPopupService extends Disposable {
         customRange?: ICustomRange;
         label?: string;
     }) | null>;
+    private _isKeepVisible;
     get currentPopup(): IHyperLinkPopup | null;
     get currentEditing(): (IHyperLinkEditing & {
         customRange?: ICustomRange;
         label?: string;
     }) | null;
     constructor(_sheetCanvasPopManagerService: SheetCanvasPopManagerService, _injector: Injector, _univerInstanceService: IUniverInstanceService, _editorBridgeService: IEditorBridgeService, _textSelectionManagerService: DocSelectionManagerService, _docCanvasPopManagerService: DocCanvasPopManagerService, _editorService: IEditorService, _rangeSelectorService: IRangeSelectorService, _zenZoneService: IZenZoneService);
+    setIsKeepVisible(v: boolean): void;
+    getIsKeepVisible(): boolean;
     showPopup(location: IHyperLinkPopupOptions): void;
     hideCurrentPopup(type?: HyperLinkEditSourceType, force?: boolean): void;
     private _getEditingRange;