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

package/lib/es/facade.js

@@ -1,11 +1,12 @@
-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 { 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 T, toDisposable as b, awaitTime as de, InterceptorEffectEnum as he, generateRandomId as le } from "@univerjs/core";
+import { FUniver as te, FEventName as re } from "@univerjs/core/facade";
 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 { 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 { SheetsSelectionsService as Ce, COMMAND_LISTENER_SKELETON_CHANGE as Se, getSkeletonChangedEffectedRange as me, InterceptCellContentPriority as be, SheetInterceptorService as Ee, INTERCEPTOR_POINT as pe } from "@univerjs/sheets";
+import { SetCellEditVisibleOperation as k, IEditorBridgeService as H, SetZoomRatioCommand as z, HoverManagerService as w, DragManagerService as U, SheetScrollManagerService as D, 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";
-import { filter as S, combineLatest as Ue } from "rxjs";
+import { filter as C, combineLatest as Ue } from "rxjs";
 class xe extends te {
   // eslint-disable-next-line max-lines-per-function
   _initSheetUIEvent(e) {
@@ -16,12 +17,12 @@ class xe extends te {
         if (t.id !== k.id) return;
         const n = this.getActiveSheet();
         if (!n) return;
-        const { workbook: o, worksheet: s } = n, c = e.get(H), g = t.params, { visible: u, keycode: l, eventType: C } = g, v = c.getEditLocation();
+        const { workbook: o, worksheet: s } = n, c = e.get(H), g = t.params, { visible: u, keycode: l, eventType: S } = g, v = c.getEditLocation();
         if (u) {
           const h = {
             row: v.row,
             column: v.column,
-            eventType: C,
+            eventType: S,
             keycode: l,
             workbook: o,
             worksheet: s,
@@ -37,18 +38,18 @@ class xe extends te {
         if (t.id !== k.id) return;
         const n = this.getActiveSheet();
         if (!n) return;
-        const { workbook: o, worksheet: s } = n, c = e.get(H), g = e.get(A), u = t.params, { visible: l, keycode: C, eventType: v } = u, h = c.getEditLocation();
+        const { workbook: o, worksheet: s } = n, c = e.get(H), g = e.get(A), u = t.params, { visible: l, keycode: S, eventType: v } = u, h = c.getEditLocation();
         if (!l) {
           const I = {
             row: h.row,
             column: h.column,
             eventType: v,
-            keycode: C,
+            keycode: S,
             workbook: o,
             worksheet: s,
             isZenEditor: !1,
             value: O.create(g.getUnit(W).getSnapshot()),
-            isConfirm: C !== B.ESC
+            isConfirm: S !== B.ESC
           };
           if (this.fireEvent(this.Event.BeforeSheetEditEnd, I), I.cancel)
             throw new j();
@@ -60,12 +61,12 @@ class xe extends te {
         if (t.id !== k.id) return;
         const n = this.getCommandSheetTarget(t);
         if (!n) return;
-        const { workbook: o, worksheet: s } = n, c = e.get(H), g = t.params, { visible: u, keycode: l, eventType: C } = g, v = c.getEditLocation();
+        const { workbook: o, worksheet: s } = n, c = e.get(H), g = t.params, { visible: u, keycode: l, eventType: S } = g, v = c.getEditLocation();
         if (u) {
           const h = {
             row: v.row,
             column: v.column,
-            eventType: C,
+            eventType: S,
             keycode: l,
             workbook: o,
             worksheet: s,
@@ -80,12 +81,12 @@ class xe extends te {
         if (t.id !== k.id) return;
         const n = this.getCommandSheetTarget(t);
         if (!n) return;
-        const { workbook: o, worksheet: s } = n, c = e.get(H), g = t.params, { visible: u, keycode: l, eventType: C } = g, v = c.getEditLocation();
+        const { workbook: o, worksheet: s } = n, c = e.get(H), g = t.params, { visible: u, keycode: l, eventType: S } = g, v = c.getEditLocation();
         if (!u) {
           const h = {
             row: v.row,
             column: v.column,
-            eventType: C,
+            eventType: S,
             keycode: l,
             workbook: o,
             worksheet: s,
@@ -105,10 +106,10 @@ class xe extends te {
         if (!c.isVisible().visible) return;
         const { unitId: l } = u;
         if (l === W) {
-          const { row: C, column: v } = c.getEditLocation(), h = {
+          const { row: S, column: v } = c.getEditLocation(), h = {
             workbook: o,
             worksheet: s,
-            row: C,
+            row: S,
             column: v,
             value: O.create(g.getUnit(W).getSnapshot()),
             isZenEditor: !1
@@ -144,23 +145,20 @@ 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), S = new y();
       this.disposeWithMe(l.lifecycle$.subscribe((v) => {
-        if (v < L.Rendered) return;
-        C.dispose();
+        if (v < F.Rendered) return;
+        S.dispose();
         const h = e.get(w), I = e.get(U);
         h && (this.registerEventHandler(
           this.Event.CellClicked,
           () => {
             var d;
-            return (d = h.currentClickedCell$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentClickedCell$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.location.unitId, i.location.subUnitId);
               a && this.fireEvent(this.Event.CellClicked, {
                 ...a,
@@ -174,7 +172,7 @@ class xe extends te {
           this.Event.CellHover,
           () => {
             var d;
-            return (d = h.currentRichText$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentRichText$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.CellHover, {
                 ...a,
@@ -188,7 +186,7 @@ class xe extends te {
           this.Event.CellPointerDown,
           () => {
             var d;
-            return (d = h.currentPointerDownCell$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentPointerDownCell$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.CellPointerDown, {
                 ...a,
@@ -202,7 +200,7 @@ class xe extends te {
           this.Event.CellPointerUp,
           () => {
             var d;
-            return (d = h.currentPointerUpCell$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentPointerUpCell$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.CellPointerUp, {
                 ...a,
@@ -216,7 +214,7 @@ class xe extends te {
           this.Event.CellPointerMove,
           () => {
             var d;
-            return (d = h.currentCellPosWithEvent$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentCellPosWithEvent$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.CellPointerMove, {
                 ...a,
@@ -230,7 +228,7 @@ class xe extends te {
           this.Event.DragOver,
           () => {
             var d;
-            return (d = I.currentCell$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = I.currentCell$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.location.unitId, i.location.subUnitId);
               a && this.fireEvent(this.Event.DragOver, {
                 ...a,
@@ -244,7 +242,7 @@ class xe extends te {
           this.Event.Drop,
           () => {
             var d;
-            return (d = I.endCell$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = I.endCell$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.location.unitId, i.location.subUnitId);
               a && this.fireEvent(this.Event.Drop, {
                 ...a,
@@ -258,7 +256,7 @@ class xe extends te {
           this.Event.RowHeaderClick,
           () => {
             var d;
-            return (d = h.currentRowHeaderClick$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentRowHeaderClick$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.RowHeaderClick, {
                 ...a,
@@ -270,7 +268,7 @@ class xe extends te {
           this.Event.RowHeaderPointerDown,
           () => {
             var d;
-            return (d = h.currentRowHeaderPointerDown$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentRowHeaderPointerDown$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.RowHeaderPointerDown, {
                 ...a,
@@ -282,7 +280,7 @@ class xe extends te {
           this.Event.RowHeaderPointerUp,
           () => {
             var d;
-            return (d = h.currentRowHeaderPointerUp$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentRowHeaderPointerUp$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.RowHeaderPointerUp, {
                 ...a,
@@ -294,7 +292,7 @@ class xe extends te {
           this.Event.RowHeaderHover,
           () => {
             var d;
-            return (d = h.currentHoveredRowHeader$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentHoveredRowHeader$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.RowHeaderHover, {
                 ...a,
@@ -306,7 +304,7 @@ class xe extends te {
           this.Event.ColumnHeaderClick,
           () => {
             var d;
-            return (d = h.currentColHeaderClick$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentColHeaderClick$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.ColumnHeaderClick, {
                 ...a,
@@ -318,7 +316,7 @@ class xe extends te {
           this.Event.ColumnHeaderPointerDown,
           () => {
             var d;
-            return (d = h.currentColHeaderPointerDown$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentColHeaderPointerDown$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.ColumnHeaderPointerDown, {
                 ...a,
@@ -330,7 +328,7 @@ class xe extends te {
           this.Event.ColumnHeaderPointerUp,
           () => {
             var d;
-            return (d = h.currentColHeaderPointerUp$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentColHeaderPointerUp$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.ColumnHeaderPointerUp, {
                 ...a,
@@ -342,7 +340,7 @@ class xe extends te {
           this.Event.ColumnHeaderHover,
           () => {
             var d;
-            return (d = h.currentHoveredColHeader$) == null ? void 0 : d.pipe(S((i) => !!i)).subscribe((i) => {
+            return (d = h.currentHoveredColHeader$) == null ? void 0 : d.pipe(C((i) => !!i)).subscribe((i) => {
               const a = this.getSheetTarget(i.unitId, i.subUnitId);
               a && this.fireEvent(this.Event.ColumnHeaderHover, {
                 ...a,
@@ -351,23 +349,23 @@ class xe extends te {
             });
           }
         ));
-      })), this.disposeWithMe(C);
+      })), this.disposeWithMe(S);
     }
     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]) => {
+    this.disposeWithMe(u.subscribe(([l, S]) => {
       var i;
-      if (l.type === ce.UNIVER_SHEET && (c = l), C <= L.Rendered) return;
+      if (l.type === ce.UNIVER_SHEET && (c = l), S <= F.Rendered) return;
       const v = new y();
       if (!c) return;
       const h = this.getWorkbook(c.unitId);
       if (!h) return;
       s.get(c.unitId) && ((i = s.get(c.unitId)) == null || i.dispose()), s.set(c.unitId, v);
-      const I = c.with(T), d = c.with(Se);
+      const I = c.with(D), d = c.with(Ce);
       v.add(this.registerEventHandler(
         this.Event.Scroll,
         () => I.validViewportScrollInfo$.subscribe((a) => {
@@ -380,47 +378,47 @@ 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);
     })), this.disposeWithMe(o.disposed$.subscribe((l) => {
-      var C;
-      (C = s.get(l)) == null || C.dispose(), s.delete(l);
+      var S;
+      (S = s.get(l)) == null || S.dispose(), s.delete(l);
     })), this.disposeWithMe(() => {
       s.forEach((l) => {
         l.dispose();
@@ -432,7 +430,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,
@@ -470,10 +468,10 @@ class xe extends te {
         ), t;
       }
     ), this.disposeWithMe(r.onCommandExecuted((t) => {
-      if (Ce.indexOf(t.id) > -1) {
+      if (Se.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);
@@ -577,7 +575,7 @@ class xe extends te {
   }
   async _beforeClipboardPasteAsync() {
     if (!q()) {
-      this._injector.get(D).warn("[Facade]: The navigator object only supports the browser environment");
+      this._injector.get(T).warn("[Facade]: The navigator object only supports the browser environment");
       return;
     }
     const e = await this._generateClipboardPasteParamAsync();
@@ -586,7 +584,7 @@ class xe extends te {
   }
   async _clipboardPasteAsync() {
     if (!q()) {
-      this._injector.get(D).warn("[Facade]: The navigator object only supports the browser environment");
+      this._injector.get(T).warn("[Facade]: The navigator object only supports the browser environment");
       return;
     }
     const e = await this._generateClipboardPasteParamAsync();
@@ -614,19 +612,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);
     });
   }
@@ -655,7 +653,7 @@ class xe extends te {
   }
 }
 te.extend(xe);
-class De extends ie {
+class Te extends ie {
   openSiderbar(e) {
     return this._logDeprecation("openSiderbar"), this._injector.get(Me).open(e);
   }
@@ -670,7 +668,7 @@ class De extends ie {
     return t;
   }
   _logDeprecation(e) {
-    this._injector.get(D).warn("[FWorkbook]", `${e} is deprecated. Please use the function of the same name on "FUniver".`);
+    this._injector.get(T).warn("[FWorkbook]", `${e} is deprecated. Please use the function of the same name on "FUniver".`);
   }
   generateCellParams(e) {
     const r = this.getActiveSheet();
@@ -683,50 +681,50 @@ class De extends ie {
   }
   onCellClick(e) {
     const r = this._injector.get(w);
-    return E(
-      r.currentClickedCell$.pipe(S((t) => !!t)).subscribe((t) => {
+    return b(
+      r.currentClickedCell$.pipe(C((t) => !!t)).subscribe((t) => {
         e(t);
       })
     );
   }
   onCellHover(e) {
     const r = this._injector.get(w);
-    return E(
-      r.currentRichText$.pipe(S((t) => !!t)).subscribe(e)
+    return b(
+      r.currentRichText$.pipe(C((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(
-      r.currentCellPosWithEvent$.pipe(S((t) => !!t)).subscribe((t) => {
+    return b(
+      r.currentCellPosWithEvent$.pipe(C((t) => !!t)).subscribe((t) => {
         e(t, t.event);
       })
     );
   }
   onDragOver(e) {
     const r = this._injector.get(U);
-    return E(
-      r.currentCell$.pipe(S((t) => !!t)).subscribe((t) => {
+    return b(
+      r.currentCell$.pipe(C((t) => !!t)).subscribe((t) => {
         e(t);
       })
     );
   }
   onDrop(e) {
     const r = this._injector.get(U);
-    return E(
-      r.endCell$.pipe(S((t) => !!t)).subscribe((t) => {
+    return b(
+      r.endCell$.pipe(C((t) => !!t)).subscribe((t) => {
         e(t);
       })
     );
@@ -760,7 +758,7 @@ class De extends ie {
    */
   getScrollStateBySheetId(e) {
     const r = this._workbook.getUnitId(), n = this._injector.get(m).getRenderById(r);
-    return n ? n.with(T).getScrollStateByParam({ unitId: r, sheetId: e }) : null;
+    return n ? n.with(D).getScrollStateByParam({ unitId: r, sheetId: e }) : null;
   }
   disableSelection() {
     const e = this._workbook.getUnitId(), t = this._injector.get(m).getRenderById(e);
@@ -779,8 +777,8 @@ class De extends ie {
     return t && t.with(x).showSelection(), this;
   }
 }
-ie.extend(De);
-class Te extends oe {
+ie.extend(Te);
+class De extends oe {
   refreshCanvas() {
     const e = this._injector.get(m), r = this._fWorkbook.id, t = e.getRenderById(r);
     if (!t)
@@ -830,18 +828,18 @@ class Te extends oe {
       sheetViewStartColumn: 0,
       sheetViewStartRow: 0
     }, r = this._workbook.getUnitId(), t = this._worksheet.getSheetId(), o = this._injector.get(m).getRenderById(r);
-    return o && o.with(T).getScrollStateByParam({ unitId: r, sheetId: t }) || e;
+    return o && o.with(D).getScrollStateByParam({ unitId: r, sheetId: t }) || e;
   }
   onScroll(e) {
     var o;
-    const r = this._workbook.getUnitId(), n = (o = this._injector.get(m).getRenderById(r)) == null ? void 0 : o.with(T);
+    const r = this._workbook.getUnitId(), n = (o = this._injector.get(m).getRenderById(r)) == null ? void 0 : o.with(D);
     if (n) {
       const s = n.validViewportScrollInfo$.subscribe((c) => {
         e(c);
       });
-      return E(s);
+      return b(s);
     }
-    return E(() => {
+    return b(() => {
     });
   }
   getSkeleton() {
@@ -910,7 +908,7 @@ class Te extends oe {
     return s;
   }
 }
-oe.extend(Te);
+oe.extend(De);
 class Be extends se {
   setPermissionDialogVisible(e) {
     this._permissionService.setShowComponents(e);
@@ -919,19 +917,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, {
+  onCellRender(e, r = he.Style, t = be.DATA_VALIDATION) {
+    return this._injector.get(Ee).intercept(pe.CELL_CONTENT, {
       effect: r,
       handler: (n, o, s) => s({
         ...n,
@@ -962,14 +960,7 @@ const M = {
   CellPointerDown: "CellPointerDown",
   CellPointerUp: "CellPointerUp",
   CellPointerMove: "CellPointerMove",
-  CellHover: "CellHover",
-  DragOver: "DragOver",
-  Drop: "Drop",
-  Scroll: "Scroll",
-  SelectionMoveStart: "SelectionMoveStart",
-  SelectionMoving: "SelectionMoving",
-  SelectionMoveEnd: "SelectionMoveEnd",
-  SelectionChanged: "SelectionChanged"
+  CellHover: "CellHover"
 };
 class We extends re {
   get BeforeClipboardChange() {
@@ -1067,7 +1058,7 @@ re.extend(We);
 class $e extends ae {
   getCell() {
     var c;
-    const e = this._injector.get(m), r = this._injector.get(D), t = this._workbook.getUnitId(), n = this._worksheet.getSheetId(), o = e.getRenderById(t), s = (c = o == null ? void 0 : o.with(R).getSkeletonParam(n)) == null ? void 0 : c.skeleton;
+    const e = this._injector.get(m), r = this._injector.get(T), t = this._workbook.getUnitId(), n = this._worksheet.getSheetId(), o = e.getRenderById(t), s = (c = o == null ? void 0 : o.with(R).getSkeletonParam(n)) == null ? void 0 : c.skeleton;
     if (!s)
       throw r.error("[Facade]: `FRange.getCell` can only be called in current worksheet"), new Error("`FRange.getCell` can only be called in current worksheet");
     return s.getCellWithCoordByIndex(this._range.startRow, this._range.startColumn);
@@ -1142,7 +1133,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);
     });
   }