@univerjs/docs-drawing-ui 1.0.0-alpha.2 → 1.0.0-alpha.4

package/lib/types/commands/commands/update-doc-drawing.command.d.ts

@@ -13,25 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICommand, IDocDrawingBase, IDocDrawingPosition, IObjectPositionH, IObjectPositionV, ISize } from '@univerjs/core';
-import type { IDocumentSkeletonDrawing, IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage } from '@univerjs/engine-render';
-export declare enum TextWrappingStyle {
-    INLINE = "inline",
-    BEHIND_TEXT = "behindText",
-    IN_FRONT_OF_TEXT = "inFrontOfText",
-    WRAP_SQUARE = "wrapSquare",
-    WRAP_TOP_AND_BOTTOM = "wrapTopAndBottom"
-}
-interface IDrawingAnchorInPage {
-    skeDrawing: IDocumentSkeletonDrawing;
-    pageMarginTop: number;
-    pageMarginLeft: number;
-}
-export declare function findDrawingAnchorInPage(page: IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter, drawingId: string, pageMarginTop: number, pageMarginLeft: number): IDrawingAnchorInPage | null;
-/**
- * The command to update drawing wrapping style.
- */
-export declare const UpdateDocDrawingWrappingStyleCommand: ICommand;
+import type { ICommand, IDocDrawingBase, IDocDrawingPosition } from '@univerjs/core';
 /**
  * The command to update drawing wrap text.
  */
@@ -40,20 +22,6 @@ export declare const UpdateDocDrawingDistanceCommand: ICommand;
  * The command to update drawing wrap text.
  */
 export declare const UpdateDocDrawingWrapTextCommand: ICommand;
-export interface IDrawingDocTransform {
-    drawingId: string;
-    key: 'size' | 'angle' | 'positionH' | 'positionV';
-    value: ISize | number | IObjectPositionH | IObjectPositionV;
-}
-export interface IUpdateDrawingDocTransformParams {
-    unitId: string;
-    subUnitId: string;
-    drawings: IDrawingDocTransform[];
-}
-/**
- * The command to update drawing position.
- */
-export declare const UpdateDrawingDocTransformCommand: ICommand;
 export interface IMoveInlineDrawingParams {
     unitId: string;
     subUnitId: string;
@@ -80,4 +48,3 @@ export interface ITransformNonInlineDrawingParams {
  * The command to transform non-inline drawing.
  */
 export declare const ITransformNonInlineDrawingCommand: ICommand;
-export {};

package/lib/types/controllers/doc-drawing-notification.controller.d.ts

@@ -17,16 +17,20 @@ import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/c
 import { IDocDrawingService } from '@univerjs/docs-drawing';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { IRenderManagerService } from '@univerjs/engine-render';
+import { DocRefreshDrawingsService } from '../services/doc-refresh-drawings.service';
 export declare class DocDrawingAddRemoveController extends Disposable {
     private readonly _univerInstanceService;
     private readonly _commandService;
     private readonly _drawingManagerService;
     private readonly _docDrawingService;
     private readonly _renderManagerService;
-    constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _drawingManagerService: IDrawingManagerService, _docDrawingService: IDocDrawingService, _renderManagerService: IRenderManagerService);
+    private readonly _docRefreshDrawingsService;
+    constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _drawingManagerService: IDrawingManagerService, _docDrawingService: IDocDrawingService, _renderManagerService: IRenderManagerService, _docRefreshDrawingsService: DocRefreshDrawingsService);
     private _initialize;
     private _commandExecutedListener;
+    private _preserveWrappingStylePosition;
     private _addDrawings;
     private _removeDrawings;
     private _updateDrawingsOrder;
+    private _syncDrawingDataFromSnapshot;
 }

package/lib/types/controllers/doc-float-dom.controller.d.ts

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { ITransformState } from '@univerjs/core';
+import type { IDocFloatDom } from '@univerjs/docs-drawing';
 import type { IDocFloatDomDataBase } from '@univerjs/drawing';
-import type { IBoundRectNoAngle, Scene } from '@univerjs/engine-render';
+import type { IBoundRectNoAngle, IDocsCustomBlockRenderViewport, Scene } from '@univerjs/engine-render';
 import type { IFloatDomLayout } from '@univerjs/ui';
 import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IDrawingManagerService } from '@univerjs/drawing';
@@ -24,6 +26,13 @@ import { CanvasFloatDomService } from '@univerjs/ui';
 export declare function calcDocFloatDomPositionByRect(rect: IBoundRectNoAngle, scene: Scene, opacity?: number, angle?: number): IFloatDomLayout;
 interface IDocFloatDomParams extends IDocFloatDomDataBase {
 }
