@univerjs/docs-drawing-ui 1.0.3 → 1.1.0

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

@@ -46,11 +46,11 @@ export declare class DocDrawingTransformerController extends Disposable {
     private _transformerCache;
     private _anchorShape;
     constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _drawingManagerService: IDrawingManagerService, _renderManagerService: IRenderManagerService);
+    dispose(): void;
     private _init;
     private _listenDrawingFocus;
     private _listenTransformerChange;
     private _updateMultipleDrawingDocTransform;
-    private _updateDrawingAnchor;
     private _updateInlineDrawingAnchor;
     private _getInlineDrawingAnchor;
     private _getDrawingAnchor;

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

@@ -0,0 +1,32 @@
+/**
+ * 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 } from '@univerjs/core';
+import type { IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import { Disposable, ThemeService } from '@univerjs/core';
+import { DocSkeletonManagerService } from '@univerjs/docs';
+import { DocSelectionRenderService } from '@univerjs/docs-ui';
+import { IDrawingManagerService } from '@univerjs/drawing';
+export declare class DocDrawingAnchorRenderController extends Disposable implements IRenderModule {
+    private readonly _context;
+    private readonly _skeletonManager;
+    private readonly _selectionRender;
+    private readonly _themeService;
+    private _stroke;
+    private _focused;
+    private readonly _markers;
+    constructor(_context: IRenderContext<DocumentDataModel>, drawingManager: IDrawingManagerService, _skeletonManager: DocSkeletonManagerService, _selectionRender: DocSelectionRenderService, _themeService: ThemeService);
+    private _updateMarkers;
+}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { DocumentDataModel, IDocDrawingBase, IDrawingParam, ITransformState } from '@univerjs/core';
-import type { IDocsCustomBlockRenderViewport, IDocumentLayoutProgress, IDocumentSkeletonCached, IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonTable, IRenderContext, IRenderModule } from '@univerjs/engine-render';
+import type { IDocsCustomBlockRenderViewport, IDocumentLayoutProgress, 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';
@@ -38,7 +38,10 @@ interface IDrawingClipBounds {
     width: number;
     height: number;
 }
-type DrawingRefreshParam = Partial<IDrawingParam & IDrawingParamsWithBehindText>;
+type DrawingRefreshParam = Partial<IDrawingParam> & {
+    behindText?: boolean;
+    customBlockRenderViewport?: IDrawingParamsWithBehindText['customBlockRenderViewport'];
+};
 export declare function shouldRefreshDocDrawingTransform(current: DrawingRefreshParam | null | undefined, next: DrawingRefreshParam): boolean;
 /**
  * Overlay drawings do not participate in text layout. While their skeleton
@@ -69,18 +72,22 @@ interface IDocumentDrawingPublicationNestedPage {
 interface IDocumentDrawingPublicationPage extends IDocumentDrawingPublicationNestedPage {
     headerId: string;
     footerId: string;
+    headerLayoutKey?: number | string;
+    footerLayoutKey?: number | string;
     pageWidth: number;
 }
-type DocumentDrawingPublicationSkeletonData = Pick<IDocumentSkeletonCached, 'skeHeaders' | 'skeFooters'> & {
+interface IDocumentDrawingPublicationSkeletonData {
     pages: IDocumentDrawingPublicationPage[];
-};
+    skeHeaders: ReadonlyMap<string, ReadonlyMap<number | string, IDocumentDrawingPublicationNestedPage>>;
+    skeFooters: ReadonlyMap<string, ReadonlyMap<number | string, IDocumentDrawingPublicationNestedPage>>;
+}
 export declare class DocDrawingPublicationTracker {
     private _generation;
     private _publishedPageCount;
     private _drawingOccurrenceCount;
     reset(): void;
     shouldRefresh(skeleton: {
-        getSkeletonData: () => DocumentDrawingPublicationSkeletonData | null | undefined | void;
+        getSkeletonData: () => IDocumentDrawingPublicationSkeletonData | null | undefined | void;
     }, progress: DocumentDrawingPublicationProgress): boolean;
 }
 export declare function getDocsDrawingPageClipBounds(config: {
@@ -106,6 +113,7 @@ export declare function getDocsPageRelativeDrawingLeft(config: {
     positionH: {
         align?: AlignTypeH;
         posOffset?: number;
+        percent?: number;
         relativeFrom?: ObjectRelativeFromH;
     };
     width: number;
@@ -115,6 +123,7 @@ export declare function getDocsPageRelativeDrawingTop(config: {
     positionV: {
         align?: AlignTypeV;
         posOffset?: number;
+        percent?: number;
         relativeFrom?: ObjectRelativeFromV;
     };
     height: number;
@@ -147,6 +156,8 @@ export declare class DocDrawingTransformUpdateController extends Disposable impl
     private _lifecycleService;
     private _liquid;
     private _changesetDrawingRefreshScheduled;
+    private _pendingMultiDrawingSelection;
+    private _pendingMultiDrawingSelectionSubscription?;
     private readonly _publicationTracker;
     constructor(_context: IRenderContext<DocumentDataModel>, _docSkeletonManagerService: DocSkeletonManagerService, _commandService: ICommandService, _editorService: IEditorService, _drawingManagerService: IDrawingManagerService, _docRefreshDrawingsService: DocRefreshDrawingsService, _univerInstanceService: IUniverInstanceService, _lifecycleService: LifecycleService);
     private _initialize;
@@ -161,6 +172,8 @@ export declare class DocDrawingTransformUpdateController extends Disposable impl
     private _collectSegmentDrawingPositions;
     private _getStaleNonMultiDrawings;
     private _handleMultiDrawingsTransform;
+    private _clearPendingMultiDrawingSelection;
+    private _restoreMultiDrawingSelection;
     private _calculateDrawingPosition;
     private _collectDrawingPosition;
     private _collectGroupChildren;

package/lib/types/utils/drawing-text-anchor.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 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 { IDocumentData } from '@univerjs/core';
+import type { ISuccinctDocRangeParam } from '@univerjs/engine-render';
+/** Locate the persisted object character without consulting the active text selection. */
+export declare function findDrawingTextAnchor(snapshot: IDocumentData, drawingId: string): {
+    offset: number;
+    segmentId: string;
+} | null;
+/** Preserve keyboard/clipboard object ranges while replacing floating selection paint with an anchor icon. */
+export declare function getDrawingTextRanges(snapshot: IDocumentData, drawingIds: string[]): ISuccinctDocRangeParam[];

