@tmagic/stage 1.0.0-rc.11 → 1.0.0-rc.12

package/src/StageDragResize.ts

@@ -111,7 +111,7 @@ export default class StageDragResize extends EventEmitter {
    */
   public updateMoveable(el = this.target): void {
     if (!this.moveable) throw new Error('未初始化moveable');
-    if (!el) throw new Error('为选中任何节点');
+    if (!el) throw new Error('未选中任何节点');
 
     this.target = el;
 
@@ -207,7 +207,7 @@ export default class StageDragResize extends EventEmitter {
   }
 
   private bindResizeEvent(): void {
-    if (!this.moveable) throw new Error('moveable 为初始化');
+    if (!this.moveable) throw new Error('moveable 未初始化');
 
     const frame = {
       left: 0,
@@ -251,7 +251,7 @@ export default class StageDragResize extends EventEmitter {
   }
 
   private bindDragEvent(): void {
-    if (!this.moveable) throw new Error('moveable 为初始化');
+    if (!this.moveable) throw new Error('moveable 未初始化');
 
     const frame = {
       left: 0,
@@ -307,7 +307,7 @@ export default class StageDragResize extends EventEmitter {
   }
 
   private bindRotateEvent(): void {
-    if (!this.moveable) throw new Error('moveable 为初始化');
+    if (!this.moveable) throw new Error('moveable 未初始化');
 
     this.moveable
       .on('rotateStart', (e) => {
@@ -334,7 +334,7 @@ export default class StageDragResize extends EventEmitter {
   }
 
   private bindScaleEvent(): void {
-    if (!this.moveable) throw new Error('moveable 为初始化');
+    if (!this.moveable) throw new Error('moveable 未初始化');
 
     this.moveable
       .on('scaleStart', (e) => {

package/src/StageRender.ts

@@ -121,5 +121,12 @@ export default class StageRender extends EventEmitter {
     }
 
     this.emit('onload');
+
+    this.contentWindow.postMessage(
+      {
+        tmagicRuntimeReady: true,
+      },
+      '*',
+    );
   };
 }

package/src/const.ts

@@ -22,7 +22,7 @@ export const GHOST_EL_ID_PREFIX = 'ghost_el_';
 /** 拖动的时候需要在蒙层中创建一个占位节点，该节点的id前缀 */
 export const DRAG_EL_ID_PREFIX = 'drag_el_';
 
-/** 高亮事需要在蒙层中创建一个占位节点，该节点的id前缀 */
+/** 高亮时需要在蒙层中创建一个占位节点，该节点的id前缀 */
 export const HIGHLIGHT_EL_ID_PREFIX = 'highlight_el_';
 
 /** 默认放到缩小倍数 */

package/src/util.ts

@@ -118,15 +118,17 @@ export const getMode = (el: HTMLElement): Mode => {
 
 export const getScrollParent = (element: HTMLElement, includeHidden = false): HTMLElement | null => {
   let style = getComputedStyle(element);
+  const excludeStaticParent = style.position === 'absolute';
   const overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/;
 
-  if (isFixed(element)) return null;
+  if (style.position === 'fixed') return null;
+
   for (let parent = element; parent.parentElement; ) {
     parent = parent.parentElement;
     style = getComputedStyle(parent);
-    if (isAbsolute(element) && isStatic(element)) {
-      continue;
-    }
+
+    if (excludeStaticParent && style.position === 'static') continue;
+
     if (overflowRegex.test(style.overflow + style.overflowY + style.overflowX)) return parent;
   }