refactor(sheets-ui): cell-editor & formula-editor

packages/core/src/docs/data-model/document-data-model.ts

@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-import { BehaviorSubject } from 'rxjs';
-import { UnitModel, UniverInstanceType } from '../../common/unit';
-import { Tools } from '../../shared/tools';
-import { getEmptySnapshot } from './empty-snapshot';
-import { JSONX } from './json-x/json-x';
-import { PRESET_LIST_TYPE } from './preset-list-type';
-import { getBodySlice, SliceBodyType } from './text-x/utils';
 import type { Nullable } from '../../shared';
 import type {
     IDocumentBody,
@@ -32,6 +25,13 @@ import type {
 } from '../../types/interfaces/i-document-data';
 import type { IPaddingData } from '../../types/interfaces/i-style-data';
 import type { JSONXActions } from './json-x/json-x';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { UnitModel, UniverInstanceType } from '../../common/unit';
+import { Tools } from '../../shared/tools';
+import { getEmptySnapshot } from './empty-snapshot';
+import { JSONX } from './json-x/json-x';
+import { PRESET_LIST_TYPE } from './preset-list-type';
+import { getBodySlice, SliceBodyType } from './text-x/utils';
 
 export const DEFAULT_DOC = {
     id: 'default_doc',
@@ -228,6 +228,7 @@ export class DocumentDataModel extends DocumentDataModelSimple {
     headerModelMap: Map<string, DocumentDataModel> = new Map();
 
     footerModelMap: Map<string, DocumentDataModel> = new Map();
+    change$ = new Subject<number>();
 
     constructor(snapshot: Partial<IDocumentData>) {
         super(Tools.isEmptyObject(snapshot) ? getEmptySnapshot() : snapshot);
@@ -281,6 +282,7 @@ export class DocumentDataModel extends DocumentDataModelSimple {
 
         this.snapshot = { ...DEFAULT_DOC, ...snapshot };
         this._initializeHeaderFooterModel();
+        this.change$.next(Date.now());
     }
 
     getSelfOrHeaderFooterModel(segmentId?: string) {
@@ -315,6 +317,7 @@ export class DocumentDataModel extends DocumentDataModelSimple {
             this._initializeHeaderFooterModel();
         }
 
+        this.change$.next(Date.now());
         return this.snapshot;
     }
 

packages/core/src/docs/data-model/text-x/build-utils/index.ts

@@ -20,7 +20,7 @@ import { addDrawing } from './drawings';
 import { changeParagraphBulletNestLevel, setParagraphBullet, switchParagraphBullet, toggleChecklistParagraph } from './paragraph';
 import { fromPlainText, getPlainText, isEmptyDocument } from './parse';
 import { isSegmentIntersects, makeSelection, normalizeSelection } from './selection';
-import { addCustomRangeTextX, deleteCustomRangeTextX, deleteSelectionTextX, replaceSelectionTextX } from './text-x-utils';
+import { addCustomRangeTextX, deleteCustomRangeTextX, deleteSelectionTextX, replaceSelectionTextRuns, replaceSelectionTextX } from './text-x-utils';
 
 export class BuildTextUtils {
     static customRange = {
@@ -41,6 +41,7 @@ export class BuildTextUtils {
         makeSelection,
         normalizeSelection,
         delete: deleteSelectionTextX,
+        replaceTextRuns: replaceSelectionTextRuns,
     };
 
     static range = {

packages/core/src/docs/data-model/text-x/build-utils/text-x-utils.ts

@@ -16,15 +16,15 @@
 
 import type { IAccessor } from '@wendellhu/redi';
 import type { ITextRange, ITextRangeParam } from '../../../../sheets/typedef';
-import type { CustomRangeType, IDocumentBody } from '../../../../types/interfaces';
+import type { CustomRangeType, IDocumentBody, ITextRun } from '../../../../types/interfaces';
 import type { DocumentDataModel } from '../../document-data-model';
 import type { TextXAction } from '../action-types';
 import type { TextXSelection } from '../text-x';
 import { type Nullable, UpdateDocsAttributeType } from '../../../../shared';
 import { textDiff } from '../../../../shared/text-diff';
 import { TextXActionType } from '../action-types';
 import { TextX } from '../text-x';
-import { getBodySlice } from '../utils';
+import { getBodySlice, getTextRunSlice } from '../utils';
 import { excludePointsFromRange, getIntersectingCustomRanges, getSelectionForAddCustomRange } from './custom-range';
 
 export interface IDeleteCustomRangeParam {
@@ -301,3 +301,73 @@ export const replaceSelectionTextX = (params: IReplaceSelectionTextXParams) => {
     textX.push(...actions);
     return textX;
 };
+
+function isTextRunsEqual(textRuns: ITextRun[] | undefined, oldTextRuns: ITextRun[] | undefined) {
+    if (textRuns?.length === oldTextRuns?.length && textRuns?.every((textRun, index) => JSON.stringify(textRun) === JSON.stringify(oldTextRuns?.[index]))) {
+        return true;
+    }
+
+    return false;
+}
+
+export const replaceSelectionTextRuns = (params: IReplaceSelectionTextXParams) => {
+    const { selection, body: insertBody, doc } = params;
+    const segmentId = selection.segmentId;
+    const body = doc.getSelfOrHeaderFooterModel(segmentId)?.getBody();
+    if (!body) return false;
+
+    const oldBody = selection.collapsed ? null : getBodySlice(body, selection.startOffset, selection.endOffset);
+    const diffs = textDiff(oldBody ? oldBody.dataStream : '', insertBody.dataStream);
+    let cursor = 0;
+    const actions = diffs.map(([type, text]) => {
+        switch (type) {
+            // retain
+            case 0: {
+                const textRunsSlice = getTextRunSlice(insertBody, cursor, cursor + text.length, false);
+                const oldTextRunsSlice = getTextRunSlice(oldBody!, cursor, cursor + text.length, false);
+                const action: TextXAction = {
+                    t: TextXActionType.RETAIN,
+                    body: isTextRunsEqual(textRunsSlice, oldTextRunsSlice)
+                        ? undefined
+                        : {
+                            textRuns: textRunsSlice,
+                            dataStream: '',
+                        },
+                    len: text.length,
+                };
+                cursor += text.length;
+                return action;
+            }
+            // insert
+            case 1: {
+                const action: TextXAction = {
+                    t: TextXActionType.INSERT,
+                    body: getBodySlice(insertBody, cursor, cursor + text.length),
+                    len: text.length,
+                };
+                cursor += text.length;
+                return action;
+            }
+            // delete
+            default: {
+                const action: TextXAction = {
+                    t: TextXActionType.DELETE,
+                    len: text.length,
+                };
+                return action;
+            }
+        }
+    });
+
+    if (actions.every((action) => action.t === TextXActionType.RETAIN && !action.body)) {
+        return false;
+    }
+
+    const textX = new TextX();
+    textX.push({
+        t: TextXActionType.RETAIN,
+        len: selection.startOffset,
+    });
+    textX.push(...actions);
+    return textX;
+};

packages/core/src/docs/data-model/text-x/utils.ts

@@ -26,19 +26,13 @@ export enum SliceBodyType {
     cut,
 }
 
-// eslint-disable-next-line max-lines-per-function, complexity
-export function getBodySlice(
+export function getTextRunSlice(
     body: IDocumentBody,
     startOffset: number,
     endOffset: number,
-    returnEmptyArray = true,
-    type = SliceBodyType.cut
-): IDocumentBody {
-    const { dataStream, textRuns, paragraphs = [], customBlocks = [], tables = [], sectionBreaks = [] } = body;
-
-    const docBody: IDocumentBody = {
-        dataStream: dataStream.slice(startOffset, endOffset),
-    };
+    returnEmptyTextRuns = true
+) {
+    const { textRuns } = body;
 
     if (textRuns) {
         const newTextRuns: ITextRun[] = [];
@@ -66,7 +60,7 @@ export function getBodySlice(
             }
         }
 
-        docBody.textRuns = normalizeTextRuns(
+        return normalizeTextRuns(
             newTextRuns.map((tr) => {
                 const { st, ed } = tr;
                 return {
@@ -76,18 +70,24 @@ export function getBodySlice(
                 };
             })
         );
-    } else if (returnEmptyArray) {
+    } else if (returnEmptyTextRuns) {
         // In the case of no style before, add the style, removeTextRuns will be empty,
         // in this case, you need to add an empty textRun for undo.
-        docBody.textRuns = [{
+        return [{
             st: 0,
             ed: endOffset - startOffset,
             ts: {},
         }];
     }
+}
 
+export function getTableSlice(
+    body: IDocumentBody,
+    startOffset: number,
+    endOffset: number
+) {
+    const { tables = [] } = body;
     const newTables = [];
-
     for (const table of tables) {
         const clonedTable = Tools.deepClone(table);
         const { startIndex, endIndex } = clonedTable;
@@ -100,11 +100,15 @@ export function getBodySlice(
             });
         }
     }
+    return newTables;
+}
 
-    if (newTables.length) {
-        docBody.tables = newTables;
-    }
-
+export function getParagraphsSlice(
+    body: IDocumentBody,
+    startOffset: number,
+    endOffset: number
+) {
+    const { paragraphs = [] } = body;
     const newParagraphs: IParagraph[] = [];
 
     for (const paragraph of paragraphs) {
@@ -115,12 +119,19 @@ export function getBodySlice(
     }
 
     if (newParagraphs.length) {
-        docBody.paragraphs = newParagraphs.map((p) => ({
+        return newParagraphs.map((p) => ({
             ...p,
             startIndex: p.startIndex - startOffset,
         }));
     }
+}
 
+export function getSectionBreakSlice(
+    body: IDocumentBody,
+    startOffset: number,
+    endOffset: number
+) {
+    const { sectionBreaks = [] } = body;
     const newSectionBreaks: ISectionBreak[] = [];
 
     for (const sectionBreak of sectionBreaks) {
@@ -131,11 +142,57 @@ export function getBodySlice(
     }
 
     if (newSectionBreaks.length) {
-        docBody.sectionBreaks = newSectionBreaks.map((sb) => ({
+        return newSectionBreaks.map((sb) => ({
             ...sb,
             startIndex: sb.startIndex - startOffset,
         }));
     }
+}
+
+export function getCustomBlockSlice(
+    body: IDocumentBody,
+    startOffset: number,
+    endOffset: number
+) {
+    const { customBlocks = [] } = body;
+    const newCustomBlocks: ICustomBlock[] = [];
+
+    for (const block of customBlocks) {
+        const { startIndex } = block;
+        if (startIndex >= startOffset && startIndex <= endOffset) {
+            newCustomBlocks.push(Tools.deepClone(block));
+        }
+    }
+
+    if (newCustomBlocks.length) {
+        return newCustomBlocks.map((b) => ({
+            ...b,
+            startIndex: b.startIndex - startOffset,
+        }));
+    }
+}
+
+export function getBodySlice(
+    body: IDocumentBody,
+    startOffset: number,
+    endOffset: number,
+    returnEmptyArray = true,
+    type = SliceBodyType.cut
+): IDocumentBody {
+    const { dataStream } = body;
+
+    const docBody: IDocumentBody = {
+        dataStream: dataStream.slice(startOffset, endOffset),
+    };
+
+    docBody.textRuns = getTextRunSlice(body, startOffset, endOffset, returnEmptyArray);
+
+    const newTables = getTableSlice(body, startOffset, endOffset);
+    if (newTables.length) {
+        docBody.tables = newTables;
+    }
+
+    docBody.paragraphs = getParagraphsSlice(body, startOffset, endOffset);
 
     if (type === SliceBodyType.cut) {
         const customDecorations = getCustomDecorationSlice(body, startOffset, endOffset);
@@ -152,21 +209,7 @@ export function getBodySlice(
         docBody.customRanges = [];
     }
 
-    const newCustomBlocks: ICustomBlock[] = [];
-
-    for (const block of customBlocks) {
-        const { startIndex } = block;
-        if (startIndex >= startOffset && startIndex <= endOffset) {
-            newCustomBlocks.push(Tools.deepClone(block));
-        }
-    }
-
-    if (newCustomBlocks.length) {
-        docBody.customBlocks = newCustomBlocks.map((b) => ({
-            ...b,
-            startIndex: b.startIndex - startOffset,
-        }));
-    }
+    docBody.customBlocks = getCustomBlockSlice(body, startOffset, endOffset);
 
     return docBody;
 }

packages/core/src/index.ts

@@ -67,8 +67,19 @@ export { updateAttributeByDelete } from './docs/data-model/text-x/apply-utils/de
 export { updateAttributeByInsert } from './docs/data-model/text-x/apply-utils/insert-apply';
 export { TextX } from './docs/data-model/text-x/text-x';
 export type { TPriority } from './docs/data-model/text-x/text-x';
-export { composeBody, getBodySlice, SliceBodyType } from './docs/data-model/text-x/utils';
-export { getCustomDecorationSlice, getCustomRangeSlice, normalizeBody } from './docs/data-model/text-x/utils';
+export {
+    composeBody,
+    getBodySlice,
+    getCustomBlockSlice,
+    getCustomDecorationSlice,
+    getCustomRangeSlice,
+    getParagraphsSlice,
+    getSectionBreakSlice,
+    getTableSlice,
+    getTextRunSlice,
+    normalizeBody,
+    SliceBodyType,
+} from './docs/data-model/text-x/utils';
 export { EventState, EventSubject, fromEventSubject, type IEventObserver } from './observer/observable';
 export { AuthzIoLocalService } from './services/authz-io/authz-io-local.service';
 export { IAuthzIoService } from './services/authz-io/type';

packages/core/src/services/context/context.ts

@@ -37,6 +37,7 @@ export const FOCUSING_EDITOR_INPUT_FORMULA = 'FOCUSING_EDITOR_INPUT_FORMULA';
 /** The focusing state of the formula editor (Fx bar). */
 export const FOCUSING_FX_BAR_EDITOR = 'FOCUSING_FX_BAR_EDITOR';
 
+/** The focusing state of the cell editor. */
 export const FOCUSING_UNIVER_EDITOR = 'FOCUSING_UNIVER_EDITOR';
 
 export const FOCUSING_EDITOR_STANDALONE = 'FOCUSING_EDITOR_INPUT_FORMULA';

packages/docs-thread-comment-ui/src/commands/operations/show-comment-panel.operation.ts

@@ -132,7 +132,7 @@ export const StartAddCommentOperation: ICommand = {
             threadId: commentId,
         };
 
-        docSelectionRenderManager?.blurEditor();
+        docSelectionRenderManager?.blur();
         docCommentService.startAdd(comment);
         panelService.setActiveComment({
             unitId,