@univerjs/docs-ui 0.4.0-alpha.0 → 0.4.0-nightly.202410121605

package/lib/es/index.js

@@ -11,7 +11,6 @@ import { LexerTreeBuilder, operatorToken, isReferenceStrings, serializeRange, se
 import { Subject, BehaviorSubject, takeUntil, fromEvent, merge, combineLatest, Observable, map as map$1, distinctUntilChanged, filter as filter$1, throttleTime, mergeMap, take, animationFrameScheduler } from "rxjs";
 import { ILayoutService, useEvent, ComponentManager, ISidebarService, KeyCode, MetaKeys, IClipboardInterfaceService, PLAIN_TEXT_CLIPBOARD_MIME_TYPE, HTML_CLIPBOARD_MIME_TYPE, CopyCommand, CutCommand, PasteCommand, IConfirmService, MenuItemType, getMenuHiddenObservable, FONT_FAMILY_LIST, FONT_SIZE_LIST, getHeaderFooterMenuHiddenObservable, RibbonStartGroup, ContextMenuPosition, ContextMenuGroup, FontFamily, FontFamilyItem, FontSize, BuiltInUIPart, IMenuManagerService, IUIPartsService, IShortcutService, ICanvasPopupService, IContextMenuService, SetEditorResizeOperation } from "@univerjs/ui";
 import { Tooltip, Dialog, Button, Input, Checkbox, InputNumber, Slider, Select, ColorPicker } from "@univerjs/design";
-import clsx from "clsx";
 import { filter, bufferTime, map } from "rxjs/operators";
 var __defProp$r = Object.defineProperty, __getOwnPropDesc$r = Object.getOwnPropertyDescriptor, __decorateClass$r = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$r(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -1440,8 +1439,8 @@ const _RectRange = class _RectRange {
 };
 __name(_RectRange, "RectRange");
 let RectRange = _RectRange;
-function getTextRangeFromCharIndex(startOffset, endOffset, scene, document2, skeleton, style, segmentId, segmentPage) {
-  const startNodePosition = skeleton.findNodePositionByCharIndex(startOffset, !0, segmentId, segmentPage), endNodePosition = skeleton.findNodePositionByCharIndex(endOffset, !0, segmentId, segmentPage);
+function getTextRangeFromCharIndex(startOffset, endOffset, scene, document2, skeleton, style, segmentId, segmentPage, startIsBack = !0, endIsBack = !0) {
+  const startNodePosition = skeleton.findNodePositionByCharIndex(startOffset, startIsBack, segmentId, segmentPage), endNodePosition = skeleton.findNodePositionByCharIndex(endOffset, endIsBack, segmentId, segmentPage);
   if (!(startNodePosition == null || endNodePosition == null))
     return new TextRange(scene, document2, skeleton, startNodePosition, endNodePosition, style, segmentId, segmentPage);
 }
@@ -1692,7 +1691,6 @@ let DocSelectionRenderService = (_a2 = class extends RxDisposable {
   _setRangeStyle(style = NORMAL_TEXT_SELECTION_PLUGIN_STYLE) {
     this._selectionStyle = style;
   }
-  // eslint-disable-next-line max-lines-per-function
   addDocRanges(ranges, isEditing = !0, options) {
     const {
       _currentSegmentId: segmentId,
@@ -1700,9 +1698,9 @@ let DocSelectionRenderService = (_a2 = class extends RxDisposable {
       _selectionStyle: style
     } = this, { scene, mainComponent } = this._context, document2 = mainComponent, docSkeleton = this._docSkeletonManagerService.getSkeleton();
     for (const range of ranges) {
-      const { startOffset, endOffset, rangeType } = range;
+      const { startOffset, endOffset, rangeType, startNodePosition, endNodePosition } = range;
       if (rangeType === DOC_RANGE_TYPE.RECT) {
-        const { startNodePosition, endNodePosition } = range, rectRange = startNodePosition && endNodePosition ? new RectRange(scene, document2, docSkeleton, startNodePosition, endNodePosition, style, segmentId, segmentPage) : getRectRangeFromCharIndex(
+        const rectRange = getRectRangeFromCharIndex(
           startOffset,
           endOffset,
           scene,
@@ -1714,15 +1712,17 @@ let DocSelectionRenderService = (_a2 = class extends RxDisposable {
         );
         rectRange && this._addRectRanges([rectRange]);
       } else if (rangeType === DOC_RANGE_TYPE.TEXT) {
-        const { startNodePosition, endNodePosition } = range, textRange = startNodePosition && endNodePosition ? new TextRange(scene, document2, docSkeleton, startNodePosition, endNodePosition, style, segmentId, segmentPage) : getTextRangeFromCharIndex(
-          startOffset,
-          endOffset,
+        const textRange = getTextRangeFromCharIndex(
+          startNodePosition != null && startNodePosition.isBack ? startOffset : startOffset - 1,
+          endNodePosition != null && endNodePosition.isBack ? endOffset : endOffset - 1,
           scene,
           document2,
           docSkeleton,
           style,
           segmentId,
-          segmentPage
+          segmentPage,
+          startNodePosition == null ? void 0 : startNodePosition.isBack,
+          endNodePosition == null ? void 0 : endNodePosition.isBack
         );
         textRange && this._addTextRange(textRange);
       } else {
@@ -1935,11 +1935,11 @@ let DocSelectionRenderService = (_a2 = class extends RxDisposable {
     }), this._scrollTimers = [];
   }
   _setSystemHighlightColorToStyle() {
-    const { r, g, b, a } = getSystemHighlightColor(), style = {
+    const { r: r2, g, b, a } = getSystemHighlightColor(), style = {
       strokeWidth: 1.5,
       stroke: "rgba(0, 0, 0, 0)",
       strokeActive: "rgba(0, 0, 0, 1)",
-      fill: `rgba(${r}, ${g}, ${b}, ${a != null ? a : 0.3})`
+      fill: `rgba(${r2}, ${g}, ${b}, ${a != null ? a : 0.3})`
     };
     this._setRangeStyle(style);
   }
@@ -3182,6 +3182,21 @@ var element = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width:
   }));
 });
 TodoList.displayName = "TodoList";
+function r(e) {
+  var t, f2, n2 = "";
+  if (typeof e == "string" || typeof e == "number") n2 += e;
+  else if (typeof e == "object") if (Array.isArray(e)) {
+    var o = e.length;
+    for (t = 0; t < o; t++) e[t] && (f2 = r(e[t])) && (n2 && (n2 += " "), n2 += f2);
+  } else for (f2 in e) e[f2] && (n2 && (n2 += " "), n2 += f2);
+  return n2;
+}
+__name(r, "r");
+function clsx() {
+  for (var e, t, f2 = 0, n2 = "", o = arguments.length; f2 < o; f2++) (e = arguments[f2]) && (t = r(e)) && (n2 && (n2 += " "), n2 += t);
+  return n2;
+}
+__name(clsx, "clsx");
 const _RangeSelectorService = class _RangeSelectorService extends Disposable {
   constructor() {
     super(...arguments);
@@ -5426,7 +5441,7 @@ const InnerPasteCommand = {
   // eslint-disable-next-line max-lines-per-function, complexity
   handler: /* @__PURE__ */ __name(async (accessor, params) => {
     var _a28, _b2, _c, _d;
-    const { segmentId, textRanges, doc } = params, commandService = accessor.get(ICommandService), docSelectionManagerService = accessor.get(DocSelectionManagerService), univerInstanceService = accessor.get(IUniverInstanceService), originSelections = docSelectionManagerService.getTextRanges(), { body, tableSource, drawings } = doc;
+    const { segmentId, textRanges, doc } = params, commandService = accessor.get(ICommandService), docSelectionManagerService = accessor.get(DocSelectionManagerService), univerInstanceService = accessor.get(IUniverInstanceService), originSelections = docSelectionManagerService.getTextRanges(), rectRanges = docSelectionManagerService.getRectRanges(), { body, tableSource, drawings } = doc;
     if (!Array.isArray(originSelections) || originSelections.length === 0 || body == null)
       return !1;
     const docDataModel = univerInstanceService.getCurrentUniverDocInstance(), originBody = docDataModel == null ? void 0 : docDataModel.getSelfOrHeaderFooterModel(segmentId).getBody();
@@ -5443,7 +5458,7 @@ const InnerPasteCommand = {
     }, memoryCursor = new MemoryCursor();
     memoryCursor.reset();
     const textX = new TextX(), jsonX = JSONX.getInstance(), rawActions = [], hasTable = !!((_a28 = body.tables) != null && _a28.length), hasCustomBlock = !!((_b2 = body.customBlocks) != null && _b2.length);
-    if (hasTable && segmentId || hasTable && hasRangeInTable(selections))
+    if (hasTable && segmentId || hasTable && hasRangeInTable(selections) || selections.length && (rectRanges != null && rectRanges.length))
       return !1;
     for (const selection of selections) {
       const { startOffset, endOffset, collapsed } = selection, len = startOffset - memoryCursor.cursor, cloneBody = Tools.deepClone(body);

package/lib/types/services/selection/selection-utils.d.ts

@@ -7,7 +7,7 @@ interface IDocRangeList {
     textRanges: TextRange[];
     rectRanges: RectRange[];
 }
-export declare function getTextRangeFromCharIndex(startOffset: number, endOffset: number, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<TextRange>;
+export declare function getTextRangeFromCharIndex(startOffset: number, endOffset: number, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number, startIsBack?: boolean, endIsBack?: boolean): Nullable<TextRange>;
 export declare function getRectRangeFromCharIndex(startOffset: number, endOffset: number, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<RectRange>;
 export declare function getRangeListFromCharIndex(startOffset: number, endOffset: number, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<IDocRangeList>;
 export declare function getRangeListFromSelection(anchorPosition: INodePosition, focusPosition: INodePosition, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<IDocRangeList>;