@univerjs-pro/sheets-shape-ui 1.0.0-alpha.2 → 1.0.0-alpha.4

package/lib/types/const.d.ts

@@ -1,4 +1,6 @@
 export declare const SHEET_SHAPE_EDIT_PANEL_KEY = "sheet.shape.edit.panel";
+export declare const SHEET_SHAPE_OBJECT_LIST_PANEL_KEY = "sheet.shape.object-list.panel";
 export declare const SHEET_SHAPE_FLOATING_TOOLBAR_KEY = "sheet.shape.floating-toolbar";
 export declare const DOCS_SHAPE_EDITOR_UNIT_ID_KEY: string;
-export declare const ShapeTextEditorContainer = "ShapeTextEditorContainer";
+export declare const SHAPE_TEXT_FLOAT_MENU_COMPONENT_KEY = "sheet.shape.text.float-menu";
+export declare const ShapeTextEditorContainer = "SheetShapeTextEditorContainer";

package/lib/types/controllers/components.controller.d.ts

@@ -1,7 +1,9 @@
 import { Disposable } from '@univerjs/core';
-import { ComponentManager } from '@univerjs/ui';
+import { ComponentManager, IconManager } from '@univerjs/ui';
 export declare class ComponentsController extends Disposable {
     private readonly _componentManager;
-    constructor(_componentManager: ComponentManager);
+    private readonly _iconManager;
+    constructor(_componentManager: ComponentManager, _iconManager: IconManager);
+    private _registerIcons;
     private _registerComponents;
 }

package/lib/types/controllers/shape-text-float-menu.render-controller.d.ts

@@ -3,7 +3,6 @@ import type { IRenderContext } from '@univerjs/engine-render';
 import { ShapeTextFloatMenuRenderControllerBase } from '@univerjs-pro/shape-editor-ui';
 import { DocSelectionManagerService } from '@univerjs/docs';
 import { DocCanvasPopManagerService, DocSelectionRenderService } from '@univerjs/docs-ui';
-import { ComponentManager } from '@univerjs/ui';
 export declare class ShapeTextFloatMenuRenderController extends ShapeTextFloatMenuRenderControllerBase {
-    constructor(context: IRenderContext<DocumentDataModel>, docSelectionManagerService: DocSelectionManagerService, docCanvasPopManagerService: DocCanvasPopManagerService, componentManager: ComponentManager, docSelectionRenderService: DocSelectionRenderService);
+    constructor(context: IRenderContext<DocumentDataModel>, docSelectionManagerService: DocSelectionManagerService, docCanvasPopManagerService: DocCanvasPopManagerService, docSelectionRenderService: DocSelectionRenderService);
 }

package/lib/types/controllers/shape-update.controller.d.ts

