camunda-bpmn-js 4.20.0 → 4.20.2

package/dist/base-modeler.development.js

@@ -6041,7 +6041,7 @@
   Canvas.prototype.viewbox = function(box) {
 
     if (box === undefined && this._cachedViewbox) {
-      return this._cachedViewbox;
+      return structuredClone(this._cachedViewbox);
     }
 
     const viewport = this._viewport,
@@ -28164,7 +28164,6 @@
       scale,
       search,
       emptyPlaceholder,
-      searchFn,
       entries: originalEntries,
       onOpened,
       onClosed
@@ -28186,19 +28185,29 @@
         return originalEntries;
       }
 
-      if (!value) {
-        return originalEntries.filter(({ rank = 0 }) => rank >= 0);
-      }
+      const filter = entry => {
+        if (!value) {
+          return (entry.rank || 0) >= 0;
+        }
+
+        if (entry.searchable === false) {
+          return false;
+        }
+
+        const searchableFields = [
+          entry.description || '',
+          entry.label || '',
+          entry.search || ''
+        ].map(string => string.toLowerCase());
 
-      const searchableEntries = originalEntries.filter(({ searchable }) => searchable !== false);
+        // every word of `value` should be included in one of the searchable fields
+        return value
+          .toLowerCase()
+          .split(/\s/g)
+          .every(word => searchableFields.some(field => field.includes(word)));
+      };
 
-      return searchFn(searchableEntries, value, {
-        keys: [
-          'label',
-          'description',
-          'search'
-        ]
-      }).map(({ item }) => item);
+      return originalEntries.filter(filter);
     }, [ searchable ]);
 
     const [ entries, setEntries ] = p$2(filterEntries(originalEntries, value));
@@ -28455,10 +28464,9 @@
    * @param {EventBus} eventBus
    * @param {Canvas} canvas
    */
