@tmagic/stage 1.1.0-beta.4 → 1.1.0-beta.7

package/dist/{tmagic-stage.es.js → tmagic-stage.mjs}

@@ -204,14 +204,22 @@ const up = (deltaTop, target) => {
 };
 
 class StageDragResize extends EventEmitter {
+  core;
+  mask;
+  container;
+  target;
+  dragEl;
+  moveable;
+  horizontalGuidelines = [];
+  verticalGuidelines = [];
+  elementGuidelines = [];
+  mode = Mode.ABSOLUTE;
+  moveableOptions = {};
+  dragStatus = "end" /* END */;
+  ghostEl;
+  moveableHelper;
   constructor(config) {
     super();
-    this.horizontalGuidelines = [];
-    this.verticalGuidelines = [];
-    this.elementGuidelines = [];
-    this.mode = Mode.ABSOLUTE;
-    this.moveableOptions = {};
-    this.dragStatus = "end" /* END */;
     this.core = config.core;
     this.container = config.container;
     this.mask = config.mask;
@@ -537,7 +545,7 @@ class StageDragResize extends EventEmitter {
     return ghostEl;
   }
   setGhostElChildrenId(el) {
-    for (const child of el.children) {
+    for (const child of Array.from(el.children)) {
       if (child.id) {
         child.id = `${GHOST_EL_ID_PREFIX}${child.id}`;
       }
@@ -611,6 +619,11 @@ class StageDragResize extends EventEmitter {
 }
 
 class TargetCalibrate extends EventEmitter {
+  parent;
+  mask;
+  dr;
+  core;
+  operationEl;
   constructor(config) {
     super();
     this.parent = config.parent;
@@ -630,6 +643,7 @@ class TargetCalibrate extends EventEmitter {
       top: ${top}px;
       width: ${el.clientWidth}px;
       height: ${el.clientHeight}px;
+      z-index: ${ZIndex.DRAG_EL};
     `;
     this.operationEl.id = `${prefix}${el.id}`;
     if (typeof this.core.config.updateDragEl === "function") {
@@ -677,6 +691,11 @@ class TargetCalibrate extends EventEmitter {
 }
 
 class StageHighlight extends EventEmitter {
+  core;
+  container;
+  target;
+  moveable;
+  calibrationTarget;
   constructor(config) {
     super();
     this.core = config.core;
@@ -697,7 +716,7 @@ class StageHighlight extends EventEmitter {
       target: this.calibrationTarget.update(el, HIGHLIGHT_EL_ID_PREFIX),
       origin: false,
       rootContainer: this.core.container,
-      zoom: 1
+      zoom: 2
     });
   }
   clearHighlight() {
@@ -714,41 +733,14 @@ class StageHighlight extends EventEmitter {
 }
 
 class Rule extends EventEmitter$1 {
+  hGuides;
+  vGuides;
+  horizontalGuidelines = [];
+  verticalGuidelines = [];
+  container;
+  containerResizeObserver;
   constructor(container) {
     super();
-    this.horizontalGuidelines = [];
-    this.verticalGuidelines = [];
-    this.getGuidesStyle = (type) => ({
-      position: "fixed",
-      zIndex: 1,
-      left: type === GuidesType.HORIZONTAL ? 0 : "-30px",
-      top: type === GuidesType.HORIZONTAL ? "-30px" : 0,
-      width: type === GuidesType.HORIZONTAL ? "100%" : "30px",
-      height: type === GuidesType.HORIZONTAL ? "30px" : "100%"
-    });
-    this.createGuides = (type, defaultGuides = []) => new Guides(this.container, {
-      type,
-      defaultGuides,
-      displayDragPos: true,
-      backgroundColor: "#fff",
-      lineColor: "#000",
-      textColor: "#000",
-      style: this.getGuidesStyle(type)
-    });
-    this.hGuidesChangeGuidesHandler = (e) => {
-      this.horizontalGuidelines = e.guides;
-      this.emit("changeGuides", {
-        type: GuidesType.HORIZONTAL,
-        guides: this.horizontalGuidelines
-      });
-    };
-    this.vGuidesChangeGuidesHandler = (e) => {
-      this.verticalGuidelines = e.guides;
-      this.emit("changeGuides", {
-        type: GuidesType.VERTICAL,
-        guides: this.verticalGuidelines
-      });
-    };
     this.container = container;
     this.hGuides = this.createGuides(GuidesType.HORIZONTAL, this.horizontalGuidelines);
     this.vGuides = this.createGuides(GuidesType.VERTICAL, this.verticalGuidelines);
@@ -820,6 +812,37 @@ class Rule extends EventEmitter$1 {
     this.containerResizeObserver.disconnect();
     this.removeAllListeners();
   }
+  getGuidesStyle = (type) => ({
+    position: "fixed",
+    zIndex: 1,
+    left: type === GuidesType.HORIZONTAL ? 0 : "-30px",
+    top: type === GuidesType.HORIZONTAL ? "-30px" : 0,
+    width: type === GuidesType.HORIZONTAL ? "100%" : "30px",
+    height: type === GuidesType.HORIZONTAL ? "30px" : "100%"
+  });
+  createGuides = (type, defaultGuides = []) => new Guides(this.container, {
+    type,
+    defaultGuides,
+    displayDragPos: true,
+    backgroundColor: "#fff",
+    lineColor: "#000",
+    textColor: "#000",
+    style: this.getGuidesStyle(type)
+  });
+  hGuidesChangeGuidesHandler = (e) => {
+    this.horizontalGuidelines = e.guides;
+    this.emit("changeGuides", {
+      type: GuidesType.HORIZONTAL,
+      guides: this.horizontalGuidelines
+    });
+  };
+  vGuidesChangeGuidesHandler = (e) => {
+    this.verticalGuidelines = e.guides;
+    this.emit("changeGuides", {
+      type: GuidesType.VERTICAL,
+      guides: this.verticalGuidelines
+    });
+  };
 }
 
 const wrapperClassName = "editor-mask-wrapper";
@@ -853,74 +876,30 @@ const createWrapper = () => {
   return el;
 };
 class StageMask extends Rule {
+  content = createContent();
+  wrapper;
+  core;
+  page = null;
+  pageScrollParent = null;
+  scrollTop = 0;
+  scrollLeft = 0;
+  width = 0;
+  height = 0;
+  wrapperHeight = 0;
+  wrapperWidth = 0;
+  maxScrollTop = 0;
+  maxScrollLeft = 0;
+  intersectionObserver = null;
+  isMultiSelectStatus = false;
+  mode = Mode.ABSOLUTE;
+  pageResizeObserver = null;
+  wrapperResizeObserver = null;
+  highlightHandler = throttle((event) => {
+    this.emit("highlight", event);
+  }, throttleTime);
   constructor(config) {
     const wrapper = createWrapper();
     super(wrapper);
-    this.content = createContent();
-    this.page = null;
-    this.pageScrollParent = null;
-    this.scrollTop = 0;
-    this.scrollLeft = 0;
-    this.width = 0;
-    this.height = 0;
-    this.wrapperHeight = 0;
-    this.wrapperWidth = 0;
-    this.maxScrollTop = 0;
-    this.maxScrollLeft = 0;
-    this.intersectionObserver = null;
-    this.shiftKeyDown = false;
-    this.mode = Mode.ABSOLUTE;
-    this.pageResizeObserver = null;
-    this.wrapperResizeObserver = null;
-    this.highlightHandler = throttle((event) => {
-      this.emit("highlight", event);
-    }, throttleTime);
-    this.mouseDownHandler = (event) => {
-      this.emit("clearHighlight");
-      event.stopImmediatePropagation();
-      event.stopPropagation();
-      if (event.button !== MouseButton.LEFT && event.button !== MouseButton.RIGHT)
-        return;
-      if (!this.shiftKeyDown && event.target.className.indexOf("moveable-area") !== -1) {
-        return;
-      }
-      if (event.target.className.indexOf("moveable-control") !== -1) {
-        return;
-      }
-      this.content.removeEventListener("mousemove", this.highlightHandler);
-      if (this.shiftKeyDown) {
-        this.emit("beforeMultiSelect", event);
-      } else {
-        this.emit("beforeSelect", event);
-        globalThis.document.addEventListener("mouseup", this.mouseUpHandler);
-      }
-    };
-    this.mouseUpHandler = () => {
-      globalThis.document.removeEventListener("mouseup", this.mouseUpHandler);
-      this.content.addEventListener("mousemove", this.highlightHandler);
-      this.emit("select");
-    };
-    this.mouseWheelHandler = (event) => {
-      this.emit("clearHighlight");
-      if (!this.page)
-        throw new Error("page \u672A\u521D\u59CB\u5316");
-      const { deltaY, deltaX } = event;
-      if (this.page.clientHeight < this.wrapperHeight && deltaY)
-        return;
-      if (this.page.clientWidth < this.wrapperWidth && deltaX)
-        return;
-      if (this.maxScrollTop > 0) {
-        this.scrollTop = this.scrollTop + deltaY;
-      }
-      if (this.maxScrollLeft > 0) {
-        this.scrollLeft = this.scrollLeft + deltaX;
-      }
-      this.scroll();
-      this.emit("scroll", event);
-    };
-    this.mouseLeaveHandler = () => {
-      setTimeout(() => this.emit("clearHighlight"), throttleTime);
-    };
     this.wrapper = wrapper;
     this.core = config.core;
     this.content.addEventListener("mousedown", this.mouseDownHandler);
@@ -928,13 +907,15 @@ class StageMask extends Rule {
     this.content.addEventListener("wheel", this.mouseWheelHandler);
     this.content.addEventListener("mousemove", this.highlightHandler);
     this.content.addEventListener("mouseleave", this.mouseLeaveHandler);
-    KeyController.global.keydown("shift", (e) => {
+    const isMac = /mac os x/.test(navigator.userAgent.toLowerCase());
+    const ctrl = isMac ? "meta" : "ctrl";
+    KeyController.global.keydown(ctrl, (e) => {
       e.inputEvent.preventDefault();
-      this.shiftKeyDown = true;
+      this.isMultiSelectStatus = true;
     });
-    KeyController.global.keyup("shift", (e) => {
+    KeyController.global.keyup(ctrl, (e) => {
       e.inputEvent.preventDefault();
-      this.shiftKeyDown = false;
+      this.isMultiSelectStatus = false;
     });
   }
   setMode(mode) {
@@ -1064,13 +1045,66 @@ class StageMask extends Rule {
     if (this.maxScrollLeft < this.scrollLeft)
       this.scrollLeft = this.maxScrollLeft;
   }
+  mouseDownHandler = (event) => {
+    this.emit("clearHighlight");
+    event.stopImmediatePropagation();
+    event.stopPropagation();
+    if (event.button !== MouseButton.LEFT && event.button !== MouseButton.RIGHT)
+      return;
+    if (!this.isMultiSelectStatus && event.target.className.indexOf("moveable-area") !== -1) {
+      return;
+    }
+    if (event.target.className.indexOf("moveable-control") !== -1) {
+      return;
+    }
+    this.content.removeEventListener("mousemove", this.highlightHandler);
+    if (this.isMultiSelectStatus) {
+      this.emit("beforeMultiSelect", event);
+    } else {
+      this.emit("beforeSelect", event);
+    }
+    globalThis.document.addEventListener("mouseup", this.mouseUpHandler);
+  };
+  mouseUpHandler = () => {
+    globalThis.document.removeEventListener("mouseup", this.mouseUpHandler);
+    this.content.addEventListener("mousemove", this.highlightHandler);
+    if (!this.isMultiSelectStatus) {
+      this.emit("select");
+    }
+  };
+  mouseWheelHandler = (event) => {
+    this.emit("clearHighlight");
+    if (!this.page)
+      throw new Error("page \u672A\u521D\u59CB\u5316");
+    const { deltaY, deltaX } = event;
+    if (this.page.clientHeight < this.wrapperHeight && deltaY)
+      return;
+    if (this.page.clientWidth < this.wrapperWidth && deltaX)
+      return;
+    if (this.maxScrollTop > 0) {
+      this.scrollTop = this.scrollTop + deltaY;
+    }
+    if (this.maxScrollLeft > 0) {
+      this.scrollLeft = this.scrollLeft + deltaX;
+    }
+    this.scroll();
+    this.emit("scroll", event);
+  };
+  mouseLeaveHandler = () => {
+    setTimeout(() => this.emit("clearHighlight"), throttleTime);
+  };
 }
 
 class StageMultiDragResize extends EventEmitter {
+  core;
+  mask;
+  container;
+  targetList = [];
+  dragElList = [];
+  moveableForMulti;
+  multiMoveableHelper;
   constructor(config) {
     super();
-    this.targetList = [];
-    this.dragElList = [];
     this.core = config.core;
     this.container = config.container;
     this.mask = config.mask;
@@ -1091,19 +1125,9 @@ class StageMultiDragResize extends EventEmitter {
     });
     this.moveableForMulti?.destroy();
     this.multiMoveableHelper?.clear();
-    this.moveableForMulti = new Moveable(this.container, {
-      target: this.dragElList,
-      defaultGroupRotate: 0,
-      defaultGroupOrigin: "50% 50%",
-      draggable: true,
-      resizable: true,
-      throttleDrag: 0,
-      startDragRotate: 0,
-      throttleDragRotate: 0,
-      zoom: 1,
-      origin: true,
-      padding: { left: 0, top: 0, right: 0, bottom: 0 }
-    });
+    this.moveableForMulti = new Moveable(this.container, this.getOptions({
+      target: this.dragElList
+    }));
     this.multiMoveableHelper = MoveableHelper.create({
       useBeforeRender: true,
       useRender: false,
@@ -1143,12 +1167,35 @@ class StageMultiDragResize extends EventEmitter {
       this.update();
     });
   }
+  canSelect(el, stop) {
+    if (el.className.includes(PAGE_CLASS)) {
+      this.core.highlightedDom = void 0;
+      this.core.highlightLayer.clearHighlight();
+      stop();
+      return false;
+    }
+    const currentTargetMode = getMode(el);
+    let selectedDomMode = "";
+    if (this.core.selectedDom?.className.includes(PAGE_CLASS)) {
+      return true;
+    }
+    if (this.targetList.length === 0 && this.core.selectedDom) {
+      selectedDomMode = getMode(this.core.selectedDom);
+    } else if (this.targetList.length > 0) {
+      selectedDomMode = getMode(this.targetList[0]);
+    }
+    if (currentTargetMode !== selectedDomMode) {
+      return false;
+    }
+    return true;
+  }
   clearSelectStatus() {
     if (!this.moveableForMulti)
       return;
     this.destroyDragElList();
     this.moveableForMulti.target = null;
     this.moveableForMulti.updateTarget();
+    this.targetList = [];
   }
   destroy() {
     this.moveableForMulti?.destroy();
@@ -1176,49 +1223,39 @@ class StageMultiDragResize extends EventEmitter {
       });
     });
   }
+  getOptions(options = {}) {
+    let { multiMoveableOptions = {} } = this.core.config;
+    if (typeof multiMoveableOptions === "function") {
+      multiMoveableOptions = multiMoveableOptions(this.core);
+    }
+    return {
+      defaultGroupRotate: 0,
+      defaultGroupOrigin: "50% 50%",
+      draggable: true,
+      resizable: true,
+      throttleDrag: 0,
+      startDragRotate: 0,
+      throttleDragRotate: 0,
+      zoom: 1,
+      origin: true,
+      padding: { left: 0, top: 0, right: 0, bottom: 0 },
+      ...options,
+      ...multiMoveableOptions
+    };
+  }
 }
 
-var style = ".tmagic-stage-container-highlight::after {\n  content: '';\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  top: 0;\n  left: 0;\n  background-color: #000;\n  opacity: .1;\n}\n";
+const style = ".tmagic-stage-container-highlight::after {\n  content: '';\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  top: 0;\n  left: 0;\n  background-color: #000;\n  opacity: .1;\n  pointer-events: none;\n}\n";
 
 class StageRender extends EventEmitter {
+  contentWindow = null;
+  runtime = null;
+  iframe;
+  runtimeUrl;
+  core;
+  render;
   constructor({ core }) {
     super();
-    this.contentWindow = null;
-    this.runtime = null;
-    this.getMagicApi = () => ({
-      onPageElUpdate: (el) => this.emit("page-el-update", el),
-      onRuntimeReady: (runtime) => {
-        this.runtime = runtime;
-        globalThis.runtime = runtime;
-        this.emit("runtime-ready", runtime);
-      }
-    });
-    this.getRuntime = () => {
-      if (this.runtime)
-        return Promise.resolve(this.runtime);
-      return new Promise((resolve) => {
-        const listener = (runtime) => {
-          this.off("runtime-ready", listener);
-          resolve(runtime);
-        };
-        this.on("runtime-ready", listener);
-      });
-    };
-    this.loadHandler = async () => {
-      this.contentWindow = this.iframe?.contentWindow;
-      this.contentWindow.magic = this.getMagicApi();
-      if (this.render) {
-        const el = await this.render(this.core);
-        if (el) {
-          this.iframe?.contentDocument?.body?.appendChild(el);
-        }
-      }
-      this.emit("onload");
-      this.contentWindow.postMessage({
-        tmagicRuntimeReady: true
-      }, "*");
-      injectStyle(this.contentWindow.document, style);
-    };
     this.core = core;
     this.runtimeUrl = core.config.runtimeUrl || "";
     this.render = core.config.render;
@@ -1231,20 +1268,39 @@ class StageRender extends EventEmitter {
     `;
     this.iframe.addEventListener("load", this.loadHandler);
   }
+  getMagicApi = () => ({
+    onPageElUpdate: (el) => this.emit("page-el-update", el),
+    onRuntimeReady: (runtime) => {
+      this.runtime = runtime;
+      globalThis.runtime = runtime;
+      this.emit("runtime-ready", runtime);
+    }
+  });
   async mount(el) {
-    if (this.iframe) {
-      if (!isSameDomain(this.runtimeUrl) && this.runtimeUrl) {
-        let html = await fetch(this.runtimeUrl).then((res) => res.text());
-        const base = `${location.protocol}//${getHost(this.runtimeUrl)}`;
-        html = html.replace("<head>", `<head>
-<base href="${base}">`);
-        this.iframe.srcdoc = html;
-      }
-      el.appendChild(this.iframe);
-    } else {
+    if (!this.iframe) {
       throw Error("mount \u5931\u8D25");
     }
-  }
+    if (!isSameDomain(this.runtimeUrl) && this.runtimeUrl) {
+      let html = await fetch(this.runtimeUrl).then((res) => res.text());
+      const base = `${location.protocol}//${getHost(this.runtimeUrl)}`;
+      html = html.replace("<head>", `<head>
+<base href="${base}">`);
+      this.iframe.srcdoc = html;
+    }
+    el.appendChild(this.iframe);
+    this.postTmagicRuntimeReady();
+  }
+  getRuntime = () => {
+    if (this.runtime)
+      return Promise.resolve(this.runtime);
+    return new Promise((resolve) => {
+      const listener = (runtime) => {
+        this.off("runtime-ready", listener);
+        resolve(runtime);
+      };
+      this.on("runtime-ready", listener);
+    });
+  };
   destroy() {
     this.iframe?.removeEventListener("load", this.loadHandler);
     this.contentWindow = null;
@@ -1252,13 +1308,48 @@ class StageRender extends EventEmitter {
     this.iframe = void 0;
     this.removeAllListeners();
   }
+  loadHandler = async () => {
+    if (!this.contentWindow?.magic) {
+      this.postTmagicRuntimeReady();
+    }
+    if (!this.contentWindow)
+      return;
+    if (this.render) {
+      const el = await this.render(this.core);
+      if (el) {
+        this.contentWindow.document?.body?.appendChild(el);
+      }
+    }
+    this.emit("onload");
+    injectStyle(this.contentWindow.document, style);
+  };
+  postTmagicRuntimeReady() {
+    this.contentWindow = this.iframe?.contentWindow;
+    this.contentWindow.magic = this.getMagicApi();
+    this.contentWindow.postMessage({
+      tmagicRuntimeReady: true
+    }, "*");
+  }
 }
 
 class StageCore extends EventEmitter {
+  container;
+  selectedDom;
+  selectedDomList = [];
+  highlightedDom;
+  renderer;
+  mask;
+  dr;
+  multiDr;
+  highlightLayer;
+  config;
+  zoom = DEFAULT_ZOOM;
+  containerHighlightClassName;
+  containerHighlightDuration;
+  isContainer;
+  canSelect;
   constructor(config) {
     super();
-    this.selectedDomList = [];
-    this.zoom = DEFAULT_ZOOM;
     this.config = config;
     this.setZoom(config.zoom);
     this.canSelect = config.canSelect || ((el) => !!el.id);
@@ -1288,7 +1379,7 @@ class StageCore extends EventEmitter {
       this.dr.setGuidelines(data.type, data.guides);
       this.emit("changeGuides", data);
     }).on("highlight", async (event) => {
-      const el = await this.getElementFromPoint(event, "mousemove");
+      const el = await this.getElementFromPoint(event);
       if (!el)
         return;
       await this.highlight(el);
@@ -1303,9 +1394,6 @@ class StageCore extends EventEmitter {
       const el = await this.getElementFromPoint(event);
       if (!el)
         return;
-      if (el.className.includes(PAGE_CLASS))
-        return;
-      this.clearSelectStatus("select");
       if (this.selectedDom && !this.selectedDom.className.includes(PAGE_CLASS)) {
         this.selectedDomList.push(this.selectedDom);
         this.selectedDom = void 0;
@@ -1316,8 +1404,7 @@ class StageCore extends EventEmitter {
       } else {
         this.selectedDomList.push(el);
       }
-      this.multiDr.multiSelect(this.selectedDomList);
-      this.emit("multiSelect", this.selectedDomList);
+      this.multiSelect(this.selectedDomList);
     });
     this.dr.on("update", (data) => {
       setTimeout(() => this.emit("update", data));
@@ -1342,22 +1429,29 @@ class StageCore extends EventEmitter {
     }
     return doc?.elementsFromPoint(x / zoom, y / zoom);
   }
-  async getElementFromPoint(event, type) {
+  async getElementFromPoint(event) {
     const els = this.getElementsFromPoint(event);
     let stopped = false;
     const stop = () => stopped = true;
     for (const el of els) {
-      if (!el.id.startsWith(GHOST_EL_ID_PREFIX) && await this.canSelect(el, event, stop)) {
+      if (!el.id.startsWith(GHOST_EL_ID_PREFIX) && await this.isElCanSelect(el, event, stop)) {
         if (stopped)
           break;
-        if (event.type === type) {
-          return el;
-        }
         return el;
       }
     }
   }
+  async isElCanSelect(el, event, stop) {
+    const canSelectByProp = await this.canSelect(el, event, stop);
+    if (!canSelectByProp)
+      return false;
+    if (this.mask.isMultiSelectStatus) {
+      return this.multiDr.canSelect(el, stop);
+    }
+    return true;
+  }
   async select(idOrEl, event) {
+    this.clearSelectStatus("multiSelect");
     const el = await this.getTargetElement(idOrEl);
     if (el === this.selectedDom)
       return;
@@ -1367,7 +1461,6 @@ class StageCore extends EventEmitter {
       await runtime.beforeSelect(el);
     }
     this.mask.setLayout(el);
-    this.multiDr.destroyDragElList();
     this.dr.select(el, event);
     if (this.config.autoScrollIntoView || el.dataset.autoScrollIntoView) {
       this.mask.intersectionObserver?.observe(el);
@@ -1380,6 +1473,12 @@ class StageCore extends EventEmitter {
       }
     }
   }
+  async multiSelect(idOrElList) {
+    this.clearSelectStatus("select");
+    const elList = await Promise.all(idOrElList.map(async (idOrEl) => await this.getTargetElement(idOrEl)));
+    this.multiDr.multiSelect(elList);
+    this.emit("multiSelect", elList);
+  }
   update(data) {
     const { config } = data;
     return this.renderer?.getRuntime().then((runtime) => {
@@ -1477,4 +1576,4 @@ class StageCore extends EventEmitter {
 }
 
 export { CONTAINER_HIGHLIGHT_CLASS, DEFAULT_ZOOM, DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, GuidesType, HIGHLIGHT_EL_ID_PREFIX, Mode, MouseButton, PAGE_CLASS, SELECTED_CLASS, StageDragResize, StageMask, StageRender, ZIndex, addSelectedClassName, calcValueByFontsize, StageCore as default, down, getAbsolutePosition, getMode, getOffset, getScrollParent, getTargetElStyle, isAbsolute, isFixed, isFixedParent, isRelative, isStatic, removeSelectedClassName, up };
-//# sourceMappingURL=tmagic-stage.es.js.map
+//# sourceMappingURL=tmagic-stage.mjs.map