refactor(drawing): fix dependencies

packages/core/src/docs/data-model/subdocument.ts

@@ -0,0 +1,17 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * 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:https://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.
+ */
+
+export const DEFAULT_DOCUMENT_SUB_COMPONENT_ID = '__default_document_sub_component_id20231101__';

packages/core/src/index.ts

@@ -16,6 +16,7 @@
 
 import { installShims } from './common/shims';
 
+export { DEFAULT_DOCUMENT_SUB_COMPONENT_ID } from './docs/data-model/subdocument';
 export { type UnitType, UnitModel, UniverInstanceType } from './common/unit';
 export { Registry, RegistryAsMap } from './common/registry';
 export { Univer } from './univer';
@@ -77,26 +78,6 @@ export { IConfigService } from './services/config/config.service';
 export * from './services/context/context';
 export { ContextService, IContextService } from './services/context/context.service';
 export { ErrorService, type IError } from './services/error/error.service';
-export type { IOffset, IScale, ISize, ITransformState, IRotationSkewFlipTransform, IAbsoluteTransform, ISrcRect } from './services/drawing/drawing-interfaces';
-export {
- DEFAULT_DOCUMENT_SUB_COMPONENT_ID,
- type DrawingType,
- DrawingTypeEnum,
- type IDrawingSearch,
- type IDrawingSpace,
- type IDrawingParam,
- IDrawingManagerService,
- type IDrawingOrderUpdateParam,
- type IUnitDrawingService,
- type IDrawingMap,
- type IDrawingSubunitMap,
- type IDrawingOrderMapParam,
- type IDrawingGroupUpdateParam,
- type IDrawingVisibleParam,
- type IDrawingMapItemData,
- type IDrawingMapItem,
- ArrangeTypeEnum,
-} from './services/drawing/drawing-manager.service';
 export { IUniverInstanceService } from './services/instance/instance.service';
 export { LifecycleStages, OnLifecycle, runOnLifecycle } from './services/lifecycle/lifecycle';
 export { LifecycleService } from './services/lifecycle/lifecycle.service';

packages/core/src/shared/check-if-move.ts

@@ -15,7 +15,7 @@
  */
 
 import type { Nullable } from '../common/type-util';
-import type { ITransformState } from '../services/drawing/drawing-interfaces';
+import type { ITransformState } from '../types/interfaces/i-document-data';
 
 export const MOVE_BUFFER_VALUE = 2;
 

packages/core/src/shared/index.ts

@@ -34,6 +34,7 @@ export { RefAlias } from './ref-alias';
 export * from './row-col-iter';
 export * from './sequence';
 export * from './sort-rules';
+export * from './shape';
 export * from './tools';
 export * from './types';
 export * from './debounce';

packages/core/src/services/drawing/drawing-interfaces.ts → packages/core/src/shared/shape.ts

@@ -29,23 +29,9 @@ export interface IOffset {
  top?: number;
 }
 
-export interface IRotationSkewFlipTransform {
- angle?: number;
- skewX?: number;
- skewY?: number;
- flipX?: boolean;
- flipY?: boolean;
-}
-
 export interface ISrcRect extends IOffset {
  right?: number;
  bottom?: number;
 }
 
-export interface IAbsoluteTransform extends ISize, IOffset, IScale {
-
-}
-
-export interface ITransformState extends IAbsoluteTransform, IRotationSkewFlipTransform {
-
-}
+export interface IAbsoluteTransform extends ISize, IOffset, IScale {}

packages/core/src/types/enum/prst-geom-type.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// TODO@Jocs: should be moved out of core.
+
 export enum BasicShapes {
  Line = 'line',
  LineInv = 'lineInv',

packages/core/src/types/interfaces/i-document-data.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type { ISize } from '../../services/drawing/drawing-interfaces';
-import type { IDrawingParam } from '../../services/drawing/drawing-manager.service';
+import type { Nullable } from '../../common/type-util';
+import type { IAbsoluteTransform, ISize } from '../../shared/shape';
 import type { BooleanNumber, CellValueType, HorizontalAlign, LocaleType, TextDirection, VerticalAlign, WrapStrategy } from '../enum';
 import type { IExtraModelData } from './i-extra-model-data';
 import type { IColorStyle, IStyleBase } from './i-style-data';
@@ -881,3 +881,65 @@ export enum PageOrientType {
  PORTRAIT,
  LANDSCAPE,
 }
+
+// #region - tech dept
+
+// TODO@Jocs: these types are here because of drawing coupled into the core of the document's model, which
+// is an anti-pattern. After fixing the problem, these types should be removed.
+
+/** @deprecated */
+export enum ArrangeTypeEnum {
+ forward,
+ backward,
+ front,
+ back,
+}
+
+/** @deprecated */
+export enum DrawingTypeEnum {
+ UNRECOGNIZED = -1,
+ DRAWING_IMAGE = 0,
+ DRAWING_SHAPE = 1,
+ DRAWING_CHART = 2,
+ DRAWING_TABLE = 3,
+ DRAWING_SMART_ART = 4,
+ DRAWING_VIDEO = 5,
+ DRAWING_GROUP = 6,
+ DRAWING_UNIT = 7,
+ DRAWING_DOM = 8,
+}
+
+/** @deprecated */
+export type DrawingType = DrawingTypeEnum | number;
+
+/** @deprecated */
+export interface IDrawingSpace {
+ unitId: string;
+ subUnitId: string; //sheetId, pageId and so on, it has a default name in doc business
+}
+
+/** @deprecated */
+export interface IDrawingSearch extends IDrawingSpace {
+ drawingId: string;
+}
+
+/** @deprecated */
+export interface IRotationSkewFlipTransform {
+ angle?: number;
+ skewX?: number;
+ skewY?: number;
+ flipX?: boolean;
+ flipY?: boolean;
+}
+
+/** @deprecated */
+export interface ITransformState extends IAbsoluteTransform, IRotationSkewFlipTransform {}
+
+/** @deprecated */
+export interface IDrawingParam extends IDrawingSearch {
+ drawingType: DrawingType;
+ transform?: Nullable<ITransformState>;
+ groupId?: string;
+}
+
+// #endregion