@dualbox/editor 1.0.80 → 1.0.82

package/js/src/m/DualboxUtils.js

@@ -30,7 +30,14 @@ class DualboxUtils {
         return packageName.indexOf('dualbox-module-') !== -1 ||
             packageName.indexOf('dualbox-core-') !== -1;
     }
-}
 
-export default new DualboxUtils();
+    isLibrary(packageName) {
+        return packageName === "@dualbox/dualbox" || packageName.indexOf('dualbox-lib-') !== -1;
+    }
+
+    isType(packageName) {
+        return packageName.indexOf('dualbox-type-') !== -1;
+    }
+}
 
+export default new DualboxUtils();

package/js/src/m/GraphModel.js

@@ -415,6 +415,20 @@ class GraphModel {
         return instances;
     }
 
+    // add pkg dependencies (lib, types, etc) to app graph
+    addDependencies(pkg) {
+        _.each(pkg.dependencies, async (dependencyVersion, dependencyName) => {
+            if (utils.isLibrary(dependencyName) || utils.isType(dependencyName)) {
+                console.log('[*] Adding dependency: ' + dependencyName);
+                // await this.e.loadPackage(dependencyName, dependencyVersion); // Is this better ?
+                await this.e.loadPackage(dependencyName); // or should we just load the last version ?
+                let pkg = this.e.packages[dependencyName]
+                this.data.root.libs[pkg.name] = pkg.version;
+                await this.addDependencies(pkg);
+            }
+        });
+    }
+
     addNode(id, pkg) {
         console.log('adding node: ' + id);
 
@@ -430,6 +444,7 @@ class GraphModel {
                 return false;
             }
             var node = this.getCurrentMetanode().modules[id] = desc;
+            this.addDependencies(pkg); // async but no pb
         } else if (utils.isUI(pkg.name)) {
             this.ensure('ui');
             if (this.getCurrentMetanode().ui[id]) {
@@ -437,6 +452,7 @@ class GraphModel {
                 return false;
             }
             var node = this.getCurrentMetanode().ui[id] = desc;
+            this.addDependencies(pkg); // async but no pb
         } else {
             // may be a metanode
             var nodeDef = idx(this.getCurrentMetanode(), o => o.metanodes[pkg.name]);
@@ -1695,7 +1711,7 @@ class GraphNode {
 
     // return true if the node is in a metanode
     isInMetanode() {
-        return this.m.getCurrentMetanodeName() != "Application";
+        return this.m.getCurrentMetanodeName() != this.m.data.windows[0][0];
     }
 
     // Works only is this.isInMetanode() == true

package/js/src/v/templates/editMainSettings.vue

@@ -543,7 +543,12 @@ export default {
             });
 
             var index = parseInt($(e.target).attr('data-index'));
+
+            // set event target
             this.view.c.setEventTarget( "#application-" + $(e.target).attr('dualbox-target') + '-' + $(e.target).attr('data-event'), index, target);
+
+            // also set event name, to ensure we don't have a set event that doesn't exist on this node
+            this.view.c.setEventName( "#application-" + $(e.target).attr('dualbox-target') + '-' + $(e.target).attr('data-event'), index, targetEvents[0]);
             this.onEdited();
         },
 

package/js/src/v/templates/editValue.vue

@@ -217,21 +217,23 @@ export default {
             var templateType = null;
             if (resolvedType.startsWith("array")) {
                 templateType = "array";
-                this.deserializedValue = this.v || [];
+                this.deserializedValue = _.clone(this.v || []);
             } else if (resolvedType.startsWith("map")) {
                 templateType = "map";
-                this.deserializedValue = window.DualBox.Type.deserialize(
-                    this.v || {
-                        metadata: {
-                            type:
-                                "Map<String," +
-                                this.firstLetterUppercase(
-                                    this.getEmbeddedType(resolvedType)
-                                ) +
-                                ">"
-                        },
-                        data: {}
-                    }
+                this.deserializedValue = _.clone(
+                    window.DualBox.Type.deserialize(
+                        this.v || {
+                            metadata: {
+                                type:
+                                    "Map<String," +
+                                    this.firstLetterUppercase(
+                                        this.getEmbeddedType(resolvedType)
+                                    ) +
+                                    ">"
+                            },
+                            data: {}
+                        }
+                    )
                 );
             }
 
@@ -298,7 +300,8 @@ export default {
             this.$forceUpdate();
 
             if (this.isTemplateType()) {
-                this.emit(this.serialize(this.deserializedValue));
+                let value = _.clone(this.deserializedValue);
+                this.emit(this.serialize(value));
                 this.emitted = true;
             } else if (this.isObjectType()) {
                 // emit the result to the parent Vue

package/js/src/v/templates/main.vue

@@ -1117,7 +1117,7 @@ export default {
                                         "dualbox-container",
                                         "dualbox-container-" + name,
                                         type == "viewer"
-                                            ? "dualbox-viewer"
+                                            ? "dualbox-viewer dualbox-mobile-h60"
                                             : "dualbox-controls",
                                         "dualbox-panel",
                                         cssPositionClass

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dualbox/editor",
-    "version": "1.0.80",
+    "version": "1.0.82",
     "description": "Editor of Dualbox apps",
     "browser": "js/dist/GraphEditor.js",
     "main": "js/dist/GraphEditor.js",