@univerjs/docs-ui 1.0.1 → 1.0.3

package/lib/cjs/index.js

@@ -2335,7 +2335,7 @@ function getLineBounding(pointsGroup) {
 	});
 }
 var TextRange = class {
-	constructor(_scene, _document, _docSkeleton, anchorNodePosition, focusNodePosition, style = _univerjs_engine_render.NORMAL_TEXT_SELECTION_PLUGIN_STYLE, _segmentId = "", _segmentPage = -1) {
+	constructor(_scene, _document, _docSkeleton, anchorNodePosition, focusNodePosition, style = _univerjs_engine_render.NORMAL_TEXT_SELECTION_PLUGIN_STYLE, _segmentId = "", _segmentPage = -1, _logicalRange) {
 		this._scene = _scene;
 		this._document = _document;
 		this._docSkeleton = _docSkeleton;
@@ -2344,6 +2344,7 @@ var TextRange = class {
 		this.style = style;
 		this._segmentId = _segmentId;
 		this._segmentPage = _segmentPage;
+		this._logicalRange = _logicalRange;
 		_defineProperty(this, "rangeType", _univerjs_core.DOC_RANGE_TYPE.TEXT);
 		_defineProperty(this, "_current", false);
 		_defineProperty(this, "_rangeShape", void 0);
@@ -2373,6 +2374,7 @@ var TextRange = class {
 	}
 	get startOffset() {
 		var _this$_docSkeleton$ge;
+		if (this._logicalRange) return Math.min(this._logicalRange.startOffset, this._logicalRange.endOffset);
 		const { startOffset } = getOneTextSelectionRange(this._cursorList) ?? {};
 		const body = (_this$_docSkeleton$ge = this._docSkeleton.getViewModel().getDataModel().getSelfOrHeaderFooterModel(this._segmentId)) === null || _this$_docSkeleton$ge === void 0 ? void 0 : _this$_docSkeleton$ge.getBody();
 		if (startOffset == null || body == null) return startOffset;
@@ -2381,6 +2383,7 @@ var TextRange = class {
 	}
 	get endOffset() {
 		var _this$_docSkeleton$ge2;
+		if (this._logicalRange) return Math.max(this._logicalRange.startOffset, this._logicalRange.endOffset);
 		const { endOffset } = getOneTextSelectionRange(this._cursorList) ?? {};
 		const body = (_this$_docSkeleton$ge2 = this._docSkeleton.getViewModel().getDataModel().getSelfOrHeaderFooterModel(this._segmentId)) === null || _this$_docSkeleton$ge2 === void 0 ? void 0 : _this$_docSkeleton$ge2.getBody();
 		if (endOffset == null || body == null) return endOffset;
@@ -2404,6 +2407,7 @@ var TextRange = class {
 		return end;
 	}
 	get direction() {
+		if (this._logicalRange) return this._logicalRange.startOffset <= this._logicalRange.endOffset ? _univerjs_core.RANGE_DIRECTION.FORWARD : _univerjs_core.RANGE_DIRECTION.BACKWARD;
 		const { collapsed, anchorNodePosition, focusNodePosition } = this;
 		if (collapsed || anchorNodePosition == null || focusNodePosition == null) return _univerjs_core.RANGE_DIRECTION.NONE;
 		return compareNodePositionLogic(anchorNodePosition, focusNodePosition) ? _univerjs_core.RANGE_DIRECTION.FORWARD : _univerjs_core.RANGE_DIRECTION.BACKWARD;
@@ -2490,6 +2494,7 @@ var TextRange = class {
 	}
 	refresh() {
 		var _this$_anchorShape6, _this$_rangeShape2;
+		this._refreshLogicalRangePositions();
 		const { _document, _docSkeleton } = this;
 		const anchor = this.anchorNodePosition;
 		const focus = this.focusNodePosition;
@@ -2512,6 +2517,26 @@ var TextRange = class {
 		this._setCursorList(cursorList);
 		if (borderBoxPointGroup.length > 0) this._createOrUpdateRange(borderBoxPointGroup, docsLeft, docsTop);
 	}
+	_refreshLogicalRangePositions() {
+		var _this$_docSkeleton$ge3;
+		const range = this._logicalRange;
+		if (!range) return;
+		const start = Math.min(range.startOffset, range.endOffset);
+		const end = Math.max(range.startOffset, range.endOffset);
+		let first;
+		let last;
+		for (const page of ((_this$_docSkeleton$ge3 = this._docSkeleton.getSkeletonData()) === null || _this$_docSkeleton$ge3 === void 0 ? void 0 : _this$_docSkeleton$ge3.pages) ?? []) {
+			if (page.isLayoutPlaceholder || page.isMaterializationPlaceholder || page.ed < start || page.st >= end) continue;
+			const positions = findDocRangeNodePositions(this._docSkeleton, Math.max(start, page.st), Math.min(end - 1, page.ed), this._segmentId, this._segmentPage);
+			if (positions) {
+				first ??= positions.startPosition;
+				last = positions.endPosition;
+			}
+		}
+		const forward = range.startOffset <= range.endOffset;
+		this.anchorNodePosition = forward ? first : last;
+		this.focusNodePosition = forward ? last : first;
+	}
 	_isEmpty() {
 		return this.anchorNodePosition == null && this.focusNodePosition == null;
 	}
@@ -2826,7 +2851,17 @@ function getColumnInputBoundaryCollapsedPosition(anchorPosition, focusPosition,
 function getTextRangeFromCharIndex(startOffset, endOffset, scene, document, skeleton, style, segmentId, segmentPage, startIsBack = true, endIsBack = true) {
 	const startNodePosition = skeleton.findNodePositionByCharIndex(startOffset, startIsBack, segmentId, segmentPage);
 	const endNodePosition = skeleton.findNodePositionByCharIndex(endOffset, endIsBack, segmentId, segmentPage);
-	if (startNodePosition == null || endNodePosition == null) return;
+	if (startNodePosition == null || endNodePosition == null) {
+		var _skeleton$getSkeleton;
+		const pages = (_skeleton$getSkeleton = skeleton.getSkeletonData()) === null || _skeleton$getSkeleton === void 0 ? void 0 : _skeleton$getSkeleton.pages;
+		const startPage = pages === null || pages === void 0 ? void 0 : pages[skeleton.findBodyPageIndexByCharIndex(startOffset)];
+		const endPage = pages === null || pages === void 0 ? void 0 : pages[skeleton.findBodyPageIndexByCharIndex(endOffset)];
+		if (segmentId === "" && startOffset !== endOffset && startPage && endPage && (startPage.isMaterializationPlaceholder || endPage.isMaterializationPlaceholder)) return new TextRange(scene, document, skeleton, void 0, void 0, style, segmentId, segmentPage, {
+			startOffset: startIsBack ? startOffset : startOffset + 1,
+			endOffset: endIsBack ? endOffset : endOffset + 1
+		});
+		return;
+	}
 	return new TextRange(scene, document, skeleton, startNodePosition, endNodePosition, style, segmentId, segmentPage);
 }
 function getRectRangeFromCharIndex(startOffset, endOffset, scene, document, skeleton, style, segmentId, segmentPage) {
@@ -2838,7 +2873,14 @@ function getRectRangeFromCharIndex(startOffset, endOffset, scene, document, skel
 function getRangeListFromCharIndex(startOffset, endOffset, scene, document, skeleton, style, segmentId, segmentPage) {
 	const startNodePosition = skeleton.findNodePositionByCharIndex(startOffset, true, segmentId, segmentPage);
 	const endNodePosition = skeleton.findNodePositionByCharIndex(endOffset, true, segmentId, segmentPage);
-	if (startNodePosition == null || endNodePosition == null) return;
+	if (startNodePosition == null || endNodePosition == null) {
+		const textRange = getTextRangeFromCharIndex(startOffset, endOffset, scene, document, skeleton, style, segmentId, segmentPage);
+		if (textRange) return {
+			textRanges: [textRange],
+			rectRanges: []
+		};
+		return;
+	}
 	return getRangeListFromSelection(startNodePosition, endNodePosition, scene, document, skeleton, style, segmentId, segmentPage);
 }
 function getRangeListFromSelection(anchorPosition, focusPosition, scene, document, skeleton, style, segmentId, segmentPage) {
@@ -5147,7 +5189,7 @@ const InnerPasteCommand = {
 			unitId: targetUnitId,
 			subUnitId: targetUnitId
 		};
-		const selections = docSelectionManagerService.getTextRanges(selectionParams) ?? [];
+		const selections = params.selections ?? docSelectionManagerService.getTextRanges(selectionParams) ?? [];
 		const rectRanges = docSelectionManagerService.getRectRanges(selectionParams) ?? [];
 		const selectionInfo = docSelectionManagerService.getSelectionInfo(selectionParams);
 		const { body: sourceBody, tableSource, drawings } = doc;
@@ -13818,6 +13860,10 @@ let DocRenderController = class DocRenderController extends _univerjs_core.RxDis
 				} finally {
 					this._docLayoutExecutorService.recordHydrationDuration(this._context.unitId, _univerjs_core.Tools.now() - hydrationStartedAt);
 				}
+				this._textSelectionManagerService.refreshSelection({
+					unitId: this._context.unitId,
+					subUnitId: this._context.unitId
+				}, false);
 				this._markDocumentRenderDirty();
 			}
 		}
@@ -17985,13 +18031,20 @@ function PasteSpecialMenuFactory(accessor) {
 		id: DocPasteSpecialCommand.id,
 		type: _univerjs_ui.MenuItemType.SELECTOR,
 		icon: "DocPasteOptionsIcon",
-		title: "docs-ui.pasteOptions.title",
-		tooltip: "docs-ui.pasteOptions.title",
+		title: "docs-ui.pasteOptions.special",
+		tooltip: "docs-ui.pasteOptions.special",
 		selections: DOC_PASTE_OPTIONS.map((option) => ({ ...option })),
 		disabled$: disableMenuWithoutDocumentUnitPermission(accessor, _univerjs_protocol.UnitAction.Edit),
 		hidden$: (0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_DOC)
 	};
 }
+function PasteRibbonMenuFactory(accessor) {
+	return {
+		...PasteSpecialMenuFactory(accessor),
+		title: "docs-ui.rightClick.paste",
+		hidden$: (0, rxjs.combineLatest)([(0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_DOC), accessor.get(_univerjs_core.IContextService).subscribeContextValue$(_univerjs_core.FOCUSING_SHAPE_TEXT_EDITOR).pipe((0, rxjs.startWith)(false))]).pipe((0, rxjs.map)(([hidden, editing]) => hidden || editing))
+	};
+}
 
 //#endregion
 //#region src/views/paragraph-menu/theme-color.ts
@@ -18594,28 +18647,26 @@ const floatToolbarMenuSchema = { [FLOAT_TOOLBAR_MENU_POSITION]: { [FLOAT_TEXT_ST
 } } };
 const menuSchema = {
 	...floatToolbarMenuSchema,
-	[_univerjs_ui.RibbonStartGroup.OTHERS]: {
-		[DocPasteSpecialCommand.id]: {
-			order: -1,
-			gridLayout: {
-				row: 1,
-				column: 2,
-				rowSpan: 2,
-				showLabel: true
-			},
-			menuItemFactory: PasteSpecialMenuFactory
+	[_univerjs_ui.RibbonStartGroup.HISTORY]: { [DocPasteSpecialCommand.id]: {
+		order: 4,
+		gridLayout: {
+			row: 1,
+			column: 3,
+			rowSpan: 2,
+			showLabel: true
 		},
-		[OpenDocPermissionPanelOperation.id]: {
-			order: 0,
-			gridLayout: {
-				row: 1,
-				column: 1,
-				rowSpan: 2,
-				showLabel: true
-			},
-			menuItemFactory: DocPermissionMenuItemFactory
-		}
-	},
+		menuItemFactory: PasteRibbonMenuFactory
+	} },
+	[_univerjs_ui.RibbonStartGroup.OTHERS]: { [OpenDocPermissionPanelOperation.id]: {
+		order: 0,
+		gridLayout: {
+			row: 1,
+			column: 1,
+			rowSpan: 2,
+			showLabel: true
+		},
+		menuItemFactory: DocPermissionMenuItemFactory
+	} },
 	[_univerjs_ui.RibbonStartGroup.FORMAT]: {
 		[SetInlineFormatBoldCommand.id]: {
 			order: 0,
@@ -18863,16 +18914,18 @@ const menuSchema = {
 			[DocPasteCommand.id]: {
 				order: 2,
 				menuItemFactory: PasteMenuFactory
-			},
+			}
+		},
+		[_univerjs_ui.ContextMenuGroup.FORMAT]: {
 			[DocPasteSpecialCommand.id]: {
-				order: 3,
+				order: -1,
 				menuItemFactory: PasteSpecialMenuFactory
+			},
+			[DeleteLeftCommand.id]: {
+				order: 0,
+				menuItemFactory: DeleteMenuFactory
 			}
 		},
-		[_univerjs_ui.ContextMenuGroup.FORMAT]: { [DeleteLeftCommand.id]: {
-			order: 0,
-			menuItemFactory: DeleteMenuFactory
-		} },
 		[_univerjs_ui.ContextMenuGroup.LAYOUT]: {
 			[DocParagraphSettingPanelOperation.id]: {
 				order: 0,
@@ -20859,7 +20912,7 @@ function resolveDocsCustomBlockRenderViewport(params) {
 //#endregion
 //#region package.json
 var name = "@univerjs/docs-ui";
-var version = "1.0.1";
+var version = "1.0.3";
 
 //#endregion
 //#region src/commands/commands/doc-paragraph-setting.command.ts
@@ -21569,6 +21622,7 @@ let DocMoveCursorController = class DocMoveCursorController extends _univerjs_co
 		if (granularity !== "character") {
 			const nextOffset = this._getCursorOffsetByGranularity(skeleton, focusOffset, direction, granularity, normalizedSegmentId, normalizedSegmentPage, dataStreamLength, body.dataStream);
 			if (nextOffset == null || nextOffset === focusOffset) return;
+			if (this._deferUnmaterializedCursorMove(docDataModel, skeleton, nextOffset, normalizedSegmentId, () => this._handleShiftMoveSelection(direction, granularity))) return;
 			const normalizedNextOffset = this._normalizeRenderableCursorOffset(skeleton, body.dataStream, customRanges, nextOffset, direction, normalizedSegmentId, normalizedSegmentPage);
 			if (normalizedNextOffset == null || normalizedNextOffset === focusOffset) return;
 			this._textSelectionManagerService.replaceDocRanges([{
@@ -24142,25 +24196,30 @@ const mobileMenuSchema = {
 			menuItemFactory: SelectAllMenuFactory
 		}
 	} },
-	[DOC_CARET_MENU_ID]: { [_univerjs_ui.ContextMenuGroup.QUICK]: {
-		quickLayout: "tile",
-		[DocPasteCommand.id]: {
-			order: 0,
-			menuItemFactory: PasteMenuFactory
-		},
-		[DocPasteSpecialCommand.id]: {
-			order: .5,
-			menuItemFactory: PasteSpecialMenuFactory
+	[DOC_CARET_MENU_ID]: {
+		[_univerjs_ui.ContextMenuGroup.QUICK]: {
+			quickLayout: "tile",
+			[DocPasteCommand.id]: {
+				order: 0,
+				menuItemFactory: PasteMenuFactory
+			},
+			[DocSelectWordCommand.id]: {
+				order: 1,
+				menuItemFactory: SelectWordMenuFactory
+			},
+			[DocSelectAllCommand.id]: {
+				order: 2,
+				menuItemFactory: SelectAllMenuFactory
+			}
 		},
-		[DocSelectWordCommand.id]: {
+		[_univerjs_ui.ContextMenuGroup.FORMAT]: {
 			order: 1,
-			menuItemFactory: SelectWordMenuFactory
-		},
-		[DocSelectAllCommand.id]: {
-			order: 2,
-			menuItemFactory: SelectAllMenuFactory
+			[DocPasteSpecialCommand.id]: {
+				order: 0,
+				menuItemFactory: PasteSpecialMenuFactory
+			}
 		}
-	} }
+	}
 };
 
 //#endregion
@@ -31458,6 +31517,7 @@ exports.getCursorWhenDelete = getCursorWhenDelete;
 exports.getCutActionsFromDocRanges = getCutActionsFromDocRanges;
 exports.getDocBlockRangeMenuId = getDocBlockRangeMenuId;
 exports.getDocObjectById = getDocObjectById;
+exports.getEditorRuntimeConfig = getEditorRuntimeConfig;
 exports.getEmptyTableCell = getEmptyTableCell;
 exports.getEmptyTableRow = getEmptyTableRow;
 exports.getLineBounding = getLineBounding;
@@ -31474,6 +31534,7 @@ exports.isTextRangeInAnyBlockRange = isTextRangeInAnyBlockRange;
 exports.isValidRectRange = isValidRectRange;
 exports.neoGetDocObject = neoGetDocObject;
 exports.normalizeDocFitToWidthOptions = normalizeDocFitToWidthOptions;
+exports.registerEditorRuntimeConfig = registerEditorRuntimeConfig;
 exports.removeClipboardHtmlImages = removeClipboardHtmlImages;
 exports.resolveDocCustomRangeChromeTheme = resolveDocCustomRangeChromeTheme;
 exports.resolveDocFitBaseWidth = resolveDocFitBaseWidth;

package/lib/cjs/locale/ar-SA.js

@@ -1,6 +1,7 @@
 //#region src/locale/ar-SA.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "لصق خاص",
 		title: "خيارات اللصق",
 		source: "الاحتفاظ بتنسيق المصدر",
 		destination: "مطابقة تنسيق الوجهة",

package/lib/cjs/locale/ca-ES.js

@@ -1,6 +1,7 @@
 //#region src/locale/ca-ES.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Enganxament especial",
 		title: "Opcions d’enganxament",
 		source: "Mantén el format d’origen",
 		destination: "Adapta al format de destinació",

package/lib/cjs/locale/de-DE.js

@@ -1,6 +1,7 @@
 //#region src/locale/de-DE.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Inhalte einfügen",
 		title: "Einfügeoptionen",
 		source: "Ursprüngliche Formatierung beibehalten",
 		destination: "Zielformatierung übernehmen",

package/lib/cjs/locale/en-US.js

@@ -16,6 +16,7 @@
 */
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Paste special",
 		title: "Paste options",
 		source: "Keep source formatting",
 		destination: "Match destination formatting",

package/lib/cjs/locale/es-ES.js

@@ -1,6 +1,7 @@
 //#region src/locale/es-ES.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Pegado especial",
 		title: "Opciones de pegado",
 		source: "Mantener formato de origen",
 		destination: "Adaptar al formato de destino",

package/lib/cjs/locale/fa-IR.js

@@ -1,6 +1,7 @@
 //#region src/locale/fa-IR.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "چسباندن ویژه",
 		title: "گزینه‌های چسباندن",
 		source: "حفظ قالب‌بندی مبدأ",
 		destination: "تطبیق با قالب‌بندی مقصد",

package/lib/cjs/locale/fr-FR.js

@@ -1,6 +1,7 @@
 //#region src/locale/fr-FR.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Collage spécial",
 		title: "Options de collage",
 		source: "Conserver la mise en forme source",
 		destination: "Adapter à la mise en forme de destination",

package/lib/cjs/locale/id-ID.js

@@ -1,6 +1,7 @@
 //#region src/locale/id-ID.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Tempel khusus",
 		title: "Opsi tempel",
 		source: "Pertahankan format sumber",
 		destination: "Sesuaikan format tujuan",

package/lib/cjs/locale/it-IT.js

@@ -1,6 +1,7 @@
 //#region src/locale/it-IT.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Incolla speciale",
 		title: "Opzioni di incolla",
 		source: "Mantieni formattazione originale",
 		destination: "Adatta alla formattazione di destinazione",

package/lib/cjs/locale/ja-JP.js

@@ -1,6 +1,7 @@
 //#region src/locale/ja-JP.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "形式を選択して貼り付け",
 		title: "貼り付けのオプション",
 		source: "元の書式を保持",
 		destination: "貼り付け先の書式に合わせる",

package/lib/cjs/locale/ko-KR.js

@@ -1,6 +1,7 @@
 //#region src/locale/ko-KR.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "선택하여 붙여넣기",
 		title: "붙여넣기 옵션",
 		source: "원본 서식 유지",
 		destination: "대상 서식에 맞추기",

package/lib/cjs/locale/pl-PL.js

@@ -1,6 +1,7 @@
 //#region src/locale/pl-PL.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Wklej specjalnie",
 		title: "Opcje wklejania",
 		source: "Zachowaj formatowanie źródłowe",
 		destination: "Dopasuj formatowanie docelowe",

package/lib/cjs/locale/pt-BR.js

@@ -1,6 +1,7 @@
 //#region src/locale/pt-BR.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Colar especial",
 		title: "Opções de colagem",
 		source: "Manter formatação original",
 		destination: "Usar formatação de destino",

package/lib/cjs/locale/ru-RU.js

@@ -1,6 +1,7 @@
 //#region src/locale/ru-RU.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Специальная вставка",
 		title: "Параметры вставки",
 		source: "Сохранить исходное форматирование",
 		destination: "Использовать форматирование назначения",

package/lib/cjs/locale/sk-SK.js

@@ -1,6 +1,7 @@
 //#region src/locale/sk-SK.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Prilepiť špeciálne",
 		title: "Možnosti prilepenia",
 		source: "Zachovať zdrojové formátovanie",
 		destination: "Prispôsobiť cieľovému formátovaniu",

package/lib/cjs/locale/vi-VN.js

@@ -1,6 +1,7 @@
 //#region src/locale/vi-VN.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "Dán đặc biệt",
 		title: "Tùy chọn dán",
 		source: "Giữ định dạng nguồn",
 		destination: "Khớp định dạng đích",

package/lib/cjs/locale/zh-CN.js

@@ -1,6 +1,7 @@
 //#region src/locale/zh-CN.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "选择性粘贴",
 		title: "粘贴选项",
 		source: "保留源格式",
 		destination: "匹配目标格式",

package/lib/cjs/locale/zh-HK.js

@@ -1,6 +1,7 @@
 //#region src/locale/zh-HK.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "選擇性貼上",
 		title: "貼上選項",
 		source: "保留來源格式",
 		destination: "符合目標格式",

package/lib/cjs/locale/zh-TW.js

@@ -1,6 +1,7 @@
 //#region src/locale/zh-TW.ts
 const locale = { "docs-ui": {
 	pasteOptions: {
+		special: "選擇性貼上",
 		title: "貼上選項",
 		source: "保留來源格式",
 		destination: "符合目的地格式",