@tmagic/stage 1.0.0-beta.9 → 1.0.0-rc.3

package/package.json

@@ -1,7 +1,9 @@
 {
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.3",
   "name": "@tmagic/stage",
-  "sideEffects": false,
+  "sideEffects": [
+    "dist/*"
+  ],
   "main": "dist/tmagic-stage.umd.js",
   "module": "dist/tmagic-stage.es.js",
   "types": "dist/types/src/index.d.ts",
@@ -9,8 +11,10 @@
     ".": {
       "import": "./dist/tmagic-stage.es.js",
       "require": "./dist/tmagic-stage.umd.js"
-    }
+    },
+    "./*": "./*"
   },
+  "license": "Apache-2.0",
   "scripts": {
     "build": "vite build"
   },
@@ -23,11 +27,11 @@
   },
   "dependencies": {
     "@scena/guides": "^0.17.0",
-    "@tmagic/schema": "^1.0.0-beta.9",
-    "@tmagic/utils": "^1.0.0-beta.8",
+    "@tmagic/schema": "^1.0.0-rc.3",
+    "@tmagic/utils": "^1.0.0-rc.3",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
-    "moveable": "^0.28.0",
+    "moveable": "^0.29.4",
     "moveable-helper": "^0.4.0"
   },
   "devDependencies": {
@@ -39,5 +43,5 @@
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6"
   },
-  "gitHead": "6314078c100ddcf513eb5581b38e2292f9b93eb9"
+  "gitHead": "d9f6ca25a0a6efba35d183e643a306e164b74af7"
 }

package/src/StageCore.ts

