@tmagic/stage 1.0.0-rc.6 → 1.0.0-rc.9

package/dist/tmagic-stage.es.js

@@ -46,29 +46,9 @@ const getParents = (el, relative) => {
   return parents;
 };
 const getOffset = (el) => {
-  const { transform } = getComputedStyle(el);
   const { offsetParent } = el;
-  let left = el.offsetLeft;
-  let top = el.offsetTop;
-  if (transform.indexOf("matrix") > -1) {
-    let a = 1;
-    let b = 1;
-    let c = 1;
-    let d = 1;
-    let e = 0;
-    let f = 0;
-    transform.replace(/matrix\((.+), (.+), (.+), (.+), (.+), (.+)\)/, ($0, $1, $2, $3, $4, $5, $6) => {
-      a = +$1;
-      b = +$2;
-      c = +$3;
-      d = +$4;
-      e = +$5;
-      f = +$6;
-      return transform;
-    });
-    left = a * left + c * top + e;
-    top = b * left + d * top + f;
-  }
+  const left = el.offsetLeft;
+  const top = el.offsetTop;
   if (offsetParent) {
     const parentOffset = getOffset(offsetParent);
     return {
@@ -216,8 +196,8 @@ class StageDragResize extends EventEmitter {
   select(el, event) {
     const oldTarget = this.target;
     this.target = el;
-    this.init(el);
     if (!this.moveable || this.target !== oldTarget) {
+      this.init(el);
       this.moveableHelper = MoveableHelper.create({
         useBeforeRender: true,
         useRender: false,
@@ -305,35 +285,38 @@ class StageDragResize extends EventEmitter {
     });
     this.bindResizeEvent();
     this.bindDragEvent();
+    this.bindRotateEvent();
+    this.bindScaleEvent();
   }
   bindResizeEvent() {
     if (!this.moveable)
       throw new Error("moveable \u4E3A\u521D\u59CB\u5316");
+    const frame = {
+      left: 0,
+      top: 0
+    };
     this.moveable.on("resizeStart", (e) => {
-      if (e.dragStart) {
-        const rect = this.moveable.getRect();
-        const offset = getAbsolutePosition(e.target, rect);
-        e.dragStart.set([offset.left, offset.top]);
-      }
-    }).on("resize", ({ width, height, drag }) => {
+      if (!this.target)
+        return;
+      this.dragStatus = "start" /* START */;
+      this.moveableHelper?.onResizeStart(e);
+      frame.top = this.target.offsetTop;
+      frame.left = this.target.offsetLeft;
+    }).on("resize", (e) => {
+      const { width, height, drag } = e;
       if (!this.moveable || !this.target || !this.dragEl)
         return;
       const { beforeTranslate } = drag;
       this.dragStatus = "ing" /* ING */;
-      this.target.style.width = `${width}px`;
-      this.target.style.height = `${height}px`;
-      this.dragEl.style.width = `${width}px`;
-      this.dragEl.style.height = `${height}px`;
+      this.moveableHelper?.onResize(e);
       if (this.mode === Mode.SORTABLE) {
-        this.dragEl.style.top = `${beforeTranslate[1]}px`;
-        this.target.style.top = `0px`;
-        return;
+        this.target.style.top = "0px";
+      } else {
+        this.target.style.left = `${frame.left + beforeTranslate[0]}px`;
+        this.target.style.top = `${frame.top + beforeTranslate[1]}px`;
       }
-      this.dragEl.style.left = `${beforeTranslate[0]}px`;
-      this.dragEl.style.top = `${beforeTranslate[1]}px`;
-      const offset = getAbsolutePosition(this.target, { left: beforeTranslate[0], top: beforeTranslate[1] });
-      this.target.style.left = `${offset.left}px`;
-      this.target.style.top = `${offset.top}px`;
+      this.target.style.width = `${width}px`;
+      this.target.style.height = `${height}px`;
     }).on("resizeEnd", () => {
       this.dragStatus = "end" /* END */;
       this.update(true);
@@ -342,7 +325,10 @@ class StageDragResize extends EventEmitter {
   bindDragEvent() {
     if (!this.moveable)
       throw new Error("moveable \u4E3A\u521D\u59CB\u5316");
-    let offset = null;
+    const frame = {
+      left: 0,
+      top: 0
+    };
     this.moveable.on("dragStart", (e) => {
       if (!this.target)
         throw new Error("\u672A\u9009\u4E2D\u7EC4\u4EF6");
@@ -351,22 +337,19 @@ class StageDragResize extends EventEmitter {
       if (this.mode === Mode.SORTABLE) {
         this.ghostEl = this.generateGhostEl(this.target);
       }
+      frame.top = this.target.offsetTop;
+      frame.left = this.target.offsetLeft;
     }).on("drag", (e) => {
       if (!this.target || !this.dragEl)
         return;
-      if (!offset) {
-        offset = getAbsolutePosition(this.target, { left: 0, top: 0 });
-      }
       this.dragStatus = "ing" /* ING */;
-      const { left, top } = e;
       if (this.ghostEl) {
-        this.dragEl.style.top = `${top}px`;
-        this.ghostEl.style.top = `${top + offset.top}px`;
+        this.ghostEl.style.top = `${frame.top + e.beforeTranslate[1]}px`;
         return;
       }
       this.moveableHelper?.onDrag(e);
-      this.target.style.left = `${left + offset.left}px`;
-      this.target.style.top = `${top + offset.top}px`;
+      this.target.style.left = `${frame.left + e.beforeTranslate[0]}px`;
+      this.target.style.top = `${frame.top + e.beforeTranslate[1]}px`;
     }).on("dragEnd", () => {
       if (this.dragStatus === "ing" /* ING */) {
         switch (this.mode) {
@@ -377,11 +360,58 @@ class StageDragResize extends EventEmitter {
             this.update();
         }
       }
-      offset = null;
       this.dragStatus = "end" /* END */;
       this.destroyGhostEl();
     });
   }
+  bindRotateEvent() {
+    if (!this.moveable)
+      throw new Error("moveable \u4E3A\u521D\u59CB\u5316");
+    this.moveable.on("rotateStart", (e) => {
+      this.dragStatus = "start" /* START */;
+      this.moveableHelper?.onRotateStart(e);
+    }).on("rotate", (e) => {
+      if (!this.target || !this.dragEl)
+        return;
+      this.dragStatus = "ing" /* ING */;
+      this.moveableHelper?.onRotate(e);
+      const frame = this.moveableHelper?.getFrame(e.target);
+      this.target.style.transform = frame?.toCSSObject().transform || "";
+    }).on("rotateEnd", (e) => {
+      this.dragStatus = "end" /* END */;
+      const frame = this.moveableHelper?.getFrame(e.target);
+      this.emit("update", {
+        el: this.target,
+        style: {
+          transform: frame?.get("transform")
+        }
+      });
+    });
+  }
+  bindScaleEvent() {
+    if (!this.moveable)
+      throw new Error("moveable \u4E3A\u521D\u59CB\u5316");
+    this.moveable.on("scaleStart", (e) => {
+      this.dragStatus = "start" /* START */;
+      this.moveableHelper?.onScaleStart(e);
+    }).on("scale", (e) => {
+      if (!this.target || !this.dragEl)
+        return;
+      this.dragStatus = "ing" /* ING */;
+      this.moveableHelper?.onScale(e);
+      const frame = this.moveableHelper?.getFrame(e.target);
+      this.target.style.transform = frame?.toCSSObject().transform || "";
+    }).on("scaleEnd", (e) => {
+      this.dragStatus = "end" /* END */;
+      const frame = this.moveableHelper?.getFrame(e.target);
+      this.emit("update", {
+        el: this.target,
+        style: {
+          transform: frame?.get("transform")
+        }
+      });
+    });
+  }
   sort() {
     if (!this.target || !this.ghostEl)
       throw new Error("\u672A\u77E5\u9519\u8BEF");
@@ -402,12 +432,13 @@ class StageDragResize extends EventEmitter {
     }
   }
   update(isResize = false) {
-    const rect = this.moveable.getRect();
-    const offset = this.mode === Mode.SORTABLE ? { left: 0, top: 0 } : getAbsolutePosition(this.target, rect);
+    if (!this.target)
+      return;
+    const offset = this.mode === Mode.SORTABLE ? { left: 0, top: 0 } : { left: this.target.offsetLeft, top: this.target.offsetTop };
     const left = this.calcValueByFontsize(offset.left);
     const top = this.calcValueByFontsize(offset.top);
-    const width = this.calcValueByFontsize(rect.width);
-    const height = this.calcValueByFontsize(rect.height);
+    const width = this.calcValueByFontsize(this.target.clientWidth);
+    const height = this.calcValueByFontsize(this.target.clientHeight);
     this.emit("update", {
       el: this.target,
       style: isResize ? { left, top, width, height } : { left, top }
@@ -433,17 +464,21 @@ class StageDragResize extends EventEmitter {
     this.ghostEl = void 0;
   }
   updateDragEl(el) {
-    const { width, height } = el.getBoundingClientRect();
     const offset = getOffset(el);
+    const { transform } = getComputedStyle(el);
     this.dragEl.style.cssText = `
       position: absolute;
+      transform: ${transform};
       left: ${offset.left}px;
       top: ${offset.top}px;
-      width: ${width}px;
-      height: ${height}px;
+      width: ${el.clientWidth}px;
+      height: ${el.clientHeight}px;
       z-index: ${ZIndex.DRAG_EL};
     `;
     this.dragEl.id = `${DRAG_EL_ID_PREFIX}${el.id}`;
+    if (typeof this.core.config.updateDragEl === "function") {
+      this.core.config.updateDragEl(this.dragEl, el);
+    }
   }
   destroyDragEl() {
     this.dragEl?.remove();
@@ -469,6 +504,8 @@ class StageDragResize extends EventEmitter {
       dragArea: false,
       draggable: true,
       resizable: true,
+      scalable: false,
+      rotatable: false,
       snappable: isAbsolute || isFixed,
       snapGap: isAbsolute || isFixed,
       snapThreshold: 5,
@@ -567,49 +604,34 @@ class TargetCalibrate extends EventEmitter {
     this.parent = config.parent;
     this.mask = config.mask;
     this.dr = config.dr;
+    this.core = config.core;
     this.operationEl = globalThis.document.createElement("div");
     this.parent.append(this.operationEl);
   }
   update(el, prefix) {
-    const { width, height } = el.getBoundingClientRect();
     const { left, top } = this.getOffset(el);
+    const { transform } = getComputedStyle(el);
     this.operationEl.style.cssText = `
       position: absolute;
+      transform: ${transform};
       left: ${left}px;
       top: ${top}px;
-      width: ${width}px;
-      height: ${height}px;
+      width: ${el.clientWidth}px;
+      height: ${el.clientHeight}px;
     `;
     this.operationEl.id = `${prefix}${el.id}`;
+    if (typeof this.core.config.updateDragEl === "function") {
+      this.core.config.updateDragEl(this.operationEl, el);
+    }
     return this.operationEl;
   }
   destroy() {
     this.operationEl?.remove();
   }
   getOffset(el) {
-    const { transform } = getComputedStyle(el);
     const { offsetParent } = el;
-    let left = el.offsetLeft;
-    let top = el.offsetTop;
-    if (transform.indexOf("matrix") > -1) {
-      let a = 1;
-      let b = 1;
-      let c = 1;
-      let d = 1;
-      let e = 0;
-      let f = 0;
-      transform.replace(/matrix\((.+), (.+), (.+), (.+), (.+), (.+)\)/, ($0, $1, $2, $3, $4, $5, $6) => {
-        a = +$1;
-        b = +$2;
-        c = +$3;
-        d = +$4;
-        e = +$5;
-        f = +$6;
-        return transform;
-      });
-      left = a * left + c * top + e;
-      top = b * left + d * top + f;
-    }
+    const left = el.offsetLeft;
+    const top = el.offsetTop;
     if (offsetParent) {
       const parentOffset = this.getOffset(offsetParent);
       return {
@@ -650,7 +672,8 @@ class StageHighlight extends EventEmitter {
     this.calibrationTarget = new TargetCalibrate({
       parent: this.core.mask.content,
       mask: this.core.mask,
-      dr: this.core.dr
+      dr: this.core.dr,
+      core: this.core
     });
   }
   highlight(el) {