fix: better code

dream-num · Feb 15, 2025 · 8780277 · 8780277
1 parent 2d4adae
commit 8780277
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/packages/sheets-ui/src/commands/commands/set-selection.command.ts b/packages/sheets-ui/src/commands/commands/set-selection.command.ts
@@ -134,6 +134,7 @@ export const MoveSelectionCommand: ICommand<IMoveSelectionCommandParams> = {
             selections,
             type: SelectionMoveType.MOVE_END,
             extra,
+            reveal: true,
         } as ISetSelectionsOperationParams);
         return rs;
     },
@@ -304,6 +305,7 @@ export const MoveSelectionEnterAndTabCommand: ICommand<IMoveSelectionEnterAndTab
             subUnitId: sheetId,
             type: SelectionMoveType.MOVE_END,
             selections,
+            reveal: true,
             extra: params.extra,
         });
         const renderManagerService = accessor.get(IRenderManagerService);
@@ -445,7 +447,7 @@ export const SelectAllCommand: ICommand<ISelectAllCommandParams> = {
         return accessor.get(ICommandService).executeCommand(SetSelectionsOperation.id, {
             unitId,
             subUnitId,
-
+            reveal: true,
             selections: [
                 {
                     range: destRange,

diff --git a/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.ts
@@ -16,7 +16,7 @@
 
 import type { IFreeze, IRange, IWorksheetData, Nullable, Workbook } from '@univerjs/core';
 import type { IRenderContext, IRenderModule, IScrollObserverParam, IWheelEvent } from '@univerjs/engine-render';
-import type { SheetsSelectionsService } from '@univerjs/sheets';
+import type { ISetSelectionsOperationParams, SheetsSelectionsService } from '@univerjs/sheets';
 import type { IScrollCommandParams } from '../../commands/commands/set-scroll.command';
 import type { IExpandSelectionCommandParams } from '../../commands/commands/set-selection.command';
 import type { IScrollState, IScrollStateSearchParam, IViewportScrollState } from '../../services/scroll-manager.service';
@@ -332,14 +332,14 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
 
     private _initCommandListener(): void {
         this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
-            if (command.params?.unitId !== this._context.unitId) {
-                return;
-            }
-
             switch (command.id) {
-                case MoveSelectionEnterAndTabCommand.id:
                 case SetSelectionsOperation.id:
-                    this._scrollToSelection();
+                    {
+                        const p = command.params as ISetSelectionsOperationParams;
+                        if (p.unitId === this._context.unitId && p.reveal) {
+                            this._scrollToSelection();
+                        }
+                    }
                     break;
 
                 case ScrollToCellOperation.id:
@@ -561,7 +561,6 @@ export class SheetsScrollRenderController extends Disposable implements IRenderM
             endRow: viewMainEndRow,
             endColumn: viewMainEndColumn,
         } = bounds;
-        // const visibleRangeOfViewMain = skeleton.getVisibleRangeByViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
 
         // why undefined?
         let startSheetViewRow: number | undefined;