@@ -61,10 +61,14 @@ export default class StageCore extends EventEmitter {
     this.renderer = new StageRender({ core: this });
     this.mask = new StageMask({ core: this });
     this.dr = new StageDragResize({ core: this, container: this.mask.content });
-    this.highlightLayer = new StageHighlight({ core: this, container: this.mask.content });
+    this.highlightLayer = new StageHighlight({ core: this, container: this.mask.wrapper });
 
-    this.renderer.on('runtime-ready', (runtime: Runtime) => this.emit('runtime-ready', runtime));
-    this.renderer.on('page-el-update', (el: HTMLElement) => this.mask?.observe(el));
+    this.renderer.on('runtime-ready', (runtime: Runtime) => {
+      this.emit('runtime-ready', runtime);
+    });
+    this.renderer.on('page-el-update', (el: HTMLElement) => {
+      this.mask?.observe(el);
+    });
 
     this.mask
       .on('beforeSelect', (event: MouseEvent) => {
@@ -79,6 +83,10 @@ export default class StageCore extends EventEmitter {
       })
       .on('highlight', async (event: MouseEvent) => {
         await this.setElementFromPoint(event);
+        if (this.highlightedDom === this.selectedDom) {
+          this.highlightLayer.clearHighlight();
+          return;
+        }
         this.highlightLayer.highlight(this.highlightedDom as HTMLElement);
         this.emit('highlight', this.highlightedDom);
       })
@@ -116,7 +124,7 @@ export default class StageCore extends EventEmitter {
     let stopped = false;
     const stop = () => (stopped = true);
     for (const el of els) {
-      if (!el.id.startsWith(GHOST_EL_ID_PREFIX) && (await this.canSelect(el, stop))) {
+      if (!el.id.startsWith(GHOST_EL_ID_PREFIX) && (await this.canSelect(el, event, stop))) {
         if (stopped) break;
         if (event.type === 'mousemove') {
           this.highlight(el);
@@ -139,18 +147,25 @@ export default class StageCore extends EventEmitter {
 
     const runtime = await this.renderer.getRuntime();
 
+    await runtime?.select?.(el.id);
+
     if (runtime?.beforeSelect) {
       await runtime.beforeSelect(el);
     }
 
     this.mask.setLayout(el);
-    this.dr?.select(el, event);
+    this.dr.select(el, event);
+
+    if (this.config.autoScrollIntoView || el.dataset.autoScrollIntoView) {
+      this.mask.intersectionObserver?.observe(el);
+    }
+
     this.selectedDom = el;
 
     if (this.renderer.contentWindow) {
       removeSelectedClassName(this.renderer.contentWindow.document);
       if (this.selectedDom) {
-        addSelectedClassName(this.selectedDom);
+        addSelectedClassName(this.selectedDom, this.renderer.contentWindow.document);
       }
     }
   }
@@ -159,18 +174,20 @@ export default class StageCore extends EventEmitter {
    * 更新选中的节点
    * @param data 更新的数据
    */
-  public update(data: UpdateData): void {
+  public update(data: UpdateData): Promise<void> {
     const { config } = data;
 
-    this.renderer?.getRuntime().then((runtime) => {
+    return this.renderer?.getRuntime().then((runtime) => {
       runtime?.update?.(data);
       // 更新配置后，需要等组件渲染更新
       setTimeout(() => {
         const el = this.renderer.contentWindow?.document.getElementById(`${config.id}`);
-        if (el) {
+        // 有可能dom已经重新渲染，不再是原来的dom了，所以这里判断id，而不是判断el === this.selectedDom
+        if (el && el.id === this.selectedDom?.id) {
+          this.selectedDom = el;
           // 更新了组件的布局，需要重新设置mask是否可以滚动
           this.mask.setLayout(el);
-          this.dr?.select(el);
+          this.dr.updateMoveable(el);
         }
       }, 0);
     });
@@ -181,22 +198,28 @@ export default class StageCore extends EventEmitter {
    * @param el 页面Dom节点
    */
   public async highlight(idOrEl: HTMLElement | Id): Promise<void> {
-    const el = await this.getTargetElement(idOrEl);
+    let el;
+    try {
+      el = await this.getTargetElement(idOrEl);
+    } catch (error) {
+      this.highlightLayer.clearHighlight();
+      return;
+    }
     if (el === this.highlightedDom) return;
     this.highlightLayer.highlight(el);
     this.highlightedDom = el;
   }
 
-  public sortNode(data: SortEventData): void {
-    this.renderer?.getRuntime().then((runtime) => runtime?.sortNode?.(data));
+  public sortNode(data: SortEventData): Promise<void> {
+    return this.renderer?.getRuntime().then((runtime) => runtime?.sortNode?.(data));
   }
 
-  public add(data: UpdateData): void {
-    this.renderer?.getRuntime().then((runtime) => runtime?.add?.(data));
+  public add(data: UpdateData): Promise<void> {
+    return this.renderer?.getRuntime().then((runtime) => runtime?.add?.(data));
   }
 
-  public remove(data: RemoveData): void {
-    this.renderer?.getRuntime().then((runtime) => runtime?.remove?.(data));
+  public remove(data: RemoveData): Promise<void> {
+    return this.renderer?.getRuntime().then((runtime) => runtime?.remove?.(data));
   }
 
   public setZoom(zoom: number = DEFAULT_ZOOM): void {
@@ -242,14 +265,11 @@ export default class StageCore extends EventEmitter {
   }
 
   private async getTargetElement(idOrEl: Id | HTMLElement): Promise<HTMLElement> {
-    let el;
     if (typeof idOrEl === 'string' || typeof idOrEl === 'number') {
-      const runtime = await this.renderer?.getRuntime();
-      el = await runtime?.select?.(`${idOrEl}`);
+      const el = this.renderer.contentWindow?.document.getElementById(`${idOrEl}`);
       if (!el) throw new Error(`不存在ID为${idOrEl}的元素`);
-    } else {
-      el = idOrEl;
+      return el;
     }
-    return el;
+    return idOrEl;
   }
 }

package/src/StageDragResize.ts

@@ -23,9 +23,9 @@ import type { MoveableOptions } from 'moveable';
 import Moveable from 'moveable';
 import MoveableHelper from 'moveable-helper';
 
-import { GHOST_EL_ID_PREFIX, GuidesType, Mode } from './const';
+import { DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, GuidesType, Mode } from './const';
 import StageCore from './StageCore';
-import type { SortEventData, StageDragResizeConfig } from './types';
+import type { Offset, Runtime, SortEventData, StageDragResizeConfig } from './types';
 import { getAbsolutePosition, getMode, getOffset } from './util';
 
 enum ActionStatus {
@@ -41,15 +41,16 @@ export default class StageDragResize extends EventEmitter {
   public core: StageCore;
   public container: HTMLElement;
   public target?: HTMLElement;
-  public dragEl?: HTMLElement;
+  public dragEl: HTMLElement;
   public moveable?: Moveable;
   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) {
@@ -57,6 +58,9 @@ export default class StageDragResize extends EventEmitter {
 
     this.core = config.core;
     this.container = config.container;
+
+    this.dragEl = globalThis.document.createElement('div');
+    this.container.append(this.dragEl);
   }
 
   /**
@@ -65,29 +69,24 @@ export default class StageDragResize extends EventEmitter {
    * @param el 选中组件的Dom节点元素
    * @param event 鼠标事件
    */
-  public async select(el: HTMLElement, event?: MouseEvent): Promise<void> {
+  public select(el: HTMLElement, event?: MouseEvent): void {
+    const oldTarget = this.target;
     this.target = el;
-    // 如果有滚动条会导致resize时获取到width，height不准确
-    if (/(auto|scroll)/.test(this.target.style.overflow)) {
-      this.target.style.overflow = 'hidden';
-    }
-    this.mode = getMode(el);
-    this.destroyDragEl();
-    this.destroyGhostEl();
 
-    this.dragEl = this.generateDragEl(el);
+    this.init(el);
 
-    this.moveableOptions = await this.getOptions({
-      target: this.dragEl || this.target,
-    });
-
-    this.moveableHelper = MoveableHelper.create({
-      useBeforeRender: true,
-      useRender: false,
-      createAuto: true,
-    });
+    // 从不能拖动到能拖动的节点之间切换，要重新创建moveable，不然dragStart不生效
+    if (!this.moveable || this.target !== oldTarget) {
+      this.moveableHelper = MoveableHelper.create({
+        useBeforeRender: true,
+        useRender: false,
+        createAuto: true,
+      });
 
-    this.initMoveable();
+      this.initMoveable();
+    } else {
+      this.updateMoveable();
+    }
 
     if (event) {
       this.moveable?.dragStart(event);
@@ -97,11 +96,15 @@ export default class StageDragResize extends EventEmitter {
   /**
    * 初始化选中框并渲染出来
    */
-  public async refresh() {
+  public updateMoveable(el = this.target): void {
     if (!this.moveable) throw new Error('未初始化moveable');
+    if (!el) throw new Error('为选中任何节点');
+
+    this.target = el;
 
-    const options = await this.getOptions();
-    Object.entries(options).forEach(([key, value]) => {
+    this.init(el);
+
+    Object.entries(this.moveableOptions).forEach(([key, value]) => {
       (this.moveable as any)[key] = value;
     });
     this.moveable.updateTarget();
@@ -110,17 +113,21 @@ export default class StageDragResize extends EventEmitter {
   public setGuidelines(type: GuidesType, guidelines: number[]): void {
     if (type === GuidesType.HORIZONTAL) {
       this.horizontalGuidelines = guidelines;
+      this.moveableOptions.horizontalGuidelines = guidelines;
     } else if (type === GuidesType.VERTICAL) {
       this.verticalGuidelines = guidelines;
+      this.moveableOptions.verticalGuidelines = guidelines;
     }
 
-    this.refresh();
+    this.updateMoveable();
   }
 
   public clearGuides() {
-    this.verticalGuidelines = [];
     this.horizontalGuidelines = [];
-    this.refresh();
+    this.verticalGuidelines = [];
+    this.moveableOptions.horizontalGuidelines = [];
+    this.moveableOptions.verticalGuidelines = [];
+    this.updateMoveable();
   }
 
   /**
@@ -134,6 +141,22 @@ export default class StageDragResize extends EventEmitter {
     this.removeAllListeners();
   }
 
+  private init(el: HTMLElement): void {
+    // 如果有滚动条会导致resize时获取到width，height不准确
+    if (/(auto|scroll)/.test(el.style.overflow)) {
+      el.style.overflow = 'hidden';
+    }
+    this.mode = getMode(el);
+
+    this.destroyGhostEl();
+
+    this.updateDragEl(el);
+
+    this.moveableOptions = this.getOptions({
+      target: this.dragEl,
+    });
+  }
+
   private initMoveable() {
     this.moveable?.destroy();
 
@@ -196,10 +219,7 @@ export default class StageDragResize extends EventEmitter {
   private bindDragEvent(): void {
     if (!this.moveable) throw new Error('moveable 为初始化');
 
-    let offset = {
-      left: 0,
-      top: 0,
-    };
+    let offset: Offset | null = null;
 
     this.moveable
       .on('dragStart', (e) => {
@@ -209,14 +229,17 @@ export default class StageDragResize extends EventEmitter {
 
         this.moveableHelper?.onDragStart(e);
 
-        offset = getAbsolutePosition(this.target, { left: 0, top: 0 });
-
         if (this.mode === Mode.SORTABLE) {
           this.ghostEl = this.generateGhostEl(this.target);
         }
       })
       .on('drag', (e) => {
         if (!this.target || !this.dragEl) return;
+
+        if (!offset) {
+          offset = getAbsolutePosition(this.target, { left: 0, top: 0 });
+        }
+
         this.dragStatus = ActionStatus.ING;
 
         const { left, top } = e;
@@ -244,24 +267,23 @@ export default class StageDragResize extends EventEmitter {
               this.update();
           }
         }
+        offset = null;
 
         this.dragStatus = ActionStatus.END;
         this.destroyGhostEl();
       });
   }
 
-  private async getSnapElements(el: HTMLElement): Promise<HTMLElement[]> {
-    const { renderer } = this.core;
+  private getSnapElements(runtime: Runtime, el?: HTMLElement): HTMLElement[] {
+    const { renderer, mask } = this.core;
     const getSnapElements =
-      (await renderer.getRuntime())?.getSnapElements ||
+      runtime?.getSnapElements ||
       (() => {
         const doc = renderer.contentWindow?.document;
         return doc ? Array.from(doc.querySelectorAll('[id]')) : [];
       });
-    return (
-      getSnapElements(el)
-        // 排除掉当前组件本身
-        .filter((element) => element !== this.target && !this.target?.contains(element))
+    return getSnapElements(el).filter(
+      (element) => element !== this.target && !this.target?.contains(element) && element !== mask.page,
     );
   }
 
@@ -307,7 +329,7 @@ export default class StageDragResize extends EventEmitter {
 
     const ghostEl = el.cloneNode(true) as HTMLElement;
     const { top, left } = getAbsolutePosition(el, getOffset(el));
-    ghostEl.id = `${GHOST_EL_ID_PREFIX}${ghostEl.id}`;
+    ghostEl.id = `${GHOST_EL_ID_PREFIX}${el.id}`;
     ghostEl.style.zIndex = '5';
     ghostEl.style.opacity = '.5';
     ghostEl.style.position = 'absolute';
@@ -322,34 +344,31 @@ export default class StageDragResize extends EventEmitter {
     this.ghostEl = undefined;
   }
 
-  private generateDragEl(el: HTMLElement): HTMLElement {
-    if (this.dragEl) {
-      this.destroyDragEl();
-    }
-
+  private updateDragEl(el: HTMLElement) {
     const { width, height } = el.getBoundingClientRect();
     const offset = getOffset(el);
-    const dragEl = globalThis.document.createElement('div');
-    dragEl.style.cssText = `
+
+    this.dragEl.style.cssText = `
       position: absolute;
       left: ${offset.left}px;
       top: ${offset.top}px;
       width: ${width}px;
       height: ${height}px;
+      z-index: 9;
     `;
-    this.container.append(dragEl);
-    return dragEl;
+
+    this.dragEl.id = `${DRAG_EL_ID_PREFIX}${el.id}`;
   }
 
   private destroyDragEl(): void {
     this.dragEl?.remove();
-    this.dragEl = undefined;
   }
 
-  private async getOptions(options: MoveableOptions = {}): Promise<MoveableOptions> {
+  private getOptions(options: MoveableOptions = {}): MoveableOptions {
     if (!this.target) return {};
 
     const isAbsolute = this.mode === Mode.ABSOLUTE;
+    const isFixed = this.mode === Mode.FIXED;
 
     let { moveableOptions = {} } = this.core.config;
 
@@ -358,14 +377,14 @@ export default class StageDragResize extends EventEmitter {
     }
 
     return {
-      origin: true,
+      origin: false,
       rootContainer: this.core.container,
       zoom: 1,
       dragArea: false,
       draggable: true,
       resizable: true,
-      snappable: isAbsolute,
-      snapGap: isAbsolute,
+      snappable: isAbsolute || isFixed,
+      snapGap: isAbsolute || isFixed,
       snapThreshold: 5,
       snapDigit: 0,
       throttleDrag: 0,
@@ -378,8 +397,16 @@ export default class StageDragResize extends EventEmitter {
         center: isAbsolute,
         middle: isAbsolute,
       },
+      elementSnapDirections: {
+        top: isAbsolute,
+        right: isAbsolute,
+        bottom: isAbsolute,
+        left: isAbsolute,
+      },
+      isDisplayInnerSnapDigit: true,
       horizontalGuidelines: this.horizontalGuidelines,
       verticalGuidelines: this.verticalGuidelines,
+      elementGuidelines: this.elementGuidelines,
 
       bounds: {
         top: 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,8 +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,
+      target: this.calibrationTarget.update(el, HIGHLIGHT_EL_ID_PREFIX),
+      origin: false,
+      rootContainer: this.core.container,
+      zoom: 1,
     });
   }
 
@@ -54,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();
   }
@@ -63,5 +76,6 @@ export default class StageHighlight extends EventEmitter {
    */
   public destroy(): void {
     this.moveable?.destroy();
+    this.calibrationTarget.destroy();
   }
 }