bpmn-js 18.1.0 → 18.1.2

package/dist/bpmn-modeler.development.js

@@ -1,5 +1,5 @@
 /*!
- * bpmn-js - bpmn-modeler v18.1.0
+ * bpmn-js - bpmn-modeler v18.1.2
  *
  * Copyright (c) 2014-present, camunda Services GmbH
  *
@@ -8,7 +8,7 @@
  *
  * Source Code: https://github.com/bpmn-io/bpmn-js
  *
- * Date: 2024-11-20
+ * Date: 2024-12-20
  */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -4919,6 +4919,7 @@
    *   deferUpdate?: boolean;
    *   width?: number;
    *   height?: number;
+   *   autoFocus?: boolean;
    * } } CanvasConfig
    * @typedef { {
    *   group: SVGElement;
@@ -5105,18 +5106,20 @@
 
     attr$1(svg, 'tabindex', 0);
 
-    eventBus.on('element.hover', () => {
+    config.autoFocus && eventBus.on('element.hover', () => {
       this.restoreFocus();
     });
 
+    eventBus.on('element.mousedown', 500, (event) => {
+      this.focus();
+    });
+
     svg.addEventListener('focusin', () => {
-      this._focused = true;
-      eventBus.fire('canvas.focus.changed', { focused: true });
+      this._setFocused(true);
     });
 
     svg.addEventListener('focusout', () => {
-      this._focused = false;
-      eventBus.fire('canvas.focus.changed', { focused: false });
+      this._setFocused(false);
     });
 
     append(container, svg);
@@ -5186,6 +5189,17 @@
     delete this._viewport;
   };
 
+  Canvas.prototype._setFocused = function(focused) {
+
+    if (focused == this._focused) {
+      return;
+    }
+
+    this._focused = focused;
+
+    this._eventBus.fire('canvas.focus.changed', { focused });
+  };
+
   Canvas.prototype._clear = function() {
 
     const allElements = this._elementRegistry.getAll();
@@ -5210,10 +5224,12 @@
   };
 
   /**
-  * Sets focus on the canvas SVG element.
-  */
+   * Sets focus on the canvas SVG element.
+   */
   Canvas.prototype.focus = function() {
     this._svg.focus({ preventScroll: true });
+
+    this._setFocused(true);
   };
 
   /**
@@ -25940,12 +25956,19 @@
 
     var context;
 
+    function handleMousedown(event) {
+      return handleStart(event.originalEvent);
+    }
 
     // listen for move on element mouse down;
     // allow others to hook into the event before us though
     // (dragging / element moving will do this)
-    eventBus.on('element.mousedown', 500, function(e) {
-      return handleStart(e.originalEvent);
+    eventBus.on('canvas.focus.changed', function(event) {
+      if (event.focused) {
+        eventBus.on('element.mousedown', 500, handleMousedown);
+      } else {
+        eventBus.off('element.mousedown', handleMousedown);
+      }
     });
 
 
@@ -26133,8 +26156,8 @@
 
     var self = this;
 
-    eventBus.on('canvas.init', function(e) {
-      self._init(config.enabled !== false);
+    eventBus.on('canvas.focus.changed', function(event) {
+      self._init(event.focused && config.enabled !== false);
     });
   }
 
@@ -26181,8 +26204,7 @@
 
   ZoomScroll.prototype._handleWheel = function handleWheel(event) {
 
-    // event is already handled by '.djs-scrollable'
-    if (closest(event.target, '.djs-scrollable', true)) {
+    if (!this._canvas.isFocused()) {
       return;
     }
 
@@ -27760,7 +27782,7 @@
         return originalEntries;
       }
 
-      if (!value) {
+      if (!value.trim()) {
         return originalEntries.filter(({ rank = 0 }) => rank >= 0);
       }
 
@@ -28637,6 +28659,12 @@
       keys
     } = options;
 
+    pattern = pattern.trim().toLowerCase();
+
+    if (!pattern) {
+      throw new Error('<pattern> must not be empty');
+    }
+
     const words = pattern.trim().toLowerCase().split(/\s+/);
 
     return items.flatMap((item) => {
@@ -28764,22 +28792,33 @@
   }
 
   /**
-   * Score a token.
+   * Score a token based on its characteristics
+   * and the length of the matched content.
    *
    * @param { Token } token
    *
    * @returns { number }
    */
   function scoreToken(token) {
+    const modifier = Math.log(token.value.length);
+
     if (!token.match) {
-      return 0;
+      return -0.07 * modifier;
     }
 
-    return token.start
-      ? 1.37
-      : token.wordStart
-        ? 1.13
-        : 1;
+    return (
+      token.start
+        ? (
+          token.end
+            ? 131.9
+            : 7.87
+        )
+        : (
+          token.wordStart
+            ? 2.19
+            : 1
+        )
+    ) * modifier;
   }
 
   /**
@@ -28818,7 +28857,12 @@
     const tokens = [];
     const matchedWords = {};
 
-    const regexpString = words.map(escapeRegexp).flatMap(str => [ '(?<wordStart>\\b' + str + ')', str ]).join('|');
+    const wordsEscaped = words.map(escapeRegexp);
+
+    const regexpString = [
+      `(?<all>${wordsEscaped.join('\\s+')})`,
+      ...wordsEscaped
+    ].join('|');
 
     const regexp = new RegExp(regexpString, 'ig');
 
@@ -28829,6 +28873,17 @@
 
       const [ value ] = match;
 
+      const startIndex = match.index;
+      const endIndex = match.index + value.length;
+
+      const start = startIndex === 0;
+      const end = endIndex === string.length;
+
+      const all = !!match.groups.all;
+
+      const wordStart = start || /\s/.test(string.charAt(startIndex - 1));
+      const wordEnd = end || /\s/.test(string.charAt(endIndex + 1));
+
       if (match.index > lastIndex) {
 
         // add previous token (NO match)
@@ -28843,11 +28898,18 @@
         value,
         index: match.index,
         match: true,
-        wordStart: !!match.groups.wordStart,
-        start: match.index === 0
+        wordStart,
+        wordEnd,
+        start,
+        end,
+        all
       });
 
-      matchedWords[value.toLowerCase()] = true;
+      const newMatchedWords = all ? words : [ value ];
+
+      for (const word of newMatchedWords) {
+        matchedWords[word.toLowerCase()] = true;
+      }
 
       lastIndex = match.index + value.length;
     }
@@ -65048,7 +65110,7 @@
     this._clearResults();
 
     // do not search on empty query
-    if (!pattern || pattern === '') {
+    if (!pattern.trim()) {
       return;
     }