package/lib/types/utils/drawing-wrapping-position.d.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 { IDocDrawingPosition, IDocumentData, LocaleService } from '@univerjs/core';
+import type { IDocumentSkeletonCached, IDocumentSkeletonDrawing, IDocumentSkeletonHeaderFooter, IDocumentSkeletonPage } from '@univerjs/engine-render';
+import { ObjectRelativeFromH, ObjectRelativeFromV, PositionedObjectLayoutType } from '@univerjs/core';
+import { DocumentEditArea } from '@univerjs/engine-render';
+export interface IDrawingAnchorInPage {
+    skeDrawing: IDocumentSkeletonDrawing;
+    page: IDocumentSkeletonPage | IDocumentSkeletonHeaderFooter;
+    hostPage?: IDocumentSkeletonPage;
+    pageMarginTop: number;
+    pageMarginLeft: number;
+}
+export declare function findDrawingAnchor(unitId: string, drawingId: string, skeleton: IDocumentSkeletonCached, editArea: DocumentEditArea, currentDrawing?: IDocumentSkeletonDrawing['drawingOrigin']): IDrawingAnchorInPage | null;
+/** Resolve a text-relative origin before committing a wrapping reference change. */
+export declare function resolveDrawingWrappingPosition(anchor: IDrawingAnchorInPage, position: IDocDrawingPosition, snapshot: IDocumentData, localeService: LocaleService, editArea: DocumentEditArea): IDocDrawingPosition | null;
+/** Preserve the rendered position when text wrapping or a positioning reference changes. */
+export declare function getDrawingWrappingPosition(anchor: IDrawingAnchorInPage, layoutType: PositionedObjectLayoutType, relativeFromH?: ObjectRelativeFromH, relativeFromV?: ObjectRelativeFromV, offset?: {
+    left: number;
+    top: number;
+}): IDocDrawingPosition;

package/lib/types/views/doc-image-panel/use-doc-drawing-position.d.ts

@@ -37,7 +37,7 @@ export declare function useDocDrawingPosition(props: IDocDrawingPositionProps):
         value: string;
         disabled?: undefined;
     })[];
-    handlePositionChange: (direction: "positionH" | "positionV", value: IObjectPositionH | IObjectPositionV) => void;
+    handlePositionChange: (direction: "positionH" | "positionV", value: IObjectPositionH | IObjectPositionV, positionH?: IObjectPositionH) => void;
     handleHorizontalRelativeFromChange: (value: string) => void;
     handleVerticalRelativeFromChange: (value: string) => void;
     handleFollowTextMoveCheck: (val: string | number | boolean) => void;