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

package/dist/tmagic-stage.mjs

@@ -907,11 +907,13 @@ 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.isMultiSelectStatus = true;
     });
-    KeyController.global.keyup("shift", (e) => {
+    KeyController.global.keyup(ctrl, (e) => {
       e.inputEvent.preventDefault();
       this.isMultiSelectStatus = false;
     });
@@ -1165,14 +1167,18 @@ class StageMultiDragResize extends EventEmitter {
       this.update();
     });
   }
-  canSelect(el) {
+  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) {
@@ -1440,7 +1446,7 @@ class StageCore extends EventEmitter {
     if (!canSelectByProp)
       return false;
     if (this.mask.isMultiSelectStatus) {
-      return this.multiDr.canSelect(el);
+      return this.multiDr.canSelect(el, stop);
     }
     return true;
   }