-  function PopupMenu(config, eventBus, canvas, search) {
+  function PopupMenu(config, eventBus, canvas) {
     this._eventBus = eventBus;
     this._canvas = canvas;
-    this._search = search;
 
     this._current = null;
 
@@ -28490,8 +28498,7 @@
   PopupMenu.$inject = [
     'config.popupMenu',
     'eventBus',
-    'canvas',
-    'search'
+    'canvas'
   ];
 
   PopupMenu.prototype._render = function() {
@@ -28535,7 +28542,6 @@
         scale=${ scale }
         onOpened=${ this._onOpened.bind(this) }
         onClosed=${ this._onClosed.bind(this) }
-        searchFn=${ this._search }
         ...${{ ...options }}
       />
     `,
@@ -28946,6 +28952,7 @@
 
 
   PopupMenu.prototype._getEmptyPlaceholder = function(providers) {
+
     const provider = providers.find(
       provider => isFunction(provider.getEmptyPlaceholder)
     );
@@ -29021,263 +29028,10 @@
     return entry;
   };
 
-  /**
-   * @typedef { {
-   *   index: number;
-   *   match: boolean;
-   *   value: string;
-   * } } Token
-   *
-   * @typedef {Token[]} Tokens
-   *
-   * @typedef { {
-   *   item: Object,
-   *   tokens: Record<string, Tokens>
-   * } } SearchResult
-   *
-   * @typedef {SearchResult[]} SearchResults
-   */
-
-  /**
-   * Search items by query.
-   *
-   * @param {Object[]} items
-   * @param {string} pattern
-   * @param { {
-   *   keys: string[];
-   * } } options
-   *
-   * @returns {SearchResults}
-   */
-  function search(items, pattern, options) {
-    return items.reduce((results, item) => {
-      const tokens = getTokens(item, pattern, options.keys);
-
-      if (Object.keys(tokens).length) {
-        const result = {
-          item,
-          tokens
-        };
-
-        const index = getIndex(result, results, options.keys);
-
-        results.splice(index, 0, result);
-      }
-
-      return results;
-    }, []);
-  }
-
-  /**
-   * Get tokens for item.
-   *
-   * @param {Object} item
-   * @param {string} pattern
-   * @param {string[]} keys
-   *
-   * @returns {Record<string, Tokens>}
-   */
-  function getTokens(item, pattern, keys) {
-    return keys.reduce((results, key) => {
-      const string = item[ key ];
-
-      const tokens = getMatchingTokens(string, pattern);
-
-      if (hasMatch$1(tokens)) {
-        results[ key ] = tokens;
-      }
-
-      return results;
-    }, {});
-  }
-
-  /**
-   * Get index of result in list of results.
-   *
-   * @param {SearchResult} result
-   * @param {SearchResults} results
-   * @param {string[]} keys
-   *
-   * @returns {number}
-   */
-  function getIndex(result, results, keys) {
-    if (!results.length) {
-      return 0;
-    }
-
-    let index = 0;
-
-    do {
-      for (const key of keys) {
-        const tokens = result.tokens[ key ],
-              tokensOther = results[ index ].tokens[ key ];
-
-        if (tokens && !tokensOther) {
-          return index;
-        } else if (!tokens && tokensOther) {
-          index++;
-
-          break;
-        } else if (!tokens && !tokensOther) {
-          continue;
-        }
-
-        const tokenComparison = compareTokens$1(tokens, tokensOther);
-
-        if (tokenComparison === -1) {
-          return index;
-        } else if (tokenComparison === 1) {
-          index++;
-
-          break;
-        } else {
-          const stringComparison = compareStrings$1(result.item[ key ], results[ index ].item[ key ]);
-
-          if (stringComparison === -1) {
-            return index;
-          } else if (stringComparison === 1) {
-            index++;
-
-            break;
-          } else {
-            continue;
-          }
-        }
-      }
-    } while (index < results.length);
-
-    return index;
-  }
-
-  /**
-  * @param {Token} token
-  *
-  * @return {boolean}
-  */
-  function isMatch$1(token) {
-    return token.match;
-  }
-
-  /**
-  * @param {Token[]} tokens
-  *
-  * @return {boolean}
-  */
-  function hasMatch$1(tokens) {
-    return tokens.find(isMatch$1);
-  }
-
-  /**
-  * Compares two token arrays.
-  *
-  * @param {Token[]} tokensA
-  * @param {Token[]} tokensB
-  *
-  * @returns {number}
-  */
-  function compareTokens$1(tokensA, tokensB) {
-    const tokensAHasMatch = hasMatch$1(tokensA),
-          tokensBHasMatch = hasMatch$1(tokensB);
-
-    if (tokensAHasMatch && !tokensBHasMatch) {
-      return -1;
-    }
-
-    if (!tokensAHasMatch && tokensBHasMatch) {
-      return 1;
-    }
-
-    if (!tokensAHasMatch && !tokensBHasMatch) {
-      return 0;
-    }
-
-    const tokensAFirstMatch = tokensA.find(isMatch$1),
-          tokensBFirstMatch = tokensB.find(isMatch$1);
-
-    if (tokensAFirstMatch.index < tokensBFirstMatch.index) {
-      return -1;
-    }
-
-    if (tokensAFirstMatch.index > tokensBFirstMatch.index) {
-      return 1;
-    }
-
-    return 0;
-  }
-
-  /**
-  * Compares two strings.
-  *
-  * @param {string} a
-  * @param {string} b
-  *
-  * @returns {number}
-  */
-  function compareStrings$1(a, b) {
-    return a.localeCompare(b);
-  }
-
-  /**
-  * @param {string} string
-  * @param {string} pattern
-  *
-  * @return {Token[]}
-  */
-  function getMatchingTokens(string, pattern) {
-    var tokens = [],
-        originalString = string;
-
-    if (!string) {
-      return tokens;
-    }
-
-    string = string.toLowerCase();
-    pattern = pattern.toLowerCase();
-
-    var index = string.indexOf(pattern);
-
-    if (index > -1) {
-      if (index !== 0) {
-        tokens.push({
-          value: originalString.slice(0, index),
-          index: 0
-        });
-      }
-
-      tokens.push({
-        value: originalString.slice(index, index + pattern.length),
-        index: index,
-        match: true
-      });
-
-      if (pattern.length + index < string.length) {
-        tokens.push({
-          value: originalString.slice(index + pattern.length),
-          index: index + pattern.length
-        });
-      }
-    } else {
-      tokens.push({
-        value: originalString,
-        index: 0
-      });
-    }
-
-    return tokens;
-  }
-
-  /**
-   * @type { import('didi').ModuleDeclaration }
-   */
-  var Search = {
-    search: [ 'value', search ]
-  };
-
   /**
    * @type { import('didi').ModuleDeclaration }
    */
   var PopupMenuModule$1 = {
-    __depends__: [ Search ],
     __init__: [ 'popupMenu' ],
     popupMenu: [ 'type', PopupMenu ]
   };
@@ -65042,6 +64796,8 @@
    * @typedef {import('./SearchPadProvider').Token} Token
    */
 
+  var SCROLL_TO_ELEMENT_PADDING = 300;
+
   /**
    * Provides searching infrastructure.
    *
@@ -65052,7 +64808,7 @@
    */
   function SearchPad(canvas, eventBus, selection, translate) {
     this._open = false;
-    this._results = [];
+    this._results = {};
     this._eventMaps = [];
 
     this._cachedRootElement = null;
@@ -65206,6 +64962,9 @@
     });
 
     if (!searchResults.length) {
+      this._clearMarkers();
+      this._selection.select(null);
+
       return;
     }
 
@@ -65274,12 +65033,22 @@
   SearchPad.prototype._clearResults = function() {
     clear$1(this._resultsContainer);
 
-    this._results = [];
+    this._results = {};
 
     this._eventBus.fire('searchPad.cleared');
   };
 
 
+  /**
+   * Clears all markers.
+   */
+  SearchPad.prototype._clearMarkers = function() {
+    for (var id in this._results) {
+      this._canvas.removeMarker(this._results[id].element, 'djs-search-preselected');
+    }
+  };
+
+
   /**
    * Get currently selected result.
    *
@@ -65396,6 +65165,8 @@
     classes$1(this._canvas.getContainer()).remove('djs-search-open');
     classes$1(this._container).remove('open');
 
+    this._clearMarkers();
+
     this._clearResults();
 
     this._searchInput.value = '';
@@ -65434,6 +65205,8 @@
       return;
     }
 
+    this._clearMarkers();
+
     // removing preselection from current node
     if (selectedNode) {
       classes$1(selectedNode).remove(SearchPad.RESULT_SELECTED_CLASS);
@@ -65444,14 +65217,14 @@
 
     classes$1(node).add(SearchPad.RESULT_SELECTED_CLASS);
 
-    this._canvas.zoom(1);
-
     this._canvas.scrollToElement(element, {
-      top: 300
+      top: SCROLL_TO_ELEMENT_PADDING
     });
 
     this._selection.select(element);
 
+    this._canvas.addMarker(element, 'djs-search-preselected');
+
     this._eventBus.fire('searchPad.preselected', element);
   };
 
@@ -65470,7 +65243,9 @@
 
     this.close(false);
 
-    this._canvas.scrollToElement(element, { top: 400 });
+    this._canvas.scrollToElement(element, {
+      top: SCROLL_TO_ELEMENT_PADDING
+    });
 
     this._selection.select(element);
 
@@ -67457,57 +67232,64 @@
     http://jedwatson.github.io/classnames
   */
 
-  (function (module) {
-  	/* global define */
+  var hasRequiredClassnames;
+
+  function requireClassnames () {
+  	if (hasRequiredClassnames) return classnames$1.exports;
+  	hasRequiredClassnames = 1;
+  	(function (module) {
+  		/* global define */
 
-  	(function () {
+  		(function () {
 
-  		var hasOwn = {}.hasOwnProperty;
+  			var hasOwn = {}.hasOwnProperty;
 
-  		function classNames() {
-  			var classes = [];
+  			function classNames() {
+  				var classes = [];
 
-  			for (var i = 0; i < arguments.length; i++) {
-  				var arg = arguments[i];
-  				if (!arg) continue;
+  				for (var i = 0; i < arguments.length; i++) {
+  					var arg = arguments[i];
+  					if (!arg) continue;
 
-  				var argType = typeof arg;
+  					var argType = typeof arg;
 
-  				if (argType === 'string' || argType === 'number') {
-  					classes.push(arg);
-  				} else if (Array.isArray(arg)) {
-  					if (arg.length) {
-  						var inner = classNames.apply(null, arg);
-  						if (inner) {
-  							classes.push(inner);
+  					if (argType === 'string' || argType === 'number') {
+  						classes.push(arg);
+  					} else if (Array.isArray(arg)) {
+  						if (arg.length) {
+  							var inner = classNames.apply(null, arg);
+  							if (inner) {
+  								classes.push(inner);
+  							}
   						}
-  					}
-  				} else if (argType === 'object') {
-  					if (arg.toString === Object.prototype.toString) {
-  						for (var key in arg) {
-  							if (hasOwn.call(arg, key) && arg[key]) {
-  								classes.push(key);
+  					} else if (argType === 'object') {
+  						if (arg.toString === Object.prototype.toString) {
+  							for (var key in arg) {
+  								if (hasOwn.call(arg, key) && arg[key]) {
+  									classes.push(key);
+  								}
   							}
+  						} else {
+  							classes.push(arg.toString());
   						}
-  					} else {
-  						classes.push(arg.toString());
   					}
   				}
-  			}
 
-  			return classes.join(' ');
-  		}
+  				return classes.join(' ');
+  			}
 
-  		if (module.exports) {
-  			classNames.default = classNames;
-  			module.exports = classNames;
-  		} else {
-  			window.classNames = classNames;
-  		}
-  	}()); 
-  } (classnames$1));
+  			if (module.exports) {
+  				classNames.default = classNames;
+  				module.exports = classNames;
+  			} else {
+  				window.classNames = classNames;
+  			}
+  		}()); 
+  	} (classnames$1));
+  	return classnames$1.exports;
+  }
 
-  var classnamesExports = classnames$1.exports;
+  var classnamesExports = requireClassnames();
   var classnames = /*@__PURE__*/getDefaultExportFromCjs(classnamesExports);
 
   /**