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

package/dist/types/src/const.d.ts

@@ -1,21 +1,46 @@
+/** 流式布局下拖动时需要clone一个镜像节点，镜像节点的id前缀 */
 export declare const GHOST_EL_ID_PREFIX = "ghost_el_";
+/** 拖动的时候需要在蒙层中创建一个占位节点，该节点的id前缀 */
+export declare const DRAG_EL_ID_PREFIX = "drag_el_";
+/** 高亮事需要在蒙层中创建一个占位节点，该节点的id前缀 */
+export declare const HIGHLIGHT_EL_ID_PREFIX = "highlight_el_";
+/** 默认放到缩小倍数 */
 export declare const DEFAULT_ZOOM = 1;
+/** 参考线类型 */
 export declare enum GuidesType {
+    /** 水平 */
     HORIZONTAL = "horizontal",
+    /** 垂直 */
     VERTICAL = "vertical"
 }
+/** css z-index */
 export declare enum ZIndex {
+    /** 蒙层，用于监听用户操作，需要置于顶层 */
     MASK = "99999",
-    SELECTED_EL = "666"
+    /** 选中的节点 */
+    SELECTED_EL = "666",
+    GHOST_EL = "700",
+    DRAG_EL = "9"
 }
+/** 鼠标按键 */
 export declare enum MouseButton {
+    /** 左键 */
     LEFT = 0,
+    /** z中健 */
     MIDDLE = 1,
+    /** 右键 */
     RIGHT = 2
 }
+/** 布局方式 */
 export declare enum Mode {
+    /** 绝对定位布局 */
     ABSOLUTE = "absolute",
+    /** 固定定位布局 */
     FIXED = "fixed",
+    /** 流式布局 */
     SORTABLE = "sortable"
 }
+/** 选中节点的class name */
 export declare const SELECTED_CLASS = "tmagic-stage-selected-area";
+export declare const H_GUIDE_LINE_STORAGE_KEY = "$MagicStageHorizontalGuidelinesData";
+export declare const V_GUIDE_LINE_STORAGE_KEY = "$MagicStageVerticalGuidelinesData";

package/dist/types/src/types.d.ts

@@ -1,8 +1,11 @@
-import { MoveableOptions } from 'react-moveable/declaration/types';
+import { MoveableOptions } from 'moveable';
+import Core from '@tmagic/core';
 import { Id, MApp, MNode } from '@tmagic/schema';
 import { GuidesType } from './const';
 import StageCore from './StageCore';
