Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(editor): preload the editor #1662

Merged
merged 4 commits into from
Mar 23, 2024
Merged

fix(editor): preload the editor #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71b6d7c
fix(editor): preload the editor
DR-Univer Mar 22, 2024
e823dd0
Merge branch 'dev' into fix-editor-steady
DR-Univer Mar 23, 2024
758cac2
fix(editor): zen editor lazy
DR-Univer Mar 23, 2024
72d75bd
Merge branch 'dev' into fix-editor-steady
DR-Univer Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/sheets-formula/src/controllers/prompt.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ enum InputPanelState {

const sheetEditorUnitIds = [DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY];

@OnLifecycle(LifecycleStages.Steady, PromptController)
@OnLifecycle(LifecycleStages.Rendered, PromptController)
export class PromptController extends Disposable {
private _formulaRefColors: string[] = [];

Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-ui/src/controllers/editor/editing.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { IRenderManagerService } from '@univerjs/engine-render';
import { Inject } from '@wendellhu/redi';
import { takeUntil } from 'rxjs';

@OnLifecycle(LifecycleStages.Steady, EditingController)
@OnLifecycle(LifecycleStages.Rendered, EditingController)
export class EditingController extends RxDisposable {
constructor(
@IUniverInstanceService private readonly _currentUniverService: IUniverInstanceService,
Expand Down
3 changes: 1 addition & 2 deletions packages/sheets-ui/src/controllers/editor/end-edit.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ enum CursorChange {
StartEditor,
CursorChange,
}

@OnLifecycle(LifecycleStages.Steady, EndEditController)
@OnLifecycle(LifecycleStages.Rendered, EndEditController)
export class EndEditController extends Disposable {
private _cursorChangeObservers: Nullable<Observer<IPointerEvent | IMouseEvent>>;

Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-ui/src/controllers/editor/start-edit.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ interface ICanvasOffset {
top: number;
}

@OnLifecycle(LifecycleStages.Steady, StartEditController)
@OnLifecycle(LifecycleStages.Rendered, StartEditController)
export class StartEditController extends Disposable {
private _editorVisiblePrevious = false;

Expand Down
6 changes: 3 additions & 3 deletions packages/sheets-ui/src/services/editor/formula-editor-manager.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type { Nullable } from '@univerjs/core';
import type { IDisposable } from '@wendellhu/redi';
import { createIdentifier } from '@wendellhu/redi';
import type { Observable } from 'rxjs';
import { BehaviorSubject } from 'rxjs';
import { BehaviorSubject, Subject } from 'rxjs';

export interface IFormulaEditorManagerService {
position$: Observable<Nullable<DOMRect>>;
Expand All @@ -42,10 +42,10 @@ export class FormulaEditorManagerService implements IDisposable {
private readonly _focus$ = new BehaviorSubject<boolean>(this._focus);
readonly focus$ = this._focus$.asObservable();

private readonly _fxBtnClick$ = new BehaviorSubject<boolean>(false);
private readonly _fxBtnClick$ = new Subject<boolean>();
readonly fxBtnClick$ = this._fxBtnClick$.asObservable();

private readonly _foldBtnStatus$ = new BehaviorSubject<boolean>(false);
private readonly _foldBtnStatus$ = new Subject<boolean>();
readonly foldBtnStatus$ = this._foldBtnStatus$.asObservable();

dispose(): void {
Expand Down
9 changes: 8 additions & 1 deletion packages/sheets-zen-editor/src/controllers/zen-editor.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class ZenEditorController extends RxDisposable {

this._commandExecutedListener();

this._createZenEditorInstance();
// this._createZenEditorInstance();
}

private _createZenEditorInstance() {
Expand Down Expand Up @@ -142,7 +142,14 @@ export class ZenEditorController extends RxDisposable {
});
}

private _zenEditorInitialState = false;

private _handleOpenZenEditor() {
if (!this._zenEditorInitialState) {
this._createZenEditorInstance();
this._zenEditorInitialState = true;
}

this._zenZoneService.open();

// Need to clear undo/redo service when open zen mode.
Expand Down
Loading