page editor

eez-open · Dec 8, 2018 · 7d76d2b · 7d76d2b
1 parent 3f91b6f
commit 7d76d2b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "author": "Envox",
   "description": "EEZ Studio",
   "version": "0.9.0",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-only",
   "repository": "https://github.com/eez-open/psu-firmware",
   "main": "packages/main/main.js",
   "scripts": {

diff --git a/packages/eez-studio-designer/package.json b/packages/eez-studio-designer/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "keywords": [],
   "author": "Envox",
-  "license": "GPLv3",
+  "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
     "url": "git://github.com/eez-open/studio.git"

diff --git a/packages/eez-studio-page-editor/editor.tsx b/packages/eez-studio-page-editor/editor.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import { observable, computed, action, toJS } from "mobx";
-import { observer, inject, IWrappedComponent } from "mobx-react";
+import { observable, computed, action, toJS, autorun } from "mobx";
+import { observer, inject, IWrappedComponent, disposeOnUnmount } from "mobx-react";
 import { bind } from "bind-decorator";
 
 import { _range } from "eez-studio-shared/algorithm";
@@ -922,6 +922,25 @@ export class PageEditor extends React.Component<PageEditorPrope> implements IDoc
     @observable
     dragWidget: Widget | undefined;
 
+    @disposeOnUnmount
+    autorunDisposer = autorun(() => {
+        const dragWidget = this.dragWidget;
+        if (dragWidget) {
+            setTimeout(() => {
+                const object = this.findObjectById(dragWidget._id);
+                if (object) {
+                    const viewState = this.designerContextComponent!.designerContext.viewState;
+                    if (
+                        viewState.selectedObjects.length !== 1 ||
+                        viewState.selectedObjects[0] !== object
+                    ) {
+                        viewState.selectObjects([object]);
+                    }
+                }
+            }, 0);
+        }
+    });
+
     get rootObjects() {
         return [this.rootObjectComponent];
     }

diff --git a/packages/eez-studio-page-editor/package.json b/packages/eez-studio-page-editor/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "keywords": [],
   "author": "Envox",
-  "license": "GPLv3",
+  "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
     "url": "git://github.com/eez-open/studio.git"

diff --git a/packages/eez-studio-shared/model/object.ts b/packages/eez-studio-shared/model/object.ts
@@ -34,7 +34,9 @@ export enum PropertyType {
 
 export enum TargetDataType {
     String,
-    Number
+    Number,
+    Array,
+    Object
 }
 
 export enum MessageType {

diff --git a/packages/eez-studio-shared/package.json b/packages/eez-studio-shared/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "keywords": [],
   "author": "Envox",
-  "license": "GPLv3",
+  "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
     "url": "git://github.com/eez-open/studio.git"

diff --git a/packages/eez-studio-ui/package.json b/packages/eez-studio-ui/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "keywords": [],
   "author": "Envox",
-  "license": "GPLv3",
+  "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
     "url": "git://github.com/eez-open/studio.git"