+type IDocFloatDomRuntimeViewport = Partial<Pick<IDocsCustomBlockRenderViewport, 'bleedLeft' | 'bleedWidth' | 'contentHeight' | 'contentWidth' | 'height' | 'viewportHeight'>>;
+interface IDocFloatDomRuntimeParam extends IDocFloatDom {
+    customBlockRenderViewport?: IDocFloatDomRuntimeViewport;
+    transform?: Partial<ITransformState>;
+    transforms?: Array<Partial<ITransformState>>;
+}
+export declare function mergeDocFloatDomRuntimeProps(existingProps: Record<string, unknown> | undefined, param: IDocFloatDomRuntimeParam): Record<string, unknown> | undefined;
 export declare class DocFloatDomController extends Disposable {
     private readonly _renderManagerService;
     private readonly _drawingManagerService;
@@ -38,6 +47,7 @@ export declare class DocFloatDomController extends Disposable {
     private _getSceneAndTransformerByDrawingSearch;
     private _drawingAddRemoveListener;
     private _insertRects;
+    private _drawingRuntimePropsListener;
     private _addHoverForRect;
     private _removeDom;
     private _initScrollAndZoomEvent;

package/lib/types/controllers/render-controllers/doc-drawing-transform-update.controller.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { DocumentDataModel, ITransformState } from '@univerjs/core';
-import type { IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonTable, IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import type { IDocsCustomBlockRenderViewport, IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonTable, IRenderContext, IRenderModule } from '@univerjs/engine-render';
 import { AlignTypeH, AlignTypeV, BooleanNumber, Disposable, ICommandService, IUniverInstanceService, LifecycleService, ObjectRelativeFromH, ObjectRelativeFromV, PositionedObjectLayoutType } from '@univerjs/core';
 import { DocSkeletonManagerService } from '@univerjs/docs';
 import { IEditorService } from '@univerjs/docs-ui';
@@ -28,6 +28,7 @@ interface IDrawingParamsWithBehindText {
     hidden?: boolean;
     transform: ITransformState;
     transforms: ITransformState[];
+    customBlockRenderViewport?: Partial<Pick<IDocsCustomBlockRenderViewport, 'bleedLeft' | 'bleedWidth' | 'contentHeight' | 'contentWidth' | 'height' | 'viewportHeight'>>;
     isMultiTransform: BooleanNumber;
 }
 interface IDrawingClipBounds {

package/lib/types/controllers/render-controllers/doc-drawing-update.render-controller.d.ts

@@ -15,11 +15,11 @@
  */
 import type { DocumentDataModel } from '@univerjs/core';
 import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
-import { Disposable, ICommandService, IContextService, LocaleService } from '@univerjs/core';
+import { Disposable, ICommandService, IContextService, IImageIoService, LocaleService } from '@univerjs/core';
 import { DocSelectionManagerService } from '@univerjs/docs';
 import { IDocDrawingService } from '@univerjs/docs-drawing';
 import { DocSelectionRenderService } from '@univerjs/docs-ui';
-import { IDrawingManagerService, IImageIoService } from '@univerjs/drawing';
+import { IDrawingManagerService } from '@univerjs/drawing';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { ILocalFileService, IMessageService } from '@univerjs/ui';
 import { DocRefreshDrawingsService } from '../../services/doc-refresh-drawings.service';

package/lib/types/index.d.ts

@@ -16,20 +16,20 @@
 import './global.css';
 export { DeleteDocDrawingsCommand } from './commands/commands/delete-doc-drawing.command';
 export { GroupDocDrawingCommand } from './commands/commands/group-doc-drawing.command';
-export { InsertDocDrawingCommand } from './commands/commands/insert-doc-drawing.command';
 export { InsertDocImageCommand } from './commands/commands/insert-image.command';
 export { InsertDocEllipseShapeCommand, InsertDocRectangleShapeCommand } from './commands/commands/insert-shape.command';
 export { MoveDocDrawingsCommand } from './commands/commands/move-drawings.command';
-export { RemoveDocDrawingCommand } from './commands/commands/remove-doc-drawing.command';
-export { SetDocDrawingArrangeCommand } from './commands/commands/set-drawing-arrange.command';
 export { UngroupDocDrawingCommand } from './commands/commands/ungroup-doc-drawing.command';
 export { ClearDocDrawingTransformerOperation } from './commands/operations/clear-drawing-transformer.operation';
 export { EditDocDrawingOperation } from './commands/operations/edit-doc-drawing.operation';
 export { SidebarDocDrawingOperation } from './commands/operations/open-drawing-panel.operation';
-export { type IUniverDocsDrawingUIConfig } from './config/config';
+export type { IUniverDocsDrawingUIConfig } from './config/config';
 export { DocFloatDomController } from './controllers/doc-float-dom.controller';
 export { DOCS_IMAGE_MENU_ID } from './menu/image.menu';
+export { menuSchema as DocsDrawingUIMenuSchema } from './menu/schema';
 export { DOCS_SHAPE_BELOW_MENU_ID, DOCS_SHAPE_MENU_ID } from './menu/shape.menu';
 export { UniverDocsDrawingUIPlugin } from './plugin';
+export { DocDrawingFloatingToolbarAdapterService } from './services/doc-drawing-floating-toolbar-adapter.service';
+export type { IDocDrawingFloatingToolbarAdapter, IDocDrawingFloatingToolbarButtonItem, IDocDrawingFloatingToolbarItem, IDocDrawingFloatingToolbarOption, IDocDrawingFloatingToolbarParams, IDocDrawingFloatingToolbarSelectItem, } from './services/doc-drawing-floating-toolbar-adapter.service';
 export { DocDrawingPosition } from './views/doc-image-panel/DocDrawingPosition';
 export { DocDrawingTextWrap } from './views/doc-image-panel/DocDrawingTextWrap';

package/lib/types/menu/drawing-popup-menu.controller.d.ts

@@ -14,25 +14,29 @@
  * limitations under the License.
  */
 import { ICommandService, IContextService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { IDocDrawingAdapterService } from '@univerjs/docs-drawing';
 import { DocCanvasPopManagerService } from '@univerjs/docs-ui';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { IRenderManagerService } from '@univerjs/engine-render';
+import { DocDrawingFloatingToolbarAdapterService } from '../services/doc-drawing-floating-toolbar-adapter.service';
 export declare class DocDrawingPopupMenuController extends RxDisposable {
     private readonly _drawingManagerService;
     private readonly _canvasPopManagerService;
     private readonly _renderManagerService;
     private readonly _univerInstanceService;
     private readonly _contextService;
+    private readonly _drawingAdapterService;
+    private readonly _floatingToolbarAdapterService;
     private readonly _commandService;
     private _initImagePopupMenu;
     private _disposePopups;
     private _isDrawingPanelOpen;
-    constructor(_drawingManagerService: IDrawingManagerService, _canvasPopManagerService: DocCanvasPopManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _contextService: IContextService, _commandService: ICommandService);
+    constructor(_drawingManagerService: IDrawingManagerService, _canvasPopManagerService: DocCanvasPopManagerService, _renderManagerService: IRenderManagerService, _univerInstanceService: IUniverInstanceService, _contextService: IContextService, _drawingAdapterService: IDocDrawingAdapterService, _floatingToolbarAdapterService: DocDrawingFloatingToolbarAdapterService, _commandService: ICommandService);
     private _init;
     private _dispose;
     private _clearPopups;
     private _create;
     private _hasCropObject;
     private _popupMenuListener;
-    private _getImageMenuItems;
+    private _getDrawingPopupMenuItems;
 }

package/lib/types/services/doc-drawing-floating-toolbar-adapter.service.d.ts

@@ -0,0 +1,54 @@
+/**
+ * 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 { IDisposable } from '@univerjs/core';
+import type { IDocDrawing } from '@univerjs/docs-drawing';
+export interface IDocDrawingFloatingToolbarParams {
+    unitId: string;
+    subUnitId: string;
+    drawing: IDocDrawing;
+}
+export interface IDocDrawingFloatingToolbarOption {
+    label: unknown;
+    value: string;
+}
+interface IDocDrawingFloatingToolbarBaseItem {
+    label: string;
+    index: number;
+    commandId: string;
+    commandParams?: object;
+    disable: boolean;
+    hideOnClick?: boolean;
+    icon?: string;
+}
+export interface IDocDrawingFloatingToolbarButtonItem extends IDocDrawingFloatingToolbarBaseItem {
+    type?: 'button';
+}
+export interface IDocDrawingFloatingToolbarSelectItem extends IDocDrawingFloatingToolbarBaseItem {
+    type: 'select';
+    value: string;
+    options: IDocDrawingFloatingToolbarOption[];
+    commandParamsFactory: (value: string) => object;
+}
+export type IDocDrawingFloatingToolbarItem = IDocDrawingFloatingToolbarButtonItem | IDocDrawingFloatingToolbarSelectItem;
+export interface IDocDrawingFloatingToolbarAdapter {
+    getItems: (params: IDocDrawingFloatingToolbarParams) => readonly IDocDrawingFloatingToolbarItem[] | null | undefined;
+}
+export declare class DocDrawingFloatingToolbarAdapterService {
+    private readonly _adapters;
+    registerAdapter(adapter: IDocDrawingFloatingToolbarAdapter): IDisposable;
+    getItems(params: IDocDrawingFloatingToolbarParams): IDocDrawingFloatingToolbarItem[] | null;
+}
+export {};

package/lib/types/views/doc-image-panel/DocDrawingPosition.d.ts

@@ -17,4 +17,4 @@ import type { IDrawingParam } from '@univerjs/core';
 export interface IDocDrawingPositionProps {
     drawings: IDrawingParam[];
 }
-export declare const DocDrawingPosition: (props: IDocDrawingPositionProps) => import("react").JSX.Element | undefined;
+export declare const DocDrawingPosition: (props: IDocDrawingPositionProps) => import("react").JSX.Element | null;