@univerjs/sheets-ui 0.6.0-nightly.202502111606 → 0.6.0-nightly.202502121606

package/lib/es/facade.js

@@ -1,7 +1,7 @@
-import { FUniver as te, ICommandService as P, CanceledError as j, IUniverInstanceService as A, RichTextValue as O, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as W, LifecycleService as F, DisposableCollection as y, LifecycleStages as L, UniverInstanceType as ce, ILogService as D, toDisposable as E, awaitTime as de, InterceptorEffectEnum as he, FEventName as re, generateRandomId as le } from "@univerjs/core";
+import { FUniver as te, ICommandService as P, CanceledError as j, IUniverInstanceService as A, RichTextValue as O, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as W, LifecycleService as L, DisposableCollection as y, LifecycleStages as F, UniverInstanceType as ce, ILogService as D, toDisposable as b, awaitTime as de, InterceptorEffectEnum as he, FEventName as re, generateRandomId as le } from "@univerjs/core";
 import { RichTextEditingMutation as ge } from "@univerjs/docs";
 import { IRenderManagerService as m, DeviceInputEventType as N, SHEET_VIEWPORT_KEY as ue, sheetContentViewportKeys as ve } from "@univerjs/engine-render";
-import { SheetsSelectionsService as Se, COMMAND_LISTENER_SKELETON_CHANGE as Ce, getSkeletonChangedEffectedRange as me, SheetInterceptorService as Ee, INTERCEPTOR_POINT as be, InterceptCellContentPriority as pe } from "@univerjs/sheets";
+import { SheetsSelectionsService as Se, COMMAND_LISTENER_SKELETON_CHANGE as Ce, getSkeletonChangedEffectedRange as me, SheetInterceptorService as be, INTERCEPTOR_POINT as Ee, InterceptCellContentPriority as pe } from "@univerjs/sheets";
 import { SetCellEditVisibleOperation as k, IEditorBridgeService as H, SetZoomRatioCommand as z, HoverManagerService as w, DragManagerService as U, SheetScrollManagerService as T, SheetPasteShortKeyCommand as V, ISheetClipboardService as ne, SheetSkeletonManagerService as R, SHEET_VIEW_KEY as f, ISheetSelectionRenderService as x, ChangeZoomRatioCommand as we, SheetsScrollRenderController as fe, SetWorksheetColAutoWidthCommand as ke, SetColumnHeaderHeightCommand as Ie, SetRowHeaderWidthCommand as _e, SheetCanvasPopManagerService as Z, CellAlertManagerService as Pe, IMarkSelectionService as Re } from "@univerjs/sheets-ui";
 import { FSheetHooks as $, FWorkbook as ie, FWorksheet as oe, FPermission as se, FRange as ae } from "@univerjs/sheets/facade";
 import { KeyCode as B, CutCommand as K, CopyCommand as Y, PasteCommand as X, IClipboardInterfaceService as He, PLAIN_TEXT_CLIPBOARD_MIME_TYPE as J, HTML_CLIPBOARD_MIME_TYPE as G, supportClipboardAPI as q, ISidebarService as Me, IDialogService as ye, ComponentManager as Q } from "@univerjs/ui";
@@ -144,16 +144,13 @@ class xe extends te {
       })
     );
   }
