@tmagic/stage 1.0.0-beta.11 → 1.0.0-beta.14

package/src/StageDragResize.ts

@@ -46,11 +46,11 @@ export default class StageDragResize extends EventEmitter {
   public horizontalGuidelines: number[] = [];
   public verticalGuidelines: number[] = [];
   public elementGuidelines: HTMLElement[] = [];
+  public mode: Mode = Mode.ABSOLUTE;
 
   private moveableOptions: MoveableOptions = {};
   private dragStatus: ActionStatus = ActionStatus.END;
   private ghostEl: HTMLElement | undefined;
-  private mode: Mode = Mode.ABSOLUTE;
   private moveableHelper?: MoveableHelper;
 
   constructor(config: StageDragResizeConfig) {
@@ -354,6 +354,7 @@ export default class StageDragResize extends EventEmitter {
       top: ${offset.top}px;
       width: ${width}px;
       height: ${height}px;
+      z-index: 9;
     `;
 
     this.dragEl.id = `${DRAG_EL_ID_PREFIX}${el.id}`;
@@ -367,6 +368,7 @@ export default class StageDragResize extends EventEmitter {
     if (!this.target) return {};
 
     const isAbsolute = this.mode === Mode.ABSOLUTE;
+    const isFixed = this.mode === Mode.FIXED;
 
     let { moveableOptions = {} } = this.core.config;
 
@@ -381,8 +383,8 @@ export default class StageDragResize extends EventEmitter {
       dragArea: false,
       draggable: true,
       resizable: true,
-      snappable: isAbsolute,
-      snapGap: isAbsolute,
+      snappable: isAbsolute || isFixed,
+      snapGap: isAbsolute || isFixed,
       snapThreshold: 5,
       snapDigit: 0,
       throttleDrag: 0,

package/src/StageHighlight.ts

@@ -21,19 +21,27 @@ import { EventEmitter } from 'events';
 
 import Moveable from 'moveable';
 
+import { HIGHLIGHT_EL_ID_PREFIX } from './const';
 import StageCore from './StageCore';
+import TargetCalibrate from './TargetCalibrate';
 import type { StageHighlightConfig } from './types';
 export default class StageHighlight extends EventEmitter {
   public core: StageCore;
   public container: HTMLElement;
   public target?: HTMLElement;
   public moveable?: Moveable;
+  public calibrationTarget: TargetCalibrate;
 
   constructor(config: StageHighlightConfig) {
     super();
 
     this.core = config.core;
     this.container = config.container;
+    this.calibrationTarget = new TargetCalibrate({
+      parent: this.core.mask.content,
+      mask: this.core.mask,
+      dr: this.core.dr,
+    });
   }
 
   /**
@@ -44,10 +52,12 @@ export default class StageHighlight extends EventEmitter {
     if (!el || el === this.target) return;
     this.target = el;
     this.moveable?.destroy();
+
     this.moveable = new Moveable(this.container, {
-      target: this.target,
-      scrollable: true,
+      target: this.calibrationTarget.update(el, HIGHLIGHT_EL_ID_PREFIX),
       origin: false,
+      rootContainer: this.core.container,
+      zoom: 1,
     });
   }
 
@@ -56,6 +66,7 @@ export default class StageHighlight extends EventEmitter {
    */
   public clearHighlight(): void {
     if (!this.moveable) return;
+    this.target = undefined;
     this.moveable.target = null;
     this.moveable.updateTarget();
   }
@@ -65,5 +76,6 @@ export default class StageHighlight extends EventEmitter {
    */
   public destroy(): void {
     this.moveable?.destroy();
+    this.calibrationTarget.destroy();
   }
 }

package/src/StageMask.ts

@@ -25,7 +25,7 @@ import type { StageMaskConfig } from './types';
 import { createDiv, getScrollParent, isFixedParent } from './util';
 
 const wrapperClassName = 'editor-mask-wrapper';
-const throttleTime = 300;
+const throttleTime = 100;
 
 const hideScrollbar = () => {
   const style = globalThis.document.createElement('style');
@@ -81,6 +81,8 @@ export default class StageMask extends Rule {
   public height = 0;
   public wrapperHeight = 0;
   public wrapperWidth = 0;
+  public maxScrollTop = 0;
+  public maxScrollLeft = 0;
 
   private mode: Mode = Mode.ABSOLUTE;
   private pageResizeObserver: ResizeObserver | null = null;
@@ -104,6 +106,7 @@ export default class StageMask extends Rule {
     this.wrapper.appendChild(this.content);
     this.content.addEventListener('wheel', this.mouseWheelHandler);
     this.content.addEventListener('mousemove', this.highlightHandler);
+    this.content.addEventListener('mouseleave', this.mouseLeaveHandler);
   }
 
   public setMode(mode: Mode) {
@@ -136,6 +139,10 @@ export default class StageMask extends Rule {
         const { clientHeight, clientWidth } = entry.target;
         this.setHeight(clientHeight);
         this.setWidth(clientWidth);
+
+        this.fixScrollValue();
+        this.scroll();
+        this.core.dr.updateMoveable();
       });
 
       this.pageResizeObserver.observe(page);
@@ -145,6 +152,8 @@ export default class StageMask extends Rule {
         const { clientHeight, clientWidth } = entry.target;
         this.wrapperHeight = clientHeight;
         this.wrapperWidth = clientWidth;
+        this.setMaxScrollLeft();
+        this.setMaxScrollTop();
       });
       this.wrapperResizeObserver.observe(this.wrapper);
     }
@@ -173,12 +182,21 @@ export default class StageMask extends Rule {
     this.pageScrollParent = null;
     this.pageResizeObserver?.disconnect();
     this.wrapperResizeObserver?.disconnect();
+
+    this.content.removeEventListener('mouseleave', this.mouseLeaveHandler);
     super.destroy();
   }
 
   private scroll() {
     let { scrollLeft, scrollTop } = this;
 
+    if (this.pageScrollParent) {
+      this.pageScrollParent.scrollTo({
+        top: scrollTop,
+        left: scrollLeft,
+      });
+    }
+
     if (this.mode === Mode.FIXED) {
       scrollLeft = 0;
       scrollTop = 0;
@@ -198,6 +216,7 @@ export default class StageMask extends Rule {
    */
   private setHeight(height: number): void {
     this.height = height;
+    this.setMaxScrollTop();
     this.content.style.height = `${height}px`;
   }
 
@@ -207,9 +226,35 @@ export default class StageMask extends Rule {
    */
   private setWidth(width: number): void {
     this.width = width;
+    this.setMaxScrollLeft();
     this.content.style.width = `${width}px`;
   }
 
+  /**
+   * 计算并设置最大滚动宽度
+   */
+  private setMaxScrollLeft(): void {
+    this.maxScrollLeft = this.width - this.wrapperWidth;
+  }
+
+  /**
+   * 计算并设置最大滚动高度
+   */
+  private setMaxScrollTop(): void {
+    this.maxScrollTop = this.height - this.wrapperHeight;
+  }
+
+  /**
+   * 修复滚动距离
+   * 由于滚动容器变化等因素，会导致当前滚动的距离不正确
+   */
+  private fixScrollValue(): void {
+    if (this.scrollTop < 0) this.scrollTop = 0;
+    if (this.scrollLeft < 0) this.scrollLeft = 0;
+    if (this.maxScrollTop < this.scrollTop) this.scrollTop = this.maxScrollTop;
+    if (this.maxScrollLeft < this.scrollLeft) this.scrollLeft = this.maxScrollLeft;
+  }
+
   /**
    * 点击事件处理函数
    * @param event 事件对象
@@ -246,39 +291,26 @@ export default class StageMask extends Rule {
     if (!this.page) throw new Error('page 未初始化');
 
     const { deltaY, deltaX } = event;
-    const { height, wrapperHeight, width, wrapperWidth } = this;
 
-    const maxScrollTop = height - wrapperHeight;
-    const maxScrollLeft = width - wrapperWidth;
+    if (this.page.clientHeight < this.wrapperHeight && deltaY) return;
+    if (this.page.clientWidth < this.wrapperWidth && deltaX) return;
 
-    if (maxScrollTop > 0) {
-      if (deltaY > 0) {
-        this.scrollTop = this.scrollTop + Math.min(maxScrollTop - this.scrollTop, deltaY);
-      } else {
-        this.scrollTop = Math.max(this.scrollTop + deltaY, 0);
-      }
+    if (this.maxScrollTop > 0) {
+      this.scrollTop = this.scrollTop + deltaY;
     }
 
-    if (width > wrapperWidth) {
-      if (deltaX > 0) {
-        this.scrollLeft = this.scrollLeft + Math.min(maxScrollLeft - this.scrollLeft, deltaX);
-      } else {
-        this.scrollLeft = Math.max(this.scrollLeft + deltaX, 0);
-      }
+    if (this.maxScrollLeft > 0) {
+      this.scrollLeft = this.scrollLeft + deltaX;
     }
 
-    if (this.mode !== Mode.FIXED) {
-      this.scrollTo(this.scrollLeft, this.scrollTop);
-    }
+    this.fixScrollValue();
 
-    if (this.pageScrollParent) {
-      this.pageScrollParent.scrollTo({
-        top: this.scrollTop,
-        left: this.scrollLeft,
-      });
-    }
     this.scroll();
 
     this.emit('scroll', event);
   };
+
+  private mouseLeaveHandler = () => {
+    setTimeout(() => this.emit('clearHighlight'), throttleTime);
+  };
 }

package/src/TargetCalibrate.ts

@@ -0,0 +1,135 @@
+/*
+ * Tencent is pleased to support the open source community by making TMagicEditor available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* eslint-disable no-param-reassign */
+import { EventEmitter } from 'events';
+
+import { Mode } from './const';
+import StageDragResize from './StageDragResize';
+import StageMask from './StageMask';
+import type { Offset, TargetCalibrateConfig } from './types';
+import { getMode } from './util';
+
+/**
+ * 将选中的节点修正定位后，添加一个操作节点到蒙层上
+ */
+export default class TargetCalibrate extends EventEmitter {
+  public parent: HTMLElement;
+  public mask: StageMask;
+  public dr: StageDragResize;
+  public operationEl: HTMLElement;
+
+  constructor(config: TargetCalibrateConfig) {
+    super();
+
+    this.parent = config.parent;
+    this.mask = config.mask;
+    this.dr = config.dr;
+
+    this.operationEl = globalThis.document.createElement('div');
+    this.parent.append(this.operationEl);
+  }
+
+  public update(el: HTMLElement, prefix: String): HTMLElement {
+    const { width, height } = el.getBoundingClientRect();
+    const { left, top } = this.getOffset(el);
+    this.operationEl.style.cssText = `
+      position: absolute;
+      left: ${left}px;
+      top: ${top}px;
+      width: ${width}px;
+      height: ${height}px;
+    `;
+
+    this.operationEl.id = `${prefix}${el.id}`;
+    return this.operationEl;
+  }
+
+  public destroy(): void {
+    this.operationEl?.remove();
+  }
+
+  private getOffset(el: HTMLElement): Offset {
+    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: string, $1: string, $2: string, $3: string, $4: string, $5: string, $6: string): string => {
+          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;
+    }
+
+    if (offsetParent) {
+      const parentOffset = this.getOffset(offsetParent as HTMLElement);
+      return {
+        left: left + parentOffset.left,
+        top: top + parentOffset.top,
+      };
+    }
+
+    // 选中固定定位元素后editor-mask高度被置为视窗大小
+    if (this.dr.mode === Mode.FIXED) {
+      // 弹窗的情况
+      if (getMode(el) === Mode.FIXED) {
+        return {
+          left,
+          top,
+        };
+      }
+
+      return {
+        left: left - this.mask.scrollLeft,
+        top: top - this.mask.scrollTop,
+      };
+    }
+
+    // 无父元素的固定定位需按滚动值计算
+    if (getMode(el) === Mode.FIXED) {
+      return {
+        left: left + this.mask.scrollLeft,
+        top: top + this.mask.scrollTop,
+      };
+    }
+
+    return {
+      left,
+      top,
+    };
+  }
+}

package/src/const.ts

@@ -21,6 +21,8 @@ export const GHOST_EL_ID_PREFIX = 'ghost_el_';
 
 export const DRAG_EL_ID_PREFIX = 'drag_el_';
 
+export const HIGHLIGHT_EL_ID_PREFIX = 'highlight_el_';
+
 // 默认放到缩小倍数
 export const DEFAULT_ZOOM = 1;
 

package/src/types.ts

@@ -22,6 +22,8 @@ import { Id, MApp, MNode } from '@tmagic/schema';
 
 import { GuidesType } from './const';
 import StageCore from './StageCore';
+import StageDragResize from './StageDragResize';
+import StageMask from './StageMask';
 
 export type CanSelect = (el: HTMLElement, event: MouseEvent, stop: () => boolean) => boolean | Promise<boolean>;
 
@@ -54,7 +56,6 @@ export type Rect = {
   width: number;
   height: number;
 } & Offset;
-
 export interface Offset {
   left: number;
   top: number;
@@ -119,3 +120,9 @@ export interface StageHighlightConfig {
   core: StageCore;
   container: HTMLElement;
 }
+
+export interface TargetCalibrateConfig {
+  parent: HTMLElement;
+  mask: StageMask;
+  dr: StageDragResize;
+}

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "../..",
-  },
-  "exclude": [
-    "**/dist/**/*"
-  ],
-}

package/vite.config.ts

@@ -1,27 +0,0 @@
-/*
- * Tencent is pleased to support the open source community by making TMagicEditor available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  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.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { defineConfig } from 'vite';
-
-import { getBaseConfig } from '../vite-config';
-
-import pkg from './package.json';
-
-const deps = Object.keys(pkg.dependencies);
-
-export default defineConfig(getBaseConfig(deps, 'TMagicStage'));