Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(docs): selection offset is wrong when refresh (#3724)

Ran Luo0babbabccd04
diff --git a/packages/docs-ui/src/commands/commands/inline-format.command.ts b/packages/docs-ui/src/commands/commands/inline-format.command.ts
index 396eea2a1c..8f372479e8 100644
--- a/packages/docs-ui/src/commands/commands/inline-format.command.ts
+++ b/packages/docs-ui/src/commands/commands/inline-format.command.ts
@@ -14,6 +14,11 @@
* limitations under the License.
*/
+import type {
+ ICommand, IDocumentBody, IMutationInfo, IStyleBase, ITextDecoration, ITextRun,
+} from '@univerjs/core';
+import type { IRichTextEditingMutationParams } from '@univerjs/docs';
+import type { ITextRangeWithStyle } from '@univerjs/engine-render';
import {
BaselineOffset, BooleanNumber, CommandType,
ICommandService, IUniverInstanceService,
@@ -21,11 +26,6 @@ import {
TextX, TextXActionType,
} from '@univerjs/core';
import { DocSelectionManagerService, RichTextEditingMutation } from '@univerjs/docs';
-import type {
- ICommand, IDocumentBody, IMutationInfo, IStyleBase, ITextDecoration, ITextRun,
-} from '@univerjs/core';
-import type { IRichTextEditingMutationParams } from '@univerjs/docs';
-import type { ITextRangeWithStyle } from '@univerjs/engine-render';
import { getRichTextEditPath } from '../util';
function handleInlineFormat(
diff --git a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts b/packages/docs-ui/src/services/selection/doc-selection-render.service.ts
index ab4f813361..1a7f77c7a5 100644
--- a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts
+++ b/packages/docs-ui/src/services/selection/doc-selection-render.service.ts
@@ -17,12 +17,12 @@
import type { DocumentDataModel, Nullable } from '@univerjs/core';
import type { Documents, Engine, IDocSelectionInnerParam, IFindNodeRestrictions, IMouseEvent, INodeInfo, INodePosition, IPointerEvent, IRenderContext, IRenderModule, IScrollObserverParam, ISuccinctDocRangeParam, ITextRangeWithStyle, ITextSelectionStyle } from '@univerjs/engine-render';
import type { Subscription } from 'rxjs';
+import type { RectRange } from './rect-range';
import { DataStreamTreeTokenType, DOC_RANGE_TYPE, ILogService, Inject, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
import { DocSkeletonManagerService } from '@univerjs/docs';
import { CURSOR_TYPE, getSystemHighlightColor, NORMAL_TEXT_SELECTION_PLUGIN_STYLE, PageLayoutType, ScrollTimer, Vector2 } from '@univerjs/engine-render';
import { ILayoutService } from '@univerjs/ui';
import { BehaviorSubject, fromEvent, Subject, takeUntil } from 'rxjs';
-import { RectRange } from './rect-range';
import { getCanvasOffsetByEngine, getParagraphInfoByGlyph, getRangeListFromCharIndex, getRangeListFromSelection, getRectRangeFromCharIndex, getTextRangeFromCharIndex, serializeRectRange, serializeTextRange } from './selection-utils';
import { TextRange } from './text-range';
@@ -161,7 +161,6 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo
this._selectionStyle = style;
}
- // eslint-disable-next-line max-lines-per-function
addDocRanges(ranges: ISuccinctDocRangeParam[], isEditing = true, options?: { [key: string]: boolean }) {
const {
_currentSegmentId: segmentId,
@@ -174,42 +173,36 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo
const docSkeleton = this._docSkeletonManagerService.getSkeleton();
for (const range of ranges) {
- const { startOffset, endOffset, rangeType } = range;
+ const { startOffset, endOffset, rangeType, startNodePosition, endNodePosition } = range as ITextRangeWithStyle;
if (rangeType === DOC_RANGE_TYPE.RECT) {
- const { startNodePosition, endNodePosition } = range as ITextRangeWithStyle;
-
- const rectRange = startNodePosition && endNodePosition
- ? new RectRange(scene, document, docSkeleton, startNodePosition, endNodePosition, style, segmentId, segmentPage)
- : getRectRangeFromCharIndex(
- startOffset,
- endOffset,
- scene,
- document,
- docSkeleton,
- style,
- segmentId,
- segmentPage
- );
+ const rectRange = getRectRangeFromCharIndex(
+ startOffset,
+ endOffset,
+ scene,
+ document,
+ docSkeleton,
+ style,
+ segmentId,
+ segmentPage
+ );
if (rectRange) {
this._addRectRanges([rectRange]);
}
} else if (rangeType === DOC_RANGE_TYPE.TEXT) {
- const { startNodePosition, endNodePosition } = range as ITextRangeWithStyle;
-
- const textRange = startNodePosition && endNodePosition
- ? new TextRange(scene, document, docSkeleton, startNodePosition, endNodePosition, style, segmentId, segmentPage)
- : getTextRangeFromCharIndex(
- startOffset,
- endOffset,
- scene,
- document,
- docSkeleton,
- style,
- segmentId,
- segmentPage
- );
+ const textRange = getTextRangeFromCharIndex(
+ startNodePosition?.isBack ? startOffset : startOffset - 1,
+ endNodePosition?.isBack ? endOffset : endOffset - 1,
+ scene,
+ document,
+ docSkeleton,
+ style,
+ segmentId,
+ segmentPage,
+ startNodePosition?.isBack,
+ endNodePosition?.isBack
+ );
if (textRange) {
this._addTextRange(textRange);
diff --git a/packages/docs-ui/src/services/selection/selection-utils.ts b/packages/docs-ui/src/services/selection/selection-utils.ts
index be876566a3..29f46e49f9 100644
--- a/packages/docs-ui/src/services/selection/selection-utils.ts
+++ b/packages/docs-ui/src/services/selection/selection-utils.ts
@@ -51,10 +51,12 @@ export function getTextRangeFromCharIndex(
skeleton: DocumentSkeleton,
style: ITextSelectionStyle,
segmentId: string,
- segmentPage: number
+ segmentPage: number,
+ startIsBack = true,
+ endIsBack = true
): Nullable<TextRange> {
- const startNodePosition = skeleton.findNodePositionByCharIndex(startOffset, true, segmentId, segmentPage);
- const endNodePosition = skeleton.findNodePositionByCharIndex(endOffset, true, segmentId, segmentPage);
+ const startNodePosition = skeleton.findNodePositionByCharIndex(startOffset, startIsBack, segmentId, segmentPage);
+ const endNodePosition = skeleton.findNodePositionByCharIndex(endOffset, endIsBack, segmentId, segmentPage);
if (startNodePosition == null || endNodePosition == null) {
return;
diff --git a/packages/docs/src/services/doc-selection-manager.service.ts b/packages/docs/src/services/doc-selection-manager.service.ts
index 2b5f0b6333..bc00ee1511 100644
--- a/packages/docs/src/services/doc-selection-manager.service.ts
+++ b/packages/docs/src/services/doc-selection-manager.service.ts
@@ -14,9 +14,6 @@
* limitations under the License.
*/
-import { ICommandService, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
-import { NORMAL_TEXT_SELECTION_PLUGIN_STYLE } from '@univerjs/engine-render';
-import { BehaviorSubject, takeUntil } from 'rxjs';
import type { DocumentDataModel, Nullable } from '@univerjs/core';
import type {
IDocSelectionInnerParam,
@@ -24,6 +21,9 @@ import type {
ISuccinctDocRangeParam,
ITextRangeWithStyle,
} from '@univerjs/engine-render';
+import { ICommandService, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
+import { NORMAL_TEXT_SELECTION_PLUGIN_STYLE } from '@univerjs/engine-render';
+import { BehaviorSubject, takeUntil } from 'rxjs';
import { SetTextSelectionsOperation } from '../commands/operations/text-selection.operation';
interface IDocSelectionManagerSearchParam {