@joint/core 4.0.1 → 4.0.3

package/src/dia/attributes/text.mjs

@@ -123,12 +123,16 @@ const textAttributesNS = {
             if (text === undefined) text = attrs.text;
             if (text !== undefined) {
                 const breakTextFn = value.breakText || breakText;
+                const computedStyles = getComputedStyle(node);
+
                 wrappedText = breakTextFn('' + text, size, {
-                    'font-weight': attrs['font-weight'],
-                    'font-size': attrs['font-size'],
-                    'font-family': attrs['font-family'],
+                    'font-weight': computedStyles.fontWeight,
+                    'font-family': computedStyles.fontFamily,
+                    'text-transform': computedStyles.textTransform,
+                    'font-size': computedStyles.fontSize,
+                    'letter-spacing': computedStyles.letterSpacing,
+                    // The `line-height` attribute in SVG is JoinJS specific.
                     'lineHeight': attrs['line-height'],
-                    'letter-spacing': attrs['letter-spacing']
                 }, {
                     // Provide an existing SVG Document here
                     // instead of creating a temporary one over again.

package/src/dia/layers/GridLayer.mjs

@@ -67,7 +67,7 @@ export const GridLayer = PaperLayer.extend({
 
         gridSettings.forEach((gridLayerSetting, index) => {
 
-            const id = 'pattern_' + index;
+            const id = this._getPatternId(index);
             const options = merge({}, gridLayerSetting);
             const { scaleFactor = 1 } = options;
             options.width = gridSize * scaleFactor || 1;
@@ -107,12 +107,16 @@ export const GridLayer = PaperLayer.extend({
         }
         gridSettings.forEach((options, index) => {
             if (isFunction(options.update)) {
-                const vPattern = patterns['pattern_' + index];
+                const vPattern = patterns[this._getPatternId(index)];
                 options.update(vPattern.node.firstChild, options, paper);
             }
         });
     },
 
+    _getPatternId(index) {
+        return `pattern_${this.options.paper.cid}_${index}`;
+    },
+
     _getGridRefs() {
         let { _gridCache: grid } = this;
         if (grid) return grid;

package/src/dia/ports.mjs

@@ -731,6 +731,13 @@ export const elementViewPortPrototype = {
             'port-group': port.group
         });
 
+        // If the port ID is a number, we need to add
+        // extra information to the port element to distinguish
+        // between ports with the same ID but different types.
+        if (util.isNumber(port.id)) {
+            portElement.attr('port-id-type', 'number');
+        }
+
         const labelMarkupDef = this._getPortLabelMarkup(port.label);
         if (Array.isArray(labelMarkupDef)) {
             // JSON Markup

package/src/linkTools/Arrowhead.mjs

@@ -48,12 +48,14 @@ const Arrowhead = ToolView.extend({
         evt.stopPropagation();
         evt.preventDefault();
         var relatedView = this.relatedView;
+        var paper = relatedView.paper;
         relatedView.model.startBatch('arrowhead-move', { ui: true, tool: this.cid });
         relatedView.startArrowheadMove(this.arrowheadType);
         this.delegateDocumentEvents();
-        relatedView.paper.undelegateEvents();
+        paper.undelegateEvents();
         this.focus();
         this.el.style.pointerEvents = 'none';
+        relatedView.notifyPointerdown(...paper.getPointerArgs(evt));
     },
     onPointerMove: function(evt) {
         var normalizedEvent = util.normalizeEvent(evt);

package/src/mvc/View.mjs

@@ -63,23 +63,25 @@ export const View = ViewBase.extend({
         return this;
     },
 
-    findAttribute: function(attributeName, node) {
-
-        var currentNode = node;
-
+    findAttributeNode: function(attributeName, node) {
+        let currentNode = node;
         while (currentNode && currentNode.nodeType === 1) {
-            var attributeValue = currentNode.getAttribute(attributeName);
             // attribute found
-            if (attributeValue) return attributeValue;
+            // (empty value does not count as attribute found)
+            if (currentNode.getAttribute(attributeName)) return currentNode;
             // do not climb up the DOM
             if (currentNode === this.el) return null;
             // try parent node
             currentNode = currentNode.parentNode;
         }
-
         return null;
     },
 
+    findAttribute: function(attributeName, node) {
+        const matchedNode = this.findAttributeNode(attributeName, node);
+        return matchedNode && matchedNode.getAttribute(attributeName);
+    },
+
     // Override the mvc ViewBase `_ensureElement()` method in order to create an
     // svg element (e.g., `<g>`) node that wraps all the nodes of the Cell view.
     // Expose class name setter as a separate method.