@univerjs/sheets-hyper-link-ui 0.4.0 → 0.4.1-experimental.20241023-bbb123f

package/lib/es/index.js

@@ -2,7 +2,7 @@ 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, 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, DOCS_ZEN_EDITOR_UNIT_ID_KEY, DisposableCollection, FOCUSING_SHEET, 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, 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";
@@ -510,10 +510,7 @@ const AddHyperLinkCommand = {
   handler: /* @__PURE__ */ __name(async (accessor, params) => {
     if (!params)
       return !1;
-    const { documentId, link } = params, commandService = accessor.get(ICommandService), textSelectionService = accessor.get(DocSelectionManagerService), newId = generateRandomId(), { payload } = link;
-    if (!textSelectionService.getActiveTextRange())
-      return !1;
-    const replaceSelection = addCustomRangeBySelectionFactory(accessor, {
+    const { documentId, link } = params, commandService = accessor.get(ICommandService), newId = generateRandomId(), { payload } = link, replaceSelection = addCustomRangeBySelectionFactory(accessor, {
       unitId: documentId,
       rangeId: newId,
       rangeType: CustomRangeType.HYPERLINK,
@@ -695,7 +692,7 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
   useEffect(() => {
     isFocusRangeSelectorSet(!1);
   }, [subUnitId]), useEffect(() => {
-    var _a16, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+    var _a16, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     if ((editing == null ? void 0 : editing.row) !== void 0 && editing.col !== void 0) {
       const { label, customRange, row, col } = editing;
       let link;
@@ -720,11 +717,11 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
           column: col
         };
       } else {
-        const doc = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC), selection = textSelectionService.getActiveTextRange(), customRange2 = selection && ((_m = BuildTextUtils.customRange.getCustomRangesInterestsWithRange(selection, (_l = (_k = doc == null ? void 0 : doc.getBody()) == null ? void 0 : _k.customRanges) != null ? _l : [])) == null ? void 0 : _m[0]);
+        const doc = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC), currentSelection = textSelectionService.getActiveTextRange(), body = doc == null ? void 0 : doc.getBody(), selection = currentSelection && body ? BuildTextUtils.selection.getInsertSelection(currentSelection, body) : null, customRange2 = selection && ((_l = BuildTextUtils.customRange.getCustomRangesInterestsWithSelection(selection, (_k = body == null ? void 0 : body.customRanges) != null ? _k : [])) == null ? void 0 : _l[0]);
         setShowLabel(!1), link = {
           id: "",
           display: label != null ? label : "",
-          payload: (_o = (_n = customRange2 == null ? void 0 : customRange2.properties) == null ? void 0 : _n.url) != null ? _o : "",
+          payload: (_n = (_m = customRange2 == null ? void 0 : customRange2.properties) == null ? void 0 : _m.url) != null ? _n : "",
           row,
           column: col
         };
@@ -744,7 +741,7 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
           break;
         }
         case SheetHyperLinkType.RANGE: {
-          const params = linkInfo.searchObj, sheetName = params.gid && (_r = (_q = (_p = univerInstanceService.getUnit(editing.unitId)) == null ? void 0 : _p.getSheetBySheetId(params.gid)) == null ? void 0 : _q.getName()) != null ? _r : "", payload2 = serializeRangeWithSheet(sheetName, deserializeRangeWithSheet(params.range).range);
+          const params = linkInfo.searchObj, sheetName = params.gid && (_q = (_p = (_o = univerInstanceService.getUnit(editing.unitId)) == null ? void 0 : _o.getSheetBySheetId(params.gid)) == null ? void 0 : _p.getName()) != null ? _q : "", payload2 = serializeRangeWithSheet(sheetName, deserializeRangeWithSheet(params.range).range);
           setPayload(payload2), payload2 === link.display && (setByPayload.current = !0);
           break;
         }
@@ -791,10 +788,12 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
     return () => {
       id2 && markSelectionService.removeShape(id2);
     };
-  }, [editing, markSelectionService, themeService, univerInstanceService]);
+  }, [editing, markSelectionService, themeService, univerInstanceService]), useEffect(() => {
+    type === SheetHyperLinkType.RANGE && !showLabel && !isFocusRangeSelector && isFocusRangeSelectorSet(!0);
+  }, [type, isFocusRangeSelector, showLabel, editorBridgeService]);
   const payloadInitial = useMemo(() => payload, [type]);
   useEffect(() => {
-    const render2 = renderManagerService.getRenderById(editorBridgeService.getCurrentEditorId()), disposeCollection = new DisposableCollection();
+    const render2 = (editing == null ? void 0 : editing.type) === HyperLinkEditSourceType.ZEN_EDITOR ? renderManagerService.getRenderById(DOCS_ZEN_EDITOR_UNIT_ID_KEY) : renderManagerService.getRenderById(editorBridgeService.getCurrentEditorId()), disposeCollection = new DisposableCollection();
     if (render2) {
       const selectionRenderService = render2.with(DocSelectionRenderService);
       selectionRenderService.setReserveRangesStatus(!0), disposeCollection.add(() => {
@@ -804,9 +803,9 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
     return () => {
       editorBridgeService.disableForceKeepVisible(), disposeCollection.dispose();
     };
-  }, [editorBridgeService, renderManagerService]), useEffect(() => (popupService.setIsKeepVisible(type === SheetHyperLinkType.RANGE), () => {
+  }, [editorBridgeService, renderManagerService]), useEffect(() => (popupService.setIsKeepVisible(isFocusRangeSelector), () => {
     popupService.setIsKeepVisible(!1);
-  }), [type]), useEffect(() => () => {
+  }), [isFocusRangeSelector, popupService]), useEffect(() => () => {
     zenZoneService.temporaryHidden && (zenZoneService.show(), contextService.setContextValue(FOCUSING_SHEET, !1));
   }, [contextService, zenZoneService]);
   const linkTypeOptions = [
@@ -952,7 +951,7 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
               setPayload(newLink), newLink && (setByPayload.current || !display || display === payload) && (setDisplay(newLink), setByPayload.current = !0);
             }, "onChange"),
             placeholder: localeService.t("hyperLink.form.linkPlaceholder"),
-            autoFocus: !showLabel,
+            autoFocus: !0,
             onKeyDown: /* @__PURE__ */ __name((e) => {
               e.keyCode === KeyCode.ENTER && handleSubmit();
             }, "onKeyDown")
@@ -986,9 +985,7 @@ const cellLinkEdit = "univer-cell-link-edit", cellLinkEditButtons = "univer-cell
                 selections: [{ range: { startRow: editing.row, endRow: editing.row, startColumn: editing.col, endColumn: editing.col } }]
               }), zenZoneService.show(), contextService.setContextValue(FOCUSING_SHEET, !1);
               const docBackScrollRenderController = (_a16 = renderManagerService.getRenderById(DOCS_ZEN_EDITOR_UNIT_ID_KEY)) == null ? void 0 : _a16.with(DocBackScrollRenderController), range = (_b = docSelectionManagerService.getTextRanges({ unitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY, subUnitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY })) == null ? void 0 : _b[0];
-              docBackScrollRenderController && range && setTimeout(() => {
-                docBackScrollRenderController.scrollToRange(range), docSelectionManagerService.refreshSelection({ unitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY, subUnitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY });
-              }, 100);
+              docBackScrollRenderController && range && (docBackScrollRenderController.scrollToRange(range), docSelectionManagerService.refreshSelection({ unitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY, subUnitId: DOCS_ZEN_EDITOR_UNIT_ID_KEY }));
             }
             editorBridgeService.disableForceKeepVisible(), setHide(!1);
           }
