@tmagic/stage 1.5.24 → 1.6.0-beta.1

package/LICENSE

@@ -1,6 +1,6 @@
 Tencent is pleased to support the open source community by making TMagicEditor available. 
 
-Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved. 
+Copyright (C) 2025 Tencent.  All rights reserved. 
 
 TMagicEditor is licensed under the Apache License Version 2.0 except for the third-party components listed below.
 

package/dist/tmagic-stage.js

@@ -1692,7 +1692,7 @@ class ActionManager extends EventEmitter {
     const dr = new StageDragResize({
       container: config.container,
       disabledDragStart: config.disabledDragStart,
-      moveableOptions: this.changeCallback(config.moveableOptions, false),
+      moveableOptions: config.moveableOptions && this.changeCallback(config.moveableOptions, false),
       dragResizeHelper: createDrHelper(),
       getRootContainer: config.getRootContainer,
       getRenderDocument: config.getRenderDocument,
@@ -1726,7 +1726,7 @@ class ActionManager extends EventEmitter {
     });
     const multiDr = new StageMultiDragResize({
       container: config.container,
-      moveableOptions: this.changeCallback(config.moveableOptions, true),
+      moveableOptions: config.moveableOptions && this.changeCallback(config.moveableOptions, true),
       dragResizeHelper: createDrHelper(),
       getRootContainer: config.getRootContainer,
       getRenderDocument: config.getRenderDocument,

package/dist/tmagic-stage.umd.cjs

@@ -4165,7 +4165,7 @@
       const dr = new StageDragResize({
         container: config.container,
         disabledDragStart: config.disabledDragStart,
-        moveableOptions: this.changeCallback(config.moveableOptions, false),
+        moveableOptions: config.moveableOptions && this.changeCallback(config.moveableOptions, false),
         dragResizeHelper: createDrHelper(),
         getRootContainer: config.getRootContainer,
         getRenderDocument: config.getRenderDocument,
@@ -4199,7 +4199,7 @@
       });
       const multiDr = new StageMultiDragResize({
         container: config.container,
-        moveableOptions: this.changeCallback(config.moveableOptions, true),
+        moveableOptions: config.moveableOptions && this.changeCallback(config.moveableOptions, true),
         dragResizeHelper: createDrHelper(),
         getRootContainer: config.getRootContainer,
         getRenderDocument: config.getRenderDocument,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.24",
+  "version": "1.6.0-beta.1",
   "name": "@tmagic/stage",
   "type": "module",
   "main": "dist/tmagic-stage.umd.cjs",
@@ -42,7 +42,7 @@
   },
   "peerDependencies": {
     "typescript": "^5.8.3",
-    "@tmagic/core": "1.5.24"
+    "@tmagic/core": "1.6.0-beta.1"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/ActionManager.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -427,7 +427,7 @@ export default class ActionManager extends EventEmitter {
     const dr = new StageDragResize({
       container: config.container,
       disabledDragStart: config.disabledDragStart,
-      moveableOptions: this.changeCallback(config.moveableOptions, false),
+      moveableOptions: config.moveableOptions && this.changeCallback(config.moveableOptions, false),
       dragResizeHelper: createDrHelper(),
       getRootContainer: config.getRootContainer,
       getRenderDocument: config.getRenderDocument,
@@ -472,7 +472,7 @@ export default class ActionManager extends EventEmitter {
       });
     const multiDr = new StageMultiDragResize({
       container: config.container,
-      moveableOptions: this.changeCallback(config.moveableOptions, true),
+      moveableOptions: config.moveableOptions && this.changeCallback(config.moveableOptions, true),
       dragResizeHelper: createDrHelper(),
       getRootContainer: config.getRootContainer,
       getRenderDocument: config.getRenderDocument,
@@ -493,7 +493,10 @@ export default class ActionManager extends EventEmitter {
     return multiDr;
   }
 
-  private changeCallback(options: CustomizeMoveableOptions, isMulti: boolean): CustomizeMoveableOptions {
+  private changeCallback(
+    options: CustomizeMoveableOptions,
+    isMulti: boolean,
+  ): MoveableOptions | (() => MoveableOptions) {
     // 在actionManager才能获取到各种参数，在这里传好参数有比较好的扩展性
     if (typeof options === 'function') {
       return () => {

package/src/DragResizeHelper.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/MoveableOptionsManager.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/StageCore.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/StageDragResize.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/StageHighlight.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/StageMask.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/StageMultiDragResize.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/StageRender.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/TargetShadow.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/const.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/index.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/logger.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/types.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,11 +31,11 @@ export type TargetElement = HTMLElement | SVGElement;
 export type CanSelect = (el: HTMLElement, event: MouseEvent, stop: () => boolean) => boolean | Promise<boolean>;
 export type IsContainer = (el: HTMLElement) => boolean | Promise<boolean>;
 export type CustomizeRender = (renderer: StageCore) => Promise<HTMLElement | void> | HTMLElement | void;
+
+export type CustomizeMoveableOptionsFunction = (config: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions;
+
 /** 业务方自定义的moveableOptions，可以是配置，也可以是回调函数 */
-export type CustomizeMoveableOptions =
-  | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions)
-  | MoveableOptions
-  | undefined;
+export type CustomizeMoveableOptions = CustomizeMoveableOptionsFunction | MoveableOptions;
 /** render提供给的接口，id转成el */
 export type GetTargetElement = (id: Id) => HTMLElement | null;
 /** render提供的接口，通过坐标获得坐标下所有HTML元素数组 */
@@ -89,7 +89,7 @@ export interface ActionManagerConfig {
 
 export interface MoveableOptionsManagerConfig {
   container: HTMLElement;
-  moveableOptions?: CustomizeMoveableOptions;
+  moveableOptions?: MoveableOptions | (() => MoveableOptions);
   getRootContainer: GetRootContainer;
 }
 
@@ -113,22 +113,16 @@ export interface StageMaskConfig {
   core: StageCore;
 }
 
-export interface StageDragResizeConfig {
-  container: HTMLElement;
+export interface StageDragResizeConfig extends MoveableOptionsManagerConfig {
   dragResizeHelper: DragResizeHelper;
-  moveableOptions?: CustomizeMoveableOptions;
   disabledDragStart?: boolean;
-  getRootContainer: GetRootContainer;
   getRenderDocument: GetRenderDocument;
   markContainerEnd: MarkContainerEnd;
   delayedMarkContainer: DelayedMarkContainer;
 }
 
-export interface StageMultiDragResizeConfig {
-  container: HTMLElement;
+export interface StageMultiDragResizeConfig extends MoveableOptionsManagerConfig {
   dragResizeHelper: DragResizeHelper;
-  moveableOptions?: CustomizeMoveableOptions;
-  getRootContainer: GetRootContainer;
   getRenderDocument: GetRenderDocument;
   markContainerEnd: MarkContainerEnd;
   delayedMarkContainer: DelayedMarkContainer;

package/src/util.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/types/index.d.ts

@@ -158,8 +158,9 @@ type TargetElement = HTMLElement | SVGElement;
 type CanSelect = (el: HTMLElement, event: MouseEvent, stop: () => boolean) => boolean | Promise<boolean>;
 type IsContainer = (el: HTMLElement) => boolean | Promise<boolean>;
 type CustomizeRender = (renderer: StageCore) => Promise<HTMLElement | void> | HTMLElement | void;
+type CustomizeMoveableOptionsFunction = (config: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions;
 /** 业务方自定义的moveableOptions，可以是配置，也可以是回调函数 */
-type CustomizeMoveableOptions = ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions) | MoveableOptions | undefined;
+type CustomizeMoveableOptions = CustomizeMoveableOptionsFunction | MoveableOptions;
 /** render提供给的接口，id转成el */
 type GetTargetElement = (id: Id) => HTMLElement | null;
 /** render提供的接口，通过坐标获得坐标下所有HTML元素数组 */
@@ -209,7 +210,7 @@ interface ActionManagerConfig {
 }
 interface MoveableOptionsManagerConfig {
     container: HTMLElement;
-    moveableOptions?: CustomizeMoveableOptions;
+    moveableOptions?: MoveableOptions | (() => MoveableOptions);
     getRootContainer: GetRootContainer;
 }
 interface CustomizeMoveableOptionsCallbackConfig {
@@ -229,21 +230,15 @@ interface StageRenderConfig {
 interface StageMaskConfig {
     core: StageCore;
 }
-interface StageDragResizeConfig {
-    container: HTMLElement;
+interface StageDragResizeConfig extends MoveableOptionsManagerConfig {
     dragResizeHelper: DragResizeHelper;
-    moveableOptions?: CustomizeMoveableOptions;
     disabledDragStart?: boolean;
-    getRootContainer: GetRootContainer;
     getRenderDocument: GetRenderDocument;
     markContainerEnd: MarkContainerEnd;
     delayedMarkContainer: DelayedMarkContainer;
 }
-interface StageMultiDragResizeConfig {
-    container: HTMLElement;
+interface StageMultiDragResizeConfig extends MoveableOptionsManagerConfig {
     dragResizeHelper: DragResizeHelper;
-    moveableOptions?: CustomizeMoveableOptions;
-    getRootContainer: GetRootContainer;
     getRenderDocument: GetRenderDocument;
     markContainerEnd: MarkContainerEnd;
     delayedMarkContainer: DelayedMarkContainer;
@@ -1031,4 +1026,4 @@ declare const _default: (handler: (type: AbleActionEventType) => void, customize
 };
 
 export { AbleActionEventType, CONTAINER_HIGHLIGHT_CLASS_NAME, ContainerHighlightType, DEFAULT_ZOOM, DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, GuidesType, HIGHLIGHT_EL_ID_PREFIX, Mode, MouseButton, _default as MoveableActionsAble, PAGE_CLASS, RenderType, SELECTED_CLASS, SelectStatus, StageDragResize, StageDragStatus, StageMask, StageRender, ZIndex, addSelectedClassName, StageCore as default, down, getAbsolutePosition, getBorderWidth, getMarginValue, getMode, getOffset, getScrollParent, getTargetElStyle, isAbsolute, isFixed, isFixedParent, isMoveableButton, isRelative, isStatic, removeSelectedClassName, up };
-export type { AbleCustomizedButton, ActionManagerConfig, ActionManagerEvents, CanSelect, CoreEvents, CustomizeMoveableOptions, CustomizeMoveableOptionsCallbackConfig, CustomizeRender, DelayedMarkContainer, DrEvents, DragResizeHelperConfig, GetElementsFromPoint, GetRenderDocument, GetRootContainer, GetTargetElement, GuidesEventData, IsContainer, Magic, MarkContainerEnd, MaskEvents, MoveableOptionsManagerConfig, MultiDrEvents, Offset, Point, Rect, RemoveData, RemoveEventData, RenderEvents, RuleOptions, Runtime, RuntimeWindow, SortEventData, StageCoreConfig, StageDragResizeConfig, StageHighlightConfig, StageMaskConfig, StageMultiDragResizeConfig, StageRenderConfig, TargetElement, TargetShadowConfig, UpdateData, UpdateDragEl, UpdateEventData };
+export type { AbleCustomizedButton, ActionManagerConfig, ActionManagerEvents, CanSelect, CoreEvents, CustomizeMoveableOptions, CustomizeMoveableOptionsCallbackConfig, CustomizeMoveableOptionsFunction, CustomizeRender, DelayedMarkContainer, DrEvents, DragResizeHelperConfig, GetElementsFromPoint, GetRenderDocument, GetRootContainer, GetTargetElement, GuidesEventData, IsContainer, Magic, MarkContainerEnd, MaskEvents, MoveableOptionsManagerConfig, MultiDrEvents, Offset, Point, Rect, RemoveData, RemoveEventData, RenderEvents, RuleOptions, Runtime, RuntimeWindow, SortEventData, StageCoreConfig, StageDragResizeConfig, StageHighlightConfig, StageMaskConfig, StageMultiDragResizeConfig, StageRenderConfig, TargetElement, TargetShadowConfig, UpdateData, UpdateDragEl, UpdateEventData };