@joint/core 4.2.0-alpha.1 → 4.2.0-beta.1

package/src/dia/ToolsView.mjs

@@ -1,7 +1,7 @@
 import * as mvc from '../mvc/index.mjs';
 import * as util from '../util/index.mjs';
 import { CellView } from './CellView.mjs';
-import { LayersNames } from './PaperLayer.mjs';
+import { Paper } from './Paper.mjs';
 import { ToolView } from './ToolView.mjs';
 
 export const ToolsView = mvc.View.extend({
@@ -14,7 +14,7 @@ export const ToolsView = mvc.View.extend({
         tools: null,
         relatedView: null,
         name: null,
-        // layer?: LayersNames.TOOLS
+        // layer?: Paper.Layers.TOOLS
         // z?: number
     },
 
@@ -139,7 +139,7 @@ export const ToolsView = mvc.View.extend({
     },
 
     getLayer() {
-        const { layer = LayersNames.TOOLS } = this.options;
+        const { layer = Paper.Layers.TOOLS } = this.options;
         return layer;
     },
 

package/src/dia/index.mjs

@@ -1,6 +1,5 @@
 export * from './Graph.mjs';
 export * from './attributes/index.mjs';
-export * from './PaperLayer.mjs';
 export * from './Cell.mjs';
 export * from './CellView.mjs';
 export * from './Element.mjs';
@@ -11,3 +10,9 @@ export * from './Paper.mjs';
 export * from './ToolView.mjs';
 export * from './ToolsView.mjs';
 export * from './HighlighterView.mjs';
+export * from './GraphLayerView.mjs';
+export * from './LayerView.mjs';
+export * from './GridLayerView.mjs';
+export * from './GraphLayer.mjs';
+export * from './GraphLayerCollection.mjs';
+export * from './CellCollection.mjs';

package/src/dia/ports.mjs

@@ -350,8 +350,17 @@ PortData.prototype = {
 
 export const elementPortPrototype = {
 
-    _initializePorts: function() {
-
+    _initializePorts: function(options) {
+        if (options) {
+            // Override port layout namespaces if provided in options
+            if (options.portLayoutNamespace) {
+                this.portLayoutNamespace = options.portLayoutNamespace;
+            }
+            // Override port label layout namespaces if provided in options
+            if (options.portLabelLayoutNamespace) {
+                this.portLabelLayoutNamespace = options.portLabelLayoutNamespace;
+            }
+        }
         this._createPortData();
         this.on('change:ports', function() {
 

package/src/dia/symbols.mjs

@@ -0,0 +1,24 @@
+// Internal tags to identify objects as specific JointJS types.
+// Used instead of `instanceof` for performance and cross-frame safety.
+
+// dia.Cell
+export const CELL_MARKER = Symbol('joint.cellMarker');
+
+// dia.CellCollection
+export const CELL_COLLECTION_MARKER = Symbol('joint.cellCollectionMarker');
+
+// dia.GraphLayer
+export const GRAPH_LAYER_MARKER = Symbol('joint.graphLayerMarker');
+
+// dia.GraphLayerCollection
+export const GRAPH_LAYER_COLLECTION_MARKER = Symbol('joint.graphLayerCollectionMarker');
+
+// dia.CellView
+export const CELL_VIEW_MARKER = Symbol('joint.cellViewMarker');
+
+// dia.LayerView
+export const LAYER_VIEW_MARKER = Symbol('joint.layerViewMarker');
+
+// dia.GraphLayerView
+export const GRAPH_LAYER_VIEW_MARKER = Symbol('joint.graphLayerViewMarker');
+

package/src/mvc/Collection.mjs

@@ -193,7 +193,7 @@ assign(Collection.prototype, Events, {
             for (i = 0; i < toAdd.length; i++) {
                 if (at != null) options.index = at + i;
                 model = toAdd[i];
-                model.trigger('add', model, this, options);
+                model.trigger(model.eventPrefix + 'add', model, this, options);
             }
             if (sort || orderChanged) this.trigger('sort', this, options);
             if (toAdd.length || toRemove.length || toMerge.length) {
@@ -257,9 +257,9 @@ assign(Collection.prototype, Events, {
     // properties, or an attributes object that is transformed through modelId.
     get: function(obj) {
         if (obj == null) return void 0;
-        return this._byId[obj] ||
-        this._byId[this.modelId(this._isModel(obj) ? obj.attributes : obj, obj.idAttribute)] ||
-        obj.cid && this._byId[obj.cid];
+        return this._byId.get(obj) ||
+            this._byId.get(this.modelId(this._isModel(obj) ? obj.attributes : obj, obj.idAttribute)) ||
+            obj.cid && this._byId.get(obj.cid);
     },
 
     // Returns `true` if the model is in the collection.
@@ -304,7 +304,7 @@ assign(Collection.prototype, Events, {
 
     // Define how to uniquely identify models in the collection.
     modelId: function(attrs, idAttribute) {
-        return attrs[idAttribute || this.model.prototype.idAttribute || 'id'];
+        return attrs[idAttribute || this.model.prototype?.idAttribute || 'id'];
     },
 
     // Get an iterator of all models in this collection.
@@ -375,18 +375,18 @@ assign(Collection.prototype, Events, {
     _reset: function() {
         this.length = 0;
         this.models = [];
-        this._byId  = {};
+        this._byId  = new Map();
     },
 
     // Prepare a hash of attributes (or other model) to be added to this
     // collection.
     _prepareModel: function(attrs, options) {
         if (this._isModel(attrs)) {
-            if (!attrs.collection) attrs.collection = this;
+            if (!options.dry && !attrs.collection) attrs.collection = this;
             return attrs;
         }
         options = options ? clone(options) : {};
-        options.collection = this;
+        if (!options.dry) options.collection = this;
 
         var model;
         if (this.model.prototype) {
@@ -414,13 +414,13 @@ assign(Collection.prototype, Events, {
 
             // Remove references before triggering 'remove' event to prevent an
             // infinite loop. #3693
-            delete this._byId[model.cid];
+            this._byId.delete(model.cid);
             var id = this.modelId(model.attributes, model.idAttribute);
-            if (id != null) delete this._byId[id];
+            if (id != null)this._byId.delete(id);
 
             if (!options.silent) {
                 options.index = index;
-                model.trigger('remove', model, this, options);
+                model.trigger(model.eventPrefix + 'remove', model, this, options);
             }
 
             removed.push(model);
@@ -438,18 +438,18 @@ assign(Collection.prototype, Events, {
 
     // Internal method to create a model's ties to a collection.
     _addReference: function(model, options) {
-        this._byId[model.cid] = model;
+        this._byId.set(model.cid, model);
         var id = this.modelId(model.attributes, model.idAttribute);
-        if (id != null) this._byId[id] = model;
+        if (id != null) this._byId.set(id, model);
         model.on('all', this._onModelEvent, this);
     },
 
     // Internal method to sever a model's ties to a collection.
     _removeReference: function(model, options) {
-        delete this._byId[model.cid];
+        this._byId.delete(model.cid);
         var id = this.modelId(model.attributes, model.idAttribute);
-        if (id != null) delete this._byId[id];
-        if (this === model.collection) delete model.collection;
+        if (id != null) this._byId.delete(id);
+        if (!options.dry && this === model.collection) delete model.collection;
         model.off('all', this._onModelEvent, this);
     },
 
@@ -459,12 +459,12 @@ assign(Collection.prototype, Events, {
     // in other collections are ignored.
     _onModelEvent: function(event, model, collection, options) {
         if (model) {
-            if ((event === 'add' || event === 'remove') && collection !== this) return;
+            if ((event === model.eventPrefix + 'add' || event === model.eventPrefix + 'remove') && collection !== this) return;
             if (event === 'changeId') {
                 var prevId = this.modelId(model.previousAttributes(), model.idAttribute);
                 var id = this.modelId(model.attributes, model.idAttribute);
-                if (prevId != null) delete this._byId[prevId];
-                if (id != null) this._byId[id] = model;
+                if (prevId != null) this._byId.delete(prevId);
+                if (id != null) this._byId.set(id, model);
             }
         }
         this.trigger.apply(this, arguments);

package/src/mvc/Model.mjs

@@ -25,17 +25,12 @@ import {
 export var Model = function(attributes, options) {
     var attrs = attributes || {};
     options || (options = {});
+    this.eventPrefix = options.eventPrefix || '';
     this.preinitialize.apply(this, arguments);
     this.cid = uniqueId(this.cidPrefix);
     this.attributes = {};
     if (options.collection) this.collection = options.collection;
-    var attributeDefaults = result(this, 'defaults');
-
-    // Just _.defaults would work fine, but the additional _.extends
-    // is in there for historical reasons. See #3843.
-    attrs = defaults(assign({}, attributeDefaults, attrs), attributeDefaults);
-
-    this.set(attrs, options);
+    this._setDefaults(attrs, options);
     this.changed = {};
     this.initialize.apply(this, arguments);
 };
@@ -137,14 +132,14 @@ assign(Model.prototype, Events, {
         if (this.idAttribute in attrs) {
             var prevId = this.id;
             this.id = this.get(this.idAttribute);
-            this.trigger('changeId', this, prevId, options);
+            this.trigger(this.eventPrefix + 'changeId', this, prevId, options);
         }
 
         // Trigger all relevant attribute changes.
         if (!silent) {
             if (changes.length) this._pending = options;
             for (var i = 0; i < changes.length; i++) {
-                this.trigger('change:' + changes[i], this, current[changes[i]], options);
+                this.trigger(this.eventPrefix + 'change:' + changes[i], this, current[changes[i]], options);
             }
         }
 
@@ -155,7 +150,7 @@ assign(Model.prototype, Events, {
             while (this._pending) {
                 options = this._pending;
                 this._pending = false;
-                this.trigger('change', this, options);
+                this.trigger(this.eventPrefix + 'change', this, options);
             }
         }
         this._pending = false;
@@ -235,6 +230,14 @@ assign(Model.prototype, Events, {
         if (!error) return true;
         this.trigger('invalid', this, error, assign(options, { validationError: error }));
         return false;
+    },
+
+    _setDefaults: function(ctorAttributes, options) {
+        const attributeDefaults = result(this, 'defaults');
+        // Just _.defaults would work fine, but the additional _.extends
+        // is in there for historical reasons. See #3843.
+        const attributes = defaults(assign({}, attributeDefaults, ctorAttributes), attributeDefaults);
+        this.set(attributes, options);
     }
 
 });