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.

feat(sheets-drawing-ui): optimize cell-image behavior on editing and paste (#4860)

ZhangWeie5414e1a6799
diff --git a/packages/design/src/components/dialog/Dialog.stories.tsx b/packages/design/src/components/dialog/Dialog.stories.tsx
index 0a6d2fb68a..61dd8f2e3f 100644
--- a/packages/design/src/components/dialog/Dialog.stories.tsx
+++ b/packages/design/src/components/dialog/Dialog.stories.tsx
@@ -47,7 +47,8 @@ export const DialogBasic = {
visible={visible}
title="hello world"
closeIcon={<CloseSingle />}
- footer={<footer>footer</footer>}
+ showOk
+ showCancel
onClose={handleToggleVisible}
>
xxxx
diff --git a/packages/design/src/components/dialog/Dialog.tsx b/packages/design/src/components/dialog/Dialog.tsx
index 27f5407f57..38aa3b7ac0 100644
--- a/packages/design/src/components/dialog/Dialog.tsx
+++ b/packages/design/src/components/dialog/Dialog.tsx
@@ -21,6 +21,7 @@ import RcDialog from 'rc-dialog';
import React, { useContext, useRef, useState } from 'react';
import Draggable from 'react-draggable';
+import { Button } from '../button';
import { ConfigContext } from '../config-provider/ConfigProvider';
import styles from './index.module.less';
@@ -118,6 +119,12 @@ export interface IDialogProps {
* @default true
*/
keyboard?: boolean;
+
+ showOk?: boolean;
+ showCancel?: boolean;
+
+ onOk?: () => void;
+ onCancel?: () => void;
}
export function Dialog(props: IDialogProps) {
@@ -133,19 +140,23 @@ export function Dialog(props: IDialogProps) {
defaultPosition,
destroyOnClose = false,
preservePositionOnDestroy = false,
- footer,
+ footer: propFooter,
onClose,
mask,
keyboard = true,
dialogStyles,
closable,
maskClosable,
+ showOk,
+ showCancel,
+ onOk,
+ onCancel,
} = props;
+ const { locale } = useContext(ConfigContext);
const [dragDisabled, setDragDisabled] = useState(false);
const [positionOffset, setPositionOffset] = useState<{ x: number; y: number } | null>(null);
const { mountContainer } = useContext(ConfigContext);
-
const TitleIfDraggable = draggable
? (
<div
@@ -177,6 +188,15 @@ export function Dialog(props: IDialogProps) {
<div className={styles.dialogTitleContent}>{title}</div>
);
+ const footer = propFooter ?? (showCancel || showOk
+ ? (
+ <div>
+ <Button className="univer-mr-2" onClick={onCancel ?? onClose}>{locale?.Confirm?.cancel ?? 'Cancel'}</Button>
+ <Button type="primary" onClick={onOk}>{locale?.Confirm?.confirm ?? 'Ok'}</Button>
+ </div>
+ )
+ : null);
+
const modalRender = (modal: React.ReactNode) => {
const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
const draggleRef = useRef<HTMLDivElement>(null!);
diff --git a/packages/docs-ui/src/index.ts b/packages/docs-ui/src/index.ts
index 85b1fb2ff7..5b43109c05 100644
--- a/packages/docs-ui/src/index.ts
+++ b/packages/docs-ui/src/index.ts
@@ -64,7 +64,7 @@ export { AfterSpaceCommand, EnterCommand, type ITabCommandParams, TabCommand } f
export { BreakLineCommand } from './commands/commands/break-line.command';
export { generateParagraphs } from './commands/commands/break-line.command';
export { DocCopyCommand, DocCutCommand, DocPasteCommand } from './commands/commands/clipboard.command';
-export { CutContentCommand, InnerPasteCommand } from './commands/commands/clipboard.inner.command';
+export { CutContentCommand, type IInnerPasteCommandParams, InnerPasteCommand } from './commands/commands/clipboard.inner.command';
export type { IInnerCutCommandParams } from './commands/commands/clipboard.inner.command';
export { getCustomBlockIdsInSelections, getCutActionsFromDocRanges } from './commands/commands/clipboard.inner.command';
export {
diff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.ts
index 9cdf00c43a..3e723a2222 100644
--- a/packages/engine-render/src/base-object.ts
+++ b/packages/engine-render/src/base-object.ts
@@ -71,6 +71,7 @@ export abstract class BaseObject extends Disposable {
onPointerLeave$ = new EventSubject<IPointerEvent | IMouseEvent>();
onPointerEnter$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onSingleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
onClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
onDblclick$ = new EventSubject<IPointerEvent | IMouseEvent>();
onTripleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
@@ -649,6 +650,14 @@ export abstract class BaseObject extends Disposable {
return true;
}
+ triggerSingleClick(evt: IPointerEvent | IMouseEvent) {
+ if (!this.onSingleClick$.emitEvent(evt)?.stopPropagation) {
+ this._parent?.triggerSingleClick(evt);
+ return false;
+ }
+ return true;
+ }
+
triggerClick(evt: IPointerEvent | IMouseEvent) {
if (!this.onClick$.emitEvent(evt)?.stopPropagation) {
this._parent?.triggerClick(evt);
@@ -771,6 +780,7 @@ export abstract class BaseObject extends Disposable {
this.onDragOver$.complete();
this.onDragEnter$.complete();
this.onDrop$.complete();
+ this.onSingleClick$.complete();
this.onClick$.complete();
this.onDblclick$.complete();
this.onTripleClick$.complete();
diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.ts
index 439c54313e..3a6fc6f289 100644
--- a/packages/engine-render/src/engine.ts
+++ b/packages/engine-render/src/engine.ts
@@ -110,6 +110,8 @@ export class Engine extends Disposable {
private _pointerClickEvent!: (evt: Event) => void;
+ private _pointerDblClickEvent!: (evt: Event) => void;
+
private _pointerMoveEvent!: (evt: Event) => void;
private _pointerDownEvent!: (evt: Event) => void;
@@ -424,6 +426,7 @@ export class Engine extends Disposable {
const eventPrefix = getPointerPrefix();
const canvasEle = this.getCanvasElement();
canvasEle.removeEventListener('click', this._pointerClickEvent);
+ canvasEle.removeEventListener('dblclick', this._pointerDblClickEvent);
canvasEle.removeEventListener(`${eventPrefix}leave`, this._pointerLeaveEvent);
canvasEle.removeEventListener(`${eventPrefix}enter`, this._pointerEnterEvent);
canvasEle.removeEventListener(`${eventPrefix}move`, this._pointerMoveEvent);
@@ -632,6 +635,13 @@ export class Engine extends Disposable {
this.onInputChanged$.emitEvent(deviceEvent);
};
+ this._pointerDblClickEvent = (e: Event) => {
+ const deviceType = this._getPointerType(e);
+ const deviceEvent = e as IPointerEvent;
+ deviceEvent.deviceType = deviceType;
+ this.onInputChanged$.emitEvent(deviceEvent);
+ };
+
this._pointerMoveEvent = (e: Event) => {
const evt = e as PointerEvent | MouseEvent;
const deviceType = this._getPointerType(evt);
@@ -877,6 +887,7 @@ export class Engine extends Disposable {
const canvasEle = this.getCanvasElement();
canvasEle.addEventListener('click', this._pointerClickEvent);
+ canvasEle.addEventListener('dblclick', this._pointerDblClickEvent);
canvasEle.addEventListener(`${eventPrefix}enter`, this._pointerEnterEvent);
canvasEle.addEventListener(`${eventPrefix}leave`, this._pointerLeaveEvent);
canvasEle.addEventListener(`${eventPrefix}move`, this._pointerMoveEvent);
diff --git a/packages/engine-render/src/scene.input-manager.ts b/packages/engine-render/src/scene.input-manager.ts
index 6bca45f676..7904a5180c 100644
--- a/packages/engine-render/src/scene.input-manager.ts
+++ b/packages/engine-render/src/scene.input-manager.ts
@@ -119,11 +119,32 @@ export class InputManager extends Disposable {
}
}
+ private _clickTimeout: ReturnType<typeof setTimeout> | null = null;
+ private _clickCount = 0;
_onClick(evt: IPointerEvent) {
if (evt.pointerId === undefined) {
(evt as unknown as PointerEvent).pointerId = 0;
}
+ this._clickCount++;
+ if (!this._clickTimeout) {
+ this._clickTimeout = setTimeout(() => {
+ if (this._clickCount === 1) {
+ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);
+ const isStop = currentObject?.triggerSingleClick(evt);
+ if (!isStop && this._shouldDispatchEventToScene(currentObject)) {
+ this._scene.onPointerDown$.emitEvent(evt);
+ }
+ } else if (this._clickCount === 2) {
+ // ....
+ }
+ // reset click state
+ clearTimeout(this._clickTimeout as ReturnType<typeof setTimeout>);
+ this._clickTimeout = null;
+ this._clickCount = 0;
+ }, 300);
+ }
+
const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);
const isStop = currentObject?.triggerClick(evt);
@@ -319,6 +340,9 @@ export class InputManager extends Disposable {
case 'click':
this._onClick(evt as IPointerEvent);
break;
+ case 'dblclick':
+ this._onDblClick(evt as IPointerEvent);
+ break;
case 'pointerout':
this._onPointerOut(evt as IPointerEvent);
break;
diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.ts
index 44c3386986..7a49ab51c7 100644
--- a/packages/engine-render/src/scene.ts
+++ b/packages/engine-render/src/scene.ts
@@ -71,7 +71,6 @@ export class Scene extends Disposable {
onTransformChange$ = new EventSubject<ITransformChangeState>();
onFileLoaded$ = new EventSubject<string>();
- onClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
onPointerDown$ = new EventSubject<IPointerEvent | IMouseEvent>();
onPointerMove$ = new EventSubject<IPointerEvent | IMouseEvent>();
onPointerUp$ = new EventSubject<IPointerEvent | IMouseEvent>();
@@ -83,6 +82,8 @@ export class Scene extends Disposable {
onDragOver$ = new EventSubject<IDragEvent>();
onDragLeave$ = new EventSubject<IDragEvent>();
onDrop$ = new EventSubject<IDragEvent>();
+ onClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onSingleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
onDblclick$ = new EventSubject<IPointerEvent | IMouseEvent>();
onTripleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
onMouseWheel$ = new EventSubject<IWheelEvent>();
@@ -954,6 +955,7 @@ export class Scene extends Disposable {
this.onDragLeave$.complete();
this.onDrop$.complete();
+ this.onSingleClick$.complete();
this.onDblclick$.complete();
this.onTripleClick$.complete();
this.onMouseWheel$.complete();
@@ -1070,9 +1072,20 @@ export class Scene extends Disposable {
return true;
}
+ triggerSingleClick(evt: IPointerEvent | IMouseEvent) {
+ if (
+ !this.onSingleClick$.emitEvent(evt)?.stopPropagation &&
+ this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
+ ) {
+ (this._parent as SceneViewer)?.triggerSingleClick(evt);
+ return false;
+ }
+ return true;
+ }
+
triggerClick(evt: IPointerEvent | IMouseEvent) {
if (
- !this.onDblclick$.emitEvent(evt)?.stopPropagation &&
+ !this.onClick$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
) {
(this._parent as SceneViewer)?.triggerClick(evt);
diff --git a/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-celll-image-hover.render-controller.ts b/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-celll-image-hover.render-controller.ts
new file mode 100644
index 0000000000..355d82ae88
--- /dev/null
+++ b/packages/sheets-drawing-ui/src/controllers/render-controllers/sheet-celll-image-hover.render-controller.ts
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { IDocImage } from '@univerjs/docs-drawing';
+import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import { Disposable, Inject } from '@univerjs/core';
+import { DrawingRenderService } from '@univerjs/drawing-ui';
+import { CURSOR_TYPE } from '@univerjs/engine-render';
+import { SheetsSelectionsService } from '@univerjs/sheets';
+import { HoverManagerService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { throttleTime } from 'rxjs';
+
+export class SheetCellImageHoverRenderController extends Disposable implements IRenderModule {
+ private _isSetCursor = false;
+
+ constructor(
+ private _context: IRenderContext,
+ @Inject(HoverManagerService) private _hoverManagerService: HoverManagerService,
+ @Inject(SheetsSelectionsService) private _selectionsService: SheetsSelectionsService,
+ @Inject(DrawingRenderService) private _drawingRenderService: DrawingRenderService,
+ @Inject(SheetSkeletonManagerService) private _sheetSkeletonManagerService: SheetSkeletonManagerService
+ ) {
+ super();
+ this._initHover();
+ this._initImageClick();
+ }
+
+ private _initHover() {
+ this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$
+ .pipe(throttleTime(33))
+ .subscribe((richText) => {
+ const currentSelections = this._selectionsService.getWorkbookSelections(this._context.unitId).getCurrentSelections();
+ if (
+ richText?.unitId === this._context.unitId &&
+ richText?.drawing &&
+ currentSelections.length === 1 &&
+ currentSelections[0].primary?.actualRow === richText.row &&
+ currentSelections[0].primary?.actualColumn === richText.col
+ ) {
+ this._isSetCursor = true;
+ this._context.scene.setCursor(CURSOR_TYPE.ZOOM_IN);
+ } else if (this._isSetCursor) {
+ this._isSetCursor = false;
+ this._context.scene.resetCursor();
+ }
+ }));
+ }
+
+ private _initImageClick() {
+ this.disposeWithMe(this._hoverManagerService.currentClickedCell$.subscribe((click) => {
+ if (click?.drawing && this._isSetCursor) {
+ const imageDrawing = click.drawing.drawing.drawingOrigin as IDocImage;
+ const imageEle = this._sheetSkeletonManagerService.getCurrentSkeleton()?.imageCacheMap.getImage(imageDrawing.imageSourceType, imageDrawing.source);
+ if (!imageEle) return;
+ this._drawingRenderService.previewImage('preview-cell-image', imageEle.src, imageEle.width, imageEle.height);
+ this._context.scene.resetCursor();
+ this._isSetCursor = false;
+ }
+ }));
+ }
+}
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-cell-image-copy-paste.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-cell-image-copy-paste.controller.ts
new file mode 100644
index 0000000000..c676f59434
--- /dev/null
+++ b/packages/sheets-drawing-ui/src/controllers/sheet-cell-image-copy-paste.controller.ts
@@ -0,0 +1,115 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 { DocumentDataModel, IDocDrawingBase } from '@univerjs/core';
+import type { IInnerPasteCommandParams } from '@univerjs/docs-ui';
+import { BuildTextUtils, createDocumentModelWithStyle, Disposable, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_ZEN_EDITOR_UNIT_ID_KEY, ICommandService, Inject, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
+import { InnerPasteCommand } from '@univerjs/docs-ui';
+import { getCurrentTypeOfRenderer, IRenderManagerService } from '@univerjs/engine-render';
+import { EditingRenderController, SetCellEditVisibleOperation } from '@univerjs/sheets-ui';
+import { IDialogService } from '@univerjs/ui';
+
+const DISABLE_UNITS = [
+ DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
+ DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY,
+ DOCS_ZEN_EDITOR_UNIT_ID_KEY,
+];
+export class SheetCellImageCopyPasteController extends Disposable {
+ constructor(
+ @ICommandService private readonly _commandService: ICommandService,
+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
+ @IDialogService private readonly _dialogService: IDialogService,
+ @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,
+ @Inject(LocaleService) private readonly _localeService: LocaleService
+ ) {
+ super();
+ this._initDocImageCopyPasteHooks();
+ }
+
+ private _setCellImage(drwaing: IDocDrawingBase) {
+ const docDataModel = createDocumentModelWithStyle('', {});
+ const editingRenderController = getCurrentTypeOfRenderer(UniverInstanceType.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)?.with(EditingRenderController);
+ const jsonXActions = BuildTextUtils.drawing.add({
+ documentDataModel: docDataModel,
+ drawings: [drwaing],
+ selection: {
+ collapsed: true,
+ startOffset: 0,
+ endOffset: 0,
+ },
+ });
+ if (jsonXActions) {
+ docDataModel.apply(jsonXActions);
+ if (editingRenderController) {
+ editingRenderController.submitCellData(docDataModel);
+ }
+ }
+ }
+
+ private _initDocImageCopyPasteHooks() {
+ this.disposeWithMe(
+ this._commandService.beforeCommandExecuted((commandInfo) => {
+ if (commandInfo.id === InnerPasteCommand.id) {
+ const params = commandInfo.params as IInnerPasteCommandParams;
+ const { doc } = params;
+ const currentDoc = this._univerInstanceService.getCurrentUnitOfType<DocumentDataModel>(UniverInstanceType.UNIVER_DOC);
+ if (currentDoc == null || !Object.keys(doc.drawings ?? {}).length) {
+ return;
+ }
+ const docUnitId = currentDoc.getUnitId();
+ if (DISABLE_UNITS.includes(docUnitId)) {
+ if (docUnitId !== DOCS_ZEN_EDITOR_UNIT_ID_KEY) {
+ const handleCloseDialog = () => {
+ this._dialogService.close('sheet-cell-image-copy-paste');
+ this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
+ visible: false,
+ });
+ };
+ // empty
+ if (currentDoc.getBody()?.dataStream === '\r\n') {
+ this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
+ visible: false,
+ });
+ this._setCellImage(Object.values(doc.drawings!)[0]);
+ } else {
+ this._dialogService.open({
+ id: 'sheet-cell-image-copy-paste',
+ title: {
+ label: this._localeService.t('cell-image.pasteTitle'),
+ },
+ children: {
+ label: this._localeService.t('cell-image.pasteContent'),
+ },
+ width: 320,
+ destroyOnClose: true,
+ onClose: handleCloseDialog,
+ showOk: true,
+ showCancel: true,
+ onOk: () => {
+ handleCloseDialog();
+ this._setCellImage(Object.values(doc.drawings!)[0]);
+ },
+ onCancel: handleCloseDialog,
+ });
+ }
+ }
+ throw new Error('Sheet cell image copy paste is not supported in this unit');
+ }
+ }
+ })
+ );
+ }
+}
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-cell-image.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-cell-image.controller.ts
index ecec2a7cdb..cc088d9757 100644
--- a/packages/sheets-drawing-ui/src/controllers/sheet-cell-image.controller.ts
+++ b/packages/sheets-drawing-ui/src/controllers/sheet-cell-image.controller.ts
@@ -18,14 +18,12 @@ import type { ICellData, IDocDrawingBase, Nullable } from '@univerjs/core';
import type { IReplaceSnapshotCommandParams } from '@univerjs/docs-ui';
import type { IImageData } from '@univerjs/drawing';
import type { ISheetLocationBase } from '@univerjs/sheets';
-import type { IEditorBridgeServiceVisibleParam } from '@univerjs/sheets-ui';
import { Disposable, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_ZEN_EDITOR_UNIT_ID_KEY, ICommandService, Inject, Injector, InterceptorEffectEnum } from '@univerjs/core';
import { DocDrawingController } from '@univerjs/docs-drawing';
import { ReplaceSnapshotCommand } from '@univerjs/docs-ui';
import { IDrawingManagerService } from '@univerjs/drawing';
-import { DeviceInputEventType } from '@univerjs/engine-render';
import { InterceptCellContentPriority, INTERCEPTOR_POINT, SheetInterceptorService } from '@univerjs/sheets';
-import { IEditorBridgeService, SetCellEditVisibleOperation } from '@univerjs/sheets-ui';
+import { IEditorBridgeService } from '@univerjs/sheets-ui';
import { getDrawingSizeByCell } from './sheet-drawing-update.controller';
export function resizeImageByCell(injector: Injector, location: ISheetLocationBase, cell: Nullable<ICellData>) {
@@ -76,23 +74,6 @@ export class SheetCellImageController extends Disposable {
this._handleInitEditor();
this._initCellContentInterceptor();
- this._initDisableEdit();
- }
-
- private _initDisableEdit() {
- this.disposeWithMe(this._commandService.beforeCommandExecuted((commandInfo) => {
- if (commandInfo.id === SetCellEditVisibleOperation.id) {
- const params = commandInfo.params as IEditorBridgeServiceVisibleParam;
- const { visible, eventType } = params;
- if (visible && eventType === DeviceInputEventType.Dblclick) {
- const editState = this._editorBridgeService.getEditCellState();
- const drawingCount = editState?.documentLayoutObject.documentModel?.getDrawingsOrder()?.length ?? 0;
- if (drawingCount > 0) {
- throw new Error('Can not edit when there are drawings.');
- }
- }
- }
- }));
}
private _handleInitEditor() {
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-celll-image-hover.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-celll-image-hover.controller.ts
deleted file mode 100644
index 8e2cce4ab8..0000000000
--- a/packages/sheets-drawing-ui/src/controllers/sheet-celll-image-hover.controller.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright 2023-present DreamNum Co., Ltd.
- *
- * 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 { Disposable, Inject } from '@univerjs/core';
-import { DrawingRenderService } from '@univerjs/drawing-ui';
-import { IRenderManagerService } from '@univerjs/engine-render';
-import { SheetsSelectionsService } from '@univerjs/sheets';
-import { HoverManagerService } from '@univerjs/sheets-ui';
-
-export class SheetCellImageHoverController extends Disposable {
- private _isSetCursor = false;
-
- constructor(
- @Inject(HoverManagerService) private _hoverManagerService: HoverManagerService,
- @Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,
- @Inject(SheetsSelectionsService) private _selectionsService: SheetsSelectionsService,
- @Inject(DrawingRenderService) private _drawingRenderService: DrawingRenderService
- ) {
- super();
- // this._initHover();
- // this._initImageClick();
- }
-
- private _initHover() {
-
- }
-
- private _initImageClick() {
-
- }
-}
diff --git a/packages/sheets-drawing-ui/src/locale/en-US.ts b/packages/sheets-drawing-ui/src/locale/en-US.ts
index ca0cc5fc06..5d188ef788 100644
--- a/packages/sheets-drawing-ui/src/locale/en-US.ts
+++ b/packages/sheets-drawing-ui/src/locale/en-US.ts
@@ -58,6 +58,11 @@ const locale: typeof zhCN = {
'drawing-delete': 'Delete Drawing',
},
},
+ 'cell-image': {
+ pasteTitle: 'Paste as cell image',
+ pasteContent: 'Pasting a cell image will overwrite the existing content of the cell, continue pasting',
+ pasteError: 'Sheet cell image copy paste is not supported in this unit',
+ },
};
export default locale;
diff --git a/packages/sheets-drawing-ui/src/locale/fa-IR.ts b/packages/sheets-drawing-ui/src/locale/fa-IR.ts
index 7498a3d781..4aafb71983 100644
--- a/packages/sheets-drawing-ui/src/locale/fa-IR.ts
+++ b/packages/sheets-drawing-ui/src/locale/fa-IR.ts
@@ -58,6 +58,11 @@ const locale: typeof zhCN = {
'drawing-delete': 'حذف طراحی',
},
},
+ 'cell-image': {
+ pasteTitle: 'چسباندن به عنوان تصویر سلول',
+ pasteContent: 'چسباندن تصویر سلول محتوای موجود سلول را پاک خواهد کرد، ادامه چسباندن',
+ pasteError: 'کپی و چسباندن تصویر سلول در این واحد پشتیبانی نمی‌شود',
+ },
};
export default locale;
diff --git a/packages/sheets-drawing-ui/src/locale/fr-FR.ts b/packages/sheets-drawing-ui/src/locale/fr-FR.ts
index 6205c5f1f1..018022e31b 100644
--- a/packages/sheets-drawing-ui/src/locale/fr-FR.ts
+++ b/packages/sheets-drawing-ui/src/locale/fr-FR.ts
@@ -58,6 +58,11 @@ const locale: typeof enUS = {
'drawing-delete': 'Supprimer le dessin',
},
},
+ 'cell-image': {
+ pasteTitle: 'Coller comme image de cellule',
+ pasteContent: 'Coller une image de cellule écrasera le contenu existant de la cellule, continuer le collage',
+ pasteError: 'Le copier-coller d\'image de cellule n\'est pas pris en charge dans cette unité',
+ },
};
export default locale;
diff --git a/packages/sheets-drawing-ui/src/locale/ru-RU.ts b/packages/sheets-drawing-ui/src/locale/ru-RU.ts
index 451b3fe9db..1f41770fc9 100644
--- a/packages/sheets-drawing-ui/src/locale/ru-RU.ts
+++ b/packages/sheets-drawing-ui/src/locale/ru-RU.ts
@@ -58,6 +58,11 @@ const locale: typeof zhCN = {
'drawing-delete': 'Delete Drawing',
},
},
+ 'cell-image': {
+ pasteTitle: 'Вставить как изображение ячейки',
+ pasteContent: 'Вставка изображения ячейки перезапишет существующее содержимое ячейки, продолжить вставку',
+ pasteError: 'Копирование и вставка изображения ячейки не поддерживается в этом блоке',
+ },
};
export default locale;
diff --git a/packages/sheets-drawing-ui/src/locale/vi-VN.ts b/packages/sheets-drawing-ui/src/locale/vi-VN.ts
index d7b3232005..e6fcff90e8 100644
--- a/packages/sheets-drawing-ui/src/locale/vi-VN.ts
+++ b/packages/sheets-drawing-ui/src/locale/vi-VN.ts
@@ -58,6 +58,11 @@ const locale: typeof zhCN = {
'drawing-delete': 'Delete Drawing',
},
},
+ 'cell-image': {
+ pasteTitle: 'Dán như hình ảnh ô',
+ pasteContent: 'Dán hình ảnh ô sẽ ghi đè lên nội dung hiện có của ô, tiếp tục dán',
+ pasteError: 'Sao chép và dán hình ảnh ô không được hỗ trợ trong đơn vị này',
+ },
};
export default locale;
diff --git a/packages/sheets-drawing-ui/src/locale/zh-CN.ts b/packages/sheets-drawing-ui/src/locale/zh-CN.ts
index 7a9fc783b9..ba66689451 100644
--- a/packages/sheets-drawing-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-drawing-ui/src/locale/zh-CN.ts
@@ -56,6 +56,11 @@ const locale = {
'drawing-delete': '删除绘图',
},
},
+ 'cell-image': {
+ pasteTitle: '粘贴为单元格图片',
+ pasteContent: '粘贴单元格图片将覆盖单元格中的现有内容,继续粘贴',
+ pasteError: '此单元中不支持单元格图片复制粘贴',
+ },
};
export default locale;
diff --git a/packages/sheets-drawing-ui/src/locale/zh-TW.ts b/packages/sheets-drawing-ui/src/locale/zh-TW.ts
index 500900e7f4..c8971bf852 100644
--- a/packages/sheets-drawing-ui/src/locale/zh-TW.ts
+++ b/packages/sheets-drawing-ui/src/locale/zh-TW.ts
@@ -59,6 +59,11 @@ const locale: typeof zhCN = {
'drawing-delete': '刪除繪圖',
},
},
+ 'cell-image': {
+ pasteTitle: '粘貼為儲存格圖片',
+ pasteContent: '粘貼儲存格圖片將覆蓋儲存格中的現有內容,繼續粘貼',
+ pasteError: '此單元中不支持儲存格圖片複製粘貼',
+ },
};
export default locale;
diff --git a/packages/sheets-drawing-ui/src/plugin.ts b/packages/sheets-drawing-ui/src/plugin.ts
index 8ee6a915ee..3480494290 100644
--- a/packages/sheets-drawing-ui/src/plugin.ts
+++ b/packages/sheets-drawing-ui/src/plugin.ts
@@ -34,10 +34,11 @@ import { IRenderManagerService } from '@univerjs/engine-render';
import { UniverSheetsDrawingPlugin } from '@univerjs/sheets-drawing';
import { defaultPluginConfig, SHEETS_DRAWING_UI_PLUGIN_CONFIG_KEY } from './controllers/config.schema';
import { DrawingPopupMenuController } from './controllers/drawing-popup-menu.controller';
+import { SheetCellImageHoverRenderController } from './controllers/render-controllers/sheet-celll-image-hover.render-controller';
import { SheetsDrawingRenderController } from './controllers/render-controllers/sheet-drawing.render-controller';
import { SheetCellImageAutofillController } from './controllers/sheet-cell-image-autofill.controller';
+import { SheetCellImageCopyPasteController } from './controllers/sheet-cell-image-copy-paste.controller';
import { SheetCellImageController } from './controllers/sheet-cell-image.controller';
-import { SheetCellImageHoverController } from './controllers/sheet-celll-image-hover.controller';
import { SheetsDrawingCopyPasteController } from './controllers/sheet-drawing-copy-paste.controller';
import { SheetDrawingPermissionController } from './controllers/sheet-drawing-permission.controller';
import { SheetDrawingPrintingController } from './controllers/sheet-drawing-printing.controller';
@@ -82,8 +83,8 @@ export class UniverSheetsDrawingUIPlugin extends Plugin {
[SheetDrawingPermissionController],
[SheetsDrawingCopyPasteController],
[SheetCellImageController],
- [SheetCellImageHoverController],
[SheetCellImageAutofillController],
+ [SheetCellImageCopyPasteController],
]);
touchDependencies(this._injector, [
@@ -94,6 +95,7 @@ export class UniverSheetsDrawingUIPlugin extends Plugin {
override onReady(): void {
touchDependencies(this._injector, [
[SheetsDrawingCopyPasteController],
+ [SheetCellImageCopyPasteController],
]);
}
@@ -105,7 +107,6 @@ export class UniverSheetsDrawingUIPlugin extends Plugin {
[SheetDrawingPrintingController],
[SheetDrawingUIController],
[SheetCellImageController],
- [SheetCellImageHoverController],
[SheetCellImageAutofillController],
]);
}
@@ -119,6 +120,7 @@ export class UniverSheetsDrawingUIPlugin extends Plugin {
[SheetDrawingUpdateController],
[SheetDrawingTransformAffectedController],
[SheetsDrawingRenderController],
+ [SheetCellImageHoverRenderController],
] as Dependency[]).forEach((m) => {
this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, m));
});
diff --git a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
index d5471ca8c7..f75fdc1960 100644
--- a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
@@ -387,7 +387,7 @@ export class EditingRenderController extends Disposable implements IRenderModule
}
// You can double-click on the cell or input content by keyboard to put the cell into the edit state.
- // eslint-disable-next-line complexity
+
private _handleEditorVisible(param: IEditorBridgeServiceVisibleParam) {
const { eventType, keycode } = param;
// Change `CursorChange` to changed status, when formula bar clicked.
@@ -436,8 +436,31 @@ export class EditingRenderController extends Disposable implements IRenderModule
});
});
- // f2, continue to edit
- if (eventType === DeviceInputEventType.Keyboard && keycode === KeyCode.F2) {
+ const clearAndEdit = () => {
+ this._emptyDocumentDataModel(documentDataModel.getSnapshot().documentStyle, !!isInArrayFormulaRange);
+ document.makeDirty();
+
+ // @JOCS, Why calculate here?
+ if (keycode === KeyCode.BACKSPACE || eventType === DeviceInputEventType.Dblclick) {
+ skeleton.calculate();
+ this._editorBridgeService.changeEditorDirty(true);
+ }
+
+ this._textSelectionManagerService.replaceDocRanges(
+ [{
+ startOffset: 0,
+ endOffset: 0,
+ }],
+ {
+ unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
+ subUnitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
+ }
+ );
+ };
+ if (this._isCellImageData(documentDataModel.getSnapshot())) {
+ clearAndEdit();
+ } else if (eventType === DeviceInputEventType.Keyboard && keycode === KeyCode.F2) {
+ // f2, continue to edit
document.makeDirty();
this._textSelectionManagerService.replaceDocRanges([
{
@@ -461,25 +484,7 @@ export class EditingRenderController extends Disposable implements IRenderModule
eventType === DeviceInputEventType.Keyboard ||
(eventType === DeviceInputEventType.Dblclick && isInArrayFormulaRange)
) {
- this._emptyDocumentDataModel(documentDataModel.getSnapshot().documentStyle, !!isInArrayFormulaRange);
- document.makeDirty();
-
- // @JOCS, Why calculate here?
- if (keycode === KeyCode.BACKSPACE || eventType === DeviceInputEventType.Dblclick) {
- skeleton.calculate();
- this._editorBridgeService.changeEditorDirty(true);
- }
-
- this._textSelectionManagerService.replaceDocRanges(
- [{
- startOffset: 0,
- endOffset: 0,
- }],
- {
- unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
- subUnitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
- }
- );
+ clearAndEdit();
} else if (eventType === DeviceInputEventType.Dblclick) {
if (this._contextService.getContextValue(FOCUSING_EDITOR_INPUT_FORMULA)) {
return;
@@ -552,7 +557,9 @@ export class EditingRenderController extends Disposable implements IRenderModule
return;
}
- if (snapshot) {
+ const isEmpty = snapshot?.body?.dataStream.length === 2;
+ const isCellImage = editCellState.documentLayoutObject.documentModel ? this._isCellImageData(editCellState.documentLayoutObject.documentModel.getSnapshot()) : false;
+ if (snapshot && !(isEmpty && isCellImage)) {
const res = await this._submitCellData(snapshot);
// if the submit was rejected, don't move selection
if (res === false) {
@@ -568,6 +575,11 @@ export class EditingRenderController extends Disposable implements IRenderModule
return getEditorObject(this._editorBridgeService.getCurrentEditorId(), this._renderManagerService);
}
+ private _isCellImageData(snapshot: IDocumentData) {
+ const drawingCount = snapshot.drawingsOrder?.length ?? 0;
+ return drawingCount > 0;
+ }
+
submitCellData(documentDataModel: DocumentDataModel) {
return this._submitCellData(documentDataModel.getSnapshot());
}
diff --git a/packages/sheets-ui/src/controllers/hover-render.controller.ts b/packages/sheets-ui/src/controllers/hover-render.controller.ts
index 1848a89eed..265d8f1c5f 100644
--- a/packages/sheets-ui/src/controllers/hover-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/hover-render.controller.ts
@@ -45,6 +45,7 @@ export class HoverRenderController extends Disposable implements IRenderModule {
// eslint-disable-next-line max-lines-per-function
private _initPointerEvent() {
const disposeSet = new DisposableCollection();
+ // eslint-disable-next-line max-lines-per-function
const handleSkeletonChange = (skeletonParam: Nullable<ISheetSkeletonManagerParam>) => {
disposeSet.dispose();
@@ -72,6 +73,9 @@ export class HoverRenderController extends Disposable implements IRenderModule {
disposeSet.add(mainComponent.onPointerUp$.subscribeEvent((evt) => {
this._hoverManagerService.triggerPointerUp(unitId, evt);
+ }));
+
+ disposeSet.add(mainComponent.onClick$.subscribeEvent((evt) => {
this._hoverManagerService.triggerClick(unitId, evt.offsetX, evt.offsetY);
}));
diff --git a/packages/sheets-ui/src/services/hover-manager.service.ts b/packages/sheets-ui/src/services/hover-manager.service.ts
index fe9dc30cce..b348f44452 100644
--- a/packages/sheets-ui/src/services/hover-manager.service.ts
+++ b/packages/sheets-ui/src/services/hover-manager.service.ts
@@ -15,7 +15,7 @@
*/
import type { ICustomRange, IParagraph, IPosition, Nullable, Workbook, Worksheet } from '@univerjs/core';
-import type { IBoundRectNoAngle, IMouseEvent, IPointerEvent, IRender } from '@univerjs/engine-render';
+import type { IBoundRectNoAngle, IDocumentSkeletonDrawing, IMouseEvent, IPointerEvent, IRender } from '@univerjs/engine-render';
import type { ISheetLocation, ISheetLocationBase } from '@univerjs/sheets';
import type { ISheetSkeletonManagerParam } from './sheet-skeleton-manager.service';
import { Disposable, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
@@ -56,7 +56,7 @@ export interface IHoverRichTextInfo extends IHoverCellPosition {
*/
rect?: Nullable<IBoundRectNoAngle>;
- drawing?: Nullable<string>;
+ drawing?: Nullable<{ drawingId: string; rect: IBoundRectNoAngle; drawing: IDocumentSkeletonDrawing }>;
}
export interface IHoverRichTextPosition extends ISheetLocationBase {
@@ -73,7 +73,7 @@ export interface IHoverRichTextPosition extends ISheetLocationBase {
*/
rect?: Nullable<IBoundRectNoAngle>;
- drawing?: Nullable<string>;
+ drawing?: Nullable<{ drawingId: string; rect: IBoundRectNoAngle; drawing: IDocumentSkeletonDrawing }>;
event?: IMouseEvent | IPointerEvent;
}
@@ -122,6 +122,19 @@ export class HoverManagerService extends Disposable {
)
);
+ currentRichTextNoDistinct$ = this._currentRichText$.pipe(
+ map((cell) => cell && {
+ unitId: cell.location.unitId,
+ subUnitId: cell.location.subUnitId,
+ row: cell.location.row,
+ col: cell.location.col,
+ customRange: cell.customRange,
+ bullet: cell.bullet,
+ rect: cell.rect,
+ drawing: cell.drawing,
+ } as IHoverRichTextPosition)
+ );
+
// Notify when hovering over different cells and different custom range or bullet
currentRichText$ = this._currentRichText$.pipe(
distinctUntilChanged(
@@ -135,7 +148,7 @@ export class HoverManagerService extends Disposable {
&& pre?.bullet?.startIndex === aft?.bullet?.startIndex
&& pre?.customRange?.startIndex === aft?.customRange?.startIndex
&& pre?.customRange?.endIndex === aft?.customRange?.endIndex
- && pre?.drawing === aft?.drawing
+ && pre?.drawing?.drawingId === aft?.drawing?.drawingId
)
),
map((cell) => cell && {
@@ -248,7 +261,6 @@ export class HoverManagerService extends Disposable {
return { currentRender, workbook, worksheet, skeletonParam };
}
- // eslint-disable-next-line complexity
private _calcActiveCell(currentRender: IRender, workbook: Workbook, worksheet: Worksheet, skeletonParam: ISheetSkeletonManagerParam, offsetX: number, offsetY: number) {
const hoverPosition = getHoverCellPosition(currentRender, workbook, worksheet, skeletonParam, offsetX, offsetY);
const skeleton = skeletonParam.skeleton;
@@ -270,6 +282,7 @@ export class HoverManagerService extends Disposable {
let drawing: Nullable<{
rect: IBoundRectNoAngle;
drawingId: string;
+ drawing: IDocumentSkeletonDrawing;
}> = null;
const cell = skeleton.getCellWithCoordByIndex(overflowLocation.row, overflowLocation.col);
@@ -293,7 +306,7 @@ export class HoverManagerService extends Disposable {
overflowLocation,
customRange: customRange?.range,
bullet: bullet?.paragraph,
- drawing: drawing?.drawingId,
+ drawing,
rect: rect && {
top: rect.top + cell.mergeInfo.startY + topOffset,
bottom: rect.bottom + cell.mergeInfo.startY + topOffset,
diff --git a/packages/sheets-ui/src/services/utils/doc-skeleton-util.ts b/packages/sheets-ui/src/services/utils/doc-skeleton-util.ts
index 0db06d4413..9fbffb7fce 100644
--- a/packages/sheets-ui/src/services/utils/doc-skeleton-util.ts
+++ b/packages/sheets-ui/src/services/utils/doc-skeleton-util.ts
@@ -150,6 +150,7 @@ export const calculateDocSkeletonRects = (docSkeleton: DocumentSkeleton, padding
left: drawings!.get(key)!.aLeft,
right: drawings!.get(key)!.aLeft + drawings!.get(key)!.height,
},
+ drawing: drawings.get(key)!,
}))
: [],
};