@@ -1466,7 +1463,7 @@ let SheetsHyperLinkPopupService = (_a3 = class extends Disposable {
           collapsed: body.dataStream.length - 2 === 0,
           label: BuildTextUtils.transform.getPlainText(body.dataStream)
         };
-      const links = BuildTextUtils.customRange.getCustomRangesInterestsWithRange(textRange, (_c = (_b = body.customRanges) == null ? void 0 : _b.filter((i) => i.rangeType === CustomRangeType.HYPERLINK)) != null ? _c : []);
+      const links = BuildTextUtils.customRange.getCustomRangesInterestsWithSelection(textRange, (_c = (_b = body.customRanges) == null ? void 0 : _b.filter((i) => i.rangeType === CustomRangeType.HYPERLINK)) != null ? _c : []);
       let start = textRange.startOffset, end = textRange.endOffset;
       return links.forEach((link) => {
         start = Math.min(start, link.startIndex), end = Math.max(end, link.endIndex + 1);
@@ -1631,16 +1628,17 @@ const getShouldDisableCellLink = /* @__PURE__ */ __name((worksheet, row, col) =>
   const row = selections[0].range.startRow, col = selections[0].range.startColumn;
   return getShouldDisableCellLink(worksheet, row, col);
 }, "getShouldDisableCurrentCellLink"), shouldDisableAddLink = /* @__PURE__ */ __name((accessor) => {
-  var _a15;
+  var _a15, _b;
   const textSelectionService = accessor.get(DocSelectionManagerService), univerInstanceService = accessor.get(IUniverInstanceService), textRanges = textSelectionService.getDocRanges();
   if (!textRanges.length || textRanges.length > 1)
     return !0;
   const activeRange = textRanges[0], doc = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC);
   if (!doc || !activeRange || activeRange.collapsed)
     return !0;
-  const body = doc.getSelfOrHeaderFooterModel(activeRange.segmentId).getBody(), paragraphs = body == null ? void 0 : body.paragraphs;
-  if (!paragraphs)
+  const body = doc.getSelfOrHeaderFooterModel(activeRange.segmentId).getBody();
+  if (!body)
     return !0;
+  const paragraphs = (_a15 = body == null ? void 0 : body.paragraphs) != null ? _a15 : [];
   for (let i = 0, len = paragraphs.length; i < len; i++) {
     const p2 = paragraphs[i];
     if (activeRange.startOffset <= p2.startIndex && activeRange.endOffset > p2.startIndex)
@@ -1648,7 +1646,7 @@ const getShouldDisableCellLink = /* @__PURE__ */ __name((worksheet, row, col) =>
     if (p2.startIndex > activeRange.endOffset)
       break;
   }
-  return !BuildTextUtils.customRange.getCustomRangesInterestsWithRange(activeRange, (_a15 = body.customRanges) != null ? _a15 : []).every((range) => range.rangeType === CustomRangeType.HYPERLINK);
+  return !BuildTextUtils.customRange.getCustomRangesInterestsWithSelection(activeRange, (_b = body.customRanges) != null ? _b : []).every((range) => range.rangeType === CustomRangeType.HYPERLINK);
 }, "shouldDisableAddLink"), OpenHyperLinkEditPanelOperation = {
   type: CommandType.OPERATION,
   id: "sheet.operation.open-hyper-link-edit-panel",
@@ -1694,7 +1692,7 @@ const getShouldDisableCellLink = /* @__PURE__ */ __name((worksheet, row, col) =>
     return accessor.get(SheetsHyperLinkPopupService).currentEditing ? commandService.executeCommand(CloseHyperLinkPopupOperation.id) : commandService.executeCommand(InsertHyperLinkOperation.id);
   }
 }, getLinkDisable$ = /* @__PURE__ */ __name((accessor) => {
-  const disableRange$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetInsertHyperlinkPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }), univerInstanceService = accessor.get(IUniverInstanceService), sheetSelectionService = accessor.get(SheetsSelectionsService), disableCell$ = univerInstanceService.focused$.pipe(
+  const disableRange$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetInsertHyperlinkPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, !0), univerInstanceService = accessor.get(IUniverInstanceService), sheetSelectionService = accessor.get(SheetsSelectionsService), disableCell$ = univerInstanceService.focused$.pipe(
     map((focused) => focused ? univerInstanceService.getUnit(focused, UniverInstanceType.UNIVER_SHEET) : null),
     mergeMap((unit) => unit ? unit.activeSheet$ : new Observable((sub) => {
       sub.next(null);
@@ -2008,7 +2006,7 @@ let SheetsHyperLinkPopupController = (_a6 = class extends Disposable {
   _initZenEditor() {
     this.disposeWithMe(
       this._zenZoneService.visible$.subscribe((visible) => {
-        visible && (this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.VIEWING), this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.EDITING), this._sheetsHyperLinkPopupService.endEditing(HyperLinkEditSourceType.EDITING), this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.VIEWING));
+        visible ? (this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.VIEWING), this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.EDITING), this._sheetsHyperLinkPopupService.endEditing(HyperLinkEditSourceType.EDITING), this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.VIEWING)) : (this._sheetsHyperLinkPopupService.hideCurrentPopup(HyperLinkEditSourceType.ZEN_EDITOR), this._sheetsHyperLinkPopupService.endEditing(HyperLinkEditSourceType.ZEN_EDITOR));
       })
     ), this.disposeWithMe(
       this._univerInstanceService.focused$.pipe(

package/lib/types/controllers/menu.d.ts

@@ -1,6 +1,6 @@
-import { MenuGroup, MenuItemType, MenuPosition, IMenuItem, IShortcutItem } from '@univerjs/ui';
-import { Observable } from 'rxjs';
 import { IAccessor } from '@univerjs/core';
+import { IMenuItem, IShortcutItem, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
+import { Observable } from 'rxjs';
 export declare const genZenEditorMenuId: (id: string) => string;
 export declare const insertLinkMenuFactory: (accessor: IAccessor) => IMenuItem;
 export declare const zenEditorInsertLinkMenuFactory: (accessor: IAccessor) => IMenuItem;