@univerjs/docs 0.1.0-alpha.2 → 0.1.0-alpha.3

package/lib/types/commands/commands/__tests__/mock-text-selection-render-manager.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { Nullable } from '@univerjs/core';
+import type { ITextSelectionInnerParam } from '@univerjs/engine-render';
+export declare class TextSelectionRenderManager {
+    private readonly _textSelectionInner$;
+    readonly textSelectionInner$: import("rxjs").Observable<Nullable<ITextSelectionInnerParam>>;
+    removeAllTextRanges(): void;
+    addTextRanges(): void;
+}
+export declare const ITextSelectionRenderManager: import("@wendellhu/redi").IdentifierDecorator<TextSelectionRenderManager>;

package/lib/types/{basics/demo-data.d.ts → commands/commands/break-line.command.d.ts}

@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentData } from '@univerjs/core';
-export declare const DOCS_DEMO_DATA: IDocumentData;
+import type { ICommand } from '@univerjs/core';
+export declare const BreakLineCommand: ICommand;

package/lib/types/commands/commands/core-editing.command.d.ts

@@ -15,9 +15,6 @@
  */
 import type { ICommand, IDocumentBody, IDocumentData, ITextRange, UpdateDocsAttributeType } from '@univerjs/core';
 import type { ITextRangeWithStyle } from '@univerjs/engine-render';
