all 70%

packages/designer/src/designer/designer.ts

@@ -1,10 +1,10 @@
-import Dragon, { isDragNodeObject, isDragNodeDataObject } from "./dragon";
+import { ComponentType } from 'react';
+import { obx, computed } from '@recore/obx';
+import { SimulatorView as BuiltinSimulatorView } from '../builtins/simulator';
+import Dragon, { isDragNodeObject, isDragNodeDataObject, LocateEvent, DragObject } from './dragon';
 import Project from './project';
 import { ProjectSchema } from './schema';
 import DocumentModel from './document/document-model';
-import BuiltinSimulatorView from '../builtins/simulator/master';
-import { Component } from 'react';
-import { obx, computed } from '@recore/obx';
 import ActiveTracker from './active-tracker';
 import Location, { LocationData, isLocationChildrenDetail } from './location';
 import Node, { insertChildren } from './document/node/node';
@@ -15,13 +15,13 @@ export interface DesignerProps {
   defaultSchema?: ProjectSchema;
   hotkeys?: object;
   simulatorProps?: object | ((document: DocumentModel) => object);
-  simulatorComponent?: Component<any>;
+  simulatorComponent?: ComponentType<any>;
-  dragGhostComponent?: Component<any>;
+  dragGhostComponent?: ComponentType<any>;
   suspensed?: boolean;
   onMount?: (designer: Designer) => void;
-  onDragstart?: (designer: Designer) => void;
+  onDragstart?: (e: LocateEvent) => void;
-  onDrag?: (designer: Designer) => void;
+  onDrag?: (e: LocateEvent) => void;
-  onDragend?: (designer: Designer) => void;
+  onDragend?: (e: { dragObject: DragObject; copy: boolean }, loc?: Location) => void;
   // TODO: ...add other events support
   [key: string]: any;
 }
@@ -35,14 +35,25 @@ export default class Designer {
   constructor(props: DesignerProps) {
     this.project = new Project(this, props.defaultSchema);
 
-    this.dragon.onDragstart(({ dragObject }) => {
+    this.dragon.onDragstart(e => {
+      const { dragObject } = e;
       if (isDragNodeObject(dragObject) && dragObject.nodes.length === 1) {
         // ensure current selecting
         dragObject.nodes[0].select();
       }
+      if (this.props?.onDragstart) {
+        this.props.onDragstart(e);
+      }
     });
 
-    this.dragon.onDragend(({ dragObject, copy }) => {
+    this.dragon.onDrag(e => {
+      if (this.props?.onDrag) {
+        this.props.onDrag(e);
+      }
+    });
+
+    this.dragon.onDragend(e => {
+      const { dragObject, copy } = e;
       const loc = this._dropLocation;
       if (loc) {
         if (isLocationChildrenDetail(loc.detail)) {
@@ -61,6 +72,9 @@ export default class Designer {
         }
       }
       this.clearLocation();
+      if (this.props?.onDragend) {
+        this.props.onDragend(e, loc);
+      }
       // this.enableEdging();
     });
 
@@ -130,17 +144,16 @@ export default class Designer {
     return this.props ? this.props[key] : null;
   }
 
-  @obx.ref private _simulatorComponent?: Component<any>;
+  @obx.ref private _simulatorComponent?: ComponentType<any>;
-  @obx.ref private _simulatorProps?: object;
+
-  @computed get simulatorConfig(): {
+  @computed get simulatorComponent(): ComponentType<any> {
-    Component: Component<any>;
+    return this._simulatorComponent || BuiltinSimulatorView;
-    props: object;
+  }
-  } {
+
-    const config: any = {
+  @obx.ref private _simulatorProps?: object | ((document: DocumentModel) => object);
-      Component: this._simulatorComponent || BuiltinSimulatorView,
+
-      props: this._simulatorProps || {},
+  @computed get simulatorProps(): object | ((document: DocumentModel) => object) {
-    };
+    return this._simulatorProps || {};
-    return config;
   }
 
   @obx.ref private _suspensed: boolean = false;
@@ -166,6 +179,6 @@ export default class Designer {
   }
 
   purge() {
-
+    // todo:
   }
 }

packages/designer/src/designer/document/document.tsx

@@ -1,27 +0,0 @@
-import { Component, createContext } from 'react';
-import DocumentModel from './document-model';
-
-export const DocumentContext = createContext<DocumentModel>(null as any);
-
-export default class DocumentView extends Component<{ documentModel: DocumentModel }> {
-  render() {
-    const { documentModel } = this.props;
-    return (
-      <div className="lc-document">
-        <DocumentContext.Provider value={documentModel}>
-          {/* 这一层将来做缩放用途 */}
-          <div className="lc-simulator-shell">
-
-          </div>
-          <DocumentInfoView />
-        </DocumentContext.Provider>
-      </div>
-    )
-  }
-}
-
-class DocumentInfoView extends Component {
-  render() {
-    return null;
-  }
-}

packages/designer/src/designer/project.ts

@@ -9,7 +9,7 @@ export default class Project {
   @obx.val readonly documents: DocumentModel[] = [];
   private data: ProjectSchema = {};
 
-  @obx.ref displayMode: 'exclusive' | 'tabbed' | 'split' = 'exclusive';
+  @obx.ref canvasDisplayMode: 'exclusive' | 'overview' = 'exclusive';
 
   // 考虑项目级别 History