-export declare type CanSelect = (el: HTMLElement, stop: () => boolean) => boolean | Promise<boolean>;
+import StageDragResize from './StageDragResize';
+import StageMask from './StageMask';
+export declare type CanSelect = (el: HTMLElement, event: MouseEvent, stop: () => boolean) => boolean | Promise<boolean>;
 export declare type StageCoreConfig = {
     /** 需要对齐的dom节点的CSS选择器字符串 */
     snapElementQuerySelector?: string;
@@ -13,6 +16,8 @@ export declare type StageCoreConfig = {
     /** runtime 的HTML地址，可以是一个HTTP地址，如果和编辑器不同域，需要设置跨域，也可以是一个相对或绝对路径 */
     runtimeUrl?: string;
     render?: (renderer: StageCore) => Promise<HTMLElement> | HTMLElement;
+    autoScrollIntoView?: boolean;
+    updateDragEl?: (el: HTMLDivElement, target: HTMLElement) => void;
 };
 export interface StageRenderConfig {
     core: StageCore;
@@ -40,10 +45,14 @@ export interface UpdateEventData {
     el: HTMLElement;
     ghostEl: HTMLElement;
     style: {
-        width: number;
-        height: number;
+        width?: number;
+        height?: number;
         left?: number;
         top?: number;
+        transform?: {
+            rotate?: string;
+            scale?: string;
+        };
     };
 }
 export interface SortEventData {
@@ -60,9 +69,10 @@ export interface RemoveData {
     root: MApp;
 }
 export interface Runtime {
+    getApp?: () => Core;
     beforeSelect?: (el: HTMLElement) => Promise<boolean> | boolean;
-    getSnapElements?: (el: HTMLElement) => HTMLElement[];
-    updateRootConfig: (config: MApp) => void;
+    getSnapElements?: (el?: HTMLElement) => HTMLElement[];
+    updateRootConfig?: (config: MApp) => void;
     updatePageId?: (id: Id) => void;
     select?: (id: Id) => Promise<HTMLElement> | HTMLElement;
     add?: (data: UpdateData) => void;
@@ -82,3 +92,9 @@ export interface StageHighlightConfig {
     core: StageCore;
     container: HTMLElement;
 }
+export interface TargetCalibrateConfig {
+    parent: HTMLElement;
+    mask: StageMask;
+    dr: StageDragResize;
+    core: StageCore;
+}

package/dist/types/src/util.d.ts

@@ -1,4 +1,4 @@
-import { Mode } from './const';
+import { GuidesType, Mode } from './const';
 import type { Offset } from './types';
 export declare const getOffset: (el: HTMLElement) => Offset;
 export declare const getAbsolutePosition: (el: HTMLElement, { top, left }: Offset) => {
@@ -19,4 +19,5 @@ export declare const createDiv: ({ className, cssText }: {
     cssText: string;
 }) => HTMLDivElement;
 export declare const removeSelectedClassName: (doc: Document) => void;
-export declare const addSelectedClassName: (el: Element) => void;
+export declare const addSelectedClassName: (el: Element, doc: Document) => void;
+export declare const getGuideLineFromCache: (type: GuidesType) => number[];

package/package.json

@@ -1,7 +1,9 @@
 {
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.11",
   "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,12 @@
   },
   "dependencies": {
     "@scena/guides": "^0.17.0",
-    "@tmagic/schema": "^1.0.0-beta.9",
-    "@tmagic/utils": "^1.0.0-beta.8",
+    "@tmagic/core": "1.0.0-rc.11",
+    "@tmagic/schema": "1.0.0-rc.11",
+    "@tmagic/utils": "1.0.0-rc.11",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
-    "moveable": "^0.28.0",
+    "moveable": "^0.29.4",
     "moveable-helper": "^0.4.0"
   },
   "devDependencies": {
@@ -38,6 +43,5 @@
     "typescript": "^4.3.4",
     "vite": "^2.3.7",
     "vite-plugin-dts": "^0.9.6"
-  },
-  "gitHead": "6314078c100ddcf513eb5581b38e2292f9b93eb9"
+  }
 }

package/src/Rule.ts

@@ -2,13 +2,14 @@ import EventEmitter from 'events';
 
 import Guides, { GuidesEvents } from '@scena/guides';
 
-import { GuidesType } from './const';
+import { GuidesType, H_GUIDE_LINE_STORAGE_KEY, V_GUIDE_LINE_STORAGE_KEY } from './const';
+import { getGuideLineFromCache } from './util';
 
 export default class Rule extends EventEmitter {
   public hGuides: Guides;
   public vGuides: Guides;
-  public horizontalGuidelines: number[] = [];
-  public verticalGuidelines: number[] = [];
+  public horizontalGuidelines: number[] = getGuideLineFromCache(GuidesType.HORIZONTAL);
+  public verticalGuidelines: number[] = getGuideLineFromCache(GuidesType.VERTICAL);
 
   private container: HTMLDivElement;
   private containerResizeObserver: ResizeObserver;
@@ -17,8 +18,8 @@ export default class Rule extends EventEmitter {
     super();
 
     this.container = container;
-    this.hGuides = this.createGuides(GuidesType.HORIZONTAL);
-    this.vGuides = this.createGuides(GuidesType.VERTICAL);
+    this.hGuides = this.createGuides(GuidesType.HORIZONTAL, this.horizontalGuidelines);
+    this.vGuides = this.createGuides(GuidesType.VERTICAL, this.verticalGuidelines);
 
     this.hGuides.on('changeGuides', this.hGuidesChangeGuidesHandler);
     this.vGuides.on('changeGuides', this.vGuidesChangeGuidesHandler);
@@ -68,6 +69,9 @@ export default class Rule extends EventEmitter {
       type: GuidesType.HORIZONTAL,
       guides: [],
     });
+
+    globalThis.localStorage.setItem(V_GUIDE_LINE_STORAGE_KEY, '[]');
+    globalThis.localStorage.setItem(H_GUIDE_LINE_STORAGE_KEY, '[]');
   }
 
   /**
@@ -138,6 +142,8 @@ export default class Rule extends EventEmitter {
       type: GuidesType.HORIZONTAL,
       guides: this.horizontalGuidelines,
     });
+
+    globalThis.localStorage.setItem(H_GUIDE_LINE_STORAGE_KEY, JSON.stringify(e.guides));
   };
 
   private vGuidesChangeGuidesHandler = (e: GuidesEvents['changeGuides']) => {
@@ -146,5 +152,7 @@ export default class Rule extends EventEmitter {
       type: GuidesType.VERTICAL,
       guides: this.verticalGuidelines,
     });
+
+    globalThis.localStorage.setItem(V_GUIDE_LINE_STORAGE_KEY, JSON.stringify(e.guides));
   };
 }

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;
   }
 }