-export declare const DeleteLeftCommand: ICommand;
-export declare const DeleteRightCommand: ICommand;
-export declare const BreakLineCommand: ICommand;
 export interface IInsertCommandParams {
     unitId: string;
     body: IDocumentBody;
@@ -26,7 +23,7 @@ export interface IInsertCommandParams {
     segmentId?: string;
 }
 /**
- * The command to insert text. The changed range could be non-collapsed.
+ * The command to insert text. The changed range could be non-collapsed, mainly use in line break and normal input.
  */
 export declare const InsertCommand: ICommand<IInsertCommandParams>;
 export declare enum DeleteDirection {
@@ -42,7 +39,7 @@ export interface IDeleteCommandParams {
     segmentId?: string;
 }
 /**
- * The command to delete text, mainly used in BACKSPACE and DELETE when collapsed is true.
+ * The command to delete text, mainly used in BACKSPACE and DELETE when collapsed is true. ONLY handle collapsed range!!!
  */
 export declare const DeleteCommand: ICommand<IDeleteCommandParams>;
 export interface IUpdateCommandParams {

package/lib/types/commands/commands/delete.command.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { ICommand } from '@univerjs/core';
+import type { IActiveTextRange } from '@univerjs/engine-render';
+import { DeleteDirection } from './core-editing.command';
+export declare const DeleteLeftCommand: ICommand;
+export declare const DeleteRightCommand: ICommand;
+interface IMergeTwoParagraphParams {
+    direction: DeleteDirection;
+    range: IActiveTextRange;
+}
+export declare const MergeTwoParagraphCommand: ICommand<IMergeTwoParagraphParams>;
+export {};

package/lib/types/commands/commands/inline-format.command.d.ts

@@ -23,6 +23,8 @@ export declare const SetInlineFormatBoldCommand: ICommand;
 export declare const SetInlineFormatItalicCommand: ICommand;
 export declare const SetInlineFormatUnderlineCommand: ICommand;
 export declare const SetInlineFormatStrikethroughCommand: ICommand;
+export declare const SetInlineFormatSubscriptCommand: ICommand;
+export declare const SetInlineFormatSuperscriptCommand: ICommand;
 export declare const SetInlineFormatFontSizeCommand: ICommand;
 export declare const SetInlineFormatFontFamilyCommand: ICommand;
 export declare const SetInlineFormatTextColorCommand: ICommand;

package/lib/types/commands/commands/list.command.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { ICommand } from '@univerjs/core';
+import { PresetListType } from '@univerjs/core';
+interface IBulletListCommandParams {
+}
+export declare const BulletListCommand: ICommand<IBulletListCommandParams>;
+interface IOrderListCommandParams {
+}
+export declare const OrderListCommand: ICommand<IOrderListCommandParams>;
+interface IListOperationCommandParams {
+    listType: PresetListType;
+}
+export declare const ListOperationCommand: ICommand<IListOperationCommandParams>;
+export {};

package/lib/types/commands/operations/text-selection.operation.d.ts

@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 import type { IOperation } from '@univerjs/core';
-import type { TextRange } from '@univerjs/engine-render';
+import type { ITextSelectionStyle, TextRange } from '@univerjs/engine-render';
 export interface ISetTextSelectionsOperationParams {
     unitId: string;
-    pluginName: string;
+    subUnitId: string;
+    segmentId: string;
+    style: ITextSelectionStyle;
     ranges: TextRange[];
 }
 export declare const SetTextSelectionsOperation: IOperation<ISetTextSelectionsOperationParams>;

package/lib/types/controllers/clipboard.controller.d.ts

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService, IContextService, ILogService, IUniverInstanceService } from '@univerjs/core';
-import { ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { IDocClipboardService } from '../services/clipboard/clipboard.service';
+import { TextSelectionManagerService } from '../services/text-selection-manager.service';
 export declare class DocClipboardController extends Disposable {
     private readonly _logService;
     private readonly _commandService;
     private readonly _currentUniverService;
     private readonly _docClipboardService;
-    private _textSelectionRenderManager;
+    private readonly _textSelectionManagerService;
     private readonly _contextService;
-    constructor(_logService: ILogService, _commandService: ICommandService, _currentUniverService: IUniverInstanceService, _docClipboardService: IDocClipboardService, _textSelectionRenderManager: ITextSelectionRenderManager, _contextService: IContextService);
+    constructor(_logService: ILogService, _commandService: ICommandService, _currentUniverService: IUniverInstanceService, _docClipboardService: IDocClipboardService, _textSelectionManagerService: TextSelectionManagerService, _contextService: IContextService);
     initialize(): void;
     private _commandExecutedListener;
     private _handlePaste;

package/lib/types/controllers/ime-input.controller.d.ts

@@ -17,13 +17,11 @@ import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/c
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { DocSkeletonManagerService } from '../services/doc-skeleton-manager.service';
 import { IMEInputManagerService } from '../services/ime-input-manager.service';
-import { TextSelectionManagerService } from '../services/text-selection-manager.service';
 export declare class IMEInputController extends Disposable {
     private readonly _docSkeletonManagerService;
     private readonly _currentUniverService;
     private readonly _renderManagerService;
     private readonly _textSelectionRenderManager;
-    private readonly _textSelectionManagerService;
     private readonly _imeInputManagerService;
     private readonly _commandService;
     private _previousIMEContent;
@@ -31,7 +29,7 @@ export declare class IMEInputController extends Disposable {
     private _onStartSubscription;
     private _onUpdateSubscription;
     private _onEndSubscription;
-    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _textSelectionManagerService: TextSelectionManagerService, _imeInputManagerService: IMEInputManagerService, _commandService: ICommandService);
+    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _imeInputManagerService: IMEInputManagerService, _commandService: ICommandService);
     dispose(): void;
     private _initialize;
     private _initialOnCompositionstart;

package/lib/types/controllers/inline-format.controller.d.ts

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { ITextSelectionRenderManager } from '@univerjs/engine-render';
+import { Disposable, ICommandService } from '@univerjs/core';
 import { TextSelectionManagerService } from '../services/text-selection-manager.service';
 /**
  * Used to manage the addition and removal of inline styles,
@@ -22,11 +21,9 @@ import { TextSelectionManagerService } from '../services/text-selection-manager.
  * some of the logic may be moved to the command, as the command is testable.
  */
 export declare class InlineFormatController extends Disposable {
-    private readonly _currentUniverService;
-    private readonly _textSelectionRenderManager;
     private readonly _textSelectionManagerService;
     private readonly _commandService;
-    constructor(_currentUniverService: IUniverInstanceService, _textSelectionRenderManager: ITextSelectionRenderManager, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService);
+    constructor(_textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService);
     private _commandExecutedListener;
     private _handleInlineFormat;
 }

package/lib/types/controllers/move-cursor.controller.d.ts

@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
+import { IRenderManagerService } from '@univerjs/engine-render';
 import { DocSkeletonManagerService } from '../services/doc-skeleton-manager.service';
 import { TextSelectionManagerService } from '../services/text-selection-manager.service';
 export declare class MoveCursorController extends Disposable {
     private readonly _docSkeletonManagerService;
     private readonly _currentUniverService;
     private readonly _renderManagerService;
-    private readonly _textSelectionRenderManager;
     private readonly _textSelectionManagerService;
     private readonly _commandService;
     private _onInputSubscription;
-    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService);
+    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService);
     dispose(): void;
     private _initialize;
     private _commandExecutedListener;

package/lib/types/controllers/normal-input.controller.d.ts

@@ -16,16 +16,14 @@
 import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
 import { DocSkeletonManagerService } from '../services/doc-skeleton-manager.service';
-import { TextSelectionManagerService } from '../services/text-selection-manager.service';
 export declare class NormalInputController extends Disposable {
     private readonly _docSkeletonManagerService;
     private readonly _currentUniverService;
     private readonly _renderManagerService;
     private readonly _textSelectionRenderManager;
-    private readonly _textSelectionManagerService;
     private readonly _commandService;
     private _onInputSubscription;
-    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _textSelectionManagerService: TextSelectionManagerService, _commandService: ICommandService);
+    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _renderManagerService: IRenderManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _commandService: ICommandService);
     dispose(): void;
     private _initialize;
     private _initialNormalInput;

package/lib/types/controllers/page-render.controller.d.ts

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Disposable } from '@univerjs/core';
+import { Disposable, IUniverInstanceService } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
 export declare class PageRenderController extends Disposable {
     private readonly _renderManagerService;
-    constructor(_renderManagerService: IRenderManagerService);
+    private readonly _currentUniverService;
+    constructor(_renderManagerService: IRenderManagerService, _currentUniverService: IUniverInstanceService);
     private _initialize;
     private _initialRenderRefresh;
     private _commandExecutedListener;

package/lib/types/controllers/text-selection.controller.d.ts

@@ -15,6 +15,7 @@
  */
 import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';
+import { LayoutService } from '@univerjs/ui';
 import { DocSkeletonManagerService } from '../services/doc-skeleton-manager.service';
 import { TextSelectionManagerService } from '../services/text-selection-manager.service';
 export declare class TextSelectionController extends Disposable {
@@ -24,19 +25,18 @@ export declare class TextSelectionController extends Disposable {
     private readonly _renderManagerService;
     private readonly _textSelectionRenderManager;
     private readonly _textSelectionManagerService;
+    private readonly _layoutService?;
     private _moveInObserver;
     private _moveOutObserver;
     private _downObserver;
     private _dblClickObserver;
     private _tripleClickObserver;
     private _loadedMap;
-    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _textSelectionManagerService: TextSelectionManagerService);
-    dispose(): void;
+    constructor(_docSkeletonManagerService: DocSkeletonManagerService, _currentUniverService: IUniverInstanceService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _textSelectionRenderManager: ITextSelectionRenderManager, _textSelectionManagerService: TextSelectionManagerService, _layoutService?: LayoutService | undefined);
     private _initialize;
+    dispose(): void;
     private _initialMain;
-    private _onChangeListener;
-    private _userActionSyncListener;
-    private _getDocObjectById;
     private _commandExecutedListener;
     private _skeletonListener;
+    private _getDocObjectById;
 }

package/lib/types/index.d.ts

@@ -15,10 +15,13 @@
  */
 export { getDocObject } from './basics/component-tools';
 export * from './basics/docs-view-key';
+export { BreakLineCommand } from './commands/commands/break-line.command';
 export { DocCopyCommand, DocCutCommand, DocPasteCommand } from './commands/commands/clipboard.command';
-export { BreakLineCommand, DeleteCommand, DeleteLeftCommand, type ICoverCommandParams, type IDeleteCommandParams, type IInsertCommandParams, InsertCommand, type IUpdateCommandParams, UpdateCommand, } from './commands/commands/core-editing.command';
+export { DeleteCommand, type ICoverCommandParams, type IDeleteCommandParams, type IInsertCommandParams, InsertCommand, type IUpdateCommandParams, UpdateCommand, } from './commands/commands/core-editing.command';
+export { DeleteLeftCommand, DeleteRightCommand } from './commands/commands/delete.command';
 export { type IIMEInputCommandParams, IMEInputCommand } from './commands/commands/ime-input.command';
-export { SetInlineFormatBoldCommand, SetInlineFormatCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand, } from './commands/commands/inline-format.command';
+export { SetInlineFormatBoldCommand, SetInlineFormatCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatSubscriptCommand, SetInlineFormatSuperscriptCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand, } from './commands/commands/inline-format.command';
+export { BulletListCommand, OrderListCommand } from './commands/commands/list.command';
 export { CoverContentCommand, ReplaceContentCommand } from './commands/commands/replace-content.command';
 export { type IRichTextEditingMutationParams, RichTextEditingMutation, } from './commands/mutations/core-editing.mutation';
 export { MoveCursorOperation, MoveSelectionOperation } from './commands/operations/cursor.operation';
@@ -27,3 +30,4 @@ export { type IUniverDocsConfig, UniverDocsPlugin } from './doc-plugin';
 export { DocSkeletonManagerService } from './services/doc-skeleton-manager.service';
 export { DocViewModelManagerService } from './services/doc-view-model-manager.service';
 export { TextSelectionManagerService } from './services/text-selection-manager.service';
+export { DocCanvasView } from './views/doc-canvas-view';

package/lib/types/services/text-selection-manager.service.d.ts

@@ -13,50 +13,52 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ISelectionCell, Nullable } from '@univerjs/core';
-import type { ITextRangeWithStyle, TextRange } from '@univerjs/engine-render';
-import type { IDisposable } from '@wendellhu/redi';
-export interface ITextSelectionManagerSearchParam {
-    pluginName: string;
+import type { Nullable } from '@univerjs/core';
+import { ICommandService, RxDisposable } from '@univerjs/core';
+import type { INodePosition, ISuccinctTextRangeParam, ITextSelectionInnerParam, ITextSelectionStyle, RANGE_DIRECTION, TextRange } from '@univerjs/engine-render';
+import { ITextSelectionRenderManager } from '@univerjs/engine-render';
+interface ITextSelectionManagerSearchParam {
     unitId: string;
+    subUnitId: string;
 }
-export interface ITextSelectionManagerInsertParam extends ITextSelectionManagerSearchParam {
-    textRanges: TextRange[];
+export interface ITextActiveRange {
+    startOffset: number;
+    endOffset: number;
+    collapsed: boolean;
+    startNodePosition: Nullable<INodePosition>;
+    endNodePosition: Nullable<INodePosition>;
+    direction: RANGE_DIRECTION;
+    segmentId: string;
+    style: ITextSelectionStyle;
+}
+interface ITextSelectionManagerInsertParam extends ITextSelectionManagerSearchParam, ITextSelectionInnerParam {
 }
-export type ITextSelectionInfo = Map<string, Map<string, TextRange[]>>;
 /**
- * This service is for selection.
+ * This service is for text selection.
  */
-export declare class TextSelectionManagerService implements IDisposable {
-    private readonly _textSelectionInfo;
+export declare class TextSelectionManagerService extends RxDisposable {
+    private _textSelectionRenderManager;
+    private readonly _commandService;
     private _currentSelection;
-    private readonly _textSelectionInfo$;
-    readonly textSelectionInfo$: import("rxjs").Observable<Nullable<ITextRangeWithStyle[]>>;
+    private readonly _textSelectionInfo;
+    private readonly _textSelection$;
+    readonly textSelection$: import("rxjs").Observable<Nullable<ITextSelectionManagerInsertParam>>;
+    constructor(_textSelectionRenderManager: ITextSelectionRenderManager, _commandService: ICommandService);
     getCurrentSelection(): Nullable<ITextSelectionManagerSearchParam>;
+    getCurrentSelectionInfo(): ITextSelectionInnerParam | undefined;
     dispose(): void;
     refreshSelection(): void;
     setCurrentSelection(param: ITextSelectionManagerSearchParam): void;
     setCurrentSelectionNotRefresh(param: ITextSelectionManagerSearchParam): void;
-    getTextSelectionInfo(): Readonly<ITextSelectionInfo>;
-    getTextRangesByParam(param: Nullable<ITextSelectionManagerSearchParam>): Readonly<Nullable<TextRange[]>>;
     getSelections(): Readonly<Nullable<TextRange[]>>;
-    getFirst(): Readonly<Nullable<TextRange>>;
-    getLast(): Readonly<Nullable<TextRange & {
-        primary: ISelectionCell;
-    }>>;
-    add(textRanges: ITextRangeWithStyle[]): void;
-    replaceTextRanges(textRanges: ITextRangeWithStyle[]): void;
-    replaceTextRangesWithNoRefresh(textRanges: TextRange[]): void;
-    private _addByParam;
-    private _clear;
-    private _remove;
-    private _reset;
-    private _resetPlugin;
+    getActiveRange(): Nullable<ITextActiveRange>;
+    add(textRanges: ISuccinctTextRangeParam[]): void;
+    replaceTextRanges(textRanges: ISuccinctTextRangeParam[]): void;
+    private _syncSelectionFromRenderService;
+    private _replaceTextRangesWithNoRefresh;
     private _getTextRanges;
     private _refresh;
-    private _getFirstByParam;
-    private _getLastByParam;
     private _replaceByParam;
-    private _clearByParam;
-    private _removeByParam;
+    private _addByParam;
 }
+export {};

package/lib/types/views/doc-canvas-view.d.ts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IConfigService, IUniverInstanceService } from '@univerjs/core';
+import { IConfigService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import type { RenderManagerService } from '@univerjs/engine-render';
 import { DocViewModelManagerService } from '../services/doc-view-model-manager.service';
-export declare class DocCanvasView {
+export declare class DocCanvasView extends RxDisposable {
     private readonly _renderManagerService;
     private readonly _configService;
     private readonly _currentUniverService;
@@ -24,8 +24,11 @@ export declare class DocCanvasView {
     private _scene;
     private _currentDocumentModel;
     private _loadedMap;
+    private readonly _fps$;
+    readonly fps$: import("rxjs").Observable<string>;
     constructor(_renderManagerService: RenderManagerService, _configService: IConfigService, _currentUniverService: IUniverInstanceService, _docViewModelManagerService: DocViewModelManagerService);
     private _initialize;
+    dispose(): void;
     private _addNewRender;
     private _addComponent;
 }