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

feat: export is active for share cursor use #1420

Merged
merged 2 commits into from
Feb 24, 2024
Merged

feat: export is active for share cursor use #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6d1bbd
feat: export is active for share cursor use
Jocs Feb 24, 2024
5f115b4
feat: export is active for share cursor use
Jocs Feb 24, 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
1 change: 1 addition & 0 deletions packages/core/src/types/interfaces/i-selection-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@ export interface ITextRange extends ITextRangeStart {

export interface ITextRangeParam extends ITextRange {
segmentId?: string; //The ID of the header, footer or footnote the location is in. An empty segment ID signifies the document's body.
isActive?: boolean; // Whether the text range is active or current range.
}
6 changes: 3 additions & 3 deletions packages/docs/src/commands/operations/text-selection.operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

import type { IOperation } from '@univerjs/core';
import { CommandType } from '@univerjs/core';
import type { ITextSelectionStyle, TextRange } from '@univerjs/engine-render';
import type { ITextRangeWithStyle, ITextSelectionStyle } from '@univerjs/engine-render';

export interface ISetTextSelectionsOperationParams {
unitId: string;
subUnitId: string;
segmentId: string;
style: ITextSelectionStyle;
ranges: TextRange[];
ranges: ITextRangeWithStyle[];
}

export const SetTextSelectionsOperation: IOperation<ISetTextSelectionsOperationParams> = {
Expand All @@ -32,7 +32,7 @@ export const SetTextSelectionsOperation: IOperation<ISetTextSelectionsOperationP
type: CommandType.OPERATION,

handler: (accessor, prams) => {
// for live share only.
// for live share and share cursor.
return true;
},
};
8 changes: 7 additions & 1 deletion packages/docs/src/services/text-selection-manager.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,17 @@ type ITextSelectionInfo = Map<string, Map<string, ITextSelectionInnerParam>>;
export function serializeTextRange(textRange: TextRange): ITextRangeWithStyle {
const { startOffset, endOffset, collapsed } = textRange;

return {
const serializedTextRange: ITextRangeWithStyle = {
startOffset: startOffset!,
endOffset: endOffset!,
collapsed,
};

if (typeof textRange.isActive === 'function') {
serializedTextRange.isActive = textRange.isActive();
}

return serializedTextRange;
}

/**
Expand Down
Loading