@@ -10,6 +10,7 @@ export declare class ShapeUpdateController extends Disposable {
     private readonly _currentUniverService;
     private readonly _drawingRenderService;
     private readonly _sheetDrawingShapeRenderController;
+    private readonly _insertingShapeKeys;
     constructor(_commandService: ICommandService, _renderManagerService: IRenderManagerService, _drawingManagerService: IDrawingManagerService, _currentUniverService: IUniverInstanceService, _drawingRenderService: DrawingRenderService, _sheetDrawingShapeRenderController: SheetDrawingShapeRenderController);
     private _initialize;
     private _drawingAddListener;

package/lib/types/controllers/sheet-shape-adjust.controller.d.ts

@@ -1,13 +1,10 @@
-import type { Workbook } from '@univerjs/core';
-import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import type { IRenderModule } from '@univerjs/engine-render';
 import { SheetsShapeService } from '@univerjs-pro/sheets-shape';
-import { Disposable, ICommandService, IContextService, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetDrawingShapeRenderController } from './sheet-shape-render.controller';
 export declare class SheetShapeAdjustController extends Disposable implements IRenderModule {
-    private readonly _context;
-    private readonly _contextService;
     private _drawingManagerService;
     private _sheetsShapeService;
     private readonly _renderManagerService;
@@ -29,7 +26,7 @@ export declare class SheetShapeAdjustController extends Disposable implements IR
     private _adjHandlerPointerMove;
     private _adjHandlerPointerUp;
     private _isShouldShowDrawingShapeAdjust;
-    constructor(_context: IRenderContext<Workbook>, _contextService: IContextService, _drawingManagerService: IDrawingManagerService, _sheetsShapeService: SheetsShapeService, _renderManagerService: IRenderManagerService, _sheetDrawingShapeRenderController: SheetDrawingShapeRenderController, _univerInstanceService: IUniverInstanceService, _commandService: ICommandService);
+    constructor(_drawingManagerService: IDrawingManagerService, _sheetsShapeService: SheetsShapeService, _renderManagerService: IRenderManagerService, _sheetDrawingShapeRenderController: SheetDrawingShapeRenderController, _univerInstanceService: IUniverInstanceService, _commandService: ICommandService);
     private _getShapeAdjustPointListById;
     clearAdjustControls(): void;
     refreshAdjustControls(): void;

package/lib/types/controllers/sheet-shape-printing.controller.d.ts

@@ -0,0 +1,12 @@
+import { Disposable } from '@univerjs/core';
+import { IDrawingManagerService } from '@univerjs/drawing';
+import { SheetPrintInterceptorService } from '@univerjs/sheets-ui';
+import { SheetDrawingShapeRenderController } from './sheet-shape-render.controller';
+/** Adds visible sheet shapes to the isolated print scene and tracks their async fills. */
+export declare class SheetShapePrintingController extends Disposable {
+    private readonly _sheetPrintInterceptorService;
+    private readonly _drawingManagerService;
+    private readonly _shapeRenderController;
+    constructor(_sheetPrintInterceptorService: SheetPrintInterceptorService, _drawingManagerService: IDrawingManagerService, _shapeRenderController: SheetDrawingShapeRenderController);
+    private _initPrinting;
+}

package/lib/types/controllers/sheet-shape-render.controller.d.ts

@@ -1,8 +1,8 @@
 import type { IDrawingShapeData } from '@univerjs-pro/sheets-shape';
 import type { Scene } from '@univerjs/engine-render';
 import { SheetsShapeService } from '@univerjs-pro/sheets-shape';
-import { Disposable, IURLImageService, LocaleService } from '@univerjs/core';
-import { IDrawingManagerService, IImageIoService } from '@univerjs/drawing';
+import { Disposable, IImageIoService, IURLImageService, LocaleService } from '@univerjs/core';
+import { IDrawingManagerService } from '@univerjs/drawing';
 import { DrawingShape } from '../view-model/drawing-shape';
 export declare class SheetDrawingShapeRenderController extends Disposable {
     private readonly _drawingManagerService;
@@ -11,7 +11,13 @@ export declare class SheetDrawingShapeRenderController extends Disposable {
     private readonly _imageIoService;
     private readonly _urlImageService;
     constructor(_drawingManagerService: IDrawingManagerService, _sheetsShapeService: SheetsShapeService, _localeService: LocaleService, _imageIoService: IImageIoService, _urlImageService: IURLImageService);
-    renderDrawingShape(drawingShapeParam: IDrawingShapeData, scene: Scene): DrawingShape[] | undefined;
+    /** The optional collector lets print callers wait for asynchronous picture fills. */
+    renderDrawingShape(drawingShapeParam: IDrawingShapeData, scene: Scene, options?: {
+        resourceCollector?: {
+            add: (resource: Promise<unknown>) => void;
+        };
+    }): DrawingShape[] | undefined;
+    refreshShapeFillImage(shape: DrawingShape): void;
     /**
      * If the shape has PictureFill, resolve the image (from cache or network) and
      * inject it into the DrawingShape so that _draw() can pass it to renderOption.

package/lib/types/index.d.ts

@@ -1,9 +1,3 @@
 import './global.css';
-export { SetShapeTextHorizontalAlignCommand } from './commands/command/set-shape-text-align.command';
-export { SetShapeTextFontSizeCommand, SetShapeTextFontSizeDecreaseCommand, SetShapeTextFontSizeIncreaseCommand } from './commands/command/set-shape-text-style.command';
-export { SetShapeTextVerticalAlignCommand } from './commands/command/set-shape-text-vertical-align.command';
-export { ShapeDocAlignCommand } from './commands/command/shape-doc-align.command';
-export { UpdateShapeDataCommand } from './commands/command/update-shape-data.command';
-export type { IUniverSheetsShapeUIConfig } from './config/config';
-export { SheetsShapeUIController } from './controllers/ui.controller';
+export { menuSchema as SheetsShapeUIMenuSchema } from './menu/schema';
 export { UniverSheetsShapeUIPlugin } from './plugin';

package/lib/types/locale/en-US.d.ts

@@ -1,38 +1,5 @@
 declare const locale: {
     'sheets-shape-ui': {
-        align: {
-            top: string;
-            middle: string;
-            bottom: string;
-            left: string;
-            center: string;
-            right: string;
-        };
-        toolbar: {
-            verticalAlignMode: {
-                main: string;
-            };
-            horizontalAlignMode: {
-                main: string;
-            };
-            fillColor: {
-                main: string;
-            };
-            fontSize: string;
-            fontSizeIncrease: string;
-            fontSizeDecrease: string;
-            alignLeft: string;
-            alignCenter: string;
-            alignRight: string;
-            alignJustify: string;
-            bold: string;
-            italic: string;
-            underline: string;
-            strikethrough: string;
-            textColor: string;
-            textBackgroundColor: string;
-            resetColor: string;
-        };
         imagePanel: {
             crop: {
                 shape: string;
@@ -54,6 +21,24 @@ declare const locale: {
         rotateRight90: string;
         rotateLeft90: string;
         toggleTextVertical: string;
+        objectListPanel: {
+            title: string;
+            open: string;
+            empty: string;
+            showAll: string;
+            hideAll: string;
+            show: string;
+            hide: string;
+            moveForward: string;
+            moveBackward: string;
+            close: string;
+            name: string;
+            nameInput: string;
+            description: string;
+            descriptionPlaceholder: string;
+            details: string;
+            noSelection: string;
+        };
     };
 };
 export default locale;

package/lib/types/menu/object-list.menu.d.ts

@@ -0,0 +1,4 @@
+import type { IAccessor } from '@univerjs/core';
+import type { IMenuButtonItem } from '@univerjs/ui';
+import type { LocaleKey } from '../locale/types';
+export declare function SheetShapeObjectListMenuItemFactory(accessor: IAccessor): IMenuButtonItem<LocaleKey>;

package/lib/types/services/shape-text-editing.service.d.ts

@@ -17,4 +17,12 @@ export declare class ShapeTextEditingService extends Disposable {
     setEditing(params: Nullable<IEditingParams>): void;
     setOnSavingEditorData(params: Nullable<boolean>): void;
     getEditing(): Nullable<IEditingParams>;
+    /**
+     * Keep the session mounted for one frame after raising the save signal.
+     * The shared shape-text editor persists its document while that signal is true;
+     * clearing the session first would discard newly entered text on external click.
+     */
+    completeEditing(_event?: PointerEvent): void;
+    /** Cancel without raising the save signal, for example when Escape is pressed. */
+    cancelEditing(): void;
 }

package/lib/types/utils/shape-text-document.d.ts

@@ -1,11 +1 @@
-import type { IShapeRect } from '@univerjs-pro/engine-shape';
-import type { HorizontalAlign, IDocumentData, VerticalAlign } from '@univerjs/core';
-interface IPrepareShapeTextDocumentOptions {
-    isHorizontal: boolean;
-    textRect: IShapeRect;
-    verticalAlign?: VerticalAlign;
-    horizontalAlign?: HorizontalAlign;
-}
-export declare function prepareShapeTextDocumentData(documentData: IDocumentData, options: IPrepareShapeTextDocumentOptions): IDocumentData;
-export declare function stripShapeTextDocumentLayout(documentData: IDocumentData): IDocumentData;
-export {};
+export { prepareShapeTextDocumentData, stripShapeTextDocumentLayout, } from '@univerjs-pro/shape-editor-ui';

package/lib/types/view-model/drawing-shape.d.ts

@@ -1,5 +1,5 @@
-import type { ShapeModel } from '@univerjs-pro/engine-shape';
-import type { IDrawingParam, ISrcRect, LocaleService, Nullable } from '@univerjs/core';
+import type { ICustomShapeTextData, IShapeData, ShapeModel } from '@univerjs-pro/engine-shape';
+import type { IDocumentData, IDrawingParam, ISrcRect, LocaleService, Nullable } from '@univerjs/core';
 import type { IShapeProps, IViewportInfo, UniverRenderingContext, Vector2 } from '@univerjs/engine-render';
 import { DrawingTypeEnum } from '@univerjs/core';
 import { RENDER_CLASS_TYPE, Shape, Transform } from '@univerjs/engine-render';
@@ -47,6 +47,10 @@ export interface IDrawingShapeData extends IDrawingParam {
      */
     prstGeom?: Nullable<string>;
 }
+export declare function resolveDrawingShapeTextRenderPolicy(shapeData: IShapeData, customTextData: ICustomShapeTextData, documentData?: IDocumentData): {
+    clip: boolean;
+    wrapStrategy: import("@univerjs/core").WrapStrategy;
+};
 export declare class DrawingShape extends Shape<IDrawingShapeProps> {
     protected _props: IDrawingShapeProps;
     private _transformCalculateSrcRect;

package/lib/types/views/ShapePicker.d.ts

@@ -1,3 +1,5 @@
 export declare const SHAPE_PICKER_COMPONENT = "sheet.shape.picker.component";
+export declare const SHEET_IMAGE_CLIP_SHAPE_PICKER_COMPONENT = "sheet.image-clip.shape-picker.component";
 export declare function ImageClipShapePicker(): import("react").JSX.Element;
+export declare function ImageClipShapePickerBridge(): import("react").JSX.Element | null;
 export declare function ShapePicker(): import("react").JSX.Element;

package/lib/types/views/object-list-panel/SheetDrawingObjectListPanel.d.ts

@@ -0,0 +1 @@
+export declare function SheetDrawingObjectListPanel(): import("react").JSX.Element;

package/lib/types/views/shape-editor-panel/ShapeFillEditor.d.ts

@@ -1,5 +1,4 @@
 import type { IShapeData } from '@univerjs-pro/engine-shape';
-import { getInitialShapeFillType } from '@univerjs-pro/shape-editor-ui';
 interface IShapeFillProps {
     unitId: string;
     subUnitId: string;
@@ -8,5 +7,5 @@ interface IShapeFillProps {
     isLineShape: boolean;
     disableShapeOption: boolean;
 }
-export { getInitialShapeFillType };
 export declare function ShapeFillEditor(props: IShapeFillProps): import("react").JSX.Element;
+export {};