-  /**
-   * @ignore
-   */
   // eslint-disable-next-line max-lines-per-function
   _initObserverListener(e) {
     const t = e.get(A).getFocusedUnit(), n = t == null ? void 0 : t.getUnitId(), o = e.get(m);
     if (n) {
-      const l = e.get(F), C = new y();
+      const l = e.get(L), C = new y();
       this.disposeWithMe(l.lifecycle$.subscribe((v) => {
-        if (v < L.Rendered) return;
+        if (v < F.Rendered) return;
         C.dispose();
         const h = e.get(w), I = e.get(U);
         h && (this.registerEventHandler(
@@ -355,13 +352,13 @@ class xe extends te {
     }
     const s = /* @__PURE__ */ new Map();
     let c;
-    const g = e.get(F), u = Ue([
+    const g = e.get(L), u = Ue([
       o.created$,
       g.lifecycle$
     ]);
     this.disposeWithMe(u.subscribe(([l, C]) => {
       var i;
-      if (l.type === ce.UNIVER_SHEET && (c = l), C <= L.Rendered) return;
+      if (l.type === ce.UNIVER_SHEET && (c = l), C <= F.Rendered) return;
       const v = new y();
       if (!c) return;
       const h = this.getWorkbook(c.unitId);
@@ -380,41 +377,41 @@ class xe extends te {
       )), v.add(this.registerEventHandler(
         this.Event.SelectionMoveStart,
         () => d.selectionMoveStart$.subscribe((a) => {
-          var b;
+          var E;
           this.fireEvent(this.Event.SelectionMoveStart, {
             workbook: h,
             worksheet: h.getActiveSheet(),
-            selections: (b = a == null ? void 0 : a.map((_) => _.range)) != null ? b : []
+            selections: (E = a == null ? void 0 : a.map((_) => _.range)) != null ? E : []
           });
         })
       )), v.add(this.registerEventHandler(
         this.Event.SelectionMoving,
         () => d.selectionMoving$.subscribe((a) => {
-          var b;
+          var E;
           this.fireEvent(this.Event.SelectionMoving, {
             workbook: h,
             worksheet: h.getActiveSheet(),
-            selections: (b = a == null ? void 0 : a.map((_) => _.range)) != null ? b : []
+            selections: (E = a == null ? void 0 : a.map((_) => _.range)) != null ? E : []
           });
         })
       )), v.add(this.registerEventHandler(
         this.Event.SelectionMoveEnd,
         () => d.selectionMoveEnd$.subscribe((a) => {
-          var b;
+          var E;
           this.fireEvent(this.Event.SelectionMoveEnd, {
             workbook: h,
             worksheet: h.getActiveSheet(),
-            selections: (b = a == null ? void 0 : a.map((_) => _.range)) != null ? b : []
+            selections: (E = a == null ? void 0 : a.map((_) => _.range)) != null ? E : []
           });
         })
       )), v.add(this.registerEventHandler(
         this.Event.SelectionChanged,
         () => d.selectionChanged$.subscribe((a) => {
-          var b;
+          var E;
           this.fireEvent(this.Event.SelectionChanged, {
             workbook: h,
             worksheet: h.getActiveSheet(),
-            selections: (b = a == null ? void 0 : a.map((_) => _.range)) != null ? b : []
+            selections: (E = a == null ? void 0 : a.map((_) => _.range)) != null ? E : []
           });
         })
       )), c = null, this.disposeWithMe(v);
@@ -432,7 +429,7 @@ class xe extends te {
    */
   // eslint-disable-next-line max-lines-per-function
   _initialize(e) {
-    this._initSheetUIEvent(e);
+    this._initSheetUIEvent(e), this._initObserverListener(e);
     const r = e.get(P);
     this.registerEventHandler(
       this.Event.BeforeClipboardChange,
@@ -473,7 +470,7 @@ class xe extends te {
       if (Ce.indexOf(t.id) > -1) {
         const n = this.getActiveSheet();
         if (!n) return;
-        const o = me(t).map((s) => {
+        const o = me(t, n.worksheet.getMaxColumns()).map((s) => {
           var c, g;
           return (g = (c = this.getWorkbook(s.unitId)) == null ? void 0 : c.getSheetBySheetId(s.subUnitId)) == null ? void 0 : g.getRange(s.range);
         }).filter(Boolean);
@@ -614,19 +611,19 @@ class xe extends te {
   }
   registerSheetRowHeaderExtension(e, ...r) {
     const t = this._getSheetRenderComponent(e, f.ROW), n = t.register(...r);
-    return E(() => {
+    return b(() => {
       n.dispose(), t.makeDirty(!0);
     });
   }
   registerSheetColumnHeaderExtension(e, ...r) {
     const t = this._getSheetRenderComponent(e, f.COLUMN), n = t.register(...r);
-    return E(() => {
+    return b(() => {
       n.dispose(), t.makeDirty(!0);
     });
   }
   registerSheetMainExtension(e, ...r) {
     const t = this._getSheetRenderComponent(e, f.MAIN), n = t.register(...r);
-    return E(() => {
+    return b(() => {
       n.dispose(), t.makeDirty(!0);
     });
   }
@@ -683,7 +680,7 @@ class De extends ie {
   }
   onCellClick(e) {
     const r = this._injector.get(w);
-    return E(
+    return b(
       r.currentClickedCell$.pipe(S((t) => !!t)).subscribe((t) => {
         e(t);
       })
@@ -691,25 +688,25 @@ class De extends ie {
   }
   onCellHover(e) {
     const r = this._injector.get(w);
-    return E(
+    return b(
       r.currentRichText$.pipe(S((t) => !!t)).subscribe(e)
     );
   }
   onCellPointerDown(e) {
     const r = this._injector.get(w);
-    return E(
+    return b(
       r.currentPointerDownCell$.subscribe(e)
     );
   }
   onCellPointerUp(e) {
     const r = this._injector.get(w);
-    return E(
+    return b(
       r.currentPointerUpCell$.subscribe(e)
     );
   }
   onCellPointerMove(e) {
     const r = this._injector.get(w);
-    return E(
+    return b(
       r.currentCellPosWithEvent$.pipe(S((t) => !!t)).subscribe((t) => {
         e(t, t.event);
       })
@@ -717,7 +714,7 @@ class De extends ie {
   }
   onDragOver(e) {
     const r = this._injector.get(U);
-    return E(
+    return b(
       r.currentCell$.pipe(S((t) => !!t)).subscribe((t) => {
         e(t);
       })
@@ -725,7 +722,7 @@ class De extends ie {
   }
   onDrop(e) {
     const r = this._injector.get(U);
-    return E(
+    return b(
       r.endCell$.pipe(S((t) => !!t)).subscribe((t) => {
         e(t);
       })
@@ -839,9 +836,9 @@ class Te extends oe {
       const s = n.validViewportScrollInfo$.subscribe((c) => {
         e(c);
       });
-      return E(s);
+      return b(s);
     }
-    return E(() => {
+    return b(() => {
     });
   }
   getSkeleton() {
@@ -919,19 +916,19 @@ class Be extends se {
 se.extend(Be);
 class Ae extends $ {
   onCellPointerMove(e) {
-    return E(this._injector.get(w).currentPosition$.subscribe(e));
+    return b(this._injector.get(w).currentPosition$.subscribe(e));
   }
   onCellPointerOver(e) {
-    return E(this._injector.get(w).currentCell$.subscribe(e));
+    return b(this._injector.get(w).currentCell$.subscribe(e));
   }
   onCellDragOver(e) {
-    return E(this._injector.get(U).currentCell$.subscribe(e));
+    return b(this._injector.get(U).currentCell$.subscribe(e));
   }
   onCellDrop(e) {
-    return E(this._injector.get(U).endCell$.subscribe(e));
+    return b(this._injector.get(U).endCell$.subscribe(e));
   }
   onCellRender(e, r = he.Style, t = pe.DATA_VALIDATION) {
-    return this._injector.get(Ee).intercept(be.CELL_CONTENT, {
+    return this._injector.get(be).intercept(Ee.CELL_CONTENT, {
       effect: r,
       handler: (n, o, s) => s({
         ...n,
@@ -1142,7 +1139,7 @@ class $e extends ae {
     const t = this._injector.get(Re), n = t.addShape({ range: this._range, style: e, primary: r });
     if (!n)
       throw new Error("Failed to highlight current range");
-    return E(() => {
+    return b(() => {
       t.removeShape(n);
     });
   }