camunda-bpmn-js 4.20.0 → 4.20.1

package/dist/base-modeler.development.js

@@ -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 searchableEntries = originalEntries.filter(({ searchable }) => searchable !== false);
+        const searchableFields = [
+          entry.description || '',
+          entry.label || '',
+          entry.search || ''
+        ].map(string => string.toLowerCase());
 
-      return searchFn(searchableEntries, value, {
-        keys: [
-          'label',
-          'description',
-          'search'
-        ]
-      }).map(({ item }) => item);
+        // 